# HG changeset patch
# User mpm@selenic.com
# Date 1120336292 28800
# Node ID 2ee819a950aa64315b57f19878fdb0a89cab22ba
# Parent  3e347929f5f9784ea0cfadb650426de114348547
[PATCH 2/5]: cleaning the template parent management in hgweb

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH 2/5]: cleaning the template parent management in hgweb

From: Goffredo Baroncelli <kreijack@libero.it>

hgweb: rename #parent1# and #parent2# to #parent# in the template managment

manifest hash: c7da29f029a1c875127989bb6635007a90f8f59c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxvmkywK+sNU5EO8RAnREAKCXuVAU054xkYsfQLug3y/u4tpGxQCfdnKA
QkX42FSUBN1EwFyzrzC6vs0=
=o8VK
-----END PGP SIGNATURE-----


diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -265,7 +265,7 @@ class hgweb:
                     'changelogentry',
                     parity = parity,
                     author = changes[1],
-                    parent1 = self.parents("changelogparent",
+                    parent = self.parents("changelogparent",
                                           cl.parents(n), cl.rev),
                     changelogtag = self.showtag("changelogtag",n),
                     p1 = hex(p1), p2 = hex(p2),
@@ -331,7 +331,7 @@ class hgweb:
                     'searchentry',
                     parity = count & 1,
                     author = changes[1],
-                    parent1 = self.parents("changelogparent",
+                    parent = self.parents("changelogparent",
                                           cl.parents(n), cl.rev),
                     changelogtag = self.showtag("changelogtag",n),
                     p1 = hex(p1), p2 = hex(p2),
@@ -380,7 +380,7 @@ class hgweb:
                      diff = diff,
                      rev = cl.rev(n),
                      node = nodeid,
-                     parent1 = self.parents("changesetparent",
+                     parent = self.parents("changesetparent",
                                            cl.parents(n), cl.rev),
                      changesettag = self.showtag("changesettag",n),
                      p1 = hex(p1), p2 = hex(p2),
@@ -462,7 +462,7 @@ class hgweb:
                      manifest = hex(mfn),
                      author = cs[1],
                      date = t,
-                     parent1 = self.parents("filerevparent",
+                     parent = self.parents("filerevparent",
                                            fl.parents(n), fl.rev, file=f),
                      p1 = hex(p1), p2 = hex(p2),
                      permissions = self.repo.manifest.readflags(mfn)[f],
@@ -529,7 +529,7 @@ class hgweb:
                      manifest = hex(mfn),
                      author = cs[1],
                      date = t,
-                     parent1 = self.parents("fileannotateparent",
+                     parent = self.parents("fileannotateparent",
                                            fl.parents(n), fl.rev, file=f),
                      p1 = hex(p1), p2 = hex(p2),
                      permissions = self.repo.manifest.readflags(mfn)[f],
diff --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl
--- a/templates/changelogentry.tmpl
+++ b/templates/changelogentry.tmpl
@@ -6,8 +6,7 @@
 <tr>
  <td align="right">changeset #rev#:&nbsp;</td>
  <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
-#parent1#
-#parent2#
+#parent#
 #changelogtag#
 <tr>
  <td align="right">author:&nbsp;</td>
diff --git a/templates/changeset-raw.tmpl b/templates/changeset-raw.tmpl
--- a/templates/changeset-raw.tmpl
+++ b/templates/changeset-raw.tmpl
@@ -3,8 +3,7 @@
 # User #author#
 # Date #date|date#
 # Node ID #node#
-#parent1#
-#parent2#
+#parent#
 #desc#
 
 #diff#
diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl
--- a/templates/changeset.tmpl
+++ b/templates/changeset.tmpl
@@ -16,8 +16,7 @@
 <tr>
  <td class="metatag">changeset #rev#:</td>
  <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
-#parent1#
-#parent2#
+#parent#
 #changesettag#
 <tr>
  <td class="metatag">manifest:</td>
diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl
--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -18,8 +18,7 @@
 <tr>
  <td class="metatag">changeset #rev#:</td>
  <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
-#parent1#
-#parent2#
+#parent#
 <tr>
  <td class="metatag">manifest:</td>
  <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr>
diff --git a/templates/filerevision.tmpl b/templates/filerevision.tmpl
--- a/templates/filerevision.tmpl
+++ b/templates/filerevision.tmpl
@@ -19,8 +19,7 @@
 <tr>
  <td class="metatag">changeset #rev#:</td>
  <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
-#parent1#
-#parent2#
+#parent#
 <tr>
  <td class="metatag">manifest:</td>
  <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr>
diff --git a/templates/searchentry.tmpl b/templates/searchentry.tmpl
--- a/templates/searchentry.tmpl
+++ b/templates/searchentry.tmpl
@@ -6,8 +6,7 @@
 <tr>
  <td align="right">changeset #rev#:&nbsp;</td>
  <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
-#parent1#
-#parent2#
+#parent#
 #changelogtag#
 <tr>
  <td align="right">author:&nbsp;</td>