comparison mercurial/wireproto.py @ 21600:5e08f3b65510

bundle2: update all ``addpart`` callers to ``newpart``

The new method is what we want in all current cases.

21599:57cd844d7a5b

        finally:
            fp.close()
            os.unlink(tempname)
    except bundle2.UnknownPartError, exc:
            bundler = bundle2.bundle20(repo.ui)
            part = bundle2.bundlepart('B2X:ERROR:UNKNOWNPART',
                                      [('parttype', str(exc))])
            bundler.addpart(part)
            return streamres(bundler.getchunks())
    except util.Abort, inst:
        # The old code we moved used sys.stderr directly.
        # We did not change it to minimise code change.
        # This need to be moved to something proper.

            sys.stderr.write("abort: %s\n" % inst)
            return pushres(0)
    except error.PushRaced, exc:
        if getattr(exc, 'duringunbundle2', False):
            bundler = bundle2.bundle20(repo.ui)
            part = bundle2.bundlepart('B2X:ERROR:PUSHRACED',
                                      [('message', str(exc))])
            bundler.addpart(part)
            return streamres(bundler.getchunks())
        else:
            return pusherr(str(exc))

21600:5e08f3b65510

        finally:
            fp.close()
            os.unlink(tempname)
    except bundle2.UnknownPartError, exc:
            bundler = bundle2.bundle20(repo.ui)
            bundler.newpart('B2X:ERROR:UNKNOWNPART', [('parttype', str(exc))])
            return streamres(bundler.getchunks())
    except util.Abort, inst:
        # The old code we moved used sys.stderr directly.
        # We did not change it to minimise code change.
        # This need to be moved to something proper.

            sys.stderr.write("abort: %s\n" % inst)
            return pushres(0)
    except error.PushRaced, exc:
        if getattr(exc, 'duringunbundle2', False):
            bundler = bundle2.bundle20(repo.ui)
            bundler.newpart('B2X:ERROR:PUSHRACED', [('message', str(exc))])
            return streamres(bundler.getchunks())
        else:
            return pusherr(str(exc))