This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8895

templater: unroll loop over mapfile directories
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd9a502a0a9ca: templater: unroll loop over mapfile directories
Summary

I'll rewrite the handling of the templatedir() case in the next
patch, so the two cases will be more different and the loop won't make
as much sense.

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.Aug 5 2020, 1:10 PM
indygreg accepted this revision.Aug 5 2020, 8:34 PM
This revision is now accepted and ready to land.Aug 5 2020, 8:34 PM
martinvonz added a commit: rHGd9a502a0a9ca: templater: unroll loop over mapfile directories.Aug 5 2020, 8:48 PM
Closed by commit rHGd9a502a0a9ca: templater: unroll loop over mapfile directories (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (25 lines)

Diff 22293

mercurial/templater.py

def _readmapfile(fp, mapfile): def _readmapfile(fp, mapfile):
"""Load template elements from the given map file""" """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()] subresource = None
for dir in templatedirs: if base:
if dir is None: abs = os.path.normpath(os.path.join(base, rel))
continue if os.path.isfile(abs):
subresource = util.posixfile(abs, b'rb')
if not subresource:
dir = templatedir()
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):
data = util.posixfile(abs, b'rb').read() subresource = util.posixfile(abs, b'rb')
if subresource:
data = subresource.read()
conf.parse( conf.parse(
abs, data, sections=sections, remap=remap, include=include abs, data, sections=sections, remap=remap, include=include,
) )
break
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)
cache = {} cache = {}
tmap = {} tmap = {}
aliases = [] aliases = []