help: don't show extension list on extension help
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 12 Nov 2009 13:43:36 +0100
changeset 9839 0a3fc37261ab
parent 9838 2e51cc30fc30
child 9840 18d5935c0c62
help: don't show extension list on extension help
mercurial/commands.py
tests/test-extension.out
tests/test-mq.out
--- a/mercurial/commands.py	Thu Nov 12 12:05:43 2009 +0100
+++ b/mercurial/commands.py	Thu Nov 12 13:43:36 2009 +0100
@@ -1551,12 +1551,6 @@
             else:
                 ui.write(' %-*s   %s\n' % (m, f, util.wrap(h[f], m + 4)))
 
-        if name != 'shortlist':
-            exts, maxlength = extensions.enabled()
-            text = help.listexts(_('enabled extensions:'), exts, maxlength)
-            if text:
-                ui.write("\n%s\n" % minirst.format(text, textwidth))
-
         if not ui.quiet:
             addglobalopts(True)
 
@@ -1627,6 +1621,11 @@
             header = _('list of commands:\n\n')
 
         helplist(header)
+        if name != 'shortlist':
+            exts, maxlength = extensions.enabled()
+            text = help.listexts(_('enabled extensions:'), exts, maxlength)
+            if text:
+                ui.write("\n%s\n" % minirst.format(text, textwidth))
 
     # list all option lists
     opt_output = []
--- a/tests/test-extension.out	Thu Nov 12 12:05:43 2009 +0100
+++ b/tests/test-extension.out	Thu Nov 12 13:43:36 2009 +0100
@@ -50,10 +50,6 @@
  foo:
       yet another foo command
 
-enabled extensions:
-
- debugextension   only debugcommands
-
 global options:
  -R --repository      repository root directory or name of overlay bundle file
     --cwd             change working directory
@@ -80,10 +76,6 @@
  foo:
       yet another foo command
 
-enabled extensions:
-
- debugextension   only debugcommands
-
 global options:
  -R --repository      repository root directory or name of overlay bundle file
     --cwd             change working directory
--- a/tests/test-mq.out	Thu Nov 12 12:05:43 2009 +0100
+++ b/tests/test-mq.out	Thu Nov 12 13:43:36 2009 +0100
@@ -50,10 +50,6 @@
  qunapplied   print the patches not yet applied
  strip        strip a revision and all its descendants from the repository
 
-enabled extensions:
-
- mq   manage a stack of patches
-
 use "hg -v help mq" to show aliases and global options
 adding a
 updating to branch default