equal
deleted
inserted
replaced
413 This function handles the repo locking itself.""" |
413 This function handles the repo locking itself.""" |
414 try: |
414 try: |
415 try: |
415 try: |
416 bundle = exchange.readbundle(self.ui, bundle, None) |
416 bundle = exchange.readbundle(self.ui, bundle, None) |
417 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
417 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
418 if util.safehasattr(ret, b'getchunks'): |
418 if util.safehasattr(ret, 'getchunks'): |
419 # This is a bundle20 object, turn it into an unbundler. |
419 # This is a bundle20 object, turn it into an unbundler. |
420 # This little dance should be dropped eventually when the |
420 # This little dance should be dropped eventually when the |
421 # API is finally improved. |
421 # API is finally improved. |
422 stream = util.chunkbuffer(ret.getchunks()) |
422 stream = util.chunkbuffer(ret.getchunks()) |
423 ret = bundle2.getunbundler(self.ui, stream) |
423 ret = bundle2.getunbundler(self.ui, stream) |