diff mercurial/wireproto.py @ 24797:0c4d5e01b31f

bundle2-wireproto: properly propagate the server output on error (issue4594)

In case of errors, output parts salvaged from the reply bundle are re-injected
into the bundle carrying the exception.

We still need to fix the situation for non-wireprotocol push.

--- a/mercurial/wireproto.py	Thu Apr 16 03:56:50 2015 -0400
+++ b/mercurial/wireproto.py	Thu Apr 16 03:17:37 2015 -0400
@@ -858,6 +858,8 @@
                 return pusherr(str(exc))
 
         bundler = bundle2.bundle20(repo.ui)
+        for out in getattr(exc, '_bundle2salvagedoutput', ()):
+            bundler.addpart(out)
         try:
             raise
         except error.BundleValueError, exc: