Mercurial > hg

changeset 25135:3b689001e7c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
paper: show branch/tags/bookmarks when comparing (issue3559)
author Anton Shestakov <engored@ya.ru>
date Fri, 15 May 2015 20:03:42 +0800
parents 339e3cc073ac
children 99d01d288c37
files mercurial/hgweb/webcommands.py mercurial/templates/paper/filecomparison.tmpl tests/test-hgweb-diffs.t
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py	Fri May 15 20:02:41 2015 +0800
+++ b/mercurial/hgweb/webcommands.py	Fri May 15 20:03:42 2015 +0800
@@ -885,6 +885,8 @@
                 branch=webutil.nodebranchnodefault(ctx),
                 parent=webutil.parents(fctx),
                 child=webutil.children(fctx),
+                tags=webutil.nodetagsdict(web.repo, ctx.node()),
+                bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
                 leftrev=leftrev,
                 leftnode=hex(leftnode),
                 rightrev=rightrev,
--- a/mercurial/templates/paper/filecomparison.tmpl	Fri May 15 20:02:41 2015 +0800
+++ b/mercurial/templates/paper/filecomparison.tmpl	Fri May 15 20:03:42 2015 +0800
@@ -36,7 +36,7 @@
 
 <div class="main">
 <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
-<h3>comparison {file|escape} @ {rev}:{node|short}</h3>
+<h3>comparison {file|escape} @ {rev}:{node|short} {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}</h3>
 
 <form class="search" action="{url|urlescape}log">
 <p>{sessionvars%hiddenformentry}</p>
--- a/tests/test-hgweb-diffs.t	Fri May 15 20:02:41 2015 +0800
+++ b/tests/test-hgweb-diffs.t	Fri May 15 20:03:42 2015 +0800
@@ -628,7 +628,7 @@
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
-  <h3>comparison a @ 0:0cd96de13884</h3>
+  <h3>comparison a @ 0:0cd96de13884 </h3>
   
   <form class="search" action="/log">
   <p></p>
@@ -755,7 +755,7 @@
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
-  <h3>comparison a @ 2:d73db4d812ff</h3>
+  <h3>comparison a @ 2:d73db4d812ff <span class="tag">tip</span> </h3>
   
   <form class="search" action="/log">
   <p></p>
@@ -884,7 +884,7 @@
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
-  <h3>comparison a @ 3:20e80271eb7a</h3>
+  <h3>comparison a @ 3:20e80271eb7a <span class="tag">tip</span> </h3>
   
   <form class="search" action="/log">
   <p></p>
@@ -1019,7 +1019,7 @@
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
-  <h3>comparison e @ 5:41d9fc4a6ae1</h3>
+  <h3>comparison e @ 5:41d9fc4a6ae1 <span class="tag">tip</span> </h3>
   
   <form class="search" action="/log">
   <p></p>