This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8907

templater: teach template loader to use open_template() function
ClosedPublic

Authored by martinvonz on Aug 6 2020, 2:29 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc3376a724e32: templater: teach template loader to use open_template() function
Summary

The template loader can apparently load templates from relative paths,
so I needed to add that support to open_template().

This takes the number of failing tests with PyOxidizer from 54 to 34.

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 6 2020, 2:29 PM
indygreg accepted this revision.Aug 6 2020, 8:31 PM
This revision is now accepted and ready to land.Aug 6 2020, 8:31 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (5 lines)

Diff 22321

mercurial/templater.py

def __contains__(self, key): def __contains__(self, key):
return key in self.cache or key in self._map return key in self.cache or key in self._map
def load(self, t): def load(self, t):
"""Get parsed tree for the given template name. Use a local cache.""" """Get parsed tree for the given template name. Use a local cache."""
if t not in self.cache: if t not in self.cache:
try: try:
self.cache[t] = util.readfile(self._map[t]) mapfile, fp = open_template(self._map[t])
self.cache[t] = fp.read()
except KeyError as inst: except KeyError as inst:
raise templateutil.TemplateNotFound( raise templateutil.TemplateNotFound(
_(b'"%s" not in template map') % inst.args[0] _(b'"%s" not in template map') % inst.args[0]
) )
except IOError as inst: except IOError as inst:
reason = _(b'template file %s: %s') % ( reason = _(b'template file %s: %s') % (
self._map[t], self._map[t],
stringutil.forcebytestr(inst.args[1]), stringutil.forcebytestr(inst.args[1]),
def open_template(name, templatepath=None): def open_template(name, templatepath=None):
'''returns a file-like object for the given template, and its full path '''returns a file-like object for the given template, and its full path
If the name is a relative path and we're in a frozen binary, the template If the name is a relative path and we're in a frozen binary, the template
will be read from the mercurial.templates package instead. The returned path will be read from the mercurial.templates package instead. The returned path
will then be the relative path. will then be the relative path.
''' '''
# Does the name point directly to a map file? # Does the name point directly to a map file?
if os.path.isabs(name): if os.path.isfile(name) or os.path.isabs(name):
return name, open(name, mode='rb') return name, open(name, mode='rb')
# Does the name point to a template in the provided templatepath, or # Does the name point to a template in the provided templatepath, or
# in mercurial/templates/ if no path was provided? # in mercurial/templates/ if no path was provided?
if templatepath is None: if templatepath is None:
templatepath = templatedir() templatepath = templatedir()
if templatepath is not None: if templatepath is not None:
f = os.path.join(templatepath, name) f = os.path.join(templatepath, name)