##// END OF EJS Templates
error: allow a 'hint' to OutOfBandError...
Pierre-Yves David -
r25242:8de7d1d9 default
parent child Browse files
Show More
@@ -193,8 +193,15 b' def _runcatch(req):'
193 ui.warn(_("hg: %s\n") % inst.args[1])
193 ui.warn(_("hg: %s\n") % inst.args[1])
194 commands.help_(ui, 'shortlist')
194 commands.help_(ui, 'shortlist')
195 except error.OutOfBandError, inst:
195 except error.OutOfBandError, inst:
196 ui.warn(_("abort: remote error:\n"))
196 if inst.args:
197 ui.warn(''.join(inst.args))
197 msg = _("abort: remote error:\n")
198 else:
199 msg = _("abort: remote error\n")
200 ui.warn(msg)
201 if inst.args:
202 ui.warn(''.join(inst.args))
203 if inst.hint:
204 ui.warn('(%s)\n' % inst.hint)
198 except error.RepoError, inst:
205 except error.RepoError, inst:
199 ui.warn(_("abort: %s!\n") % inst)
206 ui.warn(_("abort: %s!\n") % inst)
200 if inst.hint:
207 if inst.hint:
@@ -64,6 +64,10 b' class ConfigError(Abort):'
64 class OutOfBandError(Exception):
64 class OutOfBandError(Exception):
65 """Exception raised when a remote repo reports failure"""
65 """Exception raised when a remote repo reports failure"""
66
66
67 def __init__(self, *args, **kw):
68 Exception.__init__(self, *args)
69 self.hint = kw.get('hint')
70
67 class ParseError(Exception):
71 class ParseError(Exception):
68 """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
72 """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
69
73
General Comments 0
You need to be logged in to leave comments. Login now