This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8892

templater: replace templatepath() with function that also opens the file
ClosedPublic

Authored by martinvonz on Aug 5 2020, 12:26 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG65a812ed9e9f: templater: replace templatepath() with function that also opens the file
Summary

For frozen binaries, such as those created by PyOxidizer, I plan to
make it so the templatespec can keep an opened file/resource to read
from instead of needing a file path. Having templatepath() return an
opened file should help with that. At this point, it's just a wasteful
extra opening of mapfiles that we'll open again later. I'll update the
read-side next so it reads from the file-like object without opening
the file again.

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

Diff 22290

mercurial/debugcommands.py

fm.plain(_(b'checking "re2" regexp engine (%s)\n') % re2) fm.plain(_(b'checking "re2" regexp engine (%s)\n') % re2)
fm.data(re2=bool(util._re2)) fm.data(re2=bool(util._re2))
# templates # templates
p = templater.templatedir() p = templater.templatedir()
fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'') fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'')
fm.condwrite(not p, b'', _(b" no template directories found\n")) fm.condwrite(not p, b'', _(b" no template directories found\n"))
if p: if p:
m = templater.templatepath(b"map-cmdline.default") (m, fp) = templater.open_template(b"map-cmdline.default")
if m: if m:
# template found, check if it is working # template found, check if it is working
err = None err = None
try: try:
templater.templater.frommapfile(m) templater.templater.frommapfile(m)
except Exception as inst: except Exception as inst:
err = stringutil.forcebytestr(inst) err = stringutil.forcebytestr(inst)
p = None p = None

mercurial/formatter.py

# a function-style reference to built-in template # a function-style reference to built-in template
func, fsep, ftail = tmpl.partition(b'(') func, fsep, ftail = tmpl.partition(b'(')
if func in {b'cbor', b'json'} and fsep and ftail.endswith(b')'): if func in {b'cbor', b'json'} and fsep and ftail.endswith(b')'):
templater.parseexpr(tmpl) # make sure syntax errors are confined templater.parseexpr(tmpl) # make sure syntax errors are confined
return reference_templatespec(func, refargs=ftail[:-1]) return reference_templatespec(func, refargs=ftail[:-1])
# perhaps a stock style? # perhaps a stock style?
if not os.path.split(tmpl)[0]: if not os.path.split(tmpl)[0]:
mapname = templater.templatepath( (mapname, fp) = templater.open_template(
b'map-cmdline.' + tmpl b'map-cmdline.' + tmpl
) or templater.templatepath(tmpl) ) or templater.open_template(tmpl)
if mapname: if mapname:
return mapfile_templatespec(topic, mapname) return mapfile_templatespec(topic, mapname)
# perhaps it's a reference to [templates] # perhaps it's a reference to [templates]
if ui.config(b'templates', tmpl): if ui.config(b'templates', tmpl):
return reference_templatespec(tmpl) return reference_templatespec(tmpl)
if tmpl == b'list': if tmpl == b'list':

mercurial/logcmdutil.py

if tmpl: if tmpl:
return formatter.literal_templatespec(templater.unquotestring(tmpl)) return formatter.literal_templatespec(templater.unquotestring(tmpl))
else: else:
style = util.expandpath(ui.config(b'ui', b'style')) style = util.expandpath(ui.config(b'ui', b'style'))
if not tmpl and style: if not tmpl and style:
mapfile = style mapfile = style
if not os.path.split(mapfile)[0]: if not os.path.split(mapfile)[0]:
mapname = templater.templatepath( (mapname, fp) = templater.open_template(
b'map-cmdline.' + mapfile b'map-cmdline.' + mapfile
) or templater.templatepath(mapfile) ) or templater.open_template(mapfile)
if mapname: if mapname:
mapfile = mapname mapfile = mapname
return formatter.mapfile_templatespec(b'changeset', mapfile) return formatter.mapfile_templatespec(b'changeset', mapfile)
return formatter.lookuptemplate(ui, b'changeset', tmpl) return formatter.lookuptemplate(ui, b'changeset', tmpl)
def maketemplater(ui, repo, tmpl, buffered=False): def maketemplater(ui, repo, tmpl, buffered=False):

mercurial/templater.py

def templatedir(): def templatedir():
'''return the directory used for template files, or None.''' '''return the directory used for template files, or None.'''
path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates')) path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates'))
return path if os.path.isdir(path) else None return path if os.path.isdir(path) else None
def templatepath(name): def open_template(name):
'''return location of template file. returns None if not found.''' '''returns a file-like object for the given template, and its full path'''
dir = templatedir() templatepath = templatedir()
if dir is None: if templatepath is not None or os.path.isabs(name):
return None f = os.path.join(templatepath, name)
f = os.path.join(templatedir(), name) try:
if f and os.path.isfile(f): return f, open(f, mode='rb')
return f except EnvironmentError:
return None return None, None
else:
# TODO: read from resources here
return None, None