# HG changeset patch # User Dirkjan Ochtman # Date 1258029816 -3600 # Node ID 0a3fc37261ab391b8c17c7b2655e7e38925a4cd6 # Parent 2e51cc30fc307d2f85d27f545b843ad54ca277cc help: don't show extension list on extension help diff -r 2e51cc30fc30 -r 0a3fc37261ab mercurial/commands.py --- 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 = [] diff -r 2e51cc30fc30 -r 0a3fc37261ab tests/test-extension.out --- 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 diff -r 2e51cc30fc30 -r 0a3fc37261ab tests/test-mq.out --- 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