This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8846

templatespec: logcmdutil.templatespec() gets either template or mapfile
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdfb67cd1da7f: templatespec: logcmdutil.templatespec() gets either template or mapfile
Summary

The callers of the function already never pass (non-None) values for
both, so let's check that and call the new factory functions.

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/logcmdutil.py (9 lines)

Diff 22187

mercurial/logcmdutil.py

self._showpatch(ctx, graphwidth) self._showpatch(ctx, graphwidth)
if self._parts[b'footer']: if self._parts[b'footer']:
if not self.footer: if not self.footer:
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):
if pycompat.ispy3: assert not (tmpl and mapfile)
assert not isinstance(tmpl, str), b'tmpl must not be a str'
if mapfile: if mapfile:
return formatter.templatespec(b'changeset', tmpl, mapfile) return formatter.mapfile_templatespec(b'changeset', mapfile)
else: else:
return formatter.templatespec(b'', tmpl, None) if pycompat.ispy3:
assert not isinstance(tmpl, str), b'tmpl must not be a str'
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.
""" """