Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: pass opened file-like object to templatespec
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 04 Aug 2020 13:22:00 -0700
changeset 45310 f3481e4fcc3a
parent 45309 65a812ed9e9f
child 45311 3b27ed8e324e
templater: pass opened file-like object to templatespec I think I said earlier that I planned to create a special templatespec variant for built-in templates. That was true (I planned that), but I ended up (in this patch) just adding a file-like object to the `mapfile_templatespec()` variant instead. Differential Revision: https://phab.mercurial-scm.org/D8893
mercurial/formatter.py file | annotate | diff | comparison | revisions
mercurial/logcmdutil.py file | annotate | diff | comparison | revisions
mercurial/templater.py file | annotate | diff | comparison | revisions 
--- a/mercurial/formatter.py	Tue Aug 04 13:21:29 2020 -0700
+++ b/mercurial/formatter.py	Tue Aug 04 13:22:00 2020 -0700
@@ -540,6 +540,7 @@
     tmpl = attr.ib()
     mapfile = attr.ib()
     refargs = attr.ib(default=None)
+    fp = attr.ib(default=None)
 
 
 def empty_templatespec():
@@ -556,8 +557,8 @@
     return templatespec(b'', tmpl, None)
 
 
-def mapfile_templatespec(topic, mapfile):
-    return templatespec(topic, None, mapfile)
+def mapfile_templatespec(topic, mapfile, fp=None):
+    return templatespec(topic, None, mapfile, fp=fp)
 
 
 def lookuptemplate(ui, topic, tmpl):
@@ -603,7 +604,7 @@
             b'map-cmdline.' + tmpl
         ) or templater.open_template(tmpl)
         if mapname:
-            return mapfile_templatespec(topic, mapname)
+            return mapfile_templatespec(topic, mapname, fp)
 
     # perhaps it's a reference to [templates]
     if ui.config(b'templates', tmpl):
@@ -645,7 +646,11 @@
     assert not (spec.tmpl and spec.mapfile)
     if spec.mapfile:
         return templater.templater.frommapfile(
-            spec.mapfile, defaults=defaults, resources=resources, cache=cache
+            spec.mapfile,
+            spec.fp,
+            defaults=defaults,
+            resources=resources,
+            cache=cache,
         )
     return maketemplater(
         ui, spec.tmpl, defaults=defaults, resources=resources, cache=cache
--- a/mercurial/logcmdutil.py	Tue Aug 04 13:21:29 2020 -0700
+++ b/mercurial/logcmdutil.py	Tue Aug 04 13:22:00 2020 -0700
@@ -626,13 +626,14 @@
 
     if not tmpl and style:
         mapfile = style
+        fp = None
         if not os.path.split(mapfile)[0]:
             (mapname, fp) = templater.open_template(
                 b'map-cmdline.' + mapfile
             ) or templater.open_template(mapfile)
             if mapname:
                 mapfile = mapname
-        return formatter.mapfile_templatespec(b'changeset', mapfile)
+        return formatter.mapfile_templatespec(b'changeset', mapfile, fp)
 
     return formatter.lookuptemplate(ui, b'changeset', tmpl)
 
--- a/mercurial/templater.py	Tue Aug 04 13:21:29 2020 -0700
+++ b/mercurial/templater.py	Tue Aug 04 13:22:00 2020 -0700
@@ -994,6 +994,7 @@
     def frommapfile(
         cls,
         mapfile,
+        fp=None,
         filters=None,
         defaults=None,
         resources=None,
@@ -1003,7 +1004,8 @@
     ):
         """Create templater from the specified map file"""
         t = cls(filters, defaults, resources, cache, [], minchunk, maxchunk)
-        fp = _open_mapfile(mapfile)
+        if not fp:
+            fp = _open_mapfile(mapfile)
         cache, tmap, aliases = _readmapfile(fp, mapfile)
         t._loader.cache.update(cache)
         t._loader._map = tmap
mercurial