This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4014

exchange: move simple narrow changegroup generation from extension
ClosedPublic

Authored by indygreg on Aug 1 2018, 1:03 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGd99083996398: exchange: move simple narrow changegroup generation from extension
Summary

The narrow extension completely replaced the function generating the
changegroup part when a narrow changegroup was requested. Previous
commits have taught the in-core changegroup code how to filter files
based on a matcher. This commit teaches the in-core bundle2 part
generation code to construct a matcher based on arguments. It
will also emit a bundle2 part describing the narrow spec.

I believe the changegroup part generation code in the narrow extension
is now limited to ellipsis serving mode. i.e. core is now capable
of narrow changegroup generation when ellipsis mode is disabled.

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.Aug 1 2018, 1:03 PM
Closed by commit rHGd99083996398: exchange: move simple narrow changegroup generation from extension (authored by indygreg). · Explain WhyAug 2 2018, 5:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowbundle2.py (27 lines)
Mmercurial/exchange.py (20 lines)

Diff 9810

hgext/narrow/narrowbundle2.py

packer.is_shallow = depth is not None packer.is_shallow = depth is not None
return packer.generate(common, visitnodes, False, source) return packer.generate(common, visitnodes, False, source)
# Serve a changegroup for a client with a narrow clone. # Serve a changegroup for a client with a narrow clone.
def getbundlechangegrouppart_narrow(bundler, repo, source, def getbundlechangegrouppart_narrow(bundler, repo, source,
bundlecaps=None, b2caps=None, heads=None, bundlecaps=None, b2caps=None, heads=None,
common=None, **kwargs): common=None, **kwargs):
assert repo.ui.configbool('experimental', 'narrowservebrokenellipses')
cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value if cgversions: # 3.1 and 3.2 ship with an empty value
cgversions = [v for v in cgversions cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)] if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions: if not cgversions:
raise ValueError(_('no common changegroup version')) raise ValueError(_('no common changegroup version'))
version = max(cgversions) version = max(cgversions)
else: else:
raise ValueError(_("server does not advertise changegroup version," raise ValueError(_("server does not advertise changegroup version,"
" can't negotiate support for ellipsis nodes")) " can't negotiate support for ellipsis nodes"))
include = sorted(filter(bool, kwargs.get(r'includepats', []))) include = sorted(filter(bool, kwargs.get(r'includepats', [])))
exclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
newmatch = narrowspec.match(repo.root, include=include, exclude=exclude) newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)
if not repo.ui.configbool("experimental", "narrowservebrokenellipses"):
outgoing = exchange._computeoutgoing(repo, heads, common)
if not outgoing.missing:
return
cg = changegroup.makestream(repo, outgoing, version, source,
filematcher=newmatch)
part = bundler.newpart('changegroup', data=cg)
part.addparam('version', version)
if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1')
if include or exclude:
narrowspecpart = bundler.newpart(_SPECPART)
if include:
narrowspecpart.addparam(
_SPECPART_INCLUDE, '\n'.join(include), mandatory=True)
if exclude:
narrowspecpart.addparam(
_SPECPART_EXCLUDE, '\n'.join(exclude), mandatory=True)
return
depth = kwargs.get(r'depth', None) depth = kwargs.get(r'depth', None)
if depth is not None: if depth is not None:
depth = int(depth) depth = int(depth)
if depth < 1: if depth < 1:
raise error.Abort(_('depth must be positive, got %d') % depth) raise error.Abort(_('depth must be positive, got %d') % depth)
heads = set(heads or repo.heads()) heads = set(heads or repo.heads())
# Extend changegroup serving to handle requests from narrow clients. # Extend changegroup serving to handle requests from narrow clients.
origcgfn = exchange.getbundle2partsmapping['changegroup'] origcgfn = exchange.getbundle2partsmapping['changegroup']
def wrappedcgfn(*args, **kwargs): def wrappedcgfn(*args, **kwargs):
repo = args[1] repo = args[1]
if repo.ui.has_section(_NARROWACL_SECTION): if repo.ui.has_section(_NARROWACL_SECTION):
kwargs = exchange.applynarrowacl(repo, kwargs) kwargs = exchange.applynarrowacl(repo, kwargs)
if kwargs.get(r'narrow', False): if (kwargs.get(r'narrow', False) and
repo.ui.configbool('experimental', 'narrowservebrokenellipses')):
getbundlechangegrouppart_narrow(*args, **kwargs) getbundlechangegrouppart_narrow(*args, **kwargs)
else: else:
origcgfn(*args, **kwargs) origcgfn(*args, **kwargs)
exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn
# Extend changegroup receiver so client can fixup after widen requests. # Extend changegroup receiver so client can fixup after widen requests.
origcghandler = bundle2.parthandlermapping['changegroup'] origcghandler = bundle2.parthandlermapping['changegroup']
def wrappedcghandler(op, inpart): def wrappedcghandler(op, inpart):
origcghandler(op, inpart) origcghandler(op, inpart)
if util.safehasattr(op, '_widen_bundle'): if util.safehasattr(op, '_widen_bundle'):
handlechangegroup_widen(op, inpart) handlechangegroup_widen(op, inpart)
wrappedcghandler.params = origcghandler.params wrappedcghandler.params = origcghandler.params
bundle2.parthandlermapping['changegroup'] = wrappedcghandler bundle2.parthandlermapping['changegroup'] = wrappedcghandler

mercurial/exchange.py

if not cgversions: if not cgversions:
raise ValueError(_('no common changegroup version')) raise ValueError(_('no common changegroup version'))
version = max(cgversions) version = max(cgversions)
outgoing = _computeoutgoing(repo, heads, common) outgoing = _computeoutgoing(repo, heads, common)
if not outgoing.missing: if not outgoing.missing:
return return
if kwargs.get(r'narrow', False):
include = sorted(filter(bool, kwargs.get(r'includepats', [])))
exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
filematcher = narrowspec.match(repo.root, include=include,
exclude=exclude)
else:
filematcher = None
cgstream = changegroup.makestream(repo, outgoing, version, source, cgstream = changegroup.makestream(repo, outgoing, version, source,
bundlecaps=bundlecaps) bundlecaps=bundlecaps,
filematcher=filematcher)
part = bundler.newpart('changegroup', data=cgstream) part = bundler.newpart('changegroup', data=cgstream)
if cgversions: if cgversions:
part.addparam('version', version) part.addparam('version', version)
part.addparam('nbchanges', '%d' % len(outgoing.missing), part.addparam('nbchanges', '%d' % len(outgoing.missing),
mandatory=False) mandatory=False)
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1') part.addparam('treemanifest', '1')
if kwargs.get(r'narrow', False) and (include or exclude):
narrowspecpart = bundler.newpart('narrow:spec')
if include:
narrowspecpart.addparam(
'include', '\n'.join(include), mandatory=True)
if exclude:
narrowspecpart.addparam(
'exclude', '\n'.join(exclude), mandatory=True)
@getbundle2partsgenerator('bookmarks') @getbundle2partsgenerator('bookmarks')
def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None, def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None,
b2caps=None, **kwargs): b2caps=None, **kwargs):
"""add a bookmark part to the requested bundle""" """add a bookmark part to the requested bundle"""
if not kwargs.get(r'bookmarks', False): if not kwargs.get(r'bookmarks', False):
return return
if 'bookmarks' not in b2caps: if 'bookmarks' not in b2caps:
raise ValueError(_('no common bookmarks exchange method')) raise ValueError(_('no common bookmarks exchange method'))