This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8891

templater: start passing resource to read from into _readmapfile()
ClosedPublic

Authored by martinvonz on Aug 5 2020, 12:26 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdc10bcd5c08d: templater: start passing resource to read from into _readmapfile()
Summary

This patch makes it so we pass in a file-like resource to read from
instead of having _readmapfile() open the file. This is one more
step towards making _readmapfile() able to read resources opened by
from importlib.resources. We still need to pass in the mapfile path
because it's used for loading dependent mapfiles from %include and
__base__, and it's also used for giving the user better error
messages. Besides that, one can safely call _readmapfile() with any
file-like resource after this patch.

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/templater.py (25 lines)

Diff 22289

mercurial/templater.py

split = file.split(b".") split = file.split(b".")
if split[-1] in (b'orig', b'rej'): if split[-1] in (b'orig', b'rej'):
continue continue
if split[0] == b"map-cmdline": if split[0] == b"map-cmdline":
stylelist.append(split[1]) stylelist.append(split[1])
return b", ".join(sorted(stylelist)) return b", ".join(sorted(stylelist))
def _readmapfile(mapfile): def _open_mapfile(mapfile):
"""Load template elements from the given map file""" if os.path.exists(mapfile):
if not os.path.exists(mapfile): return util.posixfile(mapfile, b'rb')
raise error.Abort( raise error.Abort(
_(b"style '%s' not found") % mapfile, _(b"style '%s' not found") % mapfile,
hint=_(b"available styles: %s") % stylelist(), hint=_(b"available styles: %s") % stylelist(),
) )
def _readmapfile(fp, mapfile):
"""Load template elements from the given map file"""
base = os.path.dirname(mapfile) base = os.path.dirname(mapfile)
conf = config.config() conf = config.config()
def include(rel, remap, sections): def include(rel, remap, sections):
templatedirs = [base, templatedir()] templatedirs = [base, templatedir()]
for dir in templatedirs: for dir in templatedirs:
if dir is None: if dir is None:
continue continue
abs = os.path.normpath(os.path.join(dir, rel)) abs = os.path.normpath(os.path.join(dir, rel))
if os.path.isfile(abs): if os.path.isfile(abs):
data = util.posixfile(abs, b'rb').read() data = util.posixfile(abs, b'rb').read()
conf.parse( conf.parse(
abs, data, sections=sections, remap=remap, include=include abs, data, sections=sections, remap=remap, include=include
) )
break break
data = util.posixfile(mapfile, b'rb').read() data = fp.read()
conf.parse(mapfile, data, remap={b'': b'templates'}, include=include) conf.parse(mapfile, data, remap={b'': b'templates'}, include=include)
cache = {} cache = {}
tmap = {} tmap = {}
aliases = [] aliases = []
val = conf.get(b'templates', b'__base__') val = conf.get(b'templates', b'__base__')
if val and val[0] not in b"'\"": if val and val[0] not in b"'\"":
# treat as a pointer to a base class for this style # treat as a pointer to a base class for this style
path = os.path.normpath(os.path.join(base, val)) path = os.path.normpath(os.path.join(base, val))
# fallback check in template paths # fallback check in template paths
if not os.path.exists(path): if not os.path.exists(path):
dir = templatedir() dir = templatedir()
if dir is not None: if dir is not None:
p2 = os.path.normpath(os.path.join(dir, val)) p2 = os.path.normpath(os.path.join(dir, val))
if os.path.isfile(p2): if os.path.isfile(p2):
path = p2 path = p2
else: else:
p3 = os.path.normpath(os.path.join(p2, b"map")) p3 = os.path.normpath(os.path.join(p2, b"map"))
if os.path.isfile(p3): if os.path.isfile(p3):
path = p3 path = p3
cache, tmap, aliases = _readmapfile(path) fp = _open_mapfile(path)
cache, tmap, aliases = _readmapfile(fp, path)
for key, val in conf[b'templates'].items(): for key, val in conf[b'templates'].items():
if not val: if not val:
raise error.ParseError( raise error.ParseError(
_(b'missing value'), conf.source(b'templates', key) _(b'missing value'), conf.source(b'templates', key)
) )
if val[0] in b"'\"": if val[0] in b"'\"":
if val[0] != val[-1]: if val[0] != val[-1]:
defaults=None, defaults=None,
resources=None, resources=None,
cache=None, cache=None,
minchunk=1024, minchunk=1024,
maxchunk=65536, maxchunk=65536,
): ):
"""Create templater from the specified map file""" """Create templater from the specified map file"""
t = cls(filters, defaults, resources, cache, [], minchunk, maxchunk) t = cls(filters, defaults, resources, cache, [], minchunk, maxchunk)
cache, tmap, aliases = _readmapfile(mapfile) fp = _open_mapfile(mapfile)
cache, tmap, aliases = _readmapfile(fp, mapfile)
t._loader.cache.update(cache) t._loader.cache.update(cache)
t._loader._map = tmap t._loader._map = tmap
t._loader._aliasmap = _aliasrules.buildmap(aliases) t._loader._aliasmap = _aliasrules.buildmap(aliases)
return t return t
def __contains__(self, key): def __contains__(self, key):
return key in self._loader return key in self._loader