Mercurial > hg
diff mercurial/templater.py @ 45309:65a812ed9e9f
templater: replace templatepath() with function that also opens the file
For frozen binaries, such as those created by PyOxidizer, I plan to
make it so the templatespec can keep an opened file/resource to read
from instead of needing a file path. Having `templatepath()` return an
opened file should help with that. At this point, it's just a wasteful
extra opening of mapfiles that we'll open again later. I'll update the
read-side next so it reads from the file-like object without opening
the file again.
Differential Revision: https://phab.mercurial-scm.org/D8892
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 04 Aug 2020 13:21:29 -0700 |
parents | dc10bcd5c08d |
children | f3481e4fcc3a |
line wrap: on
line diff
--- a/mercurial/templater.py Thu Jul 30 13:44:06 2020 -0700 +++ b/mercurial/templater.py Tue Aug 04 13:21:29 2020 -0700 @@ -1071,12 +1071,15 @@ return path if os.path.isdir(path) else None -def templatepath(name): - '''return location of template file. returns None if not found.''' - dir = templatedir() - if dir is None: - return None - f = os.path.join(templatedir(), name) - if f and os.path.isfile(f): - return f - return None +def open_template(name): + '''returns a file-like object for the given template, and its full path''' + templatepath = templatedir() + if templatepath is not None or os.path.isabs(name): + f = os.path.join(templatepath, name) + try: + return f, open(f, mode='rb') + except EnvironmentError: + return None, None + else: + # TODO: read from resources here + return None, None