# HG changeset patch # User Pierre-Yves David # Date 1486745812 -3600 # Node ID accaa04f951cd643600a43b374583f431b4985a3 # Parent d554e624c5feb084e589f4ed14fe8ae639058396 bundle1: display server abort hint during unbundle The code was printing the abort message but not the hint. This is now fixed. diff -r d554e624c5fe -r accaa04f951c mercurial/wireproto.py --- a/mercurial/wireproto.py Fri Feb 10 17:56:59 2017 +0100 +++ b/mercurial/wireproto.py Fri Feb 10 17:56:52 2017 +0100 @@ -981,6 +981,8 @@ # This need to be moved to something proper. # Feel free to do it. util.stderr.write("abort: %s\n" % exc) + if exc.hint is not None: + util.stderr.write("(%s)\n" % exc.hint) return pushres(0) except error.PushRaced: return pusherr(str(exc)) diff -r d554e624c5fe -r accaa04f951c tests/test-bundle2-exchange.t --- a/tests/test-bundle2-exchange.t Fri Feb 10 17:56:59 2017 +0100 +++ b/tests/test-bundle2-exchange.t Fri Feb 10 17:56:52 2017 +0100 @@ -1113,6 +1113,7 @@ pushing to ssh://user@dummy/bundle2onlyserver searching for changes remote: abort: incompatible Mercurial client; bundle2 required + remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) [1] $ hg push