Mercurial > public > mercurial-scm > hg

diff mercurial/dispatch.py @ 26364:6e9c2aab9925

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: don't stack trace on commands like `hg .log` This used to stack trace because it raised a util.Abort which wasn't handled in this block. We now handle it. Additionally, we error out earlier instead of plodding on and showing the "log" entry of the plain `hg help` output.
author Jordi Guti?rrez Hermoso <jordigh@octave.org>
date Fri, 25 Sep 2015 11:16:20 -0400
parents ccab61d84ea7
children 4b0fc75f9403
line wrap: on
line diff
--- a/mercurial/dispatch.py	Fri Sep 25 12:38:20 2015 +0800
+++ b/mercurial/dispatch.py	Fri Sep 25 11:16:20 2015 -0400
@@ -253,7 +253,7 @@
             # 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:
+        except (error.UnknownCommand, util.Abort):
             suggested = False
             if len(inst.args) == 2:
                 sim = _getsimilar(inst.args[1], inst.args[0])