Show More
@@ -345,6 +345,11 b' class wirepeer(peer.peerrepository):' | |||||
345 | def getbundle(self, source, **kwargs): |
|
345 | def getbundle(self, source, **kwargs): | |
346 | self.requirecap('getbundle', _('look up remote changes')) |
|
346 | self.requirecap('getbundle', _('look up remote changes')) | |
347 | opts = {} |
|
347 | opts = {} | |
|
348 | bundlecaps = kwargs.get('bundlecaps') | |||
|
349 | if bundlecaps is not None: | |||
|
350 | kwargs['bundlecaps'] = sorted(bundlecaps) | |||
|
351 | else: | |||
|
352 | bundlecaps = () # kwargs could have it to None | |||
348 | for key, value in kwargs.iteritems(): |
|
353 | for key, value in kwargs.iteritems(): | |
349 | if value is None: |
|
354 | if value is None: | |
350 | continue |
|
355 | continue | |
@@ -362,9 +367,6 b' class wirepeer(peer.peerrepository):' | |||||
362 | % keytype) |
|
367 | % keytype) | |
363 | opts[key] = value |
|
368 | opts[key] = value | |
364 | f = self._callcompressable("getbundle", **opts) |
|
369 | f = self._callcompressable("getbundle", **opts) | |
365 | bundlecaps = kwargs.get('bundlecaps') |
|
|||
366 | if bundlecaps is None: |
|
|||
367 | bundlecaps = () # kwargs could have it to None |
|
|||
368 | if util.any((cap.startswith('HG2') for cap in bundlecaps)): |
|
370 | if util.any((cap.startswith('HG2') for cap in bundlecaps)): | |
369 | return bundle2.getunbundler(self.ui, f) |
|
371 | return bundle2.getunbundler(self.ui, f) | |
370 | else: |
|
372 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now