Show More
@@ -270,6 +270,8 b' def _runcatch(req):' | |||||
270 | commands.help_(ui, 'shortlist') |
|
270 | commands.help_(ui, 'shortlist') | |
271 | except error.InterventionRequired as inst: |
|
271 | except error.InterventionRequired as inst: | |
272 | ui.warn("%s\n" % inst) |
|
272 | ui.warn("%s\n" % inst) | |
|
273 | if inst.hint: | |||
|
274 | ui.warn(_("(%s)\n") % inst.hint) | |||
273 | return 1 |
|
275 | return 1 | |
274 | except error.Abort as inst: |
|
276 | except error.Abort as inst: | |
275 | ui.warn(_("abort: %s\n") % inst) |
|
277 | ui.warn(_("abort: %s\n") % inst) |
@@ -50,7 +50,7 b' class ManifestLookupError(LookupError):' | |||||
50 | class CommandError(Exception): |
|
50 | class CommandError(Exception): | |
51 | """Exception raised on errors in parsing the command line.""" |
|
51 | """Exception raised on errors in parsing the command line.""" | |
52 |
|
52 | |||
53 | class InterventionRequired(Exception): |
|
53 | class InterventionRequired(HintException): | |
54 | """Exception raised when a command requires human intervention.""" |
|
54 | """Exception raised when a command requires human intervention.""" | |
55 |
|
55 | |||
56 | class Abort(HintException): |
|
56 | class Abort(HintException): |
General Comments 0
You need to be logged in to leave comments.
Login now