This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8896

templater: try to read %include in mapfiles from resources
ClosedPublic

Authored by martinvonz on Aug 5 2020, 1:10 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfef64d7a4a84: templater: try to read %include in mapfiles from resources
Summary

The "show" style is an example of a style that uses an "%include"
statement in its definition. This patch makes hg log --style show
work.

This takes the number of failing tests with PyOxidizer from 72 to 62.

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 (16 lines)

Diff 22294

mercurial/templater.py

def include(rel, remap, sections): def include(rel, remap, sections):
subresource = None subresource = None
if base: if base:
abs = os.path.normpath(os.path.join(base, rel)) abs = os.path.normpath(os.path.join(base, rel))
if os.path.isfile(abs): if os.path.isfile(abs):
subresource = util.posixfile(abs, b'rb') subresource = util.posixfile(abs, b'rb')
if not subresource: if not subresource:
if pycompat.ossep not in rel:
abs = rel
subresource = resourceutil.open_resource(
b'mercurial.templates', rel
)
else:
dir = templatedir() dir = templatedir()
if dir: if dir:
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):
subresource = util.posixfile(abs, b'rb') subresource = util.posixfile(abs, b'rb')
if subresource: if subresource:
data = subresource.read() data = subresource.read()
conf.parse( conf.parse(
abs, data, sections=sections, remap=remap, include=include, abs, data, sections=sections, remap=remap, include=include,
) )
data = fp.read() data = fp.read()
conf.parse(mapfile, data, remap={b'': b'templates'}, include=include) conf.parse(mapfile, data, remap={b'': b'templates'}, include=include)