--- a/mercurial/exchange.py Mon Jan 22 12:12:29 2018 -0800
+++ b/mercurial/exchange.py Mon Jan 22 12:19:49 2018 -0800
@@ -1767,9 +1767,9 @@
return info, bundler.getchunks()
-@getbundle2partsgenerator('stream')
-def _getbundlestream(bundler, repo, source, bundlecaps=None,
- b2caps=None, heads=None, common=None, **kwargs):
+@getbundle2partsgenerator('stream2')
+def _getbundlestream2(bundler, repo, source, bundlecaps=None,
+ b2caps=None, heads=None, common=None, **kwargs):
if not kwargs.get('stream', False):
return
@@ -1780,11 +1780,10 @@
filecount, bytecount, it = streamclone.generatev2(repo)
requirements = ' '.join(sorted(repo.requirements))
- part = bundler.newpart('stream', data=it)
+ part = bundler.newpart('stream2', data=it)
part.addparam('bytecount', '%d' % bytecount, mandatory=True)
part.addparam('filecount', '%d' % filecount, mandatory=True)
part.addparam('requirements', requirements, mandatory=True)
- part.addparam('version', 'v2', mandatory=True)
@getbundle2partsgenerator('changegroup')
def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,