Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/webcommands.py @ 19886:e828975722c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Oct 2013 14:15:34 -0700
parents 681f7b9213a4 904061628dc4
children d51c4d85ec23
comparison
equal deleted inserted replaced
19885:6cc696179869 19886:e828975722c8
992 node = str(ctx) 992 node = str(ctx)
993 age = templatefilters.age(ctx.date()) 993 age = templatefilters.age(ctx.date())
994 desc = templatefilters.firstline(ctx.description()) 994 desc = templatefilters.firstline(ctx.description())
995 desc = cgi.escape(templatefilters.nonempty(desc)) 995 desc = cgi.escape(templatefilters.nonempty(desc))
996 user = cgi.escape(templatefilters.person(ctx.user())) 996 user = cgi.escape(templatefilters.person(ctx.user()))
997 branch = ctx.branch() 997 branch = cgi.escape(ctx.branch())
998 try: 998 try:
999 branchnode = web.repo.branchtip(branch) 999 branchnode = web.repo.branchtip(branch)
1000 except error.RepoLookupError: 1000 except error.RepoLookupError:
1001 branchnode = None 1001 branchnode = None
1002 branch = branch, branchnode == ctx.node() 1002 branch = branch, branchnode == ctx.node()
1003 1003
1004 if usetuples: 1004 if usetuples:
1005 data.append((node, vtx, edges, desc, user, age, branch, 1005 data.append((node, vtx, edges, desc, user, age, branch,
1006 ctx.tags(), ctx.bookmarks())) 1006 [cgi.escape(x) for x in ctx.tags()],
1007 [cgi.escape(x) for x in ctx.bookmarks()]))
1007 else: 1008 else:
1008 edgedata = [dict(col=edge[0], nextcol=edge[1], 1009 edgedata = [dict(col=edge[0], nextcol=edge[1],
1009 color=(edge[2] - 1) % 6 + 1, 1010 color=(edge[2] - 1) % 6 + 1,
1010 width=edge[3], bcolor=edge[4]) 1011 width=edge[3], bcolor=edge[4])
1011 for edge in edges] 1012 for edge in edges]