Patchwork [3,of,3] hgweb: also display changeset bookmarks in file log (style=paper)

login
register
mail settings
Submitter Anton Shestakov
Date May 15, 2015, 3:25 p.m.
Message ID <bcd377b8a306967c961a.1431703532@neuro>
Download mbox | patch
Permalink /patch/9102/
State Accepted
Commit c9f382c8233a86785457bbd0fe2a86e8325d4189
Headers show

Comments

Anton Shestakov - May 15, 2015, 3:25 p.m.
# HG changeset patch
# User Anton Shestakov <engored@ya.ru>
# Date 1431663591 -28800
#      Fri May 15 12:19:51 2015 +0800
# Node ID bcd377b8a306967c961ae54192aaff5f3233e3cc
# Parent  b2a1d1d89687a98660bc6b9430b89571e8cbdd2f
hgweb: also display changeset bookmarks in file log (style=paper)

There already are branches and tags in file log, now let's add what's been
missing: bookmarks.

Also, since coal borrows this template from paper, this change is effective for
coal as well.

Patch

diff --git a/mercurial/templates/paper/filelogentry.tmpl b/mercurial/templates/paper/filelogentry.tmpl
--- a/mercurial/templates/paper/filelogentry.tmpl
+++ b/mercurial/templates/paper/filelogentry.tmpl
@@ -3,6 +3,6 @@ 
   <td class="author">{author|person}</td>
   <td class="description">
    <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
-   {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename}
+   {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}{rename%filelogrename}
   </td>
  </tr>
diff --git a/tests/test-hgweb-filelog.t b/tests/test-hgweb-filelog.t
--- a/tests/test-hgweb-filelog.t
+++ b/tests/test-hgweb-filelog.t
@@ -223,7 +223,7 @@  tip - two revisions
     <td class="author">test</td>
     <td class="description">
      <a href="/rev/5ed941583260">first a</a>
-     <span class="tag">a-tag</span> 
+     <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 
     </td>
    </tr>
   
@@ -340,7 +340,7 @@  second version - two revisions
     <td class="author">test</td>
     <td class="description">
      <a href="/rev/5ed941583260">first a</a>
-     <span class="tag">a-tag</span> 
+     <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 
     </td>
    </tr>
   
@@ -449,7 +449,7 @@  first deleted - one revision
     <td class="author">test</td>
     <td class="description">
      <a href="/rev/5ed941583260">first a</a>
-     <span class="tag">a-tag</span> 
+     <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 
     </td>
    </tr>
   
@@ -558,7 +558,7 @@  first version - one revision
     <td class="author">test</td>
     <td class="description">
      <a href="/rev/5ed941583260">first a</a>
-     <span class="tag">a-tag</span> 
+     <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 
     </td>
    </tr>