# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1428787845 14400
# Node ID a2ef1dc3b59bead1059f549579e75af3e59aa6fd
# Parent  39ee0444e27c978f101b02c4ad68527e55de9d18
bundle2: flush output in a part in all cases

We want to preserve output even when the unbundling fails (eg: hook output). So
we must make sure that everything we have is flushed into the reply bundle.

(This is related to issue4594)

diff -r 39ee0444e27c -r a2ef1dc3b59b mercurial/bundle2.py
--- a/mercurial/bundle2.py	Sat Apr 11 14:44:12 2015 -0400
+++ b/mercurial/bundle2.py	Sat Apr 11 17:30:45 2015 -0400
@@ -357,10 +357,10 @@
         finally:
             if output is not None:
                 output = op.ui.popbuffer()
-        if output:
-            outpart = op.reply.newpart('output', data=output,
-                                       mandatory=False)
-            outpart.addparam('in-reply-to', str(part.id), mandatory=False)
+            if output:
+                outpart = op.reply.newpart('output', data=output,
+                                           mandatory=False)
+                outpart.addparam('in-reply-to', str(part.id), mandatory=False)
     finally:
         # consume the part content to not corrupt the stream.
         part.seek(0, 2)