# HG changeset patch # User Gregory Szorc # Date 2017-07-04 04:18:32 # Node ID b93df142485e8431746abac1f0ed5c20c0eaf0c4 # Parent 9718725dc02ab8d781d8ed10371e78555b550978 show: also catch AmbiguousCommand cmdutil.findcmd() can raise this as well. While we'll almost certainly never encounter this in the wild, guard against it regardless. diff --git a/hgext/show.py b/hgext/show.py --- a/hgext/show.py +++ b/hgext/show.py @@ -233,7 +233,7 @@ def showstack(ui, repo, displayer): try: cmdutil.findcmd('rebase', commands.table) haverebase = True - except error.UnknownCommand: + except (error.AmbiguousCommand, error.UnknownCommand): haverebase = False # TODO use templating.