Mercurial > hg
diff mercurial/hgweb/webcommands.py @ 19886:e828975722c8
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 09 Oct 2013 14:15:34 -0700 |
parents | 681f7b9213a4 904061628dc4 |
children | d51c4d85ec23 |
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py Wed Oct 09 14:15:20 2013 -0700 +++ b/mercurial/hgweb/webcommands.py Wed Oct 09 14:15:34 2013 -0700 @@ -994,7 +994,7 @@ desc = templatefilters.firstline(ctx.description()) desc = cgi.escape(templatefilters.nonempty(desc)) user = cgi.escape(templatefilters.person(ctx.user())) - branch = ctx.branch() + branch = cgi.escape(ctx.branch()) try: branchnode = web.repo.branchtip(branch) except error.RepoLookupError: @@ -1003,7 +1003,8 @@ if usetuples: data.append((node, vtx, edges, desc, user, age, branch, - ctx.tags(), ctx.bookmarks())) + [cgi.escape(x) for x in ctx.tags()], + [cgi.escape(x) for x in ctx.bookmarks()])) else: edgedata = [dict(col=edge[0], nextcol=edge[1], color=(edge[2] - 1) % 6 + 1,