diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-10-24 09:31:36 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-10-24 09:31:36 +0000 |
| commit | a6d3409a5a0c42de30fd112f9f63c9522ff62833 (patch) | |
| tree | 67d47e701f8038642b7386111fe9ff422d8097fb /lib | |
| parent | ccda115f15b0eb4c648754dcf1023b4000adc744 (diff) | |
| download | redmine-a6d3409a5a0c42de30fd112f9f63c9522ff62833.tar.gz redmine-a6d3409a5a0c42de30fd112f9f63c9522ff62833.zip | |
scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465)
Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be ,
following error raises.
<pre>
Traceback (most recent call last):
File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module>
mercurial.dispatch.run()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run
sys.exit(dispatch(sys.argv[1:]))
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch
return _runcatch(u, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch
return _dispatch(ui, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch
cmd, func, args, options, cmdoptions = _parse(lui, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse
args = fancyopts.fancyopts(args, c, cmdoptions, True)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts
for short, name, default, comment in options:
ValueError: too many values to unpack
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@7640 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial/redminehelper.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/redmine/scm/adapters/mercurial/redminehelper.py b/lib/redmine/scm/adapters/mercurial/redminehelper.py index 7b3b639f2..eaba17e1f 100644 --- a/lib/redmine/scm/adapters/mercurial/redminehelper.py +++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py @@ -196,21 +196,21 @@ cmdtable = { [ ('r', 'rev', [], 'show the specified revision'), ('b', 'branch', [], - 'show changesets within the given named branch', 'BRANCH'), + 'show changesets within the given named branch'), ('l', 'limit', '', - 'limit number of changes displayed', 'NUM'), + 'limit number of changes displayed'), ('d', 'date', '', - 'show revisions matching date spec', 'DATE'), + 'show revisions matching date spec'), ('u', 'user', [], - 'revisions committed by user', 'USER'), + 'revisions committed by user'), ('', 'from', '', - '', ''), + ''), ('', 'to', '', - '', ''), + ''), ('', 'rhbranch', '', - '', ''), + ''), ('', 'template', '', - 'display with template', 'TEMPLATE')], + 'display with template')], 'hg rhlog [OPTION]... [FILE]'), 'rhmanifest': (rhmanifest, [('r', 'rev', '', 'show the specified revision')], |