108 |
108 |
109 def getbundle(self, source, heads=None, common=None, bundlecaps=None, |
109 def getbundle(self, source, heads=None, common=None, bundlecaps=None, |
110 **kwargs): |
110 **kwargs): |
111 cg = exchange.getbundle(self._repo, source, heads=heads, |
111 cg = exchange.getbundle(self._repo, source, heads=heads, |
112 common=common, bundlecaps=bundlecaps, **kwargs) |
112 common=common, bundlecaps=bundlecaps, **kwargs) |
113 if bundlecaps is not None and 'HG2Y' in bundlecaps: |
113 if bundlecaps is not None and 'HG20' in bundlecaps: |
114 # When requesting a bundle2, getbundle returns a stream to make the |
114 # When requesting a bundle2, getbundle returns a stream to make the |
115 # wire level function happier. We need to build a proper object |
115 # wire level function happier. We need to build a proper object |
116 # from it in local peer. |
116 # from it in local peer. |
117 cg = bundle2.getunbundler(self.ui, cg) |
117 cg = bundle2.getunbundler(self.ui, cg) |
118 return cg |
118 return cg |
315 # bundle2 is not ready for prime time, drop it unless explicitly |
315 # bundle2 is not ready for prime time, drop it unless explicitly |
316 # required by the tests (or some brave tester) |
316 # required by the tests (or some brave tester) |
317 if self.ui.configbool('experimental', 'bundle2-exp', False): |
317 if self.ui.configbool('experimental', 'bundle2-exp', False): |
318 caps = set(caps) |
318 caps = set(caps) |
319 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) |
319 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) |
320 caps.add('bundle2-exp=' + urllib.quote(capsblob)) |
320 caps.add('bundle2=' + urllib.quote(capsblob)) |
321 return caps |
321 return caps |
322 |
322 |
323 def _applyrequirements(self, requirements): |
323 def _applyrequirements(self, requirements): |
324 self.requirements = requirements |
324 self.requirements = requirements |
325 self.svfs.options = dict((r, 1) for r in requirements |
325 self.svfs.options = dict((r, 1) for r in requirements |