This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8890

templater: move stylemap() to hgweb_mod, since that's its only user
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGba50c8a95e2b: templater: move stylemap() to hgweb_mod, since that's its only user
Summary

stylemap() even has an error message that mentions "hgweb
templates", so it seems that it's meant specifically for hgweb.

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/hgweb/hgweb_mod.py (36 lines)
Mmercurial/templater.py (34 lines)

Diff 22288

mercurial/hgweb/hgweb_mod.py

def getstyle(req, configfn, templatepath): def getstyle(req, configfn, templatepath):
styles = ( styles = (
req.qsparams.get(b'style', None), req.qsparams.get(b'style', None),
configfn(b'web', b'style'), configfn(b'web', b'style'),
b'paper', b'paper',
) )
return styles, templater.stylemap(styles, templatepath) return styles, _stylemap(styles, templatepath)
def _stylemap(styles, path=None):
"""Return path to mapfile for a given style.
Searches mapfile in the following locations:
1. templatepath/style/map
2. templatepath/map-style
3. templatepath/map
"""
if path is None:
path = templater.templatedir()
if path is not None:
for style in styles:
# only plain name is allowed to honor template paths
if (
not style
or style in (pycompat.oscurdir, pycompat.ospardir)
or pycompat.ossep in style
or pycompat.osaltsep
and pycompat.osaltsep in style
):
continue
locations = [os.path.join(style, b'map'), b'map-' + style]
locations.append(b'map')
for location in locations:
mapfile = os.path.join(path, location)
if os.path.isfile(mapfile):
return style, mapfile
raise RuntimeError(b"No hgweb templates found in %r" % path)
def makebreadcrumb(url, prefix=b''): def makebreadcrumb(url, prefix=b''):
'''Return a 'URL breadcrumb' list '''Return a 'URL breadcrumb' list
A 'URL breadcrumb' is a list of URL-name pairs, A 'URL breadcrumb' is a list of URL-name pairs,
corresponding to each of the path items on a URL. corresponding to each of the path items on a URL.
This can be used to create path navigation entries. This can be used to create path navigation entries.

mercurial/templater.py

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