Mercurial > hg-stable

changeset 6437:101526031d06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix merge breakage
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Mar 2008 23:14:25 -0500
parents 856ae126f48c
children c9b8f2820bc0
files mercurial/hgweb/webcommands.py mercurial/hgweb/webutil.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py	Mon Mar 31 21:49:36 2008 -0500
+++ b/mercurial/hgweb/webcommands.py	Mon Mar 31 23:14:25 2008 -0500
@@ -438,7 +438,7 @@
                 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()),
--- a/mercurial/hgweb/webutil.py	Mon Mar 31 21:49:36 2008 -0500
+++ b/mercurial/hgweb/webutil.py	Mon Mar 31 23:14:25 2008 -0500
@@ -71,7 +71,7 @@
         yield d
 
 def renamelink(fctx):
-    r = fctx.renamed(node)
+    r = fctx.renamed()
     if r:
         return [dict(file=r[0], node=hex(r[1]))]
     return []