# HG changeset patch # User Augie Fackler # Date 1360362504 21600 # Node ID 7b4b9e8ea12e7469446d4c87426cd87da4abd9de # Parent 3c224e0949de4743b4b5accce713dd93ab6cfc88 dispatch: catch InterventionRequired and print the message with no prefix diff -r 3c224e0949de -r 7b4b9e8ea12e mercurial/dispatch.py --- a/mercurial/dispatch.py Fri Feb 08 14:26:03 2013 -0600 +++ b/mercurial/dispatch.py Fri Feb 08 16:28:24 2013 -0600 @@ -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: