Mercurial > hg

changeset 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 28f557e8b419 (current diff) e33ebe67657a (diff)
children b470894c33f8
files mercurial/templates/coal/map tests/test-hgweb-commands.t
diffstat 48 files changed, 218 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/atom/bookmarkentry.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -0,0 +1,8 @@
+ <entry>
+  <title>{bookmark|escape}</title>
+  <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
+  <id>{urlbase}{url}#bookmark-{node}</id>
+  <updated>{date|rfc3339date}</updated>
+  <published>{date|rfc3339date}</published>
+  <content type="text">{bookmark|strip|escape}</content>
+ </entry>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/atom/bookmarks.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -0,0 +1,11 @@
+{header}
+ <id>{urlbase}{url}</id>
+ <link rel="self" href="{urlbase}{url}atom-bookmarks"/>
+ <link rel="alternate" href="{urlbase}{url}bookmarks"/>
+ <title>{repo|escape}: bookmarks</title>
+ <summary>{repo|escape} bookmark history</summary>
+ <author><name>Mercurial SCM</name></author>
+ {latestentry%feedupdated}
+
+{entries%bookmarkentry}
+</feed>
--- a/mercurial/templates/atom/map	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/atom/map	Mon Apr 04 08:26:08 2011 -0500
@@ -8,4 +8,6 @@
 filelogentry = filelogentry.tmpl
 tags = tags.tmpl
 tagentry = tagentry.tmpl
+bookmarks = bookmarks.tmpl
+bookmarkentry = bookmarkentry.tmpl
 error = error.tmpl
--- a/mercurial/templates/coal/map	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/coal/map	Mon Apr 04 08:26:08 2011 -0500
@@ -140,6 +140,18 @@
       {node|short}
     </td>
   </tr>'
+bookmarks = ../paper/bookmarks.tmpl
+bookmarkentry = '
+  <tr class="tagEntry parity{parity}">
+    <td>
+      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
+        {bookmark|escape}
+      </a>
+    </td>
+    <td class="node">
+      {node|short}
+    </td>
+  </tr>'
 branches = ../paper/branches.tmpl
 branchentry = '
   <tr class="tagEntry parity{parity}">
@@ -154,6 +166,7 @@
   </tr>'
 changelogtag = '<span class="tag">{name|escape}</span> '
 changesettag = '<span class="tag">{tag|escape}</span> '
+changesetbookmark = '<span class="tag">{bookmark|escape}</span> '
 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
 changelogbranchname = '<span class="branchname">{name|escape}</span> '
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/gitweb/bookmarks.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -0,0 +1,32 @@
+{header}
+<title>{repo|escape}: Bookmarks</title>
+<link rel="alternate" type="application/atom+xml"
+   href="{url}atom-bookmarks" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+   href="{url}rss-bookmarks" title="RSS feed for {repo|escape}"/>
+</head>
+<body>
+
+<div class="page_header">
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / bookmarks
+</div>
+
+<div class="page_nav">
+<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
+<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
+<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
+<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
+<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+bookmarks |
+<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
+<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
+<a href="{url}help{sessionvars%urlparameter}">help</a>
+<br/>
+</div>
+
+<div class="title">&nbsp;</div>
+<table cellspacing="0">
+{entries%bookmarkentry}
+</table>
+
+{footer}
--- a/mercurial/templates/gitweb/branches.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/branches.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 branches |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/changelog.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/changelog.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -24,6 +24,7 @@
 changelog |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/changelogentry.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/changelogentry.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -1,5 +1,5 @@
 <div>
-<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
+<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
 </div>
 <div class="title_text">
 <div class="log_link">
--- a/mercurial/templates/gitweb/changeset.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/changeset.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
 changeset |
@@ -26,7 +27,7 @@
 </div>
 
 <div>
-<a class="title" href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
+<a class="title" href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
 </div>
 <div class="title_text">
 <table cellspacing="0">
--- a/mercurial/templates/gitweb/error.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/error.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -12,7 +12,15 @@
 </div>
 
 <div class="page_nav">
-<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a><br/>
+<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
+<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
+<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
+<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
+<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
+<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
+<a href="{url}help{sessionvars%urlparameter}">help</a>
+<br/>
 </div>
 
 <div class="page_body">
--- a/mercurial/templates/gitweb/fileannotate.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/fileannotate.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
--- a/mercurial/templates/gitweb/filediff.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/filediff.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
--- a/mercurial/templates/gitweb/filelog.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/filelog.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
 revisions |
--- a/mercurial/templates/gitweb/filerevision.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/filerevision.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
--- a/mercurial/templates/gitweb/graph.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/graph.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -24,6 +24,7 @@
 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
 graph |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -85,7 +86,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] + '">';
@@ -100,6 +101,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>';
 	}
 	
--- a/mercurial/templates/gitweb/help.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/help.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
 </div>
 
 <div class="page_nav">
@@ -17,8 +17,10 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
-branches |
-<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
+<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
+<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
+help
 <br/>
 </div>
 
--- a/mercurial/templates/gitweb/helptopics.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/helptopics.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
 </div>
 
 <div class="page_nav">
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
 help
--- a/mercurial/templates/gitweb/manifest.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/manifest.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 files |
 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry} |
@@ -24,7 +25,7 @@
 <br/>
 </div>
 
-<div class="title">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></div>
+<div class="title">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></div>
 <table cellspacing="0">
 <tr class="parity{upparity}">
 <td style="font-family:monospace">drwxr-xr-x</td>
--- a/mercurial/templates/gitweb/map	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/map	Mon Apr 04 08:26:08 2011 -0500
@@ -170,6 +170,17 @@
       <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
     </td>
   </tr>'
+bookmarks = bookmarks.tmpl
+bookmarkentry = '
+  <tr class="parity{parity}">
+    <td class="age"><i>{date|age}</i></td>
+    <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td>
+    <td class="link">
+      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
+      <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
+      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
+    </td>
+  </tr>'
 branches = branches.tmpl
 branchentry = '
   <tr class="parity{parity}">
@@ -214,6 +225,7 @@
 tagtag = '<span class="tagtag" title="{name}">{name}</span> '
 branchtag = '<span class="branchtag" title="{name}">{name}</span> '
 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
+bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> '
 shortlogentry = '
   <tr class="parity{parity}">
     <td class="age"><i>{date|age}</i></td>
@@ -221,7 +233,7 @@
     <td>
       <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
         <b>{desc|strip|firstline|escape|nonempty}</b>
-        <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span>
+        <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
       </a>
     </td>
     <td class="link" nowrap>
--- a/mercurial/templates/gitweb/search.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/search.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -24,6 +24,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
  |
--- a/mercurial/templates/gitweb/shortlog.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/shortlog.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/summary.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/summary.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -24,6 +24,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/tags.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/gitweb/tags.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -17,6 +17,7 @@
 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
 tags |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
 <a href="{url}help{sessionvars%urlparameter}">help</a>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/monoblue/bookmarks.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -0,0 +1,38 @@
+{header}
+    <title>{repo|escape}: Bookmarks</title>
+    <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
+    <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>
+</head>
+
+<body>
+<div id="container">
+    <div class="page-header">
+        <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Bookmarks</h1>
+
+        <form action="{url}log">
+            {sessionvars%hiddenformentry}
+            <dl class="search">
+                <dt><label>Search: </label></dt>
+                <dd><input type="text" name="rev" /></dd>
+            </dl>
+        </form>
+
+        <ul class="page-nav">
+            <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
+            <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
+            <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li class="current">bookmarks</li>
+            <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
+            <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
+	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
+        </ul>
+    </div>
+
+    <h2 class="no-link no-border">bookmarks</h2>
+    <table cellspacing="0">
+{entries%bookmarkentry}
+    </table>
+
+{footer}
--- a/mercurial/templates/monoblue/branches.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/branches.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li class="current">branches</li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/changelog.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/changelog.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li class="current">changelog</li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
 	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/changeset.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/changeset.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/error.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/error.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/fileannotate.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/fileannotate.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/filediff.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/filediff.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/filelog.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/filelog.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/filerevision.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/filerevision.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/graph.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/graph.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -24,6 +24,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li class="current">graph</li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/help.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/help.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -7,7 +7,7 @@
 <body>
 <div id="container">
     <div class="page-header">
-        <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Branches</h1>
+        <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Help</h1>
 
         <form action="{url}log">
             {sessionvars%hiddenformentry}
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    <li class="current">help</li>
--- a/mercurial/templates/monoblue/helptopics.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/helptopics.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -7,7 +7,7 @@
 <body>
 <div id="container">
     <div class="page-header">
-        <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Branches</h1>
+        <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Help</h1>
 
         <form action="{url}log">
             {sessionvars%hiddenformentry}
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}help{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    <li class="current">help</li>
--- a/mercurial/templates/monoblue/manifest.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/manifest.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li class="current">files</li>
 	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/map	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/map	Mon Apr 04 08:26:08 2011 -0500
@@ -147,6 +147,17 @@
       <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
     </td>
   </tr>'
+bookmarks = bookmarks.tmpl
+bookmarkentry = '
+  <tr class="parity{parity}">
+    <td class="nowrap">{date|age}</td>
+    <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{bookmark|escape}</a></td>
+    <td class="nowrap">
+      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
+      <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
+      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
+    </td>
+  </tr>'
 branches = branches.tmpl
 branchentry = '
   <tr class="parity{parity}">
--- a/mercurial/templates/monoblue/notfound.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/notfound.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/search.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/search.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
             <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/shortlog.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/shortlog.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    {archives%archiveentry}
--- a/mercurial/templates/monoblue/summary.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/summary.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- a/mercurial/templates/monoblue/tags.tmpl	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/monoblue/tags.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -23,6 +23,7 @@
             <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li class="current">tags</li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
 	    <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/rss/bookmarkentry.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -0,0 +1,6 @@
+<item>
+    <title>{bookmark|escape}</title>
+    <link>{urlbase}{url}rev/{node|short}</link>
+    <description><![CDATA[{bookmark|strip|escape|addbreaks}]]></description>
+    <pubDate>{date|rfc822date}</pubDate>
+</item>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/rss/bookmarks.tmpl	Mon Apr 04 08:26:08 2011 -0500
@@ -0,0 +1,6 @@
+{header}
+    <title>{repo|escape}: bookmarks </title>
+    <description>{repo|escape} bookmark history</description>
+    {entries%bookmarkentry}
+  </channel>
+</rss>
--- a/mercurial/templates/rss/map	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/rss/map	Mon Apr 04 08:26:08 2011 -0500
@@ -7,4 +7,6 @@
 filelogentry = filelogentry.tmpl
 tags = tags.tmpl
 tagentry = tagentry.tmpl
+bookmarks = bookmarks.tmpl
+bookmarkentry = bookmarkentry.tmpl
 error = error.tmpl
--- a/mercurial/templates/static/style-gitweb.css	Mon Apr 04 00:23:21 2011 +0800
+++ b/mercurial/templates/static/style-gitweb.css	Mon Apr 04 08:26:08 2011 -0500
@@ -80,6 +80,10 @@
 	background-color: #d5dde6;
 	border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
 }
+span.logtags span.bookmarktag {
+	background-color: #afdffa;
+	border-color: #ccecff #46ace6 #46ace6 #ccecff;
+}
 
 /* Graph */
 div#wrapper {
--- 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>';
   	}
   	
--- a/tests/test-hgweb.t	Mon Apr 04 00:23:21 2011 +0800
+++ b/tests/test-hgweb.t	Mon Apr 04 08:26:08 2011 -0500
@@ -383,6 +383,10 @@
   	background-color: #d5dde6;
   	border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
   }
+  span.logtags span.bookmarktag {
+  	background-color: #afdffa;
+  	border-color: #ccecff #46ace6 #46ace6 #ccecff;
+  }
   
   /* Graph */
   div#wrapper {