This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10741

errors: make StorageError subclass Error, attaching an exit code to it
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdd339191f2dc: errors: make StorageError subclass Error, attaching an exit code to it

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:45 AM
This revision is now accepted and ready to land.May 20 2021, 4:45 AM
Alphare added a subscriber: Alphare.May 21 2021, 12:22 PM

This triggered an issue with the Rust version of the index (which broke our CI), I have send a fix for it as D10764

martinvonz added a comment.May 21 2021, 12:28 PM
In D10741#164340, @Alphare wrote:

This triggered an issue with the Rust version of the index (which broke our CI), I have send a fix for it as D10764

I'll queue that patch, thanks. Could I have noticed that myself? I suppose it'll be too slow for all contributors to always run tests with and without rust (and py2, and pure), so it's fine to notice this in CI.

Alphare added a comment.May 21 2021, 12:29 PM

Thanks! I always use the CI before queuing patches. It's kind of cumbersome, but it's the only real solution.

martinvonz added a comment.May 21 2021, 1:08 PM
In D10741#164343, @Alphare wrote:

Thanks! I always use the CI before queuing patches. It's kind of cumbersome, but it's the only real solution.

It seems like it would be nice if CI could run on all pending patches and comment on them whether tests pass or fail. Any idea how hard that would be to set up?

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (7 lines)
Mmercurial/scmutil.py (5 lines)

Diff 28146

mercurial/error.py

message += _(b"(%s)\n") % self.hint message += _(b"(%s)\n") % self.hint
return message return message
class Abort(Error): class Abort(Error):
"""Raised if a command needs to print an error and exit.""" """Raised if a command needs to print an error and exit."""
class StorageError(Hint, Exception): class StorageError(Error):
"""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 def __init__(self, message, hint=None):
super(StorageError, self).__init__(
message, hint=hint, detailed_exit_code=50
)
class RevlogError(StorageError): class RevlogError(StorageError):
pass pass
class SidedataHashError(RevlogError): class SidedataHashError(RevlogError):
def __init__(self, key, expected, got): def __init__(self, key, expected, got):

mercurial/scmutil.py

elif not isinstance(msg, bytes): elif not isinstance(msg, bytes):
ui.error(b" %r\n" % (msg,)) ui.error(b" %r\n" % (msg,))
elif not msg: elif not msg:
ui.error(_(b" empty string\n")) ui.error(_(b" empty string\n"))
else: else:
ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
except error.CensoredNodeError as inst: except error.CensoredNodeError as inst:
ui.error(_(b"abort: file censored %s\n") % inst) ui.error(_(b"abort: file censored %s\n") % inst)
except error.StorageError as inst:
ui.error(_(b"abort: %s\n") % inst)
if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint)
detailed_exit_code = 50
except error.WdirUnsupported: except error.WdirUnsupported:
ui.error(_(b"abort: working directory revision cannot be specified\n")) ui.error(_(b"abort: working directory revision cannot be specified\n"))
except error.Error as inst: except error.Error as inst:
if inst.detailed_exit_code is not None: if inst.detailed_exit_code is not None:
detailed_exit_code = inst.detailed_exit_code detailed_exit_code = inst.detailed_exit_code
if inst.coarse_exit_code is not None: if inst.coarse_exit_code is not None:
coarse_exit_code = inst.coarse_exit_code coarse_exit_code = inst.coarse_exit_code
ui.error(inst.format()) ui.error(inst.format())