This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8809

templater: reuse check for both "map-cmdline.<name>" and "<name>"
AbandonedPublic

Authored by martinvonz on Jul 24 2020, 1:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

We had two callers of templatepath() that did the same test for both
"map-cmdline.<name>" and "<name>", so let's move that into
templatepath() so we can reuse it. It should be harmless for the `hg
debuginstall` (it just means an extra file-system check in the case of
broken installs).

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 22137

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 = templater.templatepath(b"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 templatespec(func, None, None, refargs=ftail[:-1]) return templatespec(func, None, None, 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 = templater.templatepath(tmpl)
b'map-cmdline.' + tmpl
) or templater.templatepath(tmpl)
if mapname: if mapname:
return templatespec(topic, None, mapname) return templatespec(topic, None, 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 templatespec(tmpl, None, None) return templatespec(tmpl, None, None)
if tmpl == b'list': if tmpl == b'list':

mercurial/logcmdutil.py

if tmpl: if tmpl:
return templatespec(templater.unquotestring(tmpl), None) return templatespec(templater.unquotestring(tmpl), None)
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 = templater.templatepath(mapfile)
b'map-cmdline.' + mapfile
) or templater.templatepath(mapfile)
if mapname: if mapname:
mapfile = mapname mapfile = mapname
return templatespec(None, mapfile) return templatespec(None, 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

return path if os.path.isdir(path) else None return path if os.path.isdir(path) else None
def templatepath(name): def templatepath(name):
'''return location of template file. returns None if not found.''' '''return location of template file. returns None if not found.'''
dir = templatedir() dir = templatedir()
if dir is None: if dir is None:
return None return None
f = os.path.join(templatedir(), name) for filename in (b'map-cmdline.' + name, name):
f = os.path.join(dir, filename)
if f and os.path.isfile(f): if f and os.path.isfile(f):
return f return f
return None return None
def stylemap(styles, path=None): def stylemap(styles, path=None):
"""Return path to mapfile for a given style. """Return path to mapfile for a given style.
Searches mapfile in the following locations: Searches mapfile in the following locations:
1. templatepath/style/map 1. templatepath/style/map