Mercurial > hg > pyhgsh

changeset 570:2ee819a950aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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-----
author mpm@selenic.com
date Sat, 02 Jul 2005 12:31:32 -0800
parents 3e347929f5f9
children c7364b985ca2
files mercurial/hgweb.py templates/changelogentry.tmpl templates/changeset-raw.tmpl templates/changeset.tmpl templates/fileannotate.tmpl templates/filerevision.tmpl templates/searchentry.tmpl
diffstat 7 files changed, 11 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb.py	Sat Jul 02 12:27:27 2005 -0800
+++ b/mercurial/hgweb.py	Sat Jul 02 12:31:32 2005 -0800
@@ -265,7 +265,7 @@
                     '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 @@
                     '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 @@
                      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 @@
                      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 @@
                      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],
--- a/templates/changelogentry.tmpl	Sat Jul 02 12:27:27 2005 -0800
+++ b/templates/changelogentry.tmpl	Sat Jul 02 12:31:32 2005 -0800
@@ -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>
--- a/templates/changeset-raw.tmpl	Sat Jul 02 12:27:27 2005 -0800
+++ b/templates/changeset-raw.tmpl	Sat Jul 02 12:31:32 2005 -0800
@@ -3,8 +3,7 @@
 # User #author#
 # Date #date|date#
 # Node ID #node#
-#parent1#
-#parent2#
+#parent#
 #desc#
 
 #diff#
--- a/templates/changeset.tmpl	Sat Jul 02 12:27:27 2005 -0800
+++ b/templates/changeset.tmpl	Sat Jul 02 12:31:32 2005 -0800
@@ -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>
--- a/templates/fileannotate.tmpl	Sat Jul 02 12:27:27 2005 -0800
+++ b/templates/fileannotate.tmpl	Sat Jul 02 12:31:32 2005 -0800
@@ -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>
--- a/templates/filerevision.tmpl	Sat Jul 02 12:27:27 2005 -0800
+++ b/templates/filerevision.tmpl	Sat Jul 02 12:31:32 2005 -0800
@@ -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>
--- a/templates/searchentry.tmpl	Sat Jul 02 12:27:27 2005 -0800
+++ b/templates/searchentry.tmpl	Sat Jul 02 12:31:32 2005 -0800
@@ -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>