This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7418

procutil: teach resourcereader() to handle exe relative resources
Changes PlannedPublic

Authored by indygreg on Nov 14 2019, 10:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Mercurial distributions like those produced with py2exe store
their data/resource files relative to the executable. For
example, in our Windows distributions, help files are in
the help/ directory relative to hg.exe.

In a future world where we are using the ResourceReader API
for accessing package resources, we need a way to provide
a ResourceReader for these pieces of data without breaking
these Mercurial distributions.

This commit introduces logic into resourcereader() which will
return a filesystem-based ResourceReader if resources are
relative to the executable and we are requesting resources for
the "mercurial" package.

Ideally we wouldn't need to do this and would instead change
packaging. However, various downstream consumers may be sensitive
to changes in the on-disk layout of Mercurial installs. I'm
unwilling to cross this bridge at this time. I think it is more
important to get things working with the ResourceReader API first.
Then we can tackle better resource packaging/installation.

It is also likely that we'll need more logic to handle additional
packages/resources. For example, help resources are always in a
help/ directory and map cleanly, but templates resources are in a
Templates/ directory and there are case-sensitivity concerns.
Our initial target for using the resource reading API is help.
So we can defer on additional complexity.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Nov 14 2019, 10:58 PM
indygreg planned changes to this revision.Nov 14 2019, 11:02 PM

The commit message on this one is probably a bit out of date, since packaging has changed some since I initially authored this commit.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/procutil.py (8 lines)

Diff 18141

mercurial/utils/procutil.py

# Throw in a sort for good measure because we like determinism. # Throw in a sort for good measure because we like determinism.
return iter(sorted(pycompat.fsencode(p) for p in self._orig.contents())) return iter(sorted(pycompat.fsencode(p) for p in self._orig.contents()))
def resourcereader(package): def resourcereader(package):
"""Obtain an importlib.abc.ResourceReader for a Python package.""" """Obtain an importlib.abc.ResourceReader for a Python package."""
# Raising TypeError here is a little weird. But it is what the standard # Raising TypeError here is a little weird. But it is what the standard
# library does. # library does.
package = pycompat.sysstr(package) package = pycompat.sysstr(package)
# Executable relative resources are distributed next to the executable
# in special locations, not as proper package resources. We need to handle
# them specially.
if package == r'mercurial' and executablerelativeresources():
p = os.path.dirname(sys.executable)
return filesystemresourcereader(pycompat.fsencode(p))
module = importlib.import_module(package) module = importlib.import_module(package)
spec = getattr(module, '__spec__', None) spec = getattr(module, '__spec__', None)
# __spec__ should only be present in Python 3. # __spec__ should only be present in Python 3.
if spec: if spec:
if spec.submodule_search_locations is None: if spec.submodule_search_locations is None:
raise TypeError(r'%s is not a package' % package) raise TypeError(r'%s is not a package' % package)