hgweb: fix merge breakage

mercurial/hgweb/webcommands.py

@@ -438,7 +438,7 b' 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()),

mercurial/hgweb/webutil.py

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