facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

hgweb: fix merge breakage

Browse Source
This commit is contained in:
Matt Mackall 2008-03-31 23:14:25 -05:00
parent bf098a66ae
commit cf71bb5f2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hgweb/webcommands.py
View File

@ -438,7 +438,7 @@ def filediff(web, req, tmpl):
date=fctx.date(),
desc=fctx.description(),
author=fctx.user(),
rename=self.renamelink(fctx),
rename=webutil.renamelink(fctx),
branch=webutil.nodebranchnodefault(fctx),
parent=webutil.siblings(parents),
child=webutil.siblings(fctx.children()),

2
mercurial/hgweb/webutil.py
View File

@ -71,7 +71,7 @@ def siblings(siblings=[], hiderev=None, **args):
yield d
def renamelink(fctx):
r = fctx.renamed(node)
r = fctx.renamed()
if r:
return [dict(file=r[0], node=hex(r[1]))]
return []