diff mercurial/dispatch.py @ 20328:03d345da0579 stable

dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True" Before this patch, shell alias may be executed by abbreviated command name unexpectedly, even if abbreviated command name matches also against the command provided by extension. For example, "rebate" shell alias is executed by "hg reba", even if rebase extension (= "rebase" command) is enabled. In this case, "hg reba" should be aborted because of command name ambiguity. This patch makes "_checkshellalias()" invoke "cmdutil.findcmd()" always with "strict=True" (default value). If abbreviated command name matches against only one shell alias even after loading extensions, such shell alias will be executed via "_parse()". This patch doesn't remove "_checkshellalias()" invocation itself, because it may prevent shell alias from loading extensions uselessly.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 29 Jan 2014 23:47:54 +0900
parents 8f4a226c840c
children 69a0d22b9677
line wrap: on
line diff
--- a/mercurial/dispatch.py	Thu Jan 30 13:56:56 2014 -0600
+++ b/mercurial/dispatch.py	Wed Jan 29 23:47:54 2014 +0900
@@ -635,8 +635,7 @@
 
     cmd = args[0]
     try:
-        aliases, entry = cmdutil.findcmd(cmd, cmdtable,
-                                         lui.configbool("ui", "strict"))
+        aliases, entry = cmdutil.findcmd(cmd, cmdtable)
     except (error.AmbiguousCommand, error.UnknownCommand):
         restorecommands()
         return