Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle1: display server abort hint during unbundle stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 10 Feb 2017 17:56:52 +0100
branchstable
changeset 30910 accaa04f951c
parent 30909 d554e624c5fe
child 30911 f3c5a8a4dfd0
bundle1: display server abort hint during unbundle The code was printing the abort message but not the hint. This is now fixed.
mercurial/wireproto.py file | annotate | diff | comparison | revisions
tests/test-bundle2-exchange.t file | annotate | diff | comparison | revisions 
--- 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))
--- 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
mercurial