comparison mercurial/dispatch.py @ 7643:9a1ea6587557

error: move UnknownCommand and AmbiguousCommand
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:39:38 -0600
parents d2f753830f80
children 182b7114d35a
comparison
equal deleted inserted replaced
7642:84346894def8 7643:9a1ea6587557
53 ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) 53 ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
54 commands.help_(ui, inst.args[0]) 54 commands.help_(ui, inst.args[0])
55 else: 55 else:
56 ui.warn(_("hg: %s\n") % inst.args[1]) 56 ui.warn(_("hg: %s\n") % inst.args[1])
57 commands.help_(ui, 'shortlist') 57 commands.help_(ui, 'shortlist')
58 except cmdutil.AmbiguousCommand, inst: 58 except error.AmbiguousCommand, inst:
59 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % 59 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
60 (inst.args[0], " ".join(inst.args[1]))) 60 (inst.args[0], " ".join(inst.args[1])))
61 except cmdutil.UnknownCommand, inst: 61 except error.UnknownCommand, inst:
62 ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) 62 ui.warn(_("hg: unknown command '%s'\n") % inst.args[0])
63 commands.help_(ui, 'shortlist') 63 commands.help_(ui, 'shortlist')
64 except error.RepoError, inst: 64 except error.RepoError, inst:
65 ui.warn(_("abort: %s!\n") % inst) 65 ui.warn(_("abort: %s!\n") % inst)
66 except error.LockHeld, inst: 66 except error.LockHeld, inst: