# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 2013-02-08 22:28:24
# Node ID 7b4b9e8ea12e7469446d4c87426cd87da4abd9de
# Parent  3c224e0949de4743b4b5accce713dd93ab6cfc88

dispatch: catch InterventionRequired and print the message with no prefix

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -151,6 +151,8 @@ def _runcatch(req):
             commands.help_(ui, inst.args[0], unknowncmd=True)
         except error.UnknownCommand:
             commands.help_(ui, 'shortlist')
+    except error.InterventionRequired, inst:
+        ui.warn("%s\n" % inst)
     except util.Abort, inst:
         ui.warn(_("abort: %s\n") % inst)
         if inst.hint: