templatespec: use new factory functions in logcmdutil
Differential Revision: https://phab.mercurial-scm.org/D8848
--- a/mercurial/logcmdutil.py Mon Jul 20 21:33:28 2020 -0700
+++ b/mercurial/logcmdutil.py Mon Jul 20 22:43:33 2020 -0700
@@ -620,7 +620,7 @@
if not tmpl and not style: # template are stronger than style
tmpl = ui.config(b'ui', b'logtemplate')
if tmpl:
- return templatespec(templater.unquotestring(tmpl), None)
+ return formatter.literal_templatespec(templater.unquotestring(tmpl))
else:
style = util.expandpath(ui.config(b'ui', b'style'))
@@ -632,7 +632,7 @@
) or templater.templatepath(mapfile)
if mapname:
mapfile = mapname
- return templatespec(None, mapfile)
+ return formatter.mapfile_templatespec(b'changeset', mapfile)
return formatter.lookuptemplate(ui, b'changeset', tmpl)
@@ -640,7 +640,7 @@
def maketemplater(ui, repo, tmpl, buffered=False):
"""Create a changesettemplater from a literal template 'tmpl'
byte-string."""
- spec = templatespec(tmpl, None)
+ spec = formatter.literal_templatespec(tmpl)
return changesettemplater(ui, repo, spec, buffered=buffered)