Show More
@@ -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} |
@@ -453,8 +453,13 b' def transplant(ui, repo, *revs, **opts):' | |||
|
453 | 453 | '''transplant changesets from another branch |
|
454 | 454 | |
|
455 | 455 | Selected changesets will be applied on top of the current working |
|
456 |
directory with the log of the original changeset. |
|
|
457 | specified, log messages will have a comment appended of the form:: | |
|
456 | directory with the log of the original changeset. The changesets | |
|
457 | are copied and will thus appear twice in the history. Use the | |
|
458 | rebase extension instead if you want to move a whole branch of | |
|
459 | unpublished changesets. | |
|
460 | ||
|
461 | If --log is specified, log messages will have a comment appended | |
|
462 | of the form:: | |
|
458 | 463 | |
|
459 | 464 | (transplanted from CHANGESETHASH) |
|
460 | 465 | |
@@ -469,9 +474,9 b' def transplant(ui, repo, *revs, **opts):' | |||
|
469 | 474 | transplanted, otherwise you will be prompted to select the |
|
470 | 475 | changesets you want. |
|
471 | 476 | |
|
472 |
:hg:`transplant --branch REVISION --all` will |
|
|
473 |
branch (up to the named revision) onto your current |
|
|
474 | directory. | |
|
477 | :hg:`transplant --branch REVISION --all` will transplant the | |
|
478 | selected branch (up to the named revision) onto your current | |
|
479 | working directory. | |
|
475 | 480 | |
|
476 | 481 | You can optionally mark selected transplanted changesets as merge |
|
477 | 482 | changesets. You will not be prompted to transplant any ancestors |
@@ -66,7 +66,7 b' class wsgirequest(object):' | |||
|
66 | 66 | |
|
67 | 67 | def drain(self): |
|
68 | 68 | '''need to read all data from request, httplib is half-duplex''' |
|
69 |
length = int(self.env.get('CONTENT_LENGTH' |
|
|
69 | length = int(self.env.get('CONTENT_LENGTH') or 0) | |
|
70 | 70 | for s in util.filechunkiter(self.inp, limit=length): |
|
71 | 71 | pass |
|
72 | 72 |
@@ -21,8 +21,8 b' from mercurial.i18n import _' | |||
|
21 | 21 | |
|
22 | 22 | __all__ = [ |
|
23 | 23 | 'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev', |
|
24 |
'manifest', 'tags', 'branches', 'summary', 'filediff', 'diff', |
|
|
25 | 'filelog', 'archive', 'static', 'graph', 'help', | |
|
24 | 'manifest', 'tags', 'bookmarks', 'branches', 'summary', 'filediff', 'diff', | |
|
25 | 'annotate', 'filelog', 'archive', 'static', 'graph', 'help', | |
|
26 | 26 | ] |
|
27 | 27 | |
|
28 | 28 | def log(web, req, tmpl): |
@@ -205,6 +205,7 b' def changelog(web, req, tmpl, shortlog=F' | |||
|
205 | 205 | "rev": i, |
|
206 | 206 | "node": hex(n), |
|
207 | 207 | "tags": webutil.nodetagsdict(web.repo, n), |
|
208 | "bookmarks": webutil.nodebookmarksdict(web.repo, n), | |
|
208 | 209 | "inbranch": webutil.nodeinbranch(web.repo, ctx), |
|
209 | 210 | "branches": webutil.nodebranchdict(web.repo, ctx) |
|
210 | 211 | }) |
@@ -247,6 +248,8 b' def shortlog(web, req, tmpl):' | |||
|
247 | 248 | def changeset(web, req, tmpl): |
|
248 | 249 | ctx = webutil.changectx(web.repo, req) |
|
249 | 250 | showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node()) |
|
251 | showbookmarks = webutil.showbookmark(web.repo, tmpl, 'changesetbookmark', | |
|
252 | ctx.node()) | |
|
250 | 253 | showbranch = webutil.nodebranchnodefault(ctx) |
|
251 | 254 | |
|
252 | 255 | files = [] |
@@ -270,6 +273,7 b' def changeset(web, req, tmpl):' | |||
|
270 | 273 | parent=webutil.parents(ctx), |
|
271 | 274 | child=webutil.children(ctx), |
|
272 | 275 | changesettag=showtags, |
|
276 | changesetbookmark=showbookmarks, | |
|
273 | 277 | changesetbranch=showbranch, |
|
274 | 278 | author=ctx.user(), |
|
275 | 279 | desc=ctx.description(), |
@@ -277,6 +281,7 b' def changeset(web, req, tmpl):' | |||
|
277 | 281 | files=files, |
|
278 | 282 | archives=web.archivelist(ctx.hex()), |
|
279 | 283 | tags=webutil.nodetagsdict(web.repo, ctx.node()), |
|
284 | bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()), | |
|
280 | 285 | branch=webutil.nodebranchnodefault(ctx), |
|
281 | 286 | inbranch=webutil.nodeinbranch(web.repo, ctx), |
|
282 | 287 | branches=webutil.nodebranchdict(web.repo, ctx)) |
@@ -384,6 +389,30 b' def tags(web, req, tmpl):' | |||
|
384 | 389 | entriesnotip=lambda **x: entries(True, 0, **x), |
|
385 | 390 | latestentry=lambda **x: entries(True, 1, **x)) |
|
386 | 391 | |
|
392 | def bookmarks(web, req, tmpl): | |
|
393 | i = web.repo._bookmarks.items() | |
|
394 | i.reverse() | |
|
395 | parity = paritygen(web.stripecount) | |
|
396 | ||
|
397 | def entries(notip=False, limit=0, **map): | |
|
398 | count = 0 | |
|
399 | for k, n in i: | |
|
400 | if notip and k == "tip": | |
|
401 | continue | |
|
402 | if limit > 0 and count >= limit: | |
|
403 | continue | |
|
404 | count = count + 1 | |
|
405 | yield {"parity": parity.next(), | |
|
406 | "bookmark": k, | |
|
407 | "date": web.repo[n].date(), | |
|
408 | "node": hex(n)} | |
|
409 | ||
|
410 | return tmpl("bookmarks", | |
|
411 | node=hex(web.repo.changelog.tip()), | |
|
412 | entries=lambda **x: entries(False, 0, **x), | |
|
413 | entriesnotip=lambda **x: entries(True, 0, **x), | |
|
414 | latestentry=lambda **x: entries(True, 1, **x)) | |
|
415 | ||
|
387 | 416 | def branches(web, req, tmpl): |
|
388 | 417 | tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems()) |
|
389 | 418 | heads = web.repo.heads() |
@@ -721,7 +750,8 b' def graph(web, req, tmpl):' | |||
|
721 | 750 | user = cgi.escape(templatefilters.person(ctx.user())) |
|
722 | 751 | branch = ctx.branch() |
|
723 | 752 | branch = branch, web.repo.branchtags().get(branch) == ctx.node() |
|
724 |
data.append((node, vtx, edges, desc, user, age, branch, ctx.tags() |
|
|
753 | data.append((node, vtx, edges, desc, user, age, branch, ctx.tags(), | |
|
754 | ctx.bookmarks())) | |
|
725 | 755 | |
|
726 | 756 | return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev, |
|
727 | 757 | lessvars=lessvars, morevars=morevars, downrev=downrev, |
@@ -90,6 +90,9 b' def renamelink(fctx):' | |||
|
90 | 90 | def nodetagsdict(repo, node): |
|
91 | 91 | return [{"name": i} for i in repo.nodetags(node)] |
|
92 | 92 | |
|
93 | def nodebookmarksdict(repo, node): | |
|
94 | return [{"name": i} for i in repo.nodebookmarks(node)] | |
|
95 | ||
|
93 | 96 | def nodebranchdict(repo, ctx): |
|
94 | 97 | branches = [] |
|
95 | 98 | branch = ctx.branch() |
@@ -118,6 +121,10 b' def showtag(repo, tmpl, t1, node=nullid,' | |||
|
118 | 121 | for t in repo.nodetags(node): |
|
119 | 122 | yield tmpl(t1, tag=t, **args) |
|
120 | 123 | |
|
124 | def showbookmark(repo, tmpl, t1, node=nullid, **args): | |
|
125 | for t in repo.nodebookmarks(node): | |
|
126 | yield tmpl(t1, bookmark=t, **args) | |
|
127 | ||
|
121 | 128 | def cleanpath(repo, path): |
|
122 | 129 | path = path.lstrip('/') |
|
123 | 130 | return util.canonpath(repo.root, '', path) |
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> |
|
18 | 18 | <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> |
|
19 | 19 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
20 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
20 | 21 | <li class="active">branches</li> |
|
21 | 22 | </ul> |
|
22 | 23 | <ul> |
@@ -12,6 +12,7 b'' | |||
|
12 | 12 | <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> |
|
13 | 13 | <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> |
|
14 | 14 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
15 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
15 | 16 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
16 | 17 | </ul> |
|
17 | 18 | <ul> |
@@ -30,7 +31,7 b'' | |||
|
30 | 31 | <div class="main"> |
|
31 | 32 | |
|
32 | 33 | <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2> |
|
33 | <h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}</h3> | |
|
34 | <h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag} {changesetbookmark}</h3> | |
|
34 | 35 | |
|
35 | 36 | <form class="search" action="{url}log"> |
|
36 | 37 | {sessionvars%hiddenformentry} |
@@ -13,6 +13,7 b'' | |||
|
13 | 13 | <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> |
|
14 | 14 | <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> |
|
15 | 15 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
16 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
16 | 17 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
17 | 18 | <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> |
|
18 | 19 | </ul> |
@@ -13,6 +13,7 b'' | |||
|
13 | 13 | <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> |
|
14 | 14 | <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> |
|
15 | 15 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
16 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
16 | 17 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
17 | 18 | </ul> |
|
18 | 19 |
@@ -13,6 +13,7 b'' | |||
|
13 | 13 | <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> |
|
14 | 14 | <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> |
|
15 | 15 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
16 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
16 | 17 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
17 | 18 | </ul> |
|
18 | 19 | <ul> |
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> |
|
18 | 18 | <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> |
|
19 | 19 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
20 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
20 | 21 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
21 | 22 | </ul> |
|
22 | 23 | <ul> |
@@ -18,6 +18,7 b'' | |||
|
18 | 18 | <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> |
|
19 | 19 | <li class="active">graph</li> |
|
20 | 20 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
21 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
21 | 22 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
22 | 23 | </ul> |
|
23 | 24 | <ul> |
@@ -110,6 +111,12 b' graph.vertex = function(x, y, color, par' | |||
|
110 | 111 | tagspan += '<span class="tag">' + tag + '</span> '; |
|
111 | 112 | } |
|
112 | 113 | } |
|
114 | if (cur[8].length) \{ | |
|
115 | for (var b in cur[8]) \{ | |
|
116 | var bookmark = cur[8][b]; | |
|
117 | tagspan += '<span class="tag">' + bookmark + '</span> '; | |
|
118 | } | |
|
119 | } | |
|
113 | 120 | tagspan += '</span>'; |
|
114 | 121 | } |
|
115 | 122 |
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> |
|
18 | 18 | <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> |
|
19 | 19 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
20 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
20 | 21 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
21 | 22 | </ul> |
|
22 | 23 | <ul> |
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> |
|
18 | 18 | <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> |
|
19 | 19 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
20 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
20 | 21 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
21 | 22 | </ul> |
|
22 | 23 | <ul> |
@@ -13,6 +13,7 b'' | |||
|
13 | 13 | <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> |
|
14 | 14 | <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> |
|
15 | 15 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
16 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
16 | 17 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
17 | 18 | </ul> |
|
18 | 19 | <ul> |
@@ -141,6 +141,18 b" tagentry = '" | |||
|
141 | 141 | {node|short} |
|
142 | 142 | </td> |
|
143 | 143 | </tr>' |
|
144 | bookmarks = bookmarks.tmpl | |
|
145 | bookmarkentry = ' | |
|
146 | <tr class="tagEntry parity{parity}"> | |
|
147 | <td> | |
|
148 | <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> | |
|
149 | {bookmark|escape} | |
|
150 | </a> | |
|
151 | </td> | |
|
152 | <td class="node"> | |
|
153 | {node|short} | |
|
154 | </td> | |
|
155 | </tr>' | |
|
144 | 156 | branches = branches.tmpl |
|
145 | 157 | branchentry = ' |
|
146 | 158 | <tr class="tagEntry parity{parity}"> |
@@ -155,6 +167,7 b" branchentry = '" | |||
|
155 | 167 | </tr>' |
|
156 | 168 | changelogtag = '<span class="tag">{name|escape}</span> ' |
|
157 | 169 | changesettag = '<span class="tag">{tag|escape}</span> ' |
|
170 | changesetbookmark = '<span class="tag">{bookmark|escape}</span> ' | |
|
158 | 171 | changelogbranchhead = '<span class="branchhead">{name|escape}</span> ' |
|
159 | 172 | changelogbranchname = '<span class="branchname">{name|escape}</span> ' |
|
160 | 173 |
@@ -13,6 +13,7 b'' | |||
|
13 | 13 | <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> |
|
14 | 14 | <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> |
|
15 | 15 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
16 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
16 | 17 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
17 | 18 | <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> |
|
18 | 19 | </ul> |
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | <li class="active">log</li> |
|
18 | 18 | <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> |
|
19 | 19 | <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> |
|
20 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
20 | 21 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
21 | 22 | </ul> |
|
22 | 23 | <ul> |
@@ -1,5 +1,5 b'' | |||
|
1 | 1 | <tr class="parity{parity}"> |
|
2 | 2 | <td class="age">{age(date)}</td> |
|
3 | 3 | <td class="author">{author|person}</td> |
|
4 | <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> | |
|
4 | <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> | |
|
5 | 5 | </tr> |
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> |
|
18 | 18 | <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> |
|
19 | 19 | <li class="active">tags</li> |
|
20 | <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
|
20 | 21 | <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> |
|
21 | 22 | </ul> |
|
22 | 23 | <ul> |
@@ -15,6 +15,7 b' Set up the repo' | |||
|
15 | 15 | adding da/foo |
|
16 | 16 | adding foo |
|
17 | 17 | $ hg tag 1.0 |
|
18 | $ hg bookmark something | |
|
18 | 19 |
$ |
|
19 | 20 | $ hg branch stable |
|
20 | 21 | marked working directory as branch stable |
@@ -204,6 +205,7 b' Logs and changes' | |||
|
204 | 205 | <li class="active">log</li> |
|
205 | 206 | <li><a href="/graph/1d22e65f027e">graph</a></li> |
|
206 | 207 | <li><a href="/tags">tags</a></li> |
|
208 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
207 | 209 | <li><a href="/branches">branches</a></li> |
|
208 | 210 | </ul> |
|
209 | 211 | <ul> |
@@ -244,7 +246,7 b' Logs and changes' | |||
|
244 | 246 | <tr class="parity0"> |
|
245 | 247 | <td class="age">1970-01-01</td> |
|
246 | 248 | <td class="author">test</td> |
|
247 | <td class="description"><a href="/rev/1d22e65f027e">branch</a><span class="branchhead">stable</span> <span class="tag">tip</span> </td> | |
|
249 | <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> | |
|
248 | 250 | </tr> |
|
249 | 251 | <tr class="parity1"> |
|
250 | 252 | <td class="age">1970-01-01</td> |
@@ -296,6 +298,7 b' Logs and changes' | |||
|
296 | 298 | <li><a href="/shortlog/2ef0ac749a14">log</a></li> |
|
297 | 299 | <li><a href="/graph/2ef0ac749a14">graph</a></li> |
|
298 | 300 | <li><a href="/tags">tags</a></li> |
|
301 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
299 | 302 | <li><a href="/branches">branches</a></li> |
|
300 | 303 | </ul> |
|
301 | 304 | <ul> |
@@ -314,7 +317,7 b' Logs and changes' | |||
|
314 | 317 | <div class="main"> |
|
315 | 318 | |
|
316 | 319 | <h2><a href="/">test</a></h2> |
|
317 | <h3>changeset 0:2ef0ac749a14 <span class="tag">1.0</span> </h3> | |
|
320 | <h3>changeset 0:2ef0ac749a14 <span class="tag">1.0</span> </h3> | |
|
318 | 321 | |
|
319 | 322 | <form class="search" action="/log"> |
|
320 | 323 | |
@@ -409,6 +412,7 b' Logs and changes' | |||
|
409 | 412 | <li><a href="/shortlog">log</a></li> |
|
410 | 413 | <li><a href="/graph">graph</a></li> |
|
411 | 414 | <li><a href="/tags">tags</a></li> |
|
415 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
412 | 416 | <li><a href="/branches">branches</a></li> |
|
413 | 417 | <li><a href="/help">help</a></li> |
|
414 | 418 | </ul> |
@@ -811,7 +815,7 b' Overviews' | |||
|
811 | 815 | <script> |
|
812 | 816 | <!-- hide script content |
|
813 | 817 | |
|
814 | 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"]]]; | |
|
818 | 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"], []]]; | |
|
815 | 819 | var graph = new Graph(); |
|
816 | 820 | graph.scale(39); |
|
817 | 821 | |
@@ -1070,7 +1074,7 b' Graph json escape of multibyte character' | |||
|
1070 | 1074 | |
|
1071 | 1075 | $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \ |
|
1072 | 1076 | > | grep '^var data =' |
|
1073 | 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"]]]; | |
|
1077 | 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"], []]]; | |
|
1074 | 1078 | |
|
1075 | 1079 | ERRORS ENCOUNTERED |
|
1076 | 1080 |
@@ -51,6 +51,7 b' manifest with descending' | |||
|
51 | 51 | <li><a href="/shortlog/9087c84a0f5d">log</a></li> |
|
52 | 52 | <li><a href="/graph/9087c84a0f5d">graph</a></li> |
|
53 | 53 | <li><a href="/tags">tags</a></li> |
|
54 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
54 | 55 | <li><a href="/branches">branches</a></li> |
|
55 | 56 | </ul> |
|
56 | 57 | <ul> |
@@ -43,6 +43,7 b' revision' | |||
|
43 | 43 | <li><a href="/shortlog/0cd96de13884">log</a></li> |
|
44 | 44 | <li><a href="/graph/0cd96de13884">graph</a></li> |
|
45 | 45 | <li><a href="/tags">tags</a></li> |
|
46 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
46 | 47 | <li><a href="/branches">branches</a></li> |
|
47 | 48 | </ul> |
|
48 | 49 | <ul> |
@@ -61,7 +62,7 b' revision' | |||
|
61 | 62 | <div class="main"> |
|
62 | 63 | |
|
63 | 64 | <h2><a href="/">test</a></h2> |
|
64 | <h3>changeset 0:0cd96de13884 </h3> | |
|
65 | <h3>changeset 0:0cd96de13884 </h3> | |
|
65 | 66 | |
|
66 | 67 | <form class="search" action="/log"> |
|
67 | 68 | |
@@ -167,6 +168,7 b' diff removed file' | |||
|
167 | 168 | <li><a href="/shortlog/78e4ebad7cdf">log</a></li> |
|
168 | 169 | <li><a href="/graph/78e4ebad7cdf">graph</a></li> |
|
169 | 170 | <li><a href="/tags">tags</a></li> |
|
171 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
170 | 172 | <li><a href="/branches">branches</a></li> |
|
171 | 173 | </ul> |
|
172 | 174 | <ul> |
@@ -268,6 +270,7 b' revision' | |||
|
268 | 270 | <li><a href="/shortlog/0cd96de13884">log</a></li> |
|
269 | 271 | <li><a href="/graph/0cd96de13884">graph</a></li> |
|
270 | 272 | <li><a href="/tags">tags</a></li> |
|
273 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
271 | 274 | <li><a href="/branches">branches</a></li> |
|
272 | 275 | </ul> |
|
273 | 276 | <ul> |
@@ -286,7 +289,7 b' revision' | |||
|
286 | 289 | <div class="main"> |
|
287 | 290 | |
|
288 | 291 | <h2><a href="/">test</a></h2> |
|
289 | <h3>changeset 0:0cd96de13884 </h3> | |
|
292 | <h3>changeset 0:0cd96de13884 </h3> | |
|
290 | 293 | |
|
291 | 294 | <form class="search" action="/log"> |
|
292 | 295 | |
@@ -396,6 +399,7 b' diff removed file' | |||
|
396 | 399 | <li><a href="/shortlog/78e4ebad7cdf">log</a></li> |
|
397 | 400 | <li><a href="/graph/78e4ebad7cdf">graph</a></li> |
|
398 | 401 | <li><a href="/tags">tags</a></li> |
|
402 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
399 | 403 | <li><a href="/branches">branches</a></li> |
|
400 | 404 | </ul> |
|
401 | 405 | <ul> |
@@ -32,6 +32,7 b' Some tests for hgweb in an empty reposit' | |||
|
32 | 32 | <li class="active">log</li> |
|
33 | 33 | <li><a href="/graph/000000000000">graph</a></li> |
|
34 | 34 | <li><a href="/tags">tags</a></li> |
|
35 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
35 | 36 | <li><a href="/branches">branches</a></li> |
|
36 | 37 | </ul> |
|
37 | 38 | <ul> |
@@ -114,6 +115,7 b' Some tests for hgweb in an empty reposit' | |||
|
114 | 115 | <li class="active">log</li> |
|
115 | 116 | <li><a href="/graph/000000000000">graph</a></li> |
|
116 | 117 | <li><a href="/tags">tags</a></li> |
|
118 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
117 | 119 | <li><a href="/branches">branches</a></li> |
|
118 | 120 | </ul> |
|
119 | 121 | <ul> |
@@ -197,6 +199,7 b' Some tests for hgweb in an empty reposit' | |||
|
197 | 199 | <li><a href="/shortlog/000000000000">log</a></li> |
|
198 | 200 | <li class="active">graph</li> |
|
199 | 201 | <li><a href="/tags">tags</a></li> |
|
202 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
200 | 203 | <li><a href="/branches">branches</a></li> |
|
201 | 204 | </ul> |
|
202 | 205 | <ul> |
@@ -289,6 +292,12 b' Some tests for hgweb in an empty reposit' | |||
|
289 | 292 | tagspan += '<span class="tag">' + tag + '</span> '; |
|
290 | 293 | } |
|
291 | 294 | } |
|
295 | if (cur[8].length) { | |
|
296 | for (var b in cur[8]) { | |
|
297 | var bookmark = cur[8][b]; | |
|
298 | tagspan += '<span class="tag">' + bookmark + '</span> '; | |
|
299 | } | |
|
300 | } | |
|
292 | 301 | tagspan += '</span>'; |
|
293 | 302 | } |
|
294 | 303 | |
@@ -340,6 +349,7 b' Some tests for hgweb in an empty reposit' | |||
|
340 | 349 | <li><a href="/shortlog/000000000000">log</a></li> |
|
341 | 350 | <li><a href="/graph/000000000000">graph</a></li> |
|
342 | 351 | <li><a href="/tags">tags</a></li> |
|
352 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
343 | 353 | <li><a href="/branches">branches</a></li> |
|
344 | 354 | </ul> |
|
345 | 355 | <ul> |
@@ -136,6 +136,7 b' tip - two revisions' | |||
|
136 | 136 | <li><a href="/shortlog/01de2d66a28d">log</a></li> |
|
137 | 137 | <li><a href="/graph/01de2d66a28d">graph</a></li> |
|
138 | 138 | <li><a href="/tags">tags</a></li> |
|
139 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
139 | 140 | <li><a href="/branches">branches</a></li> |
|
140 | 141 | </ul> |
|
141 | 142 | <ul> |
@@ -234,6 +235,7 b' second version - two revisions' | |||
|
234 | 235 | <li><a href="/shortlog/01de2d66a28d">log</a></li> |
|
235 | 236 | <li><a href="/graph/01de2d66a28d">graph</a></li> |
|
236 | 237 | <li><a href="/tags">tags</a></li> |
|
238 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
237 | 239 | <li><a href="/branches">branches</a></li> |
|
238 | 240 | </ul> |
|
239 | 241 | <ul> |
@@ -332,6 +334,7 b' first deleted - one revision' | |||
|
332 | 334 | <li><a href="/shortlog/5ed941583260">log</a></li> |
|
333 | 335 | <li><a href="/graph/5ed941583260">graph</a></li> |
|
334 | 336 | <li><a href="/tags">tags</a></li> |
|
337 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
335 | 338 | <li><a href="/branches">branches</a></li> |
|
336 | 339 | </ul> |
|
337 | 340 | <ul> |
@@ -425,6 +428,7 b' first version - one revision' | |||
|
425 | 428 | <li><a href="/shortlog/5ed941583260">log</a></li> |
|
426 | 429 | <li><a href="/graph/5ed941583260">graph</a></li> |
|
427 | 430 | <li><a href="/tags">tags</a></li> |
|
431 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
428 | 432 | <li><a href="/branches">branches</a></li> |
|
429 | 433 | </ul> |
|
430 | 434 | <ul> |
@@ -514,6 +518,7 b' before addition - error' | |||
|
514 | 518 | <li><a href="/shortlog">log</a></li> |
|
515 | 519 | <li><a href="/graph">graph</a></li> |
|
516 | 520 | <li><a href="/tags">tags</a></li> |
|
521 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
517 | 522 | <li><a href="/branches">branches</a></li> |
|
518 | 523 | <li><a href="/help">help</a></li> |
|
519 | 524 | </ul> |
@@ -38,6 +38,7 b' revision' | |||
|
38 | 38 | <li><a href="/shortlog/c78f6c5cbea9">log</a></li> |
|
39 | 39 | <li><a href="/graph/c78f6c5cbea9">graph</a></li> |
|
40 | 40 | <li><a href="/tags">tags</a></li> |
|
41 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
41 | 42 | <li><a href="/branches">branches</a></li> |
|
42 | 43 | </ul> |
|
43 | 44 | <ul> |
@@ -56,7 +57,7 b' revision' | |||
|
56 | 57 | <div class="main"> |
|
57 | 58 | |
|
58 | 59 | <h2><a href="/">test</a></h2> |
|
59 | <h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3> | |
|
60 | <h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3> | |
|
60 | 61 | |
|
61 | 62 | <form class="search" action="/log"> |
|
62 | 63 | |
@@ -133,6 +134,7 b' diff removed file' | |||
|
133 | 134 | <li><a href="/shortlog/c78f6c5cbea9">log</a></li> |
|
134 | 135 | <li><a href="/graph/c78f6c5cbea9">graph</a></li> |
|
135 | 136 | <li><a href="/tags">tags</a></li> |
|
137 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
136 | 138 | <li><a href="/branches">branches</a></li> |
|
137 | 139 | </ul> |
|
138 | 140 | <ul> |
@@ -62,6 +62,7 b' should give a 404 - static file that doe' | |||
|
62 | 62 | <li><a href="/shortlog">log</a></li> |
|
63 | 63 | <li><a href="/graph">graph</a></li> |
|
64 | 64 | <li><a href="/tags">tags</a></li> |
|
65 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
65 | 66 | <li><a href="/branches">branches</a></li> |
|
66 | 67 | <li><a href="/help">help</a></li> |
|
67 | 68 | </ul> |
@@ -147,6 +148,7 b' should give a 404 - file does not exist' | |||
|
147 | 148 | <li><a href="/shortlog">log</a></li> |
|
148 | 149 | <li><a href="/graph">graph</a></li> |
|
149 | 150 | <li><a href="/tags">tags</a></li> |
|
151 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
150 | 152 | <li><a href="/branches">branches</a></li> |
|
151 | 153 | <li><a href="/help">help</a></li> |
|
152 | 154 | </ul> |
@@ -214,6 +216,7 b' try bad style' | |||
|
214 | 216 | <li><a href="/shortlog/2ef0ac749a14">log</a></li> |
|
215 | 217 | <li><a href="/graph/2ef0ac749a14">graph</a></li> |
|
216 | 218 | <li><a href="/tags">tags</a></li> |
|
219 | <li><a href="/bookmarks">bookmarks</a></li> | |
|
217 | 220 | <li><a href="/branches">branches</a></li> |
|
218 | 221 | </ul> |
|
219 | 222 | <ul> |
General Comments 0
You need to be logged in to leave comments.
Login now