Mercurial > public > mercurial-scm > hg-stable

diff mercurial/bundle2.py @ 24849:aff2aca3420e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: also capture hook output during processing External hook used to directly write on stdout and stderr. As a result their output was not captured by the bundle2 processing. This resulted in confusing out of order output on the client side. We are now capturing hooks output in this context.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 23 Apr 2015 17:03:58 +0100
parents e79dd1c9753e
children df0ce98c882f
line wrap: on
line diff
--- a/mercurial/bundle2.py	Thu Apr 23 14:57:39 2015 +0100
+++ b/mercurial/bundle2.py	Thu Apr 23 17:03:58 2015 +0100
@@ -354,7 +354,7 @@
         # itself represents a defect of a different variety).
         output = None
         if op.reply is not None:
-            op.ui.pushbuffer(error=True)
+            op.ui.pushbuffer(error=True, subproc=True)
             output = ''
         try:
             handler(op, part)