Mercurial > hg
changeset 18932:7b4b9e8ea12e
dispatch: catch InterventionRequired and print the message with no prefix
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 08 Feb 2013 16:28:24 -0600 |
parents | 3c224e0949de |
children | 42b620fc89e2 |
files | mercurial/dispatch.py |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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: