Mercurial > public > mercurial-scm > hg-stable

diff tests/test-hgweb-commands.t @ 13868:38906cf9d15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 08:26:08 -0500
parents b51bf961b3cb fd8a6ca3a750
children 4788923a2b33
line wrap: on
line diff
--- a/tests/test-hgweb-commands.t	Mon Apr 04 00:23:21 2011 +0800
+++ b/tests/test-hgweb-commands.t	Mon Apr 04 08:26:08 2011 -0500
@@ -640,6 +640,7 @@
   <a href="/log?style=gitweb">changelog</a> |
   <a href="/graph?style=gitweb">graph</a> |
   <a href="/tags?style=gitweb">tags</a> |
+  <a href="/bookmarks?style=gitweb">bookmarks</a> |
   <a href="/branches?style=gitweb">branches</a> |
   <a href="/file/1d22e65f027e?style=gitweb">files</a> |
   <a href="/help?style=gitweb">help</a>
@@ -662,7 +663,7 @@
   <td>
   <a class="list" href="/rev/1d22e65f027e?style=gitweb">
   <b>branch</b>
-  <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> </span>
+  <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> <span class="bookmarktag" title="something">something</span> </span>
   </a>
   </td>
   <td class="link" nowrap>
@@ -792,6 +793,7 @@
   <a href="/log/2?style=gitweb">changelog</a> |
   graph |
   <a href="/tags?style=gitweb">tags</a> |
+  <a href="/bookmarks?style=gitweb">bookmarks</a> |
   <a href="/branches?style=gitweb">branches</a> |
   <a href="/file/1d22e65f027e?style=gitweb">files</a> |
   <a href="/help?style=gitweb">help</a>
@@ -853,7 +855,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="branchtag" title="' + cur[6][0] + '">';
@@ -868,6 +870,12 @@
   				tagspan += '<span class="tagtag">' + tag + '</span> ';
   			}
   		}
+  		if (cur[8].length) {
+  			for (var t in cur[8]) {
+  				var bookmark = cur[8][t];
+  				tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
+  			}
+  		}
   		tagspan += '</span>';
   	}