( )⚙ D10736 errors: move Abort earlier, so more exceptions can subclass it

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10736

errors: move Abort earlier, so more exceptions can subclass it
ClosedPublic

Authored by martinvonz on May 19 2021, 1:47 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5e736d2e9703: errors: move Abort earlier, so more exceptions can subclass it
Summary

I'd like to make at least InterventionRequired subclass Abort and
Python requires the superclass to be defined before the subtype.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (66 lines)

Diff 28141

mercurial/error.py

pass remaining arguments to the exception class. pass remaining arguments to the exception class.
""" """
def __init__(self, *args, **kw): def __init__(self, *args, **kw):
self.hint = kw.pop('hint', None) self.hint = kw.pop('hint', None)
super(Hint, self).__init__(*args, **kw) super(Hint, self).__init__(*args, **kw)
class Abort(Hint, Exception):
"""Raised if a command needs to print an error and exit."""
def __init__(self, message, hint=None, detailed_exit_code=None):
# type: (bytes, Optional[bytes]) -> None
self.message = message
self.hint = hint
self.detailed_exit_code = detailed_exit_code
# Pass the message into the Exception constructor to help extensions
# that look for exc.args[0].
Exception.__init__(self, message)
def __bytes__(self):
return self.message
if pycompat.ispy3:
def __str__(self):
# the output would be unreadable if the message was translated,
# but do not replace it with encoding.strfromlocal(), which
# may raise another exception.
return pycompat.sysstr(self.__bytes__())
def format(self):
# type: () -> bytes
from .i18n import _
message = _(b"abort: %s\n") % self.message
if self.hint:
message += _(b"(%s)\n") % self.hint
return message
class StorageError(Hint, Exception): class StorageError(Hint, Exception):
"""Raised when an error occurs in a storage layer. """Raised when an error occurs in a storage layer.
Usually subclassed by a storage-specific exception. Usually subclassed by a storage-specific exception.
""" """
__bytes__ = _tobytes __bytes__ = _tobytes
self, self,
_( _(
b"unresolved conflicts (see 'hg resolve', then 'hg %s --continue')" b"unresolved conflicts (see 'hg resolve', then 'hg %s --continue')"
) )
% opname, % opname,
) )
class Abort(Hint, Exception):
"""Raised if a command needs to print an error and exit."""
def __init__(self, message, hint=None, detailed_exit_code=None):
# type: (bytes, Optional[bytes]) -> None
self.message = message
self.hint = hint
self.detailed_exit_code = detailed_exit_code
# Pass the message into the Exception constructor to help extensions
# that look for exc.args[0].
Exception.__init__(self, message)
def __bytes__(self):
return self.message
if pycompat.ispy3:
def __str__(self):
# the output would be unreadable if the message was translated,
# but do not replace it with encoding.strfromlocal(), which
# may raise another exception.
return pycompat.sysstr(self.__bytes__())
def format(self):
# type: () -> bytes
from .i18n import _
message = _(b"abort: %s\n") % self.message
if self.hint:
message += _(b"(%s)\n") % self.hint
return message
class InputError(Abort): class InputError(Abort):
"""Indicates that the user made an error in their input. """Indicates that the user made an error in their input.
Examples: Invalid command, invalid flags, invalid revision. Examples: Invalid command, invalid flags, invalid revision.
""" """
def __init__(self, message, hint=None): def __init__(self, message, hint=None):
super(InputError, self).__init__( super(InputError, self).__init__(