Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/webcommands.py @ 6720:084c9f1ef2bd
graph: display branch name alongside tags
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 23 Jun 2008 12:54:27 +0200 |
parents | 8251ffb35725 |
children | f6c00b17387c |
comparison
equal
deleted
inserted
replaced
6719:42dbf9548bc6 | 6720:084c9f1ef2bd |
---|---|
600 node = short(ctx.node()) | 600 node = short(ctx.node()) |
601 age = templatefilters.age(ctx.date()) | 601 age = templatefilters.age(ctx.date()) |
602 desc = templatefilters.firstline(ctx.description()) | 602 desc = templatefilters.firstline(ctx.description()) |
603 desc = cgi.escape(desc) | 603 desc = cgi.escape(desc) |
604 user = cgi.escape(templatefilters.person(ctx.user())) | 604 user = cgi.escape(templatefilters.person(ctx.user())) |
605 data.append((node, vtx, edges, desc, user, age, ctx.tags())) | 605 branch = ctx.branch() |
606 branch = branch, web.repo.branchtags().get(branch) == ctx.node() | |
607 data.append((node, vtx, edges, desc, user, age, branch, ctx.tags())) | |
606 | 608 |
607 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev, | 609 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev, |
608 lessrev=lessrev, revcountmore=revcount and 2 * revcount or 1, | 610 lessrev=lessrev, revcountmore=revcount and 2 * revcount or 1, |
609 revcountless=revcount / 2, downrev=downrev, | 611 revcountless=revcount / 2, downrev=downrev, |
610 canvasheight=canvasheight, bg_height=bg_height, | 612 canvasheight=canvasheight, bg_height=bg_height, |