This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11288

template: handle missing resource in `_readmapfile`
ClosedPublic

Authored by marmoute on Aug 17 2021, 9:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf3b1df44b716: template: handle missing resource in `_readmapfile`
Summary

This fix the remaining issue in test-template-map.t.

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

marmoute created this revision.Aug 17 2021, 9:01 PM
baymax edited the summary of this revision. (Show Details)Aug 18 2021, 6:46 AM
baymax updated this revision to Diff 29912.

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

marmoute added a commit: rHGf3b1df44b716: template: handle missing resource in `_readmapfile`.Aug 18 2021, 9:19 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf3b1df44b716: template: handle missing resource in `_readmapfile` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 29939

mercurial/templater.py

subresource = None subresource = None
if base: if base:
abs = os.path.normpath(os.path.join(base, rel)) abs = os.path.normpath(os.path.join(base, rel))
if os.path.isfile(abs): if os.path.isfile(abs):
subresource = util.posixfile(abs, b'rb') subresource = util.posixfile(abs, b'rb')
if not subresource: if not subresource:
if pycompat.ossep not in rel: if pycompat.ossep not in rel:
abs = rel abs = rel
try:
subresource = resourceutil.open_resource( subresource = resourceutil.open_resource(
b'mercurial.templates', rel b'mercurial.templates', rel
) )
except resourceutil.FileNotFoundError:
subresource = None
else: else:
dir = templatedir() dir = templatedir()
if dir: if dir:
abs = os.path.normpath(os.path.join(dir, rel)) abs = os.path.normpath(os.path.join(dir, rel))
if os.path.isfile(abs): if os.path.isfile(abs):
subresource = util.posixfile(abs, b'rb') subresource = util.posixfile(abs, b'rb')
if subresource: if subresource:
data = subresource.read() data = subresource.read()

mercurial/utils/resourceutil.py

# further down # further down
from importlib import resources from importlib import resources
from .. import encoding from .. import encoding
# Force loading of the resources module # Force loading of the resources module
resources.open_binary # pytype: disable=module-attr resources.open_binary # pytype: disable=module-attr
# pytype: disable=import-error
from importlib.resources import FileNotFoundError
# pytype: enable=import-error
def open_resource(package, name): def open_resource(package, name):
return resources.open_binary( # pytype: disable=module-attr return resources.open_binary( # pytype: disable=module-attr
pycompat.sysstr(package), pycompat.sysstr(name) pycompat.sysstr(package), pycompat.sysstr(name)
) )
def is_resource(package, name): def is_resource(package, name):
return resources.is_resource( # pytype: disable=module-attr return resources.is_resource( # pytype: disable=module-attr
pycompat.sysstr(package), encoding.strfromlocal(name) pycompat.sysstr(package), encoding.strfromlocal(name)
) )
def contents(package): def contents(package):
# pytype: disable=module-attr # pytype: disable=module-attr
for r in resources.contents(pycompat.sysstr(package)): for r in resources.contents(pycompat.sysstr(package)):
# pytype: enable=module-attr # pytype: enable=module-attr
yield encoding.strtolocal(r) yield encoding.strtolocal(r)
except (ImportError, AttributeError): except (ImportError, AttributeError):
# importlib.resources was not found (almost definitely because we're on a # importlib.resources was not found (almost definitely because we're on a
# Python version before 3.7) # Python version before 3.7)
class FileNotFoundError(RuntimeError):
pass
def open_resource(package, name): def open_resource(package, name):
path = os.path.join(_package_path(package), name) path = os.path.join(_package_path(package), name)
return open(path, "rb") return open(path, "rb")
def is_resource(package, name): def is_resource(package, name):
path = os.path.join(_package_path(package), name) path = os.path.join(_package_path(package), name)
try: try: