diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -313,9 +313,9 @@ """Return a delayed loader for help/topic.txt.""" def loader(ui): - package = b'helptext' + package = b'mercurial.helptext' if subdir: - package = b'helptext' + b'.' + subdir + package += b'.' + subdir with resourceutil.open_resource(package, topic + b'.txt') as fp: doc = gettext(fp.read()) for rewriter in helphooks.get(topic, []): diff --git a/mercurial/utils/resourceutil.py b/mercurial/utils/resourceutil.py --- a/mercurial/utils/resourceutil.py +++ b/mercurial/utils/resourceutil.py @@ -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)