Patchwork D10483: errors: remove unnecessary varargs handling from OutOfBandError

login
register
mail settings
Submitter phabricator
Date April 20, 2021, 4:43 a.m.
Message ID <differential-rev-PHID-DREV-zhazp3crtwl75u5633nd-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48800/
State Superseded
Headers show

Comments

phabricator - April 20, 2021, 4:43 a.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  In my recent D10465 <https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10483

AFFECTED FILES
  mercurial/error.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/error.py b/mercurial/error.py
--- a/mercurial/error.py
+++ b/mercurial/error.py
@@ -311,16 +311,15 @@ 
 class OutOfBandError(RemoteError):
     """Exception raised when a remote repo reports failure"""
 
-    def __init__(self, *messages, **kwargs):
+    def __init__(self, message=None, hint=None):
         from .i18n import _
 
-        if messages:
-            message = _(b"remote error:\n%s") % b''.join(messages)
+        if message:
             # Abort.format() adds a trailing newline
-            message = message.rstrip(b'\n')
+            message = _(b"remote error:\n%s") % message.rstrip(b'\n')
         else:
             message = _(b"remote error")
-        super(OutOfBandError, self).__init__(message, **kwargs)
+        super(OutOfBandError, self).__init__(message, hint=hint)
 
 
 class ParseError(Abort):