Mercurial > public > mercurial-scm > hg
diff mercurial/exchange.py @ 46478:db9e33beb0fb
bundle2: print "error:abort" message to stderr instead of stdout
It seems like the server's message is something you'd like to see even
with `--quiet`. It's clearly part of the error.
Differential Revision: https://phab.mercurial-scm.org/D9954
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 03 Feb 2021 23:23:56 -0800 |
| parents | 89a2afe31e82 |
| children | a41565bef69f |
line wrap: on
line diff
--- a/mercurial/exchange.py Wed Feb 03 13:55:58 2021 -0800 +++ b/mercurial/exchange.py Wed Feb 03 23:23:56 2021 -0800 @@ -1135,9 +1135,9 @@ except error.BundleValueError as exc: raise error.Abort(_(b'missing support for %s') % exc) except bundle2.AbortFromPart as exc: - pushop.ui.status(_(b'remote: %s\n') % exc) + pushop.ui.error(_(b'remote: %s\n') % exc) if exc.hint is not None: - pushop.ui.status(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) + pushop.ui.error(_(b'remote: %s\n') % (b'(%s)' % exc.hint)) raise error.Abort(_(b'push failed on remote')) except error.PushkeyFailed as exc: partid = int(exc.partid) @@ -1832,7 +1832,7 @@ op.modes[b'bookmarks'] = b'records' bundle2.processbundle(pullop.repo, bundle, op=op) except bundle2.AbortFromPart as exc: - pullop.repo.ui.status(_(b'remote: abort: %s\n') % exc) + pullop.repo.ui.error(_(b'remote: abort: %s\n') % exc) raise error.Abort(_(b'pull failed on remote'), hint=exc.hint) except error.BundleValueError as exc: raise error.Abort(_(b'missing support for %s') % exc)