comparison 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.

24848:2f88821856eb

                tr.close()
            except Exception, exc:
                exc.duringunbundle2 = True
                if r is not None:
                    parts = exc._bundle2salvagedoutput = r.salvageoutput()
                    repo.ui.pushbuffer(error=True)
                    def recordout(output):
                        part = bundle2.bundlepart('output', data=output,
                                                  mandatory=False)
                        parts.append(part)
                raise

24849:aff2aca3420e

                tr.close()
            except Exception, exc:
                exc.duringunbundle2 = True
                if r is not None:
                    parts = exc._bundle2salvagedoutput = r.salvageoutput()
                    repo.ui.pushbuffer(error=True, subproc=True)
                    def recordout(output):
                        part = bundle2.bundlepart('output', data=output,
                                                  mandatory=False)
                        parts.append(part)
                raise