@@ -1016,18 +1016,20 @@ def getbundle(repo, source, heads=None,
for bcaps in bundlecaps:
if bcaps.startswith('bundle2='):
blob = urllib.unquote(bcaps[len('bundle2='):])
b2caps.update(bundle2.decodecaps(blob))
bundler = bundle2.bundle20(repo.ui, b2caps)
for name in getbundle2partsorder:
func = getbundle2partsmapping[name]
- func(bundler, repo, source, heads=heads, common=common,
- bundlecaps=bundlecaps, b2caps=b2caps, **kwargs)
+ kwargs['heads'] = heads
+ kwargs['common'] = common
+ func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps,
+ **kwargs)
return util.chunkbuffer(bundler.getchunks())
@getbundle2partsgenerator('changegroup')
def _getbundlechangegrouppart(bundler, repo, source, heads=None, common=None,
bundlecaps=None, b2caps=None, **kwargs):
"""add a changegroup part to the requested bundle"""
cg = None
@@ -1035,28 +1037,28 @@ def _getbundlechangegrouppart(bundler, r
# build changegroup bundle here.
cg = changegroup.getchangegroup(repo, source, heads=heads,
common=common, bundlecaps=bundlecaps)
if cg:
bundler.newpart('b2x:changegroup', data=cg.getchunks())
@getbundle2partsgenerator('listkeys')
-def _getbundlelistkeysparts(bundler, repo, source, heads=None, common=None,
- bundlecaps=None, b2caps=None, **kwargs):
+def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None,
+ b2caps=None, **kwargs):
"""add parts containing listkeys namespaces to the requested bundle"""
listkeys = kwargs.get('listkeys', ())
for namespace in listkeys:
part = bundler.newpart('b2x:listkeys')
part.addparam('namespace', namespace)
keys = repo.listkeys(namespace).items()
part.data = pushkey.encodekeys(keys)
@getbundle2partsgenerator('obsmarkers')
-def _getbundleobsmarkerpart(bundler, repo, source, heads=None, common=None,
+def _getbundleobsmarkerpart(bundler, repo, source, heads=None,
bundlecaps=None, b2caps=None, **kwargs):
"""add an obsolescence markers part to the requested bundle"""
if kwargs.get('obsmarkers', False):
if heads is None:
heads = repo.heads()
subset = [c.node() for c in repo.set('::%ln', heads)]
markers = repo.obsstore.relevantmarkers(subset)
buildobsmarkerspart(bundler, markers)