Mercurial > hg

changeset 15071:ad6eb7d7dbca stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: properly check for bookmarks when drawing graph
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Sep 2011 18:29:53 -0500
parents e4c65158b5e7
children 91d2efecb245 19071b04c9c1
files mercurial/templates/paper/graph.tmpl tests/test-hgweb-empty.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/paper/graph.tmpl	Thu Sep 08 19:30:25 2011 +0100
+++ b/mercurial/templates/paper/graph.tmpl	Thu Sep 08 18:29:53 2011 -0500
@@ -95,7 +95,7 @@
 	item = item.replace(/_DATE/, cur[5]);
 
 	var tagspan = '';
-	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{
+	if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
 		tagspan = '<span class="logtags">';
 		if (cur[6][1]) \{
 			tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
--- a/tests/test-hgweb-empty.t	Thu Sep 08 19:30:25 2011 +0100
+++ b/tests/test-hgweb-empty.t	Thu Sep 08 18:29:53 2011 -0500
@@ -281,7 +281,7 @@
   	item = item.replace(/_DATE/, cur[5]);
   
   	var tagspan = '';
-  	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+  	if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) {
   		tagspan = '<span class="logtags">';
   		if (cur[6][1]) {
   			tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';