This is an archive of the discontinued Mercurial Phabricator instance.

Differential D666

changegroup: replace getlocalchangegroupraw with makestream
ClosedPublic

Authored by durham on Sep 10 2017, 10:06 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd8245139e720: changegroup: replace getlocalchangegroupraw with makestream
Summary

As part of reducing the number of changegroup creation apis, let's replace calls
to getlocalchangegroupraw with calls to makestream. Aside from one case of
checking if there are no outgoing commits and returning None, this is pretty
much a drop in replacement.

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

durham created this revision.Sep 10 2017, 10:06 PM
indygreg accepted this revision.Sep 11 2017, 6:18 PM
This revision is now accepted and ready to land.Sep 11 2017, 6:18 PM
Closed by commit rHGd8245139e720: changegroup: replace getlocalchangegroupraw with makestream (authored by durham). · Explain WhySep 11 2017, 6:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (11 lines)
Mmercurial/exchange.py (18 lines)

Diff 1735

mercurial/changegroup.py

heads.sort() heads.sort()
fastpathlinkrev = fastpath or ( fastpathlinkrev = fastpath or (
repo.filtername is None and heads == sorted(repo.heads())) repo.filtername is None and heads == sorted(repo.heads()))
repo.hook('preoutgoing', throw=True, source=source) repo.hook('preoutgoing', throw=True, source=source)
_changegroupinfo(repo, csets, source) _changegroupinfo(repo, csets, source)
return bundler.generate(commonrevs, csets, fastpathlinkrev, source) return bundler.generate(commonrevs, csets, fastpathlinkrev, source)
def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None,
version='01'):
"""Like getbundle, but taking a discovery.outgoing as an argument.
This is only implemented for local repos and reuses potentially
precomputed sets in outgoing. Returns a raw changegroup generator."""
if not outgoing.missing:
return None
bundler = getbundler(version, repo, bundlecaps)
return getsubsetraw(repo, outgoing, bundler, source)
def getchangegroup(repo, source, outgoing, bundlecaps=None, def getchangegroup(repo, source, outgoing, bundlecaps=None,
version='01'): version='01'):
"""Like getbundle, but taking a discovery.outgoing as an argument. """Like getbundle, but taking a discovery.outgoing as an argument.
This is only implemented for local repos and reuses potentially This is only implemented for local repos and reuses potentially
precomputed sets in outgoing.""" precomputed sets in outgoing."""
if not outgoing.missing: if not outgoing.missing:
return None return None

mercurial/exchange.py

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( if v in changegroup.supportedoutgoingversions(
pushop.repo)] pushop.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)
cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', cgstream = changegroup.makestream(pushop.repo, pushop.outgoing, version,
pushop.outgoing, 'push')
version=version) cgpart = bundler.newpart('changegroup', data=cgstream)
cgpart = bundler.newpart('changegroup', data=cg)
if cgversions: if cgversions:
cgpart.addparam('version', version) cgpart.addparam('version', version)
if 'treemanifest' in pushop.repo.requirements: if 'treemanifest' in pushop.repo.requirements:
cgpart.addparam('treemanifest', '1') cgpart.addparam('treemanifest', '1')
def handlereply(op): def handlereply(op):
"""extract addchangegroup returns from server reply""" """extract addchangegroup returns from server reply"""
cgreplies = op.records.getreplies(cgpart.id) cgreplies = op.records.getreplies(cgpart.id)
assert len(cgreplies['changegroup']) == 1 assert len(cgreplies['changegroup']) == 1
**pycompat.strkwargs(kwargs)) **pycompat.strkwargs(kwargs))
return bundler.getchunks() return bundler.getchunks()
@getbundle2partsgenerator('changegroup') @getbundle2partsgenerator('changegroup')
def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
b2caps=None, heads=None, common=None, **kwargs): b2caps=None, heads=None, common=None, **kwargs):
"""add a changegroup part to the requested bundle""" """add a changegroup part to the requested bundle"""
cg = None cgstream = None
if kwargs.get('cg', True): if kwargs.get('cg', True):
# build changegroup bundle here. # build changegroup bundle here.
version = '01' version = '01'
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)
outgoing = _computeoutgoing(repo, heads, common) outgoing = _computeoutgoing(repo, heads, common)
cg = changegroup.getlocalchangegroupraw(repo, source, outgoing, cgstream = changegroup.makestream(repo, outgoing, version, source,
bundlecaps=bundlecaps, bundlecaps=bundlecaps)
version=version)
if cg: if cgstream:
part = bundler.newpart('changegroup', data=cg) part = bundler.newpart('changegroup', data=cgstream)
if cgversions: if cgversions:
part.addparam('version', version) part.addparam('version', version)
part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False) part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False)
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1') part.addparam('treemanifest', '1')
@getbundle2partsgenerator('listkeys') @getbundle2partsgenerator('listkeys')
def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None, def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None,