# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2008-04-01 04:14:25
# Node ID 101526031d06d184559ae797687e50661b96156e
# Parent  856ae126f48c3b7949168fe9fb4d71b5f74f8261

hgweb: fix merge breakage

diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -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()),
diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py
--- a/mercurial/hgweb/webutil.py
+++ b/mercurial/hgweb/webutil.py
@@ -71,7 +71,7 @@ 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 []