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

Mercurial 2.9 compatibility (#16177) 

git-svn-id: http://svn.redmine.org/redmine/trunk@12930 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-02-26 12:01:00 +00:00
parent e266ddb309
commit 7b295f379b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,8 +79,13 @@ def _tags(ui, repo):
def _branches(ui, repo): def _branches(ui, repo):
# see mercurial/commands.py:branches # see mercurial/commands.py:branches
def iterbranches(): def iterbranches():
if hasattr(repo, 'branchtags'):
# Mercurial < 2.9
for t, n in repo.branchtags().iteritems(): for t, n in repo.branchtags().iteritems():
yield t, n, repo.changelog.rev(n) yield t, n, repo.changelog.rev(n)
else:
for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
yield tag, tip, repo.changelog.rev(tip)
def branchheads(branch): def branchheads(branch):
try: try:
return repo.branchheads(branch, closed=False) return repo.branchheads(branch, closed=False)