Mercurial > hg-stable
changeset 571:c7364b985ca2
[PATCH 3/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 3/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
the filediff template use the old style p1/p2 and p1rev/p2rev
inteface; the patch removes this old stuff, and update the code to the
new style
manifest hash: 29536b6ee71f03a48bceb7336040070ecd0d2b9e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvplywK+sNU5EO8RApW4AKCrTLHofr8jELtvNRpoNJHc0sjEfgCfaY2q
/H96T6BMMXA4VLFVxzOBHCo=
=u4El
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 02 Jul 2005 12:34:45 -0800 |
| parents | 2ee819a950aa |
| children | cb7cd12e00f1 |
| files | mercurial/hgweb.py templates/filediff.tmpl templates/map |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb.py Sat Jul 02 12:31:32 2005 -0800 +++ b/mercurial/hgweb.py Sat Jul 02 12:34:45 2005 -0800 @@ -630,7 +630,8 @@ filenode = hex(mf.get(file, nullid)), node = changeset, rev = self.repo.changelog.rev(n), - p1 = hex(p1), + parent = self.parents("filediffparent", + cl.parents(n), cl.rev), p1rev = self.repo.changelog.rev(p1), diff = diff)
--- a/templates/filediff.tmpl Sat Jul 02 12:31:32 2005 -0800 +++ b/templates/filediff.tmpl Sat Jul 02 12:34:45 2005 -0800 @@ -19,9 +19,7 @@ <tr> <td class="metatag">revision #rev#:</td> <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr> -<tr> - <td class="metatag">parent #p1rev#:</td> - <td><a href="?cmd=changeset;node=#p1#">#p1|short#</a></td></tr> +#parent# </table> <pre>
--- a/templates/map Sat Jul 02 12:31:32 2005 -0800 +++ b/templates/map Sat Jul 02 12:34:45 2005 -0800 @@ -32,3 +32,4 @@ diffblock = "<div class="parity#parity#">#lines#</div>" changelogtag = "<tr><td align="right">tag: </td><td>#tag#</td></tr>" changesettag = "<tr><td class="metatag">tag: </td><td>#tag#</td></tr>" +filediffparent = "<tr><td class="metatag">parent #rev#:</td><td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"