Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 15603:36d7a0c7505f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Dec 2011 15:57:10 -0600
parents 9e99d2bbb1b1 195dbd1cef0c
children 4841035f37b6
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Thu Dec 01 01:42:03 2011 -0600
+++ b/mercurial/cmdutil.py	Thu Dec 01 15:57:10 2011 -0600
@@ -23,7 +23,14 @@
     """
     choice = {}
     debugchoice = {}
-    for e in table.keys():
+
+    if cmd in table:
+        # short-circuit exact matches, "log" alias beats "^log|history"
+        keys = [cmd]
+    else:
+        keys = table.keys()
+
+    for e in keys:
         aliases = parsealiases(e)
         found = None
         if cmd in aliases: