This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1137

templater: don't blow up when trying to build an abort message
ClosedPublic

Authored by durin42 on Oct 16 2017, 10:56 PM.

Details

Reviewers
ryanmce
Group Reviewers
hg-reviewers
Commits
rHGe87e62b7fc0b: templater: don't blow up when trying to build an abort message
Summary

name is unicode, but we need bytes. For now, we'll make the
(mostly-safe) assumption that template filter names will be ascii.

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

durin42 created this revision.Oct 16 2017, 10:56 PM
ryanmce accepted this revision.Oct 17 2017, 8:39 AM
ryanmce added a subscriber: ryanmce.

queued

This revision is now accepted and ready to land.Oct 17 2017, 8:39 AM
Closed by commit rHGe87e62b7fc0b: templater: don't blow up when trying to build an abort message (authored by durin42). · Explain WhyOct 17 2017, 8:40 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Oct 17 2017, 8:56 AM

pycompat.sysbytes() can be used here.

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (2 lines)

Diff 2911

mercurial/templater.py

arg, filt = data arg, filt = data
thing = evalfuncarg(context, mapping, arg) thing = evalfuncarg(context, mapping, arg)
try: try:
return filt(thing) return filt(thing)
except (ValueError, AttributeError, TypeError): except (ValueError, AttributeError, TypeError):
sym = findsymbolicname(arg) sym = findsymbolicname(arg)
if sym: if sym:
msg = (_("template filter '%s' is not compatible with keyword '%s'") msg = (_("template filter '%s' is not compatible with keyword '%s'")
% (filt.__name__, sym)) % (filt.__name__.encode('ascii'), sym))
else: else:
msg = _("incompatible use of template filter '%s'") % filt.__name__ msg = _("incompatible use of template filter '%s'") % filt.__name__
raise error.Abort(msg) raise error.Abort(msg)
def buildmap(exp, context): def buildmap(exp, context):
darg = compileexp(exp[1], context, methods) darg = compileexp(exp[1], context, methods)
targ = gettemplate(exp[2], context) targ = gettemplate(exp[2], context)
return (runmap, (darg, targ)) return (runmap, (darg, targ))