changeset 38019:6e526b0961a8

help: load module doc of disabled extension in extensions.disabledcmd() This helps rewriting _finddisablecmd() to not load the module.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 03 May 2018 18:22:02 +0900
parents b45f4c1532c0
children 20a4543e9a2b
files mercurial/extensions.py mercurial/help.py
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/extensions.py	Thu May 03 18:15:43 2018 +0900
+++ b/mercurial/extensions.py	Thu May 03 18:22:02 2018 +0900
@@ -675,11 +675,12 @@
             break
     else:
         cmd = aliases[0]
-    return (cmd, name, mod)
+    doc = gettext(pycompat.getdoc(mod))
+    return (cmd, name, doc)
 
 def disabledcmd(ui, cmd, strict=False):
     '''import disabled extensions until cmd is found.
-    returns (cmdname, extname, module)'''
+    returns (cmdname, extname, doc)'''
 
     paths = _disabledpaths(strip_init=True)
     if not paths:
--- a/mercurial/help.py	Thu May 03 18:15:43 2018 +0900
+++ b/mercurial/help.py	Thu May 03 18:22:02 2018 +0900
@@ -574,9 +574,9 @@
         return rst
 
     def helpextcmd(name, subtopic=None):
-        cmd, ext, mod = extensions.disabledcmd(ui, name,
+        cmd, ext, doc = extensions.disabledcmd(ui, name,
                                                ui.configbool('ui', 'strict'))
-        doc = gettext(pycompat.getdoc(mod)).splitlines()[0]
+        doc = doc.splitlines()[0]
 
         rst = listexts(_("'%s' is provided by the following "
                               "extension:") % cmd, {ext: doc}, indent=4,