hgweb: don't point graph links at tip hash where it doesn't make sense
authorAnton Shestakov <av6@dwimlabs.net>
Fri, 12 Jun 2015 16:09:59 +0800
changeset 25525 bcc02516f384
parent 25524 e0c09398c237
child 25526 32f76eccbced
hgweb: don't point graph links at tip hash where it doesn't make sense Some pages, e.g. bookmarks, help and summary don't have a meaningful revision context: they always either show information about tip or about the whole repo (and not about any specific changeset). And error pages can just show hgweb error messages, not related to any repo or changeset. When monoblue style was added in 91b0ada2d94b, however, all graph links had tried to point at some hash, and on such pages as described above it didn't make sense. On error pages '{node|short}' is empty string anyway. Of course, it worked, but seeing such pages without revision context provide links with hashes is a bit confusing (unless you keep current tip hash in your head at all times) and wasn't consistent with other template styles, other pages in monoblue and even other links on the same page. Let's just link to '/graph', which is equal to '/graph/tip'.
mercurial/templates/monoblue/bookmarks.tmpl
mercurial/templates/monoblue/branches.tmpl
mercurial/templates/monoblue/error.tmpl
mercurial/templates/monoblue/help.tmpl
mercurial/templates/monoblue/helptopics.tmpl
mercurial/templates/monoblue/notfound.tmpl
mercurial/templates/monoblue/search.tmpl
mercurial/templates/monoblue/summary.tmpl
mercurial/templates/monoblue/tags.tmpl
--- a/mercurial/templates/monoblue/bookmarks.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/bookmarks.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li class="current">bookmarks</li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/branches.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/branches.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li class="current">branches</li>
--- a/mercurial/templates/monoblue/error.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/error.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li class="current">summary</li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/help.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/help.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/helptopics.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/helptopics.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}help{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/notfound.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/notfound.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li class="current">summary</li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/search.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/search.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/summary.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/summary.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li class="current">summary</li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
--- a/mercurial/templates/monoblue/tags.tmpl	Fri Jun 12 15:29:12 2015 +0800
+++ b/mercurial/templates/monoblue/tags.tmpl	Fri Jun 12 16:09:59 2015 +0800
@@ -21,7 +21,7 @@
             <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
-            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
             <li class="current">tags</li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>