This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8847

templatespec: move check for non-unicode to lower-level function
ClosedPublic

Authored by martinvonz on Jul 29 2020, 2:38 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG215f08c8006c: templatespec: move check for non-unicode to lower-level function
Summary

Now that we have the factory functions, it makes sense to have the
check there.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/formatter.py (2 lines)
Mmercurial/logcmdutil.py (2 lines)

Diff 22188

mercurial/formatter.py

return templatespec(None, None, None) return templatespec(None, None, None)
def reference_templatespec(ref, refargs=None): def reference_templatespec(ref, refargs=None):
return templatespec(ref, None, None, refargs) return templatespec(ref, None, None, refargs)
def literal_templatespec(tmpl): def literal_templatespec(tmpl):
if pycompat.ispy3:
assert not isinstance(tmpl, str), b'tmpl must not be a str'
return templatespec(b'', tmpl, None) return templatespec(b'', tmpl, None)
def mapfile_templatespec(topic, mapfile): def mapfile_templatespec(topic, mapfile):
return templatespec(topic, None, mapfile) return templatespec(topic, None, mapfile)
def lookuptemplate(ui, topic, tmpl): def lookuptemplate(ui, topic, tmpl):

mercurial/logcmdutil.py

self.footer = self.t.render(self._parts[b'footer'], props) self.footer = self.t.render(self._parts[b'footer'], props)
def templatespec(tmpl, mapfile): def templatespec(tmpl, mapfile):
assert not (tmpl and mapfile) assert not (tmpl and mapfile)
if mapfile: if mapfile:
return formatter.mapfile_templatespec(b'changeset', mapfile) return formatter.mapfile_templatespec(b'changeset', mapfile)
else: else:
if pycompat.ispy3:
assert not isinstance(tmpl, str), b'tmpl must not be a str'
return formatter.literal_templatespec(tmpl) return formatter.literal_templatespec(tmpl)
def _lookuptemplate(ui, tmpl, style): def _lookuptemplate(ui, tmpl, style):
"""Find the template matching the given template spec or style """Find the template matching the given template spec or style
See formatter.lookuptemplate() for details. See formatter.lookuptemplate() for details.
""" """