# HG changeset patch # User mpm@selenic.com # Date 2005-06-16 05:13:08 # Node ID b29219389b003780cb30b48d5f70ed8bc8e5899b # Parent f07d00fcd2810bbafe66e3383208d14483fe1324 Show nice short hashes in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show nice short hashes in hgweb manifest hash: c73a8e32a823af7ea7440d1db2b0c022a4366bb5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQpkywK+sNU5EO8RAmSIAJ40aYEFBi07drKuPLuofXNaUkEFtgCghC9g mG8mmhucbBe4hcZWL0AdG8I= =Khp7 -----END PGP SIGNATURE----- diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py --- a/mercurial/hgweb.py +++ b/mercurial/hgweb.py @@ -129,6 +129,7 @@ class hgweb: "date": (lambda x: time.asctime(time.gmtime(x))), "addbreaks": nl2br, "obfuscate": obfuscate, + "short": (lambda x: x[:12]), "firstline": (lambda x: x.splitlines(1)[0]), "permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--") } diff --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl --- a/templates/changelogentry.tmpl +++ b/templates/changelogentry.tmpl @@ -5,7 +5,7 @@ <td><b>#desc|firstline|escape#</b></td></tr> <tr> <td align="right">changeset #rev#: </td> - <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> + <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr> #parent1# #parent2# <tr> diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl --- a/templates/changeset.tmpl +++ b/templates/changeset.tmpl @@ -1,5 +1,5 @@ #header# -<title>#repo|escape#: changeset #node#</title> +<title>#repo|escape#: changeset #node|short#</title> </head> <body> @@ -15,12 +15,12 @@ <table> <tr> <td class="metatag">changeset #rev#:</td> - <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> + <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr> #parent1# #parent2# <tr> <td class="metatag">manifest:</td> - <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr> + <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr> <tr> <td class="metatag">author:</td> <td>#author|obfuscate#</td></tr> diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl --- a/templates/fileannotate.tmpl +++ b/templates/fileannotate.tmpl @@ -12,17 +12,17 @@ <a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> </div> -<h2>Annotate #file# (#filenode#)</h2> +<h2>Annotate #file# (#filenode|short#)</h2> <table> <tr> <td class="metatag">changeset #rev#:</td> - <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> + <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr> #parent1# #parent2# <tr> <td class="metatag">manifest:</td> - <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr> + <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr> <tr> <td class="metatag">author:</td> <td>#author|obfuscate#</td></tr> diff --git a/templates/filediff.tmpl b/templates/filediff.tmpl --- a/templates/filediff.tmpl +++ b/templates/filediff.tmpl @@ -18,10 +18,10 @@ <table> <tr> <td class="metatag">revision #rev#:</td> - <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> + <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#</a></td></tr> + <td><a href="?cmd=changeset;node=#p1#">#p1|short#</a></td></tr> </table> <pre> diff --git a/templates/filelogentry.tmpl b/templates/filelogentry.tmpl --- a/templates/filelogentry.tmpl +++ b/templates/filelogentry.tmpl @@ -4,7 +4,7 @@ <td><b><a href="?cmd=changeset;node=#node#">#desc|firstline|escape#</a></b></td></tr> <tr> <td align="right">revision #filerev#: </td> - <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode#</a> + <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode|short#</a> <a href="?cmd=filediff;file=#file#;node=#node#">(diff)</a> <a href="?cmd=annotate;file=#file#;filenode=#filenode#">(annotate)</a> </td></tr> diff --git a/templates/filerevision.tmpl b/templates/filerevision.tmpl --- a/templates/filerevision.tmpl +++ b/templates/filerevision.tmpl @@ -13,17 +13,17 @@ <a href="?cmd=file;file=#file#;filenode=#filenode#;style=raw">raw</a> </div> -<h2>#file# (revision #filenode#)</h2> +<h2>#file# (revision #filenode|short#)</h2> <table> <tr> <td class="metatag">changeset #rev#:</td> - <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> + <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr> #parent1# #parent2# <tr> <td class="metatag">manifest:</td> - <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr> + <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr> <tr> <td class="metatag">author:</td> <td>#author|obfuscate#</td></tr> diff --git a/templates/manifest.tmpl b/templates/manifest.tmpl --- a/templates/manifest.tmpl +++ b/templates/manifest.tmpl @@ -1,5 +1,5 @@ #header# -<title>#repo|escape#: manifest #manifest#</title> +<title>#repo|escape#: manifest #manifest|short#</title> </head> <body> @@ -9,7 +9,7 @@ <a href="?cmd=changeset;node=#node#">changeset</a> </div> -<h2>manifest: #path#</h2> +<h2>manifest #manifest|short#: #path#</h2> <table cellpadding="0" cellspacing="0"> <tr class="parity1"> diff --git a/templates/map b/templates/map --- a/templates/map +++ b/templates/map @@ -21,10 +21,10 @@ difflineplus = "<span class="plusline"># difflineminus = "<span class="minusline">#line|escape#</span>" difflineat = "<span class="atline">#line|escape#</span>" diffline = "#line|escape#" -changelogparent = "<tr><td align="right">parent: </td><td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>" +changelogparent = "<tr><td align="right">parent: </td><td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>" changesetparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>" -filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node#</a></td></tr>" -fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node#</a></td></tr>" +filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>" +fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node|short#</a></td></tr>" tags = tags.tmpl tagentry = "<div class="parity#parity#"><tt>#node#</tt> <a href="?cmd=changeset;node=#node#">#tag#</a><br /></div>" diffblock = "<div class="parity#parity#">#lines#</div>"