This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1923

bundle2: specify what capabilities will be used for
ClosedPublic

Authored by indygreg on Jan 20 2018, 7:44 PM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHGc97639ad6874: bundle2: specify what capabilities will be used for
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 20 2018, 7:44 PM
lothiraldan accepted this revision.Jan 22 2018, 10:44 AM
durin42 accepted this revision.Jan 22 2018, 3:01 PM
This revision is now accepted and ready to land.Jan 22 2018, 3:01 PM
Closed by commit rHGc97639ad6874: bundle2: specify what capabilities will be used for (authored by indygreg). · Explain WhyJan 22 2018, 3:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4981

mercurial/bundle2.py

'pushkey': (), 'pushkey': (),
'digests': tuple(sorted(util.DIGESTS.keys())), 'digests': tuple(sorted(util.DIGESTS.keys())),
'remote-changegroup': ('http', 'https'), 'remote-changegroup': ('http', 'https'),
'hgtagsfnodes': (), 'hgtagsfnodes': (),
'phases': ('heads',), 'phases': ('heads',),
'stream': ('v2',), 'stream': ('v2',),
} }
def getrepocaps(repo, allowpushback=False): def getrepocaps(repo, allowpushback=False, role=None):
"""return the bundle2 capabilities for a given repo """return the bundle2 capabilities for a given repo
Exists to allow extensions (like evolution) to mutate the capabilities. Exists to allow extensions (like evolution) to mutate the capabilities.
The returned value is used for servers advertising their capabilities as
well as clients advertising their capabilities to servers as part of
bundle2 requests. The ``role`` argument specifies which is which.
""" """
if role not in ('client', 'server'):
raise error.ProgrammingError('role argument must be client or server')
caps = capabilities.copy() caps = capabilities.copy()
caps['changegroup'] = tuple(sorted( caps['changegroup'] = tuple(sorted(
changegroup.supportedincomingversions(repo))) changegroup.supportedincomingversions(repo)))
if obsolete.isenabled(repo, obsolete.exchangeopt): if obsolete.isenabled(repo, obsolete.exchangeopt):
supportedformat = tuple('V%i' % v for v in obsolete.formats) supportedformat = tuple('V%i' % v for v in obsolete.formats)
caps['obsmarkers'] = supportedformat caps['obsmarkers'] = supportedformat
if allowpushback: if allowpushback:
caps['pushback'] = () caps['pushback'] = ()

mercurial/bundlerepo.py

forcebundle1 = 'bundle2' not in legexc and 'bundle1' in legexc forcebundle1 = 'bundle2' not in legexc and 'bundle1' in legexc
canbundle2 = (not forcebundle1 canbundle2 = (not forcebundle1
and other.capable('getbundle') and other.capable('getbundle')
and other.capable('bundle2')) and other.capable('bundle2'))
if canbundle2: if canbundle2:
kwargs = {} kwargs = {}
kwargs[r'common'] = common kwargs[r'common'] = common
kwargs[r'heads'] = rheads kwargs[r'heads'] = rheads
kwargs[r'bundlecaps'] = exchange.caps20to10(repo) kwargs[r'bundlecaps'] = exchange.caps20to10(repo, role='client')
kwargs[r'cg'] = True kwargs[r'cg'] = True
b2 = other.getbundle('incoming', **kwargs) b2 = other.getbundle('incoming', **kwargs)
fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(), fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(),
bundlename) bundlename)
else: else:
if other.capable('getbundle'): if other.capable('getbundle'):
cg = other.getbundle('incoming', common=common, heads=rheads) cg = other.getbundle('incoming', common=common, heads=rheads)
elif onlyheads is None and not other.capable('changegroupsubset'): elif onlyheads is None and not other.capable('changegroupsubset'):

mercurial/exchange.py

The only currently supported type of data is changegroup but this will The only currently supported type of data is changegroup but this will
evolve in the future.""" evolve in the future."""
bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote))
pushback = (pushop.trmanager pushback = (pushop.trmanager
and pushop.ui.configbool('experimental', 'bundle2.pushback')) and pushop.ui.configbool('experimental', 'bundle2.pushback'))
# create reply capability # create reply capability
capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo, capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo,
allowpushback=pushback)) allowpushback=pushback,
role='client'))
bundler.newpart('replycaps', data=capsblob) bundler.newpart('replycaps', data=capsblob)
replyhandlers = [] replyhandlers = []
for partgenname in b2partsgenorder: for partgenname in b2partsgenorder:
partgen = b2partsgenmapping[partgenname] partgen = b2partsgenmapping[partgenname]
ret = partgen(pushop, bundler) ret = partgen(pushop, bundler)
if callable(ret): if callable(ret):
replyhandlers.append(ret) replyhandlers.append(ret)
# do not push if nothing to push # do not push if nothing to push
pullop.common = common pullop.common = common
pullop.fetch = fetch pullop.fetch = fetch
pullop.rheads = rheads pullop.rheads = rheads
def _pullbundle2(pullop): def _pullbundle2(pullop):
"""pull data using bundle2 """pull data using bundle2
For now, the only supported data are changegroup.""" For now, the only supported data are changegroup."""
kwargs = {'bundlecaps': caps20to10(pullop.repo)} kwargs = {'bundlecaps': caps20to10(pullop.repo, role='client')}
# make ui easier to access # make ui easier to access
ui = pullop.repo.ui ui = pullop.repo.ui
# At the moment we don't do stream clones over bundle2. If that is # At the moment we don't do stream clones over bundle2. If that is
# implemented then here's where the check for that will go. # implemented then here's where the check for that will go.
streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0] streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0]
data = util.b85decode(remoteobs[key]) data = util.b85decode(remoteobs[key])
version, newmarks = obsolete._readmarkers(data) version, newmarks = obsolete._readmarkers(data)
markers += newmarks markers += newmarks
if markers: if markers:
pullop.repo.obsstore.add(tr, markers) pullop.repo.obsstore.add(tr, markers)
pullop.repo.invalidatevolatilesets() pullop.repo.invalidatevolatilesets()
return tr return tr
def caps20to10(repo): def caps20to10(repo, role):
"""return a set with appropriate options to use bundle20 during getbundle""" """return a set with appropriate options to use bundle20 during getbundle"""
caps = {'HG20'} caps = {'HG20'}
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=role))
caps.add('bundle2=' + urlreq.quote(capsblob)) caps.add('bundle2=' + urlreq.quote(capsblob))
return caps return caps
# List of names of steps to perform for a bundle2 for getbundle, order matters. # List of names of steps to perform for a bundle2 for getbundle, order matters.
getbundle2partsorder = [] getbundle2partsorder = []
# Mapping between step name and function # Mapping between step name and function
# #

mercurial/localrepo.py

def _writecaches(self): def _writecaches(self):
if self._revbranchcache: if self._revbranchcache:
self._revbranchcache.write() self._revbranchcache.write()
def _restrictcapabilities(self, caps): def _restrictcapabilities(self, caps):
if self.ui.configbool('experimental', 'bundle2-advertise'): if self.ui.configbool('experimental', 'bundle2-advertise'):
caps = set(caps) caps = set(caps)
capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) capsblob = bundle2.encodecaps(bundle2.getrepocaps(self,
role='client'))
caps.add('bundle2=' + urlreq.quote(capsblob)) caps.add('bundle2=' + urlreq.quote(capsblob))
return caps return caps
def _applyopenerreqs(self): def _applyopenerreqs(self):
self.svfs.options = dict((r, 1) for r in self.requirements self.svfs.options = dict((r, 1) for r in self.requirements
if r in self.openerreqs) if r in self.openerreqs)
# experimental config: format.chunkcachesize # experimental config: format.chunkcachesize
chunkcachesize = self.ui.configint('format', 'chunkcachesize') chunkcachesize = self.ui.configint('format', 'chunkcachesize')

mercurial/wireproto.py

requiredformats = repo.requirements & repo.supportedformats requiredformats = repo.requirements & repo.supportedformats
# if our local revlogs are just revlogv1, add 'stream' cap # if our local revlogs are just revlogv1, add 'stream' cap
if not requiredformats - {'revlogv1'}: if not requiredformats - {'revlogv1'}:
caps.append('stream') caps.append('stream')
# otherwise, add 'streamreqs' detailing our local revlog format # otherwise, add 'streamreqs' detailing our local revlog format
else: else:
caps.append('streamreqs=%s' % ','.join(sorted(requiredformats))) caps.append('streamreqs=%s' % ','.join(sorted(requiredformats)))
if repo.ui.configbool('experimental', 'bundle2-advertise'): if repo.ui.configbool('experimental', 'bundle2-advertise'):
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role='server'))
caps.append('bundle2=' + urlreq.quote(capsblob)) caps.append('bundle2=' + urlreq.quote(capsblob))
caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority)) caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority))
if proto.name == 'http': if proto.name == 'http':
caps.append('httpheader=%d' % caps.append('httpheader=%d' %
repo.ui.configint('server', 'maxhttpheaderlen')) repo.ui.configint('server', 'maxhttpheaderlen'))
if repo.ui.configbool('experimental', 'httppostargs'): if repo.ui.configbool('experimental', 'httppostargs'):
caps.append('httppostargs') caps.append('httppostargs')