Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix merge breakage
authorMatt Mackall <mpm@selenic.com>
Mon, 31 Mar 2008 23:14:25 -0500
changeset 6437 101526031d06
parent 6436 856ae126f48c
child 6441 c9b8f2820bc0
hgweb: fix merge breakage
mercurial/hgweb/webcommands.py file | annotate | diff | comparison | revisions
mercurial/hgweb/webutil.py file | annotate | diff | comparison | revisions 
--- 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 []
Mercurial