Mercurial > hg

comparison mercurial/dispatch.py @ 18935:e5d9441ec281

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: exit with status 1 for an InterventionRequired exception (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:17:46 -0600
parents 7b4b9e8ea12e
children 12acbea17625
comparison
equal deleted inserted replaced
18934:93f3a06b2035 18935:e5d9441ec281
151 commands.help_(ui, inst.args[0], unknowncmd=True) 151 commands.help_(ui, inst.args[0], unknowncmd=True)
152 except error.UnknownCommand: 152 except error.UnknownCommand:
153 commands.help_(ui, 'shortlist') 153 commands.help_(ui, 'shortlist')
154 except error.InterventionRequired, inst: 154 except error.InterventionRequired, inst:
155 ui.warn("%s\n" % inst) 155 ui.warn("%s\n" % inst)
156 return 1
156 except util.Abort, inst: 157 except util.Abort, inst:
157 ui.warn(_("abort: %s\n") % inst) 158 ui.warn(_("abort: %s\n") % inst)
158 if inst.hint: 159 if inst.hint:
159 ui.warn(_("(%s)\n") % inst.hint) 160 ui.warn(_("(%s)\n") % inst.hint)
160 except ImportError, inst: 161 except ImportError, inst: