# HG changeset patch
# User mpm@selenic.com
# Date 1117040678 28800
# Node ID 32ce2c5d4d25ec4f0f1f7ac00ff09217147fa6f5
# Parent  083c38bdfa6468113b31a7def64e89b00fbd6551
Fix some broken parent links in hgweb



diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -122,9 +122,9 @@ class hgweb:
         if len(files) > self.maxfiles:
             yield self.t("fileellipses")
 
-    def parent(self, t1, node, rev):
+    def parent(self, t1, node=nullid, rev=-1, **args):
         if node != hex(nullid):
-            yield self.t(t1, node = node, rev = rev)
+            yield self.t(t1, node = node, rev = rev, **args)
 
     def diff(self, node1, node2, files):
         def filterfiles(list, files):
@@ -359,9 +359,9 @@ class hgweb:
                      date = time.asctime(time.gmtime(t)),
                      shortdesc = cgi.escape(cs[4].splitlines()[0]),
                      parent1 = self.parent("filerevparent",
-                                           hex(p1), fl.rev(p1)),
+                                           hex(p1), fl.rev(p1), file=f),
                      parent2 = self.parent("filerevparent",
-                                           hex(p2), fl.rev(p2)),
+                                           hex(p2), fl.rev(p2), file=f),
                      p1 = hex(p1), p2 = hex(p2),
                      p1rev = fl.rev(p1), p2rev = fl.rev(p2))
 
@@ -426,10 +426,10 @@ class hgweb:
                      age = age(t),
                      date = time.asctime(time.gmtime(t)),
                      shortdesc = cgi.escape(cs[4].splitlines()[0]),
-                     parent1 = self.parent("filerevparent",
-                                           hex(p1), fl.rev(p1)),
-                     parent2 = self.parent("filerevparent",
-                                           hex(p2), fl.rev(p2)),
+                     parent1 = self.parent("fileannotateparent",
+                                           hex(p1), fl.rev(p1), file=f),
+                     parent2 = self.parent("fileannotateparent",
+                                           hex(p2), fl.rev(p2), file=f),
                      p1 = hex(p1), p2 = hex(p2),
                      p1rev = fl.rev(p1), p2rev = fl.rev(p2))
 
diff --git a/templates/map b/templates/map
--- a/templates/map
+++ b/templates/map
@@ -23,5 +23,5 @@ difflineat = "<span class="atline">#line
 diffline = "#line#"
 changelogparent = "<tr><td align="right">parent:&nbsp;</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"
 changesetparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"
-filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"
-fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"
+filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#rev#:#node#</a></td></tr>"
+fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#rev#:#node#</a></td></tr>"