comparison mercurial/localrepo.py @ 35783:c97639ad6874

bundle2: specify what capabilities will be used for We currently assume there is a symmetric relationship of bundle2 capabilities between client and server. However, this may not always be the case. We need a bundle2 capability to advertise bundle2 streaming clone support on servers to differentiate it from the existing, legacy streaming clone support. However, servers may wish to disable streaming clone support. If bundle2 capabilities were the same between client and server, a client (which may also be a server) that has disabled streaming clone support would not be able to perform a streaming clone itself! This commit introduces a "role" argument to bundle2.getrepocaps() that explicitly defines the role being performed. This will allow us (and extensions) to alter bundle2 capabilities depending on the operation being performed. Differential Revision: https://phab.mercurial-scm.org/D1923
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 20 Jan 2018 13:54:36 -0800
parents 3a3b59bbe7ce
children ba15580e53d5
comparison
equal deleted inserted replaced
35782:9d249f3de730 35783:c97639ad6874
575 self._revbranchcache.write() 575 self._revbranchcache.write()
576 576
577 def _restrictcapabilities(self, caps): 577 def _restrictcapabilities(self, caps):
578 if self.ui.configbool('experimental', 'bundle2-advertise'): 578 if self.ui.configbool('experimental', 'bundle2-advertise'):
579 caps = set(caps) 579 caps = set(caps)
580 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) 580 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self,
581 role='client'))
581 caps.add('bundle2=' + urlreq.quote(capsblob)) 582 caps.add('bundle2=' + urlreq.quote(capsblob))
582 return caps 583 return caps
583 584
584 def _applyopenerreqs(self): 585 def _applyopenerreqs(self):
585 self.svfs.options = dict((r, 1) for r in self.requirements 586 self.svfs.options = dict((r, 1) for r in self.requirements