kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2011-10-24 09:31:36 +00:00
parent ccda115f15
commit a6d3409a5a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/redmine/scm/adapters/mercurial/redminehelper.py
View File

@ -196,21 +196,21 @@ cmdtable = {
[ [
('r', 'rev', [], 'show the specified revision'), ('r', 'rev', [], 'show the specified revision'),
('b', 'branch', [], ('b', 'branch', [],
'show changesets within the given named branch', 'BRANCH'), 'show changesets within the given named branch'),
('l', 'limit', '', ('l', 'limit', '',
'limit number of changes displayed', 'NUM'), 'limit number of changes displayed'),
('d', 'date', '', ('d', 'date', '',
'show revisions matching date spec', 'DATE'), 'show revisions matching date spec'),
('u', 'user', [], ('u', 'user', [],
'revisions committed by user', 'USER'), 'revisions committed by user'),
('', 'from', '', ('', 'from', '',
'', ''), ''),
('', 'to', '', ('', 'to', '',
'', ''), ''),
('', 'rhbranch', '', ('', 'rhbranch', '',
'', ''), ''),
('', 'template', '', ('', 'template', '',
'display with template', 'TEMPLATE')], 'display with template')],
'hg rhlog [OPTION]... [FILE]'), 'hg rhlog [OPTION]... [FILE]'),
'rhmanifest': (rhmanifest, 'rhmanifest': (rhmanifest,
[('r', 'rev', '', 'show the specified revision')], [('r', 'rev', '', 'show the specified revision')],