Commit Graph

197 Commits

Author SHA1 Message Date
Toshi MARUYAMA 41667cd5de Merged r12929 from trunk to 2.5-stable (#16177)
scm: mercurial: add one "closed" branch to test repository.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12931 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 13:01:43 +00:00
Toshi MARUYAMA e8df3d50e8 Rails4: fix time related git adapter test failures
git-svn-id: http://svn.redmine.org/redmine/trunk@12882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-14 05:05:24 +00:00
Toshi MARUYAMA 5872d079e6 scm: mercurial: use long id in adapter level (#14361)
git-svn-id: http://svn.redmine.org/redmine/trunk@12761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 04:44:38 +00:00
Toshi MARUYAMA d26b4fc5b7 scm: mercurial: add adapter entry test (#14361)
git-svn-id: http://svn.redmine.org/redmine/trunk@12756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 04:43:17 +00:00
Toshi MARUYAMA f2ec6f8d77 back out r12752 (#14361)
Revision, Author and Comment of repository browser are broken.

git-svn-id: http://svn.redmine.org/redmine/trunk@12753 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 08:46:47 +00:00
Toshi MARUYAMA ae68ff1100 scm: mercurial: use long id in adapter level (#14361)
git-svn-id: http://svn.redmine.org/redmine/trunk@12752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 07:47:04 +00:00
Toshi MARUYAMA 35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA 9002477006 scm: git: use "--encoding=UTF-8" for blame (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 06:16:55 +00:00
Toshi MARUYAMA da87e4b1ef scm: git: change non ASCII user name variable to instance variable (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 06:16:43 +00:00
Jean-Philippe Lang 01a9e17c49 CVS root_url not recognized when connection string does not include port (#14422).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12027 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-15 21:06:54 +00:00
Jean-Philippe Lang 01f259be0d Adds a test for CvsAdapter#root_url_path (#14422).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-13 11:03:37 +00:00
Toshi MARUYAMA 596366b062 upgrade mocha 0.14 and remove deprecation warning
<pre>
Mocha deprecation warning: Change `require 'mocha'` to `require 'mocha/setup'`.
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11896 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-21 12:57:11 +00:00
Jean-Philippe Lang e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Toshi MARUYAMA 123d2b318f fix scm_iconv local variable name (#12228)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 07:12:23 +00:00
Toshi MARUYAMA 01e2472c92 scm: bazaar: add entry test to unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10411 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 10:41:59 +00:00
Toshi MARUYAMA 2da70de1a7 scm: git: add entry test to unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10410 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 10:41:33 +00:00
Toshi MARUYAMA 55748b6fc0 scm: bazaar: add revisions test to unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10408 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 07:58:05 +00:00
Toshi MARUYAMA 17db2dca3d scm: mercurial: add test of diff from new to old revision to unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10390 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-16 08:51:19 +00:00
Toshi MARUYAMA 3cd15102c6 scm: bazaar: add diff test to unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10389 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-16 08:50:55 +00:00
Toshi MARUYAMA c2b12d853f scm: git: remove unnecessary encoding header from unit adapter test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10385 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-15 15:42:14 +00:00
Toshi MARUYAMA 67cdaabe6f scm: git: change test author encoding in unit adapter test to ASCII-8BIT
Author encoding in adapter is ASCII-8BIT.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10384 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-15 15:41:47 +00:00
Toshi MARUYAMA c70bc540dd add copyright statement to test/unit/lib/redmine/scm/adapters/*.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10378 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-14 21:40:45 +00:00
Toshi MARUYAMA 9c060fe33a scm: git: fix unable to run unit lib test if git binary is not available on Windows
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9870 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-18 23:57:27 +00:00
Toshi MARUYAMA ba25d27e3a scm: git: skip Latin-1 path tests on Git for Windows above 1.7.10
Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10.
http://code.google.com/p/msysgit/issues/detail?id=80

So, Latin-1 path tests fail on Japanese Windows

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-02 18:36:23 +00:00
Jean-Philippe Lang ba5a052c8c Copyright update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Toshi MARUYAMA 6fcea5ef9d scm: git: fix test revision value of unit lib test
Hash value range is from 0 to 9 and a to f

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9541 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-27 01:33:04 +00:00
Toshi MARUYAMA ae5edac243 remove hard-coded non ASCII literal from unit git lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-14 01:15:41 +00:00
Toshi MARUYAMA 2fa19441a7 scm: git: use default branch from HEAD (#10207)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 06:22:59 +00:00
Toshi MARUYAMA 804482ef2b scm: git: update test repository (#10207)
New "master-20120212" branch is added.
Git branch is the reference to the specific revision.
This branch points the same revision with "master" branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 06:22:33 +00:00
Toshi MARUYAMA d90cdb1b10 scm: git: raise exception if "git log" is error and block is given in lib revision method (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 22:56:54 +00:00
Toshi MARUYAMA c94426d21e scm: git: add explicit :excludes option to calling revision method in "test_revisions_includes_master_two_revs_from_origin" of unit lib test (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 15:07:11 +00:00
Toshi MARUYAMA 7f70d2faaa scm: git: add test of get revisions from disjointed histories to unit lib test (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 08:34:24 +00:00
Toshi MARUYAMA e34dab7443 scm: git: update test repository (#8857)
New disjointed history revisions are added.
This test repository has two origins.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 08:20:37 +00:00
Toshi MARUYAMA a9ad2a4dcc scm: git: remove redundant comma from test_revisions_includes_master_two_revs_from_origin of unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 07:39:27 +00:00
Toshi MARUYAMA f4de82510a scm: git: code cleanup "test_branches" of unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 06:43:42 +00:00
Toshi MARUYAMA 19909bc4c8 scm: git: add lib test to get master branch revisions from origin (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 06:05:10 +00:00
Toshi MARUYAMA 34b3a9851f scm: git: add includes and excludes options to lib revisions method (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 23:38:35 +00:00
Toshi MARUYAMA f319409abc scm: git: remove unused "--all" option of "git log" in lib revisions method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:18:20 +00:00
Toshi MARUYAMA 40a37b194d scm: git: use explicit "master" instead of all for revisions method at unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8812 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:04:03 +00:00
Toshi MARUYAMA 186abba94b code layout cleanup test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:03:39 +00:00
Toshi MARUYAMA 1489623584 scm: git: remove "test_getting_certain_revisions" from unit lib test
Redmine does not use '899a15d^' syntax.
This test is covered by "test_revisions_master_merged_rev".

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8809 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-07 15:40:56 +00:00
Toshi MARUYAMA eb789b147a scm: git: remove unused --since option (#4547, #4716, #7146, #6013)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8156 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 11:55:02 +00:00
Toshi MARUYAMA 2b4549b3ea scm: mercurial: test: lib: update branches test for Branch class (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7674 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:19:58 +00:00
Toshi MARUYAMA daae07f47c scm: git: test: lib: update branches test for Branch class (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7672 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:18:28 +00:00
Toshi MARUYAMA 9ff5c7034d scm: git: test: add test of parents to unit lib test (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7669 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:59:06 +00:00
Toshi MARUYAMA 613a056ed6 scm: mercurial: test: add test of parents to unit lib test (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7667 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:57:43 +00:00
Toshi MARUYAMA 476c3d54b7 scm: mercurial: update test repository (#5501)
This test repository has one merged revision.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7662 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 01:44:12 +00:00
Toshi MARUYAMA 81ef038587 scm: mercurial: drop supporting below Mercurial 1.1 (#9465)
On November 1st 2011, Mercurial 2.0 will be released.

On Mercurial 1.1.2, unit lib test fails with following error.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand
    return checkargs()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs
    return cmdfunc()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check
    return func(*args, **kwargs)
  File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog
    if hg.util.version() >= '1.6':
AttributeError: 'module' object has no attribute 'version'

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 06:10:12 +00:00
Toshi MARUYAMA 74cbbd38d0 scm: mercurial: skip failing unit lib tests on below Mercurial 1.5 (#9465)
Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7642 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:32:38 +00:00
Toshi MARUYAMA 185dcb9877 scm: git: add unit adapter test of annotate invalid revision (#8767).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6194 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-08 02:06:38 +00:00