Patchwork D8848: templatespec: use new factory functions from logcmdutil

login
register
mail settings
Submitter phabricator
Date July 29, 2020, 6:39 p.m.
Message ID <differential-rev-PHID-DREV-yupn5gjdpcyz5dbcstvi-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46935/
State Superseded
Headers show

Comments

phabricator - July 29, 2020, 6:39 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8848

AFFECTED FILES
  mercurial/logcmdutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -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)