mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
hgweb: fix merge breakage
This commit is contained in:
parent
bf098a66ae
commit
cf71bb5f2b
@ -438,7 +438,7 @@ def filediff(web, req, tmpl):
|
|||||||
date=fctx.date(),
|
date=fctx.date(),
|
||||||
desc=fctx.description(),
|
desc=fctx.description(),
|
||||||
author=fctx.user(),
|
author=fctx.user(),
|
||||||
rename=self.renamelink(fctx),
|
rename=webutil.renamelink(fctx),
|
||||||
branch=webutil.nodebranchnodefault(fctx),
|
branch=webutil.nodebranchnodefault(fctx),
|
||||||
parent=webutil.siblings(parents),
|
parent=webutil.siblings(parents),
|
||||||
child=webutil.siblings(fctx.children()),
|
child=webutil.siblings(fctx.children()),
|
||||||
|
@ -71,7 +71,7 @@ def siblings(siblings=[], hiderev=None, **args):
|
|||||||
yield d
|
yield d
|
||||||
|
|
||||||
def renamelink(fctx):
|
def renamelink(fctx):
|
||||||
r = fctx.renamed(node)
|
r = fctx.renamed()
|
||||||
if r:
|
if r:
|
||||||
return [dict(file=r[0], node=hex(r[1]))]
|
return [dict(file=r[0], node=hex(r[1]))]
|
||||||
return []
|
return []
|
||||||
|
Loading…
Reference in New Issue
Block a user