# HG changeset patch # User Brodie Rao # Date 1282956311 14400 # Node ID 4982fa38e544520e76f7f6bc974f6c60959eb66d # Parent 339bd18c772f545e624b74489dde50a63d74ce09 alias: print what command is being shadowed in debug message diff -r 339bd18c772f -r 4982fa38e544 mercurial/dispatch.py --- a/mercurial/dispatch.py Mon Aug 30 22:52:00 2010 +0200 +++ b/mercurial/dispatch.py Fri Aug 27 20:45:11 2010 -0400 @@ -190,6 +190,7 @@ class cmdalias(object): def __init__(self, name, definition, cmdtable): self.name = self.cmd = name + self.cmdname = '' self.definition = definition self.args = [] self.opts = [] @@ -234,7 +235,7 @@ return args = shlex.split(self.definition) - cmd = args.pop(0) + self.cmdname = cmd = args.pop(0) args = map(util.expandpath, args) for invalidarg in ("--cwd", "-R", "--repository", "--repo"): @@ -286,7 +287,8 @@ def __call__(self, ui, *args, **opts): if self.shadows: - ui.debug("alias '%s' shadows command\n" % self.name) + ui.debug("alias '%s' shadows command '%s'\n" % + (self.name, self.cmdname)) if self.definition.startswith('!'): return self.fn(ui, *args, **opts)