diff mercurial/exchange.py @ 21600:5e08f3b65510

bundle2: update all ``addpart`` callers to ``newpart`` The new method is what we want in all current cases.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 23 May 2014 15:59:19 -0700
parents e303b8ea84b3
children 0cfda08afd24
line wrap: on
line diff
--- a/mercurial/exchange.py	Fri May 23 15:54:18 2014 -0700
+++ b/mercurial/exchange.py	Fri May 23 15:59:19 2014 -0700
@@ -214,16 +214,13 @@
     bundler = bundle2.bundle20(pushop.ui, caps)
     # create reply capability
     capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
-    bundler.addpart(bundle2.bundlepart('b2x:replycaps', data=capsblob))
+    bundler.newpart('b2x:replycaps', data=capsblob)
     if not pushop.force:
-        part = bundle2.bundlepart('B2X:CHECK:HEADS',
-                                  data=iter(pushop.remoteheads))
-        bundler.addpart(part)
+        bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads))
     extrainfo = _pushbundle2extraparts(pushop, bundler)
     # add the changegroup bundle
     cg = changegroup.getlocalbundle(pushop.repo, 'push', pushop.outgoing)
-    cgpart = bundle2.bundlepart('B2X:CHANGEGROUP', data=cg.getchunks())
-    bundler.addpart(cgpart)
+    cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks())
     stream = util.chunkbuffer(bundler.getchunks())
     try:
         reply = pushop.remote.unbundle(stream, ['force'], 'push')
@@ -670,8 +667,7 @@
             b2caps.update(bundle2.decodecaps(blob))
     bundler = bundle2.bundle20(repo.ui, b2caps)
     if cg:
-        part = bundle2.bundlepart('b2x:changegroup', data=cg.getchunks())
-        bundler.addpart(part)
+        bundler.newpart('b2x:changegroup', data=cg.getchunks())
     _getbundleextrapart(bundler, repo, source, heads=heads, common=common,
                         bundlecaps=bundlecaps, **kwargs)
     return util.chunkbuffer(bundler.getchunks())