This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10738

errors: create superclass for Abort exception
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5a75be916316: errors: create superclass for Abort exception
Summary

I'd like to let extensions subclass StorageError to define a custom
exit code. However, StorageError does not extend Abort (which is
where the exit code currently lives), and it seems that it's not
supposed to either (StorageError seems to be for lower-level errors
and Abort is for command-level errors). This patch therefore
extracts all the code from Abort into a new Error class, which
I'll soon make StorageError also extend.

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.

Event Timeline

martinvonz created this revision.May 19 2021, 1:47 AM
pulkit accepted this revision.May 20 2021, 4:43 AM
This revision is now accepted and ready to land.May 20 2021, 4:43 AM
pulkit requested changes to this revision.May 20 2021, 4:43 AM
This revision now requires changes to proceed.May 20 2021, 4:43 AM
pulkit accepted this revision.May 20 2021, 4:43 AM
This revision is now accepted and ready to land.May 20 2021, 4:43 AM
martinvonz added a commit: rHG5a75be916316: errors: create superclass for Abort exception.May 20 2021, 9:21 AM
Closed by commit rHG5a75be916316: errors: create superclass for Abort exception (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (8 lines)

Diff 28143

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): class Error(Hint, Exception):
"""Raised if a command needs to print an error and exit.""" """Base class for Mercurial errors."""
def __init__( def __init__(
self, message, hint=None, coarse_exit_code=None, detailed_exit_code=None self, message, hint=None, coarse_exit_code=None, detailed_exit_code=None
): ):
# type: (bytes, Optional[bytes]) -> None # type: (bytes, Optional[bytes]) -> None
self.message = message self.message = message
self.hint = hint self.hint = hint
self.coarse_exit_code = coarse_exit_code self.coarse_exit_code = coarse_exit_code
from .i18n import _ from .i18n import _
message = _(b"abort: %s\n") % self.message message = _(b"abort: %s\n") % self.message
if self.hint: if self.hint:
message += _(b"(%s)\n") % self.hint message += _(b"(%s)\n") % self.hint
return message return message
class Abort(Error):
"""Raised if a command needs to print an error and exit."""
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