diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2679,15 +2679,22 @@ norepo = ("clone init version help debug def find(cmd): """Return (aliases, command table entry) for command string.""" choice = [] + debugchoice = [] for e in table.keys(): aliases = e.lstrip("^").split("|") if cmd in aliases: return aliases, table[e] for a in aliases: if a.startswith(cmd): - choice.append([aliases, table[e]]) + if aliases[0].startswith("debug"): + debugchoice.append([aliases, table[e]]) + else: + choice.append([aliases, table[e]]) break + if not choice and debugchoice: + choice = debugchoice + if len(choice) > 1: clist = [] for aliases, table_e in choice: