diff mercurial/help.py @ 43676:2e017696181f

help: create packages for the help text These files need to be loaded as resources with PyOxidizer, instead of using filesystem representations. AFAICT, the resource loading mechanisms only work for the named package given to it, and can't reach into a subdirectory. While here, the `help` directory is renamed to `helptext`. Without this, trying to load external help text crashed in mercurial/help.py when importing `.i18n`, saying there's no `mercurial.help.i18n` module. Differential Revision: https://phab.mercurial-scm.org/D7376
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 13 Nov 2019 21:52:25 -0500
parents 9f70512ae2cf
children 5be909dbe385
line wrap: on
line diff
--- a/mercurial/help.py	Thu Nov 14 11:33:05 2019 +0100
+++ b/mercurial/help.py	Wed Nov 13 21:52:25 2019 -0500
@@ -311,7 +311,7 @@
     """Return a delayed loader for help/topic.txt."""
 
     def loader(ui):
-        docdir = os.path.join(util.datapath, b'help')
+        docdir = os.path.join(util.datapath, b'helptext')
         if subdir:
             docdir = os.path.join(docdir, subdir)
         path = os.path.join(docdir, topic + b".txt")