This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8792

templater: do search for include of unqualified builtin outside of config code
ClosedPublic

Authored by martinvonz on Jul 22 2020, 1:40 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4ccd5ec565c2: templater: do search for include of unqualified builtin outside of config code
Summary

Commit 081b08e4ea13 (templater: look for mapfiles in template paths,
2015-05-15) added support for using things like `%include
map-cmdline.default` to include built-in map files without using a
valid path to them. This patch rewrites that support by moving it into
_readmapfile() so it can later be adapted for reading from a
non-file resource.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (13 lines)

Diff 22055

mercurial/templater.py

"""Load template elements from the given map file""" """Load template elements from the given map file"""
if not os.path.exists(mapfile): if not os.path.exists(mapfile):
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(),
) )
base = os.path.dirname(mapfile) base = os.path.dirname(mapfile)
conf = config.config(includepaths=[templatedir()]) conf = config.config()
def include(rel, abs, remap, sections): def include(rel, abs, remap, sections):
templatedirs = [base, templatedir()]
for dir in templatedirs:
abs = os.path.normpath(os.path.join(dir, rel))
if os.path.isfile(abs):
data = util.posixfile(abs, b'rb').read() data = util.posixfile(abs, b'rb').read()
conf.parse(abs, data, sections=sections, remap=remap, include=include) conf.parse(
abs, data, sections=sections, remap=remap, include=include
)
break
data = util.posixfile(mapfile, b'rb').read() data = util.posixfile(mapfile, b'rb').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 = []