comparison mercurial/exchange.py @ 24847:b705e5ab3b07 stable

bundle2: capture transaction rollback message output (issue4614)

The output from the transaction rollback was not included into the reply bundle.
It was eventually caught by the usual 'unbundle' output capture and sent to the
client but the result was out of order on the client side. We now capture the
output for the transaction release and transmit it the same way as all other
output.

We should probably rethink the whole output capture things but this would not be
appropriate for stable.

The is still multiple cases were output failed to be properly capture, they will
be fixed in later changesets.

24846:e79dd1c9753e

    If the push was raced as PushRaced exception is raised."""
    r = 0
    # need a transaction when processing a bundle2 stream
    wlock = lock = tr = None
    try:
        check_heads(repo, heads, 'uploading changes')
        # push can proceed
        if util.safehasattr(cg, 'params'):
            r = None

                r = bundle2.processbundle(repo, cg, lambda: tr).reply
                tr.close()
            except Exception, exc:
                exc.duringunbundle2 = True
                if r is not None:
                    exc._bundle2salvagedoutput = r.salvageoutput()
                raise
        else:
            lock = repo.lock()
            r = changegroup.addchangegroup(repo, cg, source, url)
    finally:
        lockmod.release(tr, lock, wlock)
    return r

24847:b705e5ab3b07

    If the push was raced as PushRaced exception is raised."""
    r = 0
    # need a transaction when processing a bundle2 stream
    wlock = lock = tr = None
    recordout = None
    try:
        check_heads(repo, heads, 'uploading changes')
        # push can proceed
        if util.safehasattr(cg, 'params'):
            r = None

                r = bundle2.processbundle(repo, cg, lambda: tr).reply
                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
        else:
            lock = repo.lock()
            r = changegroup.addchangegroup(repo, cg, source, url)
    finally:
        lockmod.release(tr, lock, wlock)
        if recordout is not None:
            recordout(repo.ui.popbuffer())
    return r