Mercurial > hg

comparison mercurial/dispatch.py @ 8144:fca54469480e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: introduce new config parser
author Matt Mackall <mpm@selenic.com>
date Thu, 23 Apr 2009 15:40:10 -0500
parents 7fd0616b3d80
children 9b8ac5fb7760
comparison
equal deleted inserted replaced
8143:507c49e297e1 8144:fca54469480e
53 # Global exception handling, alphabetically 53 # Global exception handling, alphabetically
54 # Mercurial-specific first, followed by built-in and library exceptions 54 # Mercurial-specific first, followed by built-in and library exceptions
55 except error.AmbiguousCommand, inst: 55 except error.AmbiguousCommand, inst:
56 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % 56 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
57 (inst.args[0], " ".join(inst.args[1]))) 57 (inst.args[0], " ".join(inst.args[1])))
58 except error.ConfigError, inst:
59 ui.warn(_("hg: %s\n") % inst.args[0])
58 except error.LockHeld, inst: 60 except error.LockHeld, inst:
59 if inst.errno == errno.ETIMEDOUT: 61 if inst.errno == errno.ETIMEDOUT:
60 reason = _('timed out waiting for lock held by %s') % inst.locker 62 reason = _('timed out waiting for lock held by %s') % inst.locker
61 else: 63 else:
62 reason = _('lock held by %s') % inst.locker 64 reason = _('lock held by %s') % inst.locker