Mercurial > hg-stable

changeset 25110:c9f382c8233a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Anton Shestakov <engored@ya.ru>
date Fri, 15 May 2015 12:19:51 +0800
parents f3e0a5784ca8
children 1ef96a3b8b89
files mercurial/templates/paper/filelogentry.tmpl tests/test-hgweb-filelog.t
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/paper/filelogentry.tmpl	Fri May 15 13:30:34 2015 +0800
+++ b/mercurial/templates/paper/filelogentry.tmpl	Fri May 15 12:19:51 2015 +0800
@@ -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>
--- a/tests/test-hgweb-filelog.t	Fri May 15 13:30:34 2015 +0800
+++ b/tests/test-hgweb-filelog.t	Fri May 15 12:19:51 2015 +0800
@@ -223,7 +223,7 @@
     <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 @@
     <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 @@
     <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 @@
     <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>