diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-08-25 08:40:32 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-08-25 08:40:32 +0000 |
| commit | 9709f8f364e1d05003b3016937ba3590db1dcdb5 (patch) | |
| tree | d4df20041313e6eb4be9224a88274d56367a51ce | |
| parent | c0df5d1ae269f5fdf274f0a1d3e188b2b2760d06 (diff) | |
| download | redmine-9709f8f364e1d05003b3016937ba3590db1dcdb5.tar.gz redmine-9709f8f364e1d05003b3016937ba3590db1dcdb5.zip | |
Mercurial 4.7 compatibility (#29413).
Patch by Frédéric Fondement.
git-svn-id: http://svn.redmine.org/redmine/trunk@17474 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial/redminehelper.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/mercurial/redminehelper.py b/lib/redmine/scm/adapters/mercurial/redminehelper.py index d98ae5184..8097d905a 100644 --- a/lib/redmine/scm/adapters/mercurial/redminehelper.py +++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py @@ -46,15 +46,17 @@ Output example of rhmanifest:: </rhmanifest> """ import re, time, cgi, urllib -from mercurial import cmdutil, commands, node, error, hg +from mercurial import cmdutil, commands, node, error, hg, registrar cmdtable = {} -command = cmdutil.command(cmdtable) +command = registrar.command(cmdtable) if hasattr(registrar, 'command') else cmdutil.command(cmdtable) _x = cgi.escape _u = lambda s: cgi.escape(urllib.quote(s)) def _changectx(repo, rev): + if isinstance(rev, str): + rev = repo.lookup(rev) if hasattr(repo, 'changectx'): return repo.changectx(rev) else: |