Mercurial > public > mercurial-scm > hg-stable

diff mercurial/bundle2.py @ 24795:f9aa4cb8f2dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: store the salvaged output on the exception object The re-handling of output is happening in some 'unbundle' callers. We have to transmit the output information to this place so we stick it on the exception. This is the third step in our quest for preserving the server output on error (issue4594). We want to be able to copy the output part from the aborted reply into the exception bundle.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 16 Apr 2015 03:17:01 -0400
parents 21f2e8f48ae1
children e79dd1c9753e
line wrap: on
line diff
--- a/mercurial/bundle2.py	Thu Apr 16 03:16:04 2015 -0400
+++ b/mercurial/bundle2.py	Thu Apr 16 03:17:01 2015 -0400
@@ -318,6 +318,10 @@
         # type of bundle. We should probably clean up or drop this return code
         # craziness in a future version.
         exc.duringunbundle2 = True
+        salvaged = []
+        if op.reply is not None:
+            salvaged = op.reply.salvageoutput()
+        exc._bundle2salvagedoutput = salvaged
         raise
     return op