# HG changeset patch # User Matt Mackall # Date 1138507838 -46800 # Node ID e8a3df8b62b3bdab446160eb598fe12a134ee55e # Parent f910437af806f2f9659683aa5f48c62f2e065e7e hgweb: show copy/rename links in file history diff -r f910437af806 -r e8a3df8b62b3 mercurial/hgweb.py --- a/mercurial/hgweb.py Sun Jan 29 00:31:11 2006 +0100 +++ b/mercurial/hgweb.py Sun Jan 29 17:10:38 2006 +1300 @@ -222,6 +222,12 @@ for s in siblings: yield dict(node=hex(s), rev=rev(s), **args) + def renamelink(self, fl, node): + r = fl.renamed(node) + if r: + return [dict(file=r[0], node=hex(r[1]))] + return [] + def showtag(self, t1, node=nullid, **args): for t in self.repo.nodetags(node): yield self.t(t1, tag=t, **args) @@ -466,6 +472,7 @@ "node": hex(cn), "author": cs[1], "date": cs[2], + "rename": self.renamelink(fl, n), "parent": self.siblings(fl.parents(n), fl.rev, file=f), "child": self.siblings(fl.children(n), @@ -514,6 +521,7 @@ date=cs[2], parent=self.siblings(fl.parents(n), fl.rev, file=f), child=self.siblings(fl.children(n), fl.rev, file=f), + rename=self.renamelink(fl, n), permissions=self.repo.manifest.readflags(mfn)[f]) def fileannotate(self, f, node): @@ -565,6 +573,7 @@ manifest=hex(mfn), author=cs[1], date=cs[2], + rename=self.renamelink(fl, n), parent=self.siblings(fl.parents(n), fl.rev, file=f), child=self.siblings(fl.children(n), fl.rev, file=f), permissions=self.repo.manifest.readflags(mfn)[f]) diff -r f910437af806 -r e8a3df8b62b3 templates/fileannotate.tmpl --- a/templates/fileannotate.tmpl Sun Jan 29 00:31:11 2006 +0100 +++ b/templates/fileannotate.tmpl Sun Jan 29 17:10:38 2006 +1300 @@ -18,6 +18,7 @@ changeset #rev#: #node|short# +#rename%filerename# #parent%fileannotateparent# #child%fileannotatechild# diff -r f910437af806 -r e8a3df8b62b3 templates/filelogentry.tmpl --- a/templates/filelogentry.tmpl Sun Jan 29 00:31:11 2006 +0100 +++ b/templates/filelogentry.tmpl Sun Jan 29 17:10:38 2006 +1300 @@ -8,6 +8,7 @@ (diff) (annotate) +#rename%filelogrename# author:  #author|obfuscate# diff -r f910437af806 -r e8a3df8b62b3 templates/filerevision.tmpl --- a/templates/filerevision.tmpl Sun Jan 29 00:31:11 2006 +0100 +++ b/templates/filerevision.tmpl Sun Jan 29 17:10:38 2006 +1300 @@ -19,6 +19,7 @@ changeset #rev#: #node|short# +#rename%filerename# #parent%filerevparent# #child%filerevchild# diff -r f910437af806 -r e8a3df8b62b3 templates/map --- a/templates/map Sun Jan 29 00:31:11 2006 +0100 +++ b/templates/map Sun Jan 29 17:10:38 2006 +1300 @@ -27,6 +27,8 @@ changelogparent = "parent #rev#:#node|short#" changesetparent = "parent #rev#:#node|short#" filerevparent = "parent:#node|short#" +filerename = "parent:#file|escape#@#node|short#" +filelogrename = "base: #file|escape#@#node|short#" fileannotateparent = "parent:#node|short#" changesetchild = "child #rev#:#node|short#" changelogchild = "child #rev#:#node|short#"