upstream/mercurial-mirror Commit - r13607:2151703e

merge with stable

Martin Geisler -

r13607:2151703e default

parent child

mercurial/templates/paper/bookmarks.tmpl

0 created 644 +49 0

@@ -0,0 +1,49 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}: bookmarks" />
	5	<link rel="alternate" type="application/rss+xml"
	6	href="{url}rss-bookmarks" title="RSS feed for {repo\|escape}: bookmarks" />
	7	</head>
	8	<body>
	9
	10	<div class="container">
	11	<div class="menu">
	12	<div class="logo">
	13	<a href="http://mercurial.selenic.com/">
	14	<img src="{staticurl}hglogo.png" alt="mercurial" /></a>
	15	</div>
	16	<ul>
	17	<li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
	18	<li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
	19	<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
	20	<li class="active">bookmarks</li>
	21	<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
	22	</ul>
	23	<ul>
	24	<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
	25	</ul>
	26	</div>
	27
	28	<div class="main">
	29	<h2><a href="{url}{sessionvars%urlparameter}">{repo\|escape}</a></h2>
	30	<h3>bookmarks</h3>
	31
	32	<form class="search" action="{url}log">
	33	{sessionvars%hiddenformentry}
	34	<p><input name="rev" id="search1" type="text" size="30" /></p>
	35	<div id="hint">find changesets by author, revision,
	36	files, or words in the commit message</div>
	37	</form>
	38
	39	<table class="bigtable">
	40	<tr>
	41	<th>bookmark</th>
	42	<th>node</th>
	43	</tr>
	44	{entries%bookmarkentry}
	45	</table>
	46	</div>
	47	</div>
	48
	49	{footer}

hgext/transplant.py

0 +10 -5

                 '''transplant changesets from another branch
                 Selected changesets will be applied on top of the current working
-                directory with the log of the original changeset. If --log is
+                directory with the log of the original changeset. The changesets
-                specified, log messages will have a comment appended of the form::
+                are copied and will thus appear twice in the history. Use the
+                rebase extension instead if you want to move a whole branch of
+                unpublished changesets.
+                If --log is specified, log messages will have a comment appended
+                of the form::
                   (transplanted from CHANGESETHASH)
                 transplanted, otherwise you will be prompted to select the
                 changesets you want.
-                :hg:`transplant --branch REVISION --all` will rebase the selected
+                :hg:`transplant --branch REVISION --all` will transplant the
-                branch (up to the named revision) onto your current working
+                selected branch (up to the named revision) onto your current
-                directory.
+                working directory.
                 You can optionally mark selected transplanted changesets as merge
                 changesets. You will not be prompted to transplant any ancestors

mercurial/hgweb/request.py

0 +1 -1

                 def drain(self):
                     '''need to read all data from request, httplib is half-duplex'''
-                    length = int(self.env.get('CONTENT_LENGTH', 0))
+                    length = int(self.env.get('CONTENT_LENGTH') or 0)
                     for s in util.filechunkiter(self.inp, limit=length):
                         pass

mercurial/hgweb/webcommands.py

0 +33 -3

             __all__ = [
                'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
-               'manifest', 'tags', 'branches', 'summary', 'filediff', 'diff', 'annotate',
+               'manifest', 'tags', 'bookmarks', 'branches', 'summary', 'filediff', 'diff',
-               'filelog', 'archive', 'static', 'graph', 'help',
+               'annotate', 'filelog', 'archive', 'static', 'graph', 'help',
             ]
             def log(web, req, tmpl):
                                      "rev": i,
                                      "node": hex(n),
                                      "tags": webutil.nodetagsdict(web.repo, n),
+                                     "bookmarks": webutil.nodebookmarksdict(web.repo, n),
                                      "inbranch": webutil.nodeinbranch(web.repo, ctx),
                                      "branches": webutil.nodebranchdict(web.repo, ctx)
                                     })
             def changeset(web, req, tmpl):
                 ctx = webutil.changectx(web.repo, req)
                 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
+                showbookmarks = webutil.showbookmark(web.repo, tmpl, 'changesetbookmark',
+                                                     ctx.node())
                 showbranch = webutil.nodebranchnodefault(ctx)
                 files = []
                             parent=webutil.parents(ctx),
                             child=webutil.children(ctx),
                             changesettag=showtags,
+                            changesetbookmark=showbookmarks,
                             changesetbranch=showbranch,
                             author=ctx.user(),
                             desc=ctx.description(),
                             files=files,
                             archives=web.archivelist(ctx.hex()),
                             tags=webutil.nodetagsdict(web.repo, ctx.node()),
+                            bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
                             branch=webutil.nodebranchnodefault(ctx),
                             inbranch=webutil.nodeinbranch(web.repo, ctx),
                             branches=webutil.nodebranchdict(web.repo, ctx))
                             entriesnotip=lambda **x: entries(True, 0, **x),
                             latestentry=lambda **x: entries(True, 1, **x))
+            def bookmarks(web, req, tmpl):
+                i = web.repo._bookmarks.items()
+                i.reverse()
+                parity = paritygen(web.stripecount)
+                def entries(notip=False, limit=0, **map):
+                    count = 0
+                    for k, n in i:
+                        if notip and k == "tip":
+                            continue
+                        if limit > 0 and count >= limit:
+                            continue
+                        count = count + 1
+                        yield {"parity": parity.next(),
+                               "bookmark": k,
+                               "date": web.repo[n].date(),
+                               "node": hex(n)}
+                return tmpl("bookmarks",
+                            node=hex(web.repo.changelog.tip()),
+                            entries=lambda **x: entries(False, 0, **x),
+                            entriesnotip=lambda **x: entries(True, 0, **x),
+                            latestentry=lambda **x: entries(True, 1, **x))
             def branches(web, req, tmpl):
                 tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems())
                 heads = web.repo.heads()
                     user = cgi.escape(templatefilters.person(ctx.user()))
                     branch = ctx.branch()
                     branch = branch, web.repo.branchtags().get(branch) == ctx.node()
-                    data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
+                    data.append((node, vtx, edges, desc, user, age, branch, ctx.tags(),
+                                 ctx.bookmarks()))
                 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev,
                             lessvars=lessvars, morevars=morevars, downrev=downrev,

mercurial/hgweb/webutil.py

0 +7 0

             def nodetagsdict(repo, node):
                 return [{"name": i} for i in repo.nodetags(node)]
+            def nodebookmarksdict(repo, node):
+                return [{"name": i} for i in repo.nodebookmarks(node)]
             def nodebranchdict(repo, ctx):
                 branches = []
                 branch = ctx.branch()
                 for t in repo.nodetags(node):
                     yield tmpl(t1, tag=t, **args)
+            def showbookmark(repo, tmpl, t1, node=nullid, **args):
+                for t in repo.nodebookmarks(node):
+                    yield tmpl(t1, bookmark=t, **args)
             def cleanpath(repo, path):
                 path = path.lstrip('/')
                 return util.canonpath(repo.root, '', path)

mercurial/templates/paper/branches.tmpl

0 +1 0

             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{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="active">branches</li>
             </ul>
             <ul>

mercurial/templates/paper/changeset.tmpl

0 +2 -1

              <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</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>
             </ul>
             <ul>
             <div class="main">
             <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
-            <h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}</h3>
+            <h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag} {changesetbookmark}</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}

mercurial/templates/paper/error.tmpl

0 +1 0

             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{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}help{sessionvars%urlparameter}">help</a></li>
             </ul>

mercurial/templates/paper/fileannotate.tmpl

0 +1 0

             <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</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>
             </ul>

mercurial/templates/paper/filediff.tmpl

0 +1 0

             <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</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>
             </ul>
             <ul>

mercurial/templates/paper/filelog.tmpl

0 +1 0

             <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</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>
             </ul>
             <ul>

mercurial/templates/paper/graph.tmpl

0 +7 0

             <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
             <li class="active">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>
             </ul>
             <ul>
             				tagspan += '<span class="tag">' + tag + '</span> ';
             			}
             		}
+            		if (cur[8].length) \{
+            			for (var b in cur[8]) \{
+            				var bookmark = cur[8][b];
+            				tagspan += '<span class="tag">' + bookmark + '</span> ';
+            			}
+            		}
             		tagspan += '</span>';
             	}

mercurial/templates/paper/help.tmpl

0 +1 0

             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{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>
             </ul>
             <ul>

mercurial/templates/paper/helptopics.tmpl

0 +1 0

             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{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>
             </ul>
             <ul>

mercurial/templates/paper/manifest.tmpl

0 +1 0

             <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</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>
             </ul>
             <ul>

mercurial/templates/paper/map

0 +13 0

                   {node|short}
                 </td>
               </tr>'
+            bookmarks = 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 = 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/paper/search.tmpl

0 +1 0

             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{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}help{sessionvars%urlparameter}">help</a></li>
             </ul>

mercurial/templates/paper/shortlog.tmpl

0 +1 0

             <li class="active">log</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>
             </ul>
             <ul>

mercurial/templates/paper/shortlogentry.tmpl

0 +1 -1

              <tr class="parity{parity}">
               <td class="age">{age(date)}</td>
               <td class="author">{author|person}</td>
-              <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags % '<span class="tag">{name|escape}</span> '}</td>
+              <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags % '<span class="tag">{name|escape}</span> '}{bookmarks % '<span class="tag">{name|escape}</span> '}</td>
              </tr>

mercurial/templates/paper/tags.tmpl

0 +1 0

             <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
             <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
             <li class="active">tags</li>
+            <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             </ul>
             <ul>

tests/test-hgweb-commands.t

0 +8 -4

               adding da/foo
               adding foo
               $ hg tag 1.0
+              $ hg bookmark something
               $ echo another > foo
               $ hg branch stable
               marked working directory as branch stable
               <li class="active">log</li>
               <li><a href="/graph/1d22e65f027e">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
                <tr class="parity0">
                 <td class="age">1970-01-01</td>
                 <td class="author">test</td>
-                <td class="description"><a href="/rev/1d22e65f027e">branch</a><span class="branchhead">stable</span> <span class="tag">tip</span> </td>
+                <td class="description"><a href="/rev/1d22e65f027e">branch</a><span class="branchhead">stable</span> <span class="tag">tip</span> <span class="tag">something</span> </td>
                </tr>
                <tr class="parity1">
                 <td class="age">1970-01-01</td>
                <li><a href="/shortlog/2ef0ac749a14">log</a></li>
                <li><a href="/graph/2ef0ac749a14">graph</a></li>
                <li><a href="/tags">tags</a></li>
+               <li><a href="/bookmarks">bookmarks</a></li>
                <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <div class="main">
               <h2><a href="/">test</a></h2>
-              <h3>changeset 0:2ef0ac749a14  <span class="tag">1.0</span> </h3>
+              <h3>changeset 0:2ef0ac749a14  <span class="tag">1.0</span>  </h3>
               <form class="search" action="/log">
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               <li><a href="/help">help</a></li>
               </ul>
               <script>
               <!-- hide script content
-              var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", true], ["tip"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"]]];
+              var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", true], ["tip"], ["something"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], []]];
               var graph = new Graph();
               graph.scale(39);
               $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \
               >     | grep '^var data ='
-              var data = [["40b4d6888e92", [0, 1], [[0, 0, 1]], "\u80fd", "test", "1970-01-01", ["stable", true], ["tip"]], ["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", false], []], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"]]];
+              var data = [["40b4d6888e92", [0, 1], [[0, 0, 1]], "\u80fd", "test", "1970-01-01", ["stable", true], ["tip"], ["something"]], ["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", false], [], []], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], []]];
             ERRORS ENCOUNTERED

tests/test-hgweb-descend-empties.t

0 +1 0

               <li><a href="/shortlog/9087c84a0f5d">log</a></li>
               <li><a href="/graph/9087c84a0f5d">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>

tests/test-hgweb-diffs.t

0 +6 -2

                <li><a href="/shortlog/0cd96de13884">log</a></li>
                <li><a href="/graph/0cd96de13884">graph</a></li>
                <li><a href="/tags">tags</a></li>
+               <li><a href="/bookmarks">bookmarks</a></li>
                <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <div class="main">
               <h2><a href="/">test</a></h2>
-              <h3>changeset 0:0cd96de13884  </h3>
+              <h3>changeset 0:0cd96de13884   </h3>
               <form class="search" action="/log">
               <li><a href="/shortlog/78e4ebad7cdf">log</a></li>
               <li><a href="/graph/78e4ebad7cdf">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
                <li><a href="/shortlog/0cd96de13884">log</a></li>
                <li><a href="/graph/0cd96de13884">graph</a></li>
                <li><a href="/tags">tags</a></li>
+               <li><a href="/bookmarks">bookmarks</a></li>
                <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <div class="main">
               <h2><a href="/">test</a></h2>
-              <h3>changeset 0:0cd96de13884  </h3>
+              <h3>changeset 0:0cd96de13884   </h3>
               <form class="search" action="/log">
               <li><a href="/shortlog/78e4ebad7cdf">log</a></li>
               <li><a href="/graph/78e4ebad7cdf">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>

tests/test-hgweb-empty.t

0 +10 0

               <li class="active">log</li>
               <li><a href="/graph/000000000000">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li class="active">log</li>
               <li><a href="/graph/000000000000">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/shortlog/000000000000">log</a></li>
               <li class="active">graph</li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               				tagspan += '<span class="tag">' + tag + '</span> ';
               			}
               		}
+              		if (cur[8].length) {
+              			for (var b in cur[8]) {
+              				var bookmark = cur[8][b];
+              				tagspan += '<span class="tag">' + bookmark + '</span> ';
+              			}
+              		}
               		tagspan += '</span>';
               	}
               <li><a href="/shortlog/000000000000">log</a></li>
               <li><a href="/graph/000000000000">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>

tests/test-hgweb-filelog.t

0 +5 0

               <li><a href="/shortlog/01de2d66a28d">log</a></li>
               <li><a href="/graph/01de2d66a28d">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/shortlog/01de2d66a28d">log</a></li>
               <li><a href="/graph/01de2d66a28d">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/shortlog/5ed941583260">log</a></li>
               <li><a href="/graph/5ed941583260">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/shortlog/5ed941583260">log</a></li>
               <li><a href="/graph/5ed941583260">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               <li><a href="/help">help</a></li>
               </ul>

tests/test-hgweb-removed.t

0 +3 -1

                <li><a href="/shortlog/c78f6c5cbea9">log</a></li>
                <li><a href="/graph/c78f6c5cbea9">graph</a></li>
                <li><a href="/tags">tags</a></li>
+               <li><a href="/bookmarks">bookmarks</a></li>
                <li><a href="/branches">branches</a></li>
               </ul>
               <ul>
               <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">
               <li><a href="/shortlog/c78f6c5cbea9">log</a></li>
               <li><a href="/graph/c78f6c5cbea9">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>

tests/test-hgweb.t

0 +3 0

               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               <li><a href="/help">help</a></li>
               </ul>
               <li><a href="/shortlog">log</a></li>
               <li><a href="/graph">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               <li><a href="/help">help</a></li>
               </ul>
               <li><a href="/shortlog/2ef0ac749a14">log</a></li>
               <li><a href="/graph/2ef0ac749a14">graph</a></li>
               <li><a href="/tags">tags</a></li>
+              <li><a href="/bookmarks">bookmarks</a></li>
               <li><a href="/branches">branches</a></li>
               </ul>
               <ul>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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