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.

Download Raw Diff

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

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 22 2020, 1:40 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 22 2020, 1:40 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

martinvonz added a child revision: D8793: config: remove now-unused support for "includepaths".Jul 22 2020, 1:40 PM

pulkit accepted this revision.Jul 23 2020, 10:24 AM

This revision is now accepted and ready to land.Jul 23 2020, 10:24 AM

martinvonz added a commit: rHG4ccd5ec565c2: templater: do search for include of unqualified builtin outside of config code.Jul 23 2020, 10:55 AM

Closed by commit rHG4ccd5ec565c2: templater: do search for include of unqualified builtin outside of config code (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz removed a child revision: D8793: config: remove now-unused support for "includepaths".Jul 24 2020, 1:09 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/templater.py (13 lines)

Status	Author	Revision
Closed	martinvonz	D8792 templater: do search for include of unqualified builtin outside of config code
Closed	martinvonz	D8791 templater: switch to lower-level config.parse() in _readmapfile()
Closed	martinvonz	D8790 config: pass both relative and absolute paths to `include` callback
Closed	martinvonz	D8798 tests: add test for bad template %include and __base__
Closed	martinvonz	D8797 tests: add test for unqualified include of a built-in template map

Diff 22076

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 = []

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22055		Jul 22 2020, 1:40 PM	★	★
Diff 2	22076	rHG4ccd5ec565c2baaa1d598b20a7ea14d3c4fd39dc	Jul 22 2020, 3:09 AM	★	★