# HG changeset patch # User Martin von Zweigbergk # Date 1595393952 25200 # Node ID 8ec3062b7047ceb02c5136afda624e2596c0b7f6 # Parent f7f142d74df3f0a04b2c1d0da2a64b7b6df8c8c2 templater: switch to lower-level config.parse() in _readmapfile() I hope to modify this code to also work with resources loaded from memory (for PyOxidizer support). For that, we'll need to handle the lookup of relative `%include` path (not joined with the base directory of the containing file). This patch prepares for that by using `config.parse()` instead of `config.read()`, since the latter expects a file in the file system. As it happens, this change also lets us clean up the `config` class to not need the `_includepaths` field. That will happen next. Differential Revision: https://phab.mercurial-scm.org/D8791 diff -r f7f142d74df3 -r 8ec3062b7047 mercurial/templater.py --- a/mercurial/templater.py Tue Jul 21 23:50:42 2020 -0700 +++ b/mercurial/templater.py Tue Jul 21 21:59:12 2020 -0700 @@ -824,7 +824,13 @@ base = os.path.dirname(mapfile) conf = config.config(includepaths=[templatedir()]) - conf.read(mapfile, remap={b'': b'templates'}) + + def include(rel, abs, remap, sections): + data = util.posixfile(abs, b'rb').read() + conf.parse(abs, data, sections=sections, remap=remap, include=include) + + data = util.posixfile(mapfile, b'rb').read() + conf.parse(mapfile, data, remap={b'': b'templates'}, include=include) cache = {} tmap = {}