This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5666

hgweb: ensure template mapping keys are bytes
ClosedPublic

Authored by indygreg on Jan 23 2019, 8:28 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGeff0a7d3229c: hgweb: ensure template mapping keys are bytes
Summary

Before, str keys were being added in Python 3 because named
arguments to dict() use native str for keys. This caused the
templater to fail to find the keys since it was looking for
bytes versions.

This makes a handful of tests pass on Python 3.

We may want to consider having the templater validate that keys
in mapping dicts are bytes. But I'm unsure whether this is
appropriate and won't be doing this.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 23 2019, 8:28 PM
durin42 accepted this revision.Jan 23 2019, 9:21 PM
This revision is now accepted and ready to land.Jan 23 2019, 9:21 PM
Closed by commit rHGeff0a7d3229c: hgweb: ensure template mapping keys are bytes (authored by indygreg). · Explain WhyJan 23 2019, 9:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/webutil.py (14 lines)

Diff 13382

mercurial/hgweb/webutil.py

''' '''
repo = web.repo repo = web.repo
rev = ctx.rev() rev = ctx.rev()
n = scmutil.binnode(ctx) n = scmutil.binnode(ctx)
showtags = showtag(repo, 'changelogtag', n) showtags = showtag(repo, 'changelogtag', n)
files = listfilediffs(ctx.files(), n, web.maxfiles) files = listfilediffs(ctx.files(), n, web.maxfiles)
entry = commonentry(repo, ctx) entry = commonentry(repo, ctx)
entry.update( entry.update({
allparents=_kwfunc(lambda context, mapping: parents(ctx)), 'allparents': _kwfunc(lambda context, mapping: parents(ctx)),
parent=_kwfunc(lambda context, mapping: parents(ctx, rev - 1)), 'parent': _kwfunc(lambda context, mapping: parents(ctx, rev - 1)),
child=_kwfunc(lambda context, mapping: children(ctx, rev + 1)), 'child': _kwfunc(lambda context, mapping: children(ctx, rev + 1)),
changelogtag=showtags, 'changelogtag': showtags,
files=files, 'files': files,
) })
return entry return entry
def changelistentries(web, revs, maxcount, parityfn): def changelistentries(web, revs, maxcount, parityfn):
"""Emit up to N records for an iterable of revisions.""" """Emit up to N records for an iterable of revisions."""
repo = web.repo repo = web.repo
count = 0 count = 0
for rev in revs: for rev in revs: