equal
deleted
inserted
replaced
279 def _restrictcapabilities(self, caps): |
279 def _restrictcapabilities(self, caps): |
280 # bundle2 is not ready for prime time, drop it unless explicitly |
280 # bundle2 is not ready for prime time, drop it unless explicitly |
281 # required by the tests (or some brave tester) |
281 # required by the tests (or some brave tester) |
282 if not self.ui.configbool('server', 'bundle2', False): |
282 if not self.ui.configbool('server', 'bundle2', False): |
283 caps = set(caps) |
283 caps = set(caps) |
284 caps.remove('bundle2') |
284 caps.discard('bundle2') |
285 return caps |
285 return caps |
286 |
286 |
287 def _applyrequirements(self, requirements): |
287 def _applyrequirements(self, requirements): |
288 self.requirements = requirements |
288 self.requirements = requirements |
289 self.sopener.options = dict((r, 1) for r in requirements |
289 self.sopener.options = dict((r, 1) for r in requirements |