This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8906

templater: restructure open_template() a little to prepare for relative paths
ClosedPublic

Authored by martinvonz on Aug 6 2020, 2:29 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG735756ecda8c: templater: restructure open_template() a little to prepare for relative paths
Summary

I found that it was easier to add support for relative paths after
this restructuring. It also made it easier to explain each case with a
code comment (which I did).

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/templater.py (23 lines)

Diff 22320

mercurial/templater.py

def open_template(name, templatepath=None): 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.
''' '''
# Does the name point directly to a map file?
if os.path.isabs(name):
return name, open(name, mode='rb')
# Does the name point to a template in the provided templatepath, or
# in mercurial/templates/ if no path was provided?
if templatepath is None: if templatepath is None:
templatepath = templatedir() templatepath = templatedir()
if templatepath is not None or os.path.isabs(name): if templatepath is not None:
f = os.path.join(templatepath, name) f = os.path.join(templatepath, name)
return f, open(f, mode='rb') return f, open(f, mode='rb')
else:
# Otherwise try to read it using the resources API
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])
return ( return (
name, name,
resourceutil.open_resource(package_name, name_parts[-1]), resourceutil.open_resource(package_name, name_parts[-1]),
) )
def try_open_template(name, templatepath=None): def try_open_template(name, templatepath=None):
try: try:
return open_template(name, templatepath) return open_template(name, templatepath)
except (EnvironmentError, ImportError): except (EnvironmentError, ImportError):
return None, None return None, None