Mercurial > hg

changeset 7410:f1111704061e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coal/paper: show branch name in changeset view
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Tue, 25 Nov 2008 22:53:01 +0100
parents 0fa3b6677027
children b71ee3e00e81
files mercurial/hgweb/webcommands.py templates/coal/changeset.tmpl templates/static/style-coal.css templates/static/style-paper.css tests/test-hgweb-commands.out tests/test-hgweb-diffs.out tests/test-hgweb-removed.out
diffstat 7 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py	Tue Nov 25 21:54:28 2008 +0100
+++ b/mercurial/hgweb/webcommands.py	Tue Nov 25 22:53:01 2008 +0100
@@ -227,6 +227,7 @@
 def changeset(web, req, tmpl):
     ctx = webutil.changectx(web.repo, req)
     showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
+    showbranch = webutil.nodebranchnodefault(ctx)
     parents = ctx.parents()
 
     files = []
@@ -246,6 +247,7 @@
                 parent=webutil.siblings(parents),
                 child=webutil.siblings(ctx.children()),
                 changesettag=showtags,
+                changesetbranch=showbranch,
                 author=ctx.user(),
                 desc=ctx.description(),
                 date=ctx.date(),
--- a/templates/coal/changeset.tmpl	Tue Nov 25 21:54:28 2008 +0100
+++ b/templates/coal/changeset.tmpl	Tue Nov 25 22:53:01 2008 +0100
@@ -26,7 +26,7 @@
 <div class="main">
 
 <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
-<h3>changeset {rev}:{node|short} {changesettag}</h3>
+<h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}</h3>
 
 <form class="search" action="{url}log">
 {sessionvars%hiddenformentry}
--- a/templates/static/style-coal.css	Tue Nov 25 21:54:28 2008 +0100
+++ b/templates/static/style-coal.css	Tue Nov 25 22:53:01 2008 +0100
@@ -131,6 +131,10 @@
   vertical-align: baseline;
 }
 
+h3 .branchname {
+  font-size: 80%;
+}
+
 /* Common */
 pre { margin: 0; }
 
--- a/templates/static/style-paper.css	Tue Nov 25 21:54:28 2008 +0100
+++ b/templates/static/style-paper.css	Tue Nov 25 22:53:01 2008 +0100
@@ -122,6 +122,10 @@
   vertical-align: baseline;
 }
 
+h3 .branchname {
+  font-size: 80%;
+}
+
 /* Common */
 pre { margin: 0; }
 
Binary file tests/test-hgweb-commands.out has changed
--- a/tests/test-hgweb-diffs.out	Tue Nov 25 21:54:28 2008 +0100
+++ b/tests/test-hgweb-diffs.out	Tue Nov 25 22:53:01 2008 +0100
@@ -41,7 +41,7 @@
 <div class="main">
 
 <h2><a href="/">test</a></h2>
-<h3>changeset 0:0cd96de13884 </h3>
+<h3>changeset 0:0cd96de13884  </h3>
 
 <form class="search" action="/log">
 
@@ -223,7 +223,7 @@
 <div class="main">
 
 <h2><a href="/">test</a></h2>
-<h3>changeset 0:0cd96de13884 </h3>
+<h3>changeset 0:0cd96de13884  </h3>
 
 <form class="search" action="/log">
 
--- a/tests/test-hgweb-removed.out	Tue Nov 25 21:54:28 2008 +0100
+++ b/tests/test-hgweb-removed.out	Tue Nov 25 22:53:01 2008 +0100
@@ -39,7 +39,7 @@
 <div class="main">
 
 <h2><a href="/">test</a></h2>
-<h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3>
+<h3>changeset 1:c78f6c5cbea9  <span class="tag">tip</span> </h3>
 
 <form class="search" action="/log">