| hg-reviewers |
I'm about to create a new RemoteError exception and make
OutOfBandError extend it. This patch prepares for that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/error.py (14 lines) | |||
| M | mercurial/scmutil.py (13 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| """Raised when an EOF is received for a prompt""" | """Raised when an EOF is received for a prompt""" | ||||
| def __init__(self): | def __init__(self): | ||||
| from .i18n import _ | from .i18n import _ | ||||
| Abort.__init__(self, _(b'response expected')) | Abort.__init__(self, _(b'response expected')) | ||||
| class OutOfBandError(Hint, Exception): | class OutOfBandError(Abort): | ||||
| """Exception raised when a remote repo reports failure""" | """Exception raised when a remote repo reports failure""" | ||||
| __bytes__ = _tobytes | def __init__(self, *messages, hint=None): | ||||
| # type: (Any, Optional[bytes]) -> None | |||||
| from .i18n import _ | |||||
| if messages: | |||||
| message = _(b"remote error:\n%s") % b''.join(messages) | |||||
| # Abort.format() adds a trailing newline | |||||
| message = message.rstrip(b'\n') | |||||
| else: | |||||
| message = _(b"remote error") | |||||
| super(OutOfBandError, self).__init__(message, hint=hint) | |||||
| class ParseError(Abort): | class ParseError(Abort): | ||||
| """Raised when parsing config files and {rev,file}sets (msg[, pos])""" | """Raised when parsing config files and {rev,file}sets (msg[, pos])""" | ||||
| def __init__(self, message, location=None, hint=None): | def __init__(self, message, location=None, hint=None): | ||||
| # type: (bytes, Optional[Union[bytes, int]], Optional[bytes]) -> None | # type: (bytes, Optional[Union[bytes, int]], Optional[bytes]) -> None | ||||
| super(ParseError, self).__init__(message, hint=hint) | super(ParseError, self).__init__(message, hint=hint) | ||||
| detailed_exit_code = 20 | detailed_exit_code = 20 | ||||
| ui.error( | ui.error( | ||||
| _(b"abort: could not lock %s: %s\n") | _(b"abort: could not lock %s: %s\n") | ||||
| % ( | % ( | ||||
| inst.desc or stringutil.forcebytestr(inst.filename), | inst.desc or stringutil.forcebytestr(inst.filename), | ||||
| encoding.strtolocal(inst.strerror), | encoding.strtolocal(inst.strerror), | ||||
| ) | ) | ||||
| ) | ) | ||||
| except error.OutOfBandError as inst: | |||||
| detailed_exit_code = 100 | |||||
| if inst.args: | |||||
| msg = _(b"abort: remote error:\n") | |||||
| else: | |||||
| msg = _(b"abort: remote error\n") | |||||
| ui.error(msg) | |||||
| if inst.args: | |||||
| ui.error(b''.join(inst.args)) | |||||
| if inst.hint: | |||||
| ui.error(b'(%s)\n' % inst.hint) | |||||
| except error.RepoError as inst: | except error.RepoError as inst: | ||||
| ui.error(_(b"abort: %s\n") % inst) | ui.error(_(b"abort: %s\n") % inst) | ||||
| if inst.hint: | if inst.hint: | ||||
| ui.error(_(b"(%s)\n") % inst.hint) | ui.error(_(b"(%s)\n") % inst.hint) | ||||
| except error.ResponseError as inst: | except error.ResponseError as inst: | ||||
| ui.error(_(b"abort: %s") % inst.args[0]) | ui.error(_(b"abort: %s") % inst.args[0]) | ||||
| msg = inst.args[1] | msg = inst.args[1] | ||||
| if isinstance(msg, type(u'')): | if isinstance(msg, type(u'')): | ||||
| if isinstance(inst, (error.InputError, error.ParseError)): | if isinstance(inst, (error.InputError, error.ParseError)): | ||||
| detailed_exit_code = 10 | detailed_exit_code = 10 | ||||
| elif isinstance(inst, error.StateError): | elif isinstance(inst, error.StateError): | ||||
| detailed_exit_code = 20 | detailed_exit_code = 20 | ||||
| elif isinstance(inst, error.ConfigError): | elif isinstance(inst, error.ConfigError): | ||||
| detailed_exit_code = 30 | detailed_exit_code = 30 | ||||
| elif isinstance(inst, error.HookAbort): | elif isinstance(inst, error.HookAbort): | ||||
| detailed_exit_code = 40 | detailed_exit_code = 40 | ||||
| elif isinstance(inst, error.OutOfBandError): | |||||
| detailed_exit_code = 100 | |||||
| elif isinstance(inst, error.SecurityError): | elif isinstance(inst, error.SecurityError): | ||||
| detailed_exit_code = 150 | detailed_exit_code = 150 | ||||
| elif isinstance(inst, error.CanceledError): | elif isinstance(inst, error.CanceledError): | ||||
| detailed_exit_code = 250 | detailed_exit_code = 250 | ||||
| ui.error(inst.format()) | ui.error(inst.format()) | ||||
| except error.WorkerError as inst: | except error.WorkerError as inst: | ||||
| # Don't print a message -- the worker already should have | # Don't print a message -- the worker already should have | ||||
| return inst.status_code | return inst.status_code | ||||