Mercurial > hg-stable
changeset 27628:707d66afce21
error: make InterventionRequired take a hint
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 23 Dec 2015 08:52:52 +0000 |
| parents | dcbba68e076f |
| children | e7ff83b2bcfe |
| files | mercurial/dispatch.py mercurial/error.py |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Thu Dec 24 20:41:17 2015 +0000 +++ b/mercurial/dispatch.py Wed Dec 23 08:52:52 2015 +0000 @@ -270,6 +270,8 @@ commands.help_(ui, 'shortlist') except error.InterventionRequired as inst: ui.warn("%s\n" % inst) + if inst.hint: + ui.warn(_("(%s)\n") % inst.hint) return 1 except error.Abort as inst: ui.warn(_("abort: %s\n") % inst)
--- a/mercurial/error.py Thu Dec 24 20:41:17 2015 +0000 +++ b/mercurial/error.py Wed Dec 23 08:52:52 2015 +0000 @@ -50,7 +50,7 @@ class CommandError(Exception): """Exception raised on errors in parsing the command line.""" -class InterventionRequired(Exception): +class InterventionRequired(HintException): """Exception raised when a command requires human intervention.""" class Abort(HintException):