This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8899

hgweb: open mapfile using templater.open_template()
ClosedPublic

Authored by martinvonz on Aug 5 2020, 6:05 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1b983985edd9: hgweb: open mapfile using templater.open_template()
Summary

This will help us read templates from resources in frozen binaries.

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.

Event Timeline

martinvonz created this revision.Aug 5 2020, 6:05 PM
indygreg accepted this revision.Aug 5 2020, 8:38 PM
This revision is now accepted and ready to land.Aug 5 2020, 8:38 PM
martinvonz added a commit: rHG1b983985edd9: hgweb: open mapfile using templater.open_template().Aug 5 2020, 8:49 PM
Closed by commit rHG1b983985edd9: hgweb: open mapfile using templater.open_template() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/hgweb_mod.py (4 lines)
Mmercurial/templater.py (5 lines)

Diff 22298

mercurial/hgweb/hgweb_mod.py

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, b'map') locations = (os.path.join(style, b'map'), b'map-' + style, b'map')
for location in locations: for location in locations:
mapfile = os.path.join(path, location) mapfile, fp = templater.open_template(location, path)
if os.path.isfile(mapfile): if mapfile:
return style, mapfile return style, mapfile
raise RuntimeError(b"No hgweb templates found in %r" % path) 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

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 open_template(name): def open_template(name, templatepath=None):
'''returns a file-like object for the given template, and its full path '''returns a file-like object for the given template, and its full path
If the name is a relative path and we're in a frozen binary, the template If the name is a relative path and we're in a frozen binary, the template
will be read from the mercurial.templates package instead. The returned path will be read from the mercurial.templates package instead. The returned path
will then be the relative path. will then be the relative path.
''' '''
if templatepath is None:
templatepath = templatedir() templatepath = templatedir()
if templatepath is not None or os.path.isabs(name): if templatepath is not None or os.path.isabs(name):
f = os.path.join(templatepath, name) f = os.path.join(templatepath, name)
try: try:
return f, open(f, mode='rb') return f, open(f, mode='rb')
except EnvironmentError: except EnvironmentError:
return None, None return None, None
else: else:
name_parts = pycompat.sysstr(name).split('/') name_parts = pycompat.sysstr(name).split('/')
package_name = '.'.join(['mercurial', 'templates'] + name_parts[:-1]) package_name = '.'.join(['mercurial', 'templates'] + name_parts[:-1])
try: try:
return ( return (
name, name,
resourceutil.open_resource(package_name, name_parts[-1]), resourceutil.open_resource(package_name, name_parts[-1]),
) )
except (ModuleNotFoundError, FileNotFoundError): except (ModuleNotFoundError, FileNotFoundError):
return None, None return None, None