( )⚙ D8787 templater: simplify stylemap() now that templatedir() returns a single path

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8787

templater: simplify stylemap() now that templatedir() returns a single path
ClosedPublic

Authored by martinvonz on Jul 22 2020, 1:24 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4e9b39033d3f: templater: simplify stylemap() now that templatedir() returns a single path

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (19 lines)

Diff 22035

mercurial/templater.py

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.'''
f = os.path.join(templatedir(), name) f = os.path.join(templatedir(), name)
if f and os.path.exists(f): if f and os.path.exists(f):
return f return f
return None return None
def stylemap(styles, paths=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
2. templatepath/map-style 2. templatepath/map-style
3. templatepath/map 3. templatepath/map
""" """
if paths is None: if path is None:
paths = [templatedir()] path = templatedir()
elif isinstance(paths, bytes):
paths = [paths]
if isinstance(styles, bytes): if isinstance(styles, bytes):
styles = [styles] styles = [styles]
for style in styles: for style in styles:
# only plain name is allowed to honor template paths # only plain name is allowed to honor template paths
if ( if (
not style not style
or style in (pycompat.oscurdir, pycompat.ospardir) or style in (pycompat.oscurdir, pycompat.ospardir)
or pycompat.ossep in style or pycompat.ossep in style
or pycompat.osaltsep or pycompat.osaltsep
and pycompat.osaltsep in style and pycompat.osaltsep in style
): ):
continue continue
locations = [os.path.join(style, b'map'), b'map-' + style] locations = [os.path.join(style, b'map'), b'map-' + style]
locations.append(b'map') locations.append(b'map')
for path in paths:
for location in locations: for location in locations:
mapfile = os.path.join(path, location) mapfile = os.path.join(path, location)
if os.path.isfile(mapfile): if os.path.isfile(mapfile):
return style, mapfile return style, mapfile
raise RuntimeError(b"No hgweb templates found in %r" % paths) raise RuntimeError(b"No hgweb templates found in %r" % path)