upstream/mercurial-mirror Commit - r13868:38906cf9

mercurial/templates/atom/bookmarkentry.tmpl

0 created 644 +8 0

@@ -0,0 +1,8 b''
	1	<entry>
	2	<title>{bookmark\|escape}</title>
	3	<link rel="alternate" href="{urlbase}{url}rev/{node\|short}"/>
	4	<id>{urlbase}{url}#bookmark-{node}</id>
	5	<updated>{date\|rfc3339date}</updated>
	6	<published>{date\|rfc3339date}</published>
	7	<content type="text">{bookmark\|strip\|escape}</content>
	8	</entry>

mercurial/templates/atom/bookmarks.tmpl

0 created 644 +11 0

@@ -0,0 +1,11 b''
	1	{header}
	2	<id>{urlbase}{url}</id>
	3	<link rel="self" href="{urlbase}{url}atom-bookmarks"/>
	4	<link rel="alternate" href="{urlbase}{url}bookmarks"/>
	5	<title>{repo\|escape}: bookmarks</title>
	6	<summary>{repo\|escape} bookmark history</summary>
	7	<author><name>Mercurial SCM</name></author>
	8	{latestentry%feedupdated}
	9
	10	{entries%bookmarkentry}
	11	</feed>

mercurial/templates/gitweb/bookmarks.tmpl

0 created 644 +32 0

@@ -0,0 +1,32 b''
	1	{header}
	2	<title>{repo\|escape}: Bookmarks</title>
	3	<link rel="alternate" type="application/atom+xml"
	4	href="{url}atom-bookmarks" title="Atom feed for {repo\|escape}"/>
	5	<link rel="alternate" type="application/rss+xml"
	6	href="{url}rss-bookmarks" title="RSS feed for {repo\|escape}"/>
	7	</head>
	8	<body>
	9
	10	<div class="page_header">
	11	<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / bookmarks
	12	</div>
	13
	14	<div class="page_nav">
	15	<a href="{url}summary{sessionvars%urlparameter}">summary</a> \|
	16	<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> \|
	17	<a href="{url}log{sessionvars%urlparameter}">changelog</a> \|
	18	<a href="{url}graph{sessionvars%urlparameter}">graph</a> \|
	19	<a href="{url}tags{sessionvars%urlparameter}">tags</a> \|
	20	bookmarks \|
	21	<a href="{url}branches{sessionvars%urlparameter}">branches</a> \|
	22	<a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a> \|
	23	<a href="{url}help{sessionvars%urlparameter}">help</a>
	24	<br/>
	25	</div>
	26
	27	<div class="title"> </div>
	28	<table cellspacing="0">
	29	{entries%bookmarkentry}
	30	</table>
	31
	32	{footer}

mercurial/templates/monoblue/bookmarks.tmpl

0 created 644 +38 0

@@ -0,0 +1,38 b''
	1	{header}
	2	<title>{repo\|escape}: Bookmarks</title>
	3	<link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
	4	<link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
	5	</head>
	6
	7	<body>
	8	<div id="container">
	9	<div class="page-header">
	10	<h1><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / Bookmarks</h1>
	11
	12	<form action="{url}log">
	13	{sessionvars%hiddenformentry}
	14	<dl class="search">
	15	<dt><label>Search: </label></dt>
	16	<dd><input type="text" name="rev" /></dd>
	17	</dl>
	18	</form>
	19
	20	<ul class="page-nav">
	21	<li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
	22	<li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
	23	<li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
	24	<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
	25	<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
	26	<li class="current">bookmarks</li>
	27	<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
	28	<li><a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a></li>
	29	<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
	30	</ul>
	31	</div>
	32
	33	<h2 class="no-link no-border">bookmarks</h2>
	34	<table cellspacing="0">
	35	{entries%bookmarkentry}
	36	</table>
	37
	38	{footer}

mercurial/templates/rss/bookmarkentry.tmpl

0 created 644 +6 0

@@ -0,0 +1,6 b''
	1	<item>
	2	<title>{bookmark\|escape}</title>
	3	<link>{urlbase}{url}rev/{node\|short}</link>
	4	<description><![CDATA[{bookmark\|strip\|escape\|addbreaks}]]></description>
	5	<pubDate>{date\|rfc822date}</pubDate>
	6	</item>

mercurial/templates/rss/bookmarks.tmpl

0 created 644 +6 0

@@ -0,0 +1,6 b''
	1	{header}
	2	<title>{repo\|escape}: bookmarks </title>
	3	<description>{repo\|escape} bookmark history</description>
	4	{entries%bookmarkentry}
	5	</channel>
	6	</rss>

mercurial/templates/atom/map

0 +2 0

             filelogentry = filelogentry.tmpl
             tags = tags.tmpl
             tagentry = tagentry.tmpl
+            bookmarks = bookmarks.tmpl
+            bookmarkentry = bookmarkentry.tmpl
             error = error.tmpl

mercurial/templates/coal/map

0 +13 0

                   {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}">
               </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> '

mercurial/templates/gitweb/branches.tmpl

0 +1 0

             <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>

mercurial/templates/gitweb/changelog.tmpl

0 +1 0

             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>

mercurial/templates/gitweb/changelogentry.tmpl

0 +1 -1

             <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">

mercurial/templates/gitweb/changeset.tmpl

0 +2 -1

             <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 |
             </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">

mercurial/templates/gitweb/error.tmpl

0 +9 -1

@@ -12,7 +12,15 b''
12	</div>	12	</div>
13		13
14	<div class="page_nav">	14	<div class="page_nav">
15	<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/>	15	<a href="{url}summary{sessionvars%urlparameter}">summary</a> \|
		16	<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		17	<a href="{url}log{sessionvars%urlparameter}">changelog</a> \|
		18	<a href="{url}tags{sessionvars%urlparameter}">tags</a> \|
		19	<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
		20	<a href="{url}branches{sessionvars%urlparameter}">branches</a> \|
		21	<a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a> \|
		22	<a href="{url}help{sessionvars%urlparameter}">help</a>
		23	<br/>
16	</div>	24	</div>
17		25
18	<div class="page_body">	26	<div class="page_body">

mercurial/templates/gitweb/fileannotate.tmpl

0 +1 0

             <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> |

mercurial/templates/gitweb/filediff.tmpl

0 +1 0

             <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> |

mercurial/templates/gitweb/filelog.tmpl

0 +1 0

             <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 |

mercurial/templates/gitweb/filerevision.tmpl

0 +1 0

             <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> |

mercurial/templates/gitweb/graph.tmpl

0 +8 -1

             <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>
             	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] + '">';
             				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>';
             	}

mercurial/templates/gitweb/help.tmpl

0 +5 -3

             <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">
             <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}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
-            <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
+            <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
+            <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
+            help
             <br/>
             </div>

mercurial/templates/gitweb/helptopics.tmpl

0 +2 -1

             <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">
             <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

mercurial/templates/gitweb/manifest.tmpl

0 +2 -1

             <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} |
             <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>

mercurial/templates/gitweb/map

0 +13 -1

                   <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}">
             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>
                 <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>

mercurial/templates/gitweb/search.tmpl

0 +1 0

             <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}
              |

mercurial/templates/gitweb/shortlog.tmpl

0 +1 0

             <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>

mercurial/templates/gitweb/summary.tmpl

0 +1 0

             <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>

mercurial/templates/gitweb/tags.tmpl

0 +1 0

             <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>

mercurial/templates/monoblue/branches.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/changelog.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/changeset.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/error.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/fileannotate.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/filediff.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/filelog.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/filerevision.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/graph.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/help.tmpl

0 +2 -1

             <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}
                         <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>

mercurial/templates/monoblue/helptopics.tmpl

0 +2 -1

             <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}
                         <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>

mercurial/templates/monoblue/manifest.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/map

0 +11 0

@@ -147,6 +147,17 b" tagentry = '"
147	<a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a>	147	<a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a>
148	</td>	148	</td>
149	</tr>'	149	</tr>'
		150	bookmarks = bookmarks.tmpl
		151	bookmarkentry = '
		152	<tr class="parity{parity}">
		153	<td class="nowrap">{date\|age}</td>
		154	<td><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{bookmark\|escape}</a></td>
		155	<td class="nowrap">
		156	<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">changeset</a> \|
		157	<a href="{url}log/{node\|short}{sessionvars%urlparameter}">changelog</a> \|
		158	<a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a>
		159	</td>
		160	</tr>'
150	branches = branches.tmpl	161	branches = branches.tmpl
151	branchentry = '	162	branchentry = '
152	<tr class="parity{parity}">	163	<tr class="parity{parity}">

mercurial/templates/monoblue/notfound.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/search.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/shortlog.tmpl

0 +1 0

                         <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}

mercurial/templates/monoblue/summary.tmpl

0 +1 0

                         <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>

mercurial/templates/monoblue/tags.tmpl

0 +1 0

                         <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>

mercurial/templates/rss/map

0 +2 0

             filelogentry = filelogentry.tmpl
             tags = tags.tmpl
             tagentry = tagentry.tmpl
+            bookmarks = bookmarks.tmpl
+            bookmarkentry = bookmarkentry.tmpl
             error = error.tmpl

mercurial/templates/static/style-gitweb.css

0 +4 0

             	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 {

tests/test-hgweb-commands.t

0 +10 -2

               <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>
               <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>
               <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>
               	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] + '">';
               				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>';
               	}

tests/test-hgweb.t

0 +4 0

               	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 {

@@ -0,0 +1,8 b''
	1	<entry>
	2	<title>{bookmark\|escape}</title>
	3	<link rel="alternate" href="{urlbase}{url}rev/{node\|short}"/>
	4	<id>{urlbase}{url}#bookmark-{node}</id>
	5	<updated>{date\|rfc3339date}</updated>
	6	<published>{date\|rfc3339date}</published>
	7	<content type="text">{bookmark\|strip\|escape}</content>
	8	</entry>

@@ -0,0 +1,6 b''
	1	<item>
	2	<title>{bookmark\|escape}</title>
	3	<link>{urlbase}{url}rev/{node\|short}</link>
	4	<description><![CDATA[{bookmark\|strip\|escape\|addbreaks}]]></description>
	5	<pubDate>{date\|rfc822date}</pubDate>
	6	</item>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages