equal
deleted
inserted
replaced
362 % keytype) |
362 % keytype) |
363 opts[key] = value |
363 opts[key] = value |
364 f = self._callcompressable("getbundle", **opts) |
364 f = self._callcompressable("getbundle", **opts) |
365 bundlecaps = kwargs.get('bundlecaps') |
365 bundlecaps = kwargs.get('bundlecaps') |
366 if bundlecaps is not None and 'HG2Y' in bundlecaps: |
366 if bundlecaps is not None and 'HG2Y' in bundlecaps: |
367 return bundle2.unbundle20(self.ui, f) |
367 return bundle2.getunbundler(self.ui, f) |
368 else: |
368 else: |
369 return changegroupmod.cg1unpacker(f, 'UN') |
369 return changegroupmod.cg1unpacker(f, 'UN') |
370 |
370 |
371 def unbundle(self, cg, heads, source): |
371 def unbundle(self, cg, heads, source): |
372 '''Send cg (a readable file-like object representing the |
372 '''Send cg (a readable file-like object representing the |
399 for l in output.splitlines(True): |
399 for l in output.splitlines(True): |
400 self.ui.status(_('remote: '), l) |
400 self.ui.status(_('remote: '), l) |
401 else: |
401 else: |
402 # bundle2 push. Send a stream, fetch a stream. |
402 # bundle2 push. Send a stream, fetch a stream. |
403 stream = self._calltwowaystream('unbundle', cg, heads=heads) |
403 stream = self._calltwowaystream('unbundle', cg, heads=heads) |
404 ret = bundle2.unbundle20(self.ui, stream) |
404 ret = bundle2.getunbundler(self.ui, stream) |
405 return ret |
405 return ret |
406 |
406 |
407 def debugwireargs(self, one, two, three=None, four=None, five=None): |
407 def debugwireargs(self, one, two, three=None, four=None, five=None): |
408 # don't pass optional arguments left at their default value |
408 # don't pass optional arguments left at their default value |
409 opts = {} |
409 opts = {} |