This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10483

errors: remove unnecessary varargs handling from OutOfBandError
ClosedPublic

Authored by martinvonz on Apr 20 2021, 12:43 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGabd18d6306f1: errors: remove unnecessary varargs handling from OutOfBandError
Summary

In my recent D10465, I moved some code over from scmutil into
OutOfBandError.__init__. The code was written to deal with an
arbitrary number of message arguments to the constructor. It turns
out that we only ever pass 0 or 1. Given that, let's simplify 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.Apr 20 2021, 12:43 AM
martinvonz added a commit: rHGabd18d6306f1: errors: remove unnecessary varargs handling from OutOfBandError.Apr 20 2021, 12:59 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGabd18d6306f1: errors: remove unnecessary varargs handling from OutOfBandError (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (9 lines)

Diff 27086

mercurial/error.py

class RemoteError(Abort): class RemoteError(Abort):
"""Exception raised when interacting with a remote repo fails""" """Exception raised when interacting with a remote repo fails"""
class OutOfBandError(RemoteError): class OutOfBandError(RemoteError):
"""Exception raised when a remote repo reports failure""" """Exception raised when a remote repo reports failure"""
def __init__(self, *messages, **kwargs): def __init__(self, message=None, hint=None):
from .i18n import _ from .i18n import _
if messages: if message:
message = _(b"remote error:\n%s") % b''.join(messages)
# Abort.format() adds a trailing newline # Abort.format() adds a trailing newline
message = message.rstrip(b'\n') message = _(b"remote error:\n%s") % message.rstrip(b'\n')
else: else:
message = _(b"remote error") message = _(b"remote error")
super(OutOfBandError, self).__init__(message, **kwargs) 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)