diff mercurial/dispatch.py @ 18935:e5d9441ec281

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
line wrap: on
line diff
--- a/mercurial/dispatch.py	Fri Feb 08 16:27:49 2013 -0600
+++ b/mercurial/dispatch.py	Fri Feb 08 16:17:46 2013 -0600
@@ -153,6 +153,7 @@
             commands.help_(ui, 'shortlist')
     except error.InterventionRequired, inst:
         ui.warn("%s\n" % inst)
+        return 1
     except util.Abort, inst:
         ui.warn(_("abort: %s\n") % inst)
         if inst.hint: