Mercurial > hg
diff mercurial/exchange.py @ 24849:aff2aca3420e stable
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 | b705e5ab3b07 |
| children | 6b81309d15a7 |
line wrap: on
line diff
--- a/mercurial/exchange.py Thu Apr 23 14:57:39 2015 +0100 +++ b/mercurial/exchange.py Thu Apr 23 17:03:58 2015 +0100 @@ -1303,7 +1303,7 @@ exc.duringunbundle2 = True if r is not None: parts = exc._bundle2salvagedoutput = r.salvageoutput() - repo.ui.pushbuffer(error=True) + repo.ui.pushbuffer(error=True, subproc=True) def recordout(output): part = bundle2.bundlepart('output', data=output, mandatory=False)