From patchwork Mon Apr 15 04:28:44 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Bug 3749 --help does not show non-command help topics
From: Ankur Ankan <ankurankan@gmail.com>
X-Patchwork-Id: 1315
Message-Id: <CANnmyOvgOFFkMnmKPJNvvJkLb8MpsFWEYOeKPa27UCnhd2aypQ@mail.gmail.com>
To: mercurial-devel <mercurial-devel@selenic.com>
Date: Mon, 15 Apr 2013 09:58:44 +0530

# HG changeset patch
# User Ankur Ankan <ankurankan@gmail.com>
# Date 1365998534 -19800
#      Mon Apr 15 09:32:14 2013 +0530
# Node ID 12eb5092b99745e6117e38489c145b7b0cb80576
# Parent  4e1ae55e63ef13bbee13256f236d93efe817be69
bug 3749

diff -r 4e1ae55e63ef -r 12eb5092b997 mercurial/dispatch.py
--- a/mercurial/dispatch.py Fri Apr 12 17:00:42 2013 -0400
+++ b/mercurial/dispatch.py Mon Apr 15 09:32:14 2013 +0530
@@ -144,13 +144,16 @@
     except error.SignalInterrupt:
         ui.warn(_("killed!\n"))
     except error.UnknownCommand, inst:
-        ui.warn(_("hg: unknown command '%s'\n") % inst.args[0])
         try:
-            # check if the command is in a disabled extension
-            # (but don't check for extensions themselves)
-            commands.help_(ui, inst.args[0], unknowncmd=True)
-        except error.UnknownCommand:
-            commands.help_(ui, 'shortlist')
+            commands.help_(ui,inst.args[0])
+        except:
+            ui.warn(_("hg: unknown command '%s'\n") % inst.args[0])
+            try:
+                # check if the command is in a disabled extension
+                # (but don't check for extensions themselves)
+                commands.help_(ui, inst.args[0], unknowncmd=True)
+            except error.UnknownCommand:
+                commands.help_(ui, 'shortlist')
     except util.Abort, inst:
         ui.warn(_("abort: %s\n") % inst)
         if inst.hint: