Mercurial > public > mercurial-scm > hg

diff mercurial/utils/resourceutil.py @ 44027:52f0140c2604

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resourceutil: don't limit resources to the `mercurial` package This should make things a little clearer, in that it now requires the full package name to access a resource. But the real motivation is that `extensions._disabledpaths()` walks the `hgext` directory looking for bundled extensions. This in turn feeds, among other things: 1) Listing disabled extensions in `hg help extensions` 2) Indicating that an unknown command is in a non-enabled extension 3) Displaying help for non-enabled extensions 4) Generating documentation 5) Announcing LFS is auto-enabled (or not) when cloning from an LFS source The filesystem based ResourceReader will happily return *.py and *.pyc, but the one supplied by PyOxidizer doesn't. Presumably we can change that. The only other idea I had here is for setup.py to generate a text file containing the list of extensions, but that doesn't seem great when running from source. Differential Revision: https://phab.mercurial-scm.org/D7772
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 28 Dec 2019 23:35:13 -0500
parents 75ec46c63657
children 42a897bf678c
line wrap: on
line diff
--- a/mercurial/utils/resourceutil.py	Sat Dec 28 23:08:57 2019 -0500
+++ b/mercurial/utils/resourceutil.py	Sat Dec 28 23:35:13 2019 -0500
@@ -35,6 +35,7 @@
     datapath = os.path.dirname(pycompat.sysexecutable)
 else:
     datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__)))
+    _rootpath = os.path.dirname(datapath)
 
 try:
     from importlib import resources
@@ -43,7 +44,6 @@
     resources.open_binary  # pytype: disable=module-attr
 
     def open_resource(package, name):
-        package = b'mercurial.' + package
         return resources.open_binary(  # pytype: disable=module-attr
             pycompat.sysstr(package), pycompat.sysstr(name)
         )
@@ -52,7 +52,7 @@
 except (ImportError, AttributeError):
 
     def _package_path(package):
-        return os.path.join(datapath, *package.split(b'.'))
+        return os.path.join(_rootpath, *package.split(b'.'))
 
     def open_resource(package, name):
         path = os.path.join(_package_path(package), name)