Mercurial > public > mercurial-scm > hg
diff mercurial/exchange.py @ 21146:4676135ac555
bundle2: move all parts into a `bx2` namespace
All currently core parts are moved to a `bx2` namespace (for "bundle 2
experimental"). This should avoid conflicts between the final stable
format and the one about to be released.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 17 Apr 2014 15:45:12 -0400 |
| parents | 0c5088be66af |
| children | 468cd774aa22 |
line wrap: on
line diff
--- a/mercurial/exchange.py Thu Apr 17 15:33:17 2014 -0400 +++ b/mercurial/exchange.py Thu Apr 17 15:45:12 2014 -0400 @@ -212,13 +212,14 @@ bundler = bundle2.bundle20(pushop.ui, caps) # create reply capability capsblob = bundle2.encodecaps(pushop.repo.bundle2caps) - bundler.addpart(bundle2.bundlepart('replycaps', data=capsblob)) + bundler.addpart(bundle2.bundlepart('b2x:replycaps', data=capsblob)) if not pushop.force: - part = bundle2.bundlepart('CHECK:HEADS', data=iter(pushop.remoteheads)) + part = bundle2.bundlepart('B2X:CHECK:HEADS', + data=iter(pushop.remoteheads)) bundler.addpart(part) # add the changegroup bundle cg = changegroup.getlocalbundle(pushop.repo, 'push', pushop.outgoing) - cgpart = bundle2.bundlepart('CHANGEGROUP', data=cg.getchunks()) + cgpart = bundle2.bundlepart('B2X:CHANGEGROUP', data=cg.getchunks()) bundler.addpart(cgpart) stream = util.chunkbuffer(bundler.getchunks()) reply = pushop.remote.unbundle(stream, ['force'], 'push') @@ -668,7 +669,7 @@ blob = urllib.unquote(bcaps[len('bundle2='):]) b2caps.update(bundle2.decodecaps(blob)) bundler = bundle2.bundle20(repo.ui, b2caps) - part = bundle2.bundlepart('changegroup', data=cg.getchunks()) + part = bundle2.bundlepart('b2x:changegroup', data=cg.getchunks()) bundler.addpart(part) return util.chunkbuffer(bundler.getchunks())