Patchwork D8344: extensions: refactor function for obtaining disabled extension help

login
register
mail settings
Submitter phabricator
Date April 1, 2020, 7:10 p.m.
Message ID <8e5cd83390c58ab2f2973cff71494eb0@localhost.localdomain>
Download mbox | patch
Permalink /patch/45984/
State Not Applicable
Headers show

Comments

phabricator - April 1, 2020, 7:10 p.m.
Closed by commit rHG843418dc0b1b: extensions: refactor function for obtaining disabled extension help (authored by indygreg).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8344?vs=20917&id=20954

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8344/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8344

AFFECTED FILES
  mercurial/extensions.py
  mercurial/help.py
  mercurial/hg.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mharbison72, mercurial-devel

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -695,7 +695,7 @@ 
         # data.
         createopts[b'lfs'] = True
 
-        if extensions.disabledext(b'lfs'):
+        if extensions.disabled_help(b'lfs'):
             ui.status(
                 _(
                     b'(remote is using large file support (lfs), but it is '
diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -966,7 +966,7 @@ 
             doc = gettext(pycompat.getdoc(mod)) or _(b'no help text available')
         except KeyError:
             mod = None
-            doc = extensions.disabledext(name)
+            doc = extensions.disabled_help(name)
             if not doc:
                 raise error.UnknownCommand(name)
 
diff --git a/mercurial/extensions.py b/mercurial/extensions.py
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -808,18 +808,8 @@ 
     return exts
 
 
-def disabledext(name):
-    '''find a specific disabled extension from hgext. returns desc'''
-    try:
-        from hgext import __index__  # pytype: disable=import-error
-
-        if name in _order:  # enabled
-            return
-        else:
-            return gettext(__index__.docs.get(name))
-    except (ImportError, AttributeError):
-        pass
-
+def disabled_help(name):
+    """Obtain the full help text for a disabled extension, or None."""
     paths = _disabledpaths()
     if name in paths:
         return _disabledhelp(paths[name])