This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8805

formatter: remove now-unnecessary check for file-ness
ClosedPublic

Authored by martinvonz on Jul 24 2020, 2:01 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG653b2a439412: formatter: remove now-unnecessary check for file-ness
Summary

templater.templatepath() now returns non-None only for files, so
the caller doesn't have to check.

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/formatter.py (2 lines)

Diff 22182

mercurial/formatter.py

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(
b'map-cmdline.' + tmpl b'map-cmdline.' + tmpl
) or templater.templatepath(tmpl) ) or templater.templatepath(tmpl)
if mapname and os.path.isfile(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':
ui.write(_(b"available styles: %s\n") % templater.stylelist()) ui.write(_(b"available styles: %s\n") % templater.stylelist())