Patchwork [1,of,5,STABLE] hgweb: fix lack of "bookmarks" link in "/file" page of "paper" style

login
register
mail settings
Submitter Katsunori FUJIWARA
Date April 17, 2014, 12:42 a.m.
Message ID <be3ab685ee520dfb4652.1397695342@juju>
Download mbox | patch
Permalink /patch/4388/
State Accepted
Commit 4705d82734c196d714f5f41e558ce8f5d7d1e02d
Headers show

Comments

Katsunori FUJIWARA - April 17, 2014, 12:42 a.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1397694968 -32400
#      Thu Apr 17 09:36:08 2014 +0900
# Branch stable
# Node ID be3ab685ee520dfb4652c981dd11ffee158f86cb
# Parent  a0f437e2f5a900fccd7812e66ce27b68a6ac4fad
hgweb: fix lack of "bookmarks" link in "/file" page of "paper" style

This patch also fixes same problem of "coal" style, because it re-uses
"filerevision.tmpl" of "paper" style.

"gitweb" and "monoblue" styles don't have such problems.

"spartan" style doesn't have "bookmarks" page definition itself.

Patch

diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl
--- a/mercurial/templates/paper/filerevision.tmpl
+++ b/mercurial/templates/paper/filerevision.tmpl
@@ -13,6 +13,7 @@ 
 <li><a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
 <li><a href="{url|urlescape}graph/{node|short}{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>
 </ul>
 <ul>
diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -764,6 +764,7 @@ 
   <li><a href="/shortlog/a4f92ed23982">log</a></li>
   <li><a href="/graph/a4f92ed23982">graph</a></li>
   <li><a href="/tags">tags</a></li>
+  <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -82,6 +82,7 @@ 
   <li><a href="/shortlog/853dcd4de2a6">log</a></li>
   <li><a href="/graph/853dcd4de2a6">graph</a></li>
   <li><a href="/tags">tags</a></li>
+  <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>