Mercurial > public > mercurial-scm > hg-stable
diff mercurial/exchange.py @ 46977:3f87d2af0bd6
errors: raise RemoteError in some places in exchange.py
This is part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan
Differential Revision: https://phab.mercurial-scm.org/D10467
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 19 Apr 2021 12:52:23 -0700 |
| parents | ffd3e823a7e5 |
| children | d55b71393907 |
line wrap: on
line diff
--- a/mercurial/exchange.py Mon Apr 19 09:37:01 2021 -0700 +++ b/mercurial/exchange.py Mon Apr 19 12:52:23 2021 -0700 @@ -1147,19 +1147,19 @@ }, ).result() except error.BundleValueError as exc: - raise error.Abort(_(b'missing support for %s') % exc) + raise error.RemoteError(_(b'missing support for %s') % exc) try: trgetter = None if pushback: trgetter = pushop.trmanager.transaction op = bundle2.processbundle(pushop.repo, reply, trgetter) except error.BundleValueError as exc: - raise error.Abort(_(b'missing support for %s') % exc) + raise error.RemoteError(_(b'missing support for %s') % exc) except bundle2.AbortFromPart as exc: pushop.ui.error(_(b'remote: %s\n') % exc) if exc.hint is not None: pushop.ui.error(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) - raise error.Abort(_(b'push failed on remote')) + raise error.RemoteError(_(b'push failed on remote')) except error.PushkeyFailed as exc: partid = int(exc.partid) if partid not in pushop.pkfailcb: @@ -1875,9 +1875,9 @@ bundle2.processbundle(pullop.repo, bundle, op=op) except bundle2.AbortFromPart as exc: pullop.repo.ui.error(_(b'remote: abort: %s\n') % exc) - raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) + raise error.RemoteError(_(b'pull failed on remote'), hint=exc.hint) except error.BundleValueError as exc: - raise error.Abort(_(b'missing support for %s') % exc) + raise error.RemoteError(_(b'missing support for %s') % exc) if pullop.fetch: pullop.cgresult = bundle2.combinechangegroupresults(op)