[PATCH 2 of 5] dispatch: catch InterventionRequired and print the message with no prefix

Augie Fackler raf at durin42.com
Fri Feb 8 16:49:51 CST 2013


# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1360362504 21600
# Node ID 1c4102a7ec7c80a1baa98ccaf8c867ea0fd520a7
# Parent  4d997c5075c446963b6ac65155f2129c73257b6f
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 @@
             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:


More information about the Mercurial-devel mailing list