Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/webutil.py @ 39810:4f44f747f094
hgweb: use scmutil.binnode() to translate None to wdir hash (issue5988)
I left some of ctx.node() calls unchanged as they seemed unlikely to be
workingctx, or passed to diff functions where None is the default value.
Note that a None revision can also cause a similar problem, but I'm not sure
if we can simply bulk-replace ctx.rev() with scmutil.intrev(ctx) as there's
large hole between tip revision and wdir revision. If such pair were passed
in to xrange() for example, we would waste CPU time.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 23 Sep 2018 16:11:01 +0900 |
| parents | 15e8250a82da |
| children | 5716d48b2a5b |
line wrap: on
line diff
--- a/mercurial/hgweb/webutil.py Sun Sep 23 16:15:48 2018 +0900 +++ b/mercurial/hgweb/webutil.py Sun Sep 23 16:11:01 2018 +0900 @@ -416,7 +416,7 @@ return f def commonentry(repo, ctx): - node = ctx.node() + node = scmutil.binnode(ctx) return { # TODO: perhaps ctx.changectx() should be assigned if ctx is a # filectx, but I'm not pretty sure if that would always work because @@ -451,7 +451,7 @@ ''' repo = web.repo rev = ctx.rev() - n = ctx.node() + n = scmutil.binnode(ctx) showtags = showtag(repo, 'changelogtag', n) files = listfilediffs(ctx.files(), n, web.maxfiles) @@ -485,7 +485,7 @@ if 'node' in req.qsparams: return templatefilters.revescape(req.qsparams['node']) else: - return short(ctx.node()) + return short(scmutil.binnode(ctx)) def _listfilesgen(context, ctx, stripecount): parity = paritygen(stripecount) @@ -501,8 +501,9 @@ def changesetentry(web, ctx): '''Obtain a dictionary to be used to render the "changeset" template.''' - showtags = showtag(web.repo, 'changesettag', ctx.node()) - showbookmarks = showbookmark(web.repo, 'changesetbookmark', ctx.node()) + showtags = showtag(web.repo, 'changesettag', scmutil.binnode(ctx)) + showbookmarks = showbookmark(web.repo, 'changesetbookmark', + scmutil.binnode(ctx)) showbranch = nodebranchnodefault(ctx) basectx = basechangectx(web.repo, web.req)