This is an archive of the discontinued Mercurial Phabricator instance.

Differential D669

changegroup: replace getchangegroup with makechangegroup
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5ede882c249c: changegroup: replace getchangegroup with makechangegroup
Summary

As part of reducing the number of changegroup creation APIs, let's replace
getchangegroup with calls to makechangegroup. This is mostly a drop in
replacement, but it does change the version specifier to be required, so it's
more obvious which callers are creating old version 1 changegroups still.

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:07 PM
indygreg accepted this revision.Sep 11 2017, 6:14 PM
This revision is now accepted and ready to land.Sep 11 2017, 6:14 PM
Closed by commit rHG5ede882c249c: changegroup: replace getchangegroup with makechangegroup (authored by durham). · Explain WhySep 11 2017, 6:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1738

mercurial/bundle2.py

"""extract the list of supported obsmarkers versions from a bundle2caps dict """extract the list of supported obsmarkers versions from a bundle2caps dict
""" """
obscaps = caps.get('obsmarkers', ()) obscaps = caps.get('obsmarkers', ())
return [int(c[1:]) for c in obscaps if c.startswith('V')] return [int(c[1:]) for c in obscaps if c.startswith('V')]
def writenewbundle(ui, repo, source, filename, bundletype, outgoing, opts, def writenewbundle(ui, repo, source, filename, bundletype, outgoing, opts,
vfs=None, compression=None, compopts=None): vfs=None, compression=None, compopts=None):
if bundletype.startswith('HG10'): if bundletype.startswith('HG10'):
cg = changegroup.getchangegroup(repo, source, outgoing, version='01') cg = changegroup.makechangegroup(repo, outgoing, '01', source)
return writebundle(ui, cg, filename, bundletype, vfs=vfs, return writebundle(ui, cg, filename, bundletype, vfs=vfs,
compression=compression, compopts=compopts) compression=compression, compopts=compopts)
elif not bundletype.startswith('HG20'): elif not bundletype.startswith('HG20'):
raise error.ProgrammingError('unknown bundle type: %s' % bundletype) raise error.ProgrammingError('unknown bundle type: %s' % bundletype)
caps = {} caps = {}
if 'obsolescence' in opts: if 'obsolescence' in opts:
caps['obsmarkers'] = ('V1',) caps['obsmarkers'] = ('V1',)
# The type of input from 'getbundle' and 'writenewbundle' are a bit # The type of input from 'getbundle' and 'writenewbundle' are a bit
# different right now. So we keep them separated for now for the sake of # different right now. So we keep them separated for now for the sake of
# simplicity. # simplicity.
# we always want a changegroup in such bundle # we always want a changegroup in such bundle
cgversion = opts.get('cg.version') cgversion = opts.get('cg.version')
if cgversion is None: if cgversion is None:
cgversion = changegroup.safeversion(repo) cgversion = changegroup.safeversion(repo)
cg = changegroup.getchangegroup(repo, source, outgoing, cg = changegroup.makechangegroup(repo, outgoing, cgversion, source)
version=cgversion)
part = bundler.newpart('changegroup', data=cg.getchunks()) part = bundler.newpart('changegroup', data=cg.getchunks())
part.addparam('version', cg.version) part.addparam('version', cg.version)
if 'clcount' in cg.extras: if 'clcount' in cg.extras:
part.addparam('nbchanges', str(cg.extras['clcount']), part.addparam('nbchanges', str(cg.extras['clcount']),
mandatory=False) mandatory=False)
if opts.get('phases') and repo.revs('%ln and secret()', if opts.get('phases') and repo.revs('%ln and secret()',
outgoing.missingheads): outgoing.missingheads):
part.addparam('targetphase', '%d' % phases.secret, mandatory=False) part.addparam('targetphase', '%d' % phases.secret, mandatory=False)

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 getchangegroup(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."""
if not outgoing.missing:
return None
return makechangegroup(repo, outgoing, version, source,
bundlecaps=bundlecaps)
def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles):
revisions = 0 revisions = 0
files = 0 files = 0
for chunkdata in iter(source.filelogheader, {}): for chunkdata in iter(source.filelogheader, {}):
files += 1 files += 1
f = chunkdata["filename"] f = chunkdata["filename"]
repo.ui.debug("adding %s revisions\n" % f) repo.ui.debug("adding %s revisions\n" % f)
repo.ui.progress(_('files'), files, unit=_('files'), repo.ui.progress(_('files'), files, unit=_('files'),

mercurial/exchange.py

# create a changegroup from local # create a changegroup from local
if pushop.revs is None and not (outgoing.excluded if pushop.revs is None and not (outgoing.excluded
or pushop.repo.changelog.filteredrevs): or pushop.repo.changelog.filteredrevs):
# push everything, # push everything,
# use the fast path, no race possible on push # use the fast path, no race possible on push
cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', 'push', cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', 'push',
fastpath=True, bundlecaps=bundlecaps) fastpath=True, bundlecaps=bundlecaps)
else: else:
cg = changegroup.getchangegroup(pushop.repo, 'push', outgoing, cg = changegroup.makechangegroup(pushop.repo, outgoing, '01',
bundlecaps=bundlecaps) 'push', bundlecaps=bundlecaps)
# apply changegroup to remote # apply changegroup to remote
# local repo finds heads on server, finds out what # local repo finds heads on server, finds out what
# revs it must push. once revs transferred, if server # revs it must push. once revs transferred, if server
# finds it has different heads (someone else won # finds it has different heads (someone else won
# commit/push race), server aborts. # commit/push race), server aborts.
if pushop.force: if pushop.force:
remoteheads = ['force'] remoteheads = ['force']

tests/test-bundle2-format.t

> if 'rev' in opts: > if 'rev' in opts:
> revs = scmutil.revrange(repo, opts['rev']) > revs = scmutil.revrange(repo, opts['rev'])
> if revs: > if revs:
> # very crude version of a changegroup part creation > # very crude version of a changegroup part creation
> bundled = repo.revs('%ld::%ld', revs, revs) > bundled = repo.revs('%ld::%ld', revs, revs)
> headmissing = [c.node() for c in repo.set('heads(%ld)', revs)] > headmissing = [c.node() for c in repo.set('heads(%ld)', revs)]
> headcommon = [c.node() for c in repo.set('parents(%ld) - %ld', revs, revs)] > headcommon = [c.node() for c in repo.set('parents(%ld) - %ld', revs, revs)]
> outgoing = discovery.outgoing(repo, headcommon, headmissing) > outgoing = discovery.outgoing(repo, headcommon, headmissing)
> cg = changegroup.getchangegroup(repo, 'test:bundle2', outgoing, None) > cg = changegroup.makechangegroup(repo, outgoing, '01',
> 'test:bundle2')
> bundler.newpart('changegroup', data=cg.getchunks(), > bundler.newpart('changegroup', data=cg.getchunks(),
> mandatory=False) > mandatory=False)
> >
> if opts['parts']: > if opts['parts']:
> bundler.newpart('test:empty', mandatory=False) > bundler.newpart('test:empty', mandatory=False)
> # add a second one to make sure we handle multiple parts > # add a second one to make sure we handle multiple parts
> bundler.newpart('test:empty', mandatory=False) > bundler.newpart('test:empty', mandatory=False)
> bundler.newpart('test:song', data=ELEPHANTSSONG, mandatory=False) > bundler.newpart('test:song', data=ELEPHANTSSONG, mandatory=False)

tests/test-bundle2-multiple-changegroups.t

Create an extension to test bundle2 with multiple changegroups Create an extension to test bundle2 with multiple changegroups
$ cat > bundle2.py <<EOF $ cat > bundle2.py <<EOF
> """ > """
> """ > """
> from mercurial import changegroup, discovery, exchange > from mercurial import changegroup, discovery, exchange
> >
> def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, > def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
> b2caps=None, heads=None, common=None, > b2caps=None, heads=None, common=None,
> **kwargs): > **kwargs):
> # Create two changegroups given the common changesets and heads for the > # Create two changegroups given the common changesets and heads for the
> # changegroup part we are being requested. Use the parent of each head > # changegroup part we are being requested. Use the parent of each head
> # in 'heads' as intermediate heads for the first changegroup. > # in 'heads' as intermediate heads for the first changegroup.
> intermediates = [repo[r].p1().node() for r in heads] > intermediates = [repo[r].p1().node() for r in heads]
> outgoing = discovery.outgoing(repo, common, intermediates) > outgoing = discovery.outgoing(repo, common, intermediates)
> cg = changegroup.getchangegroup(repo, source, outgoing, > cg = changegroup.makechangegroup(repo, outgoing, '01',
> bundlecaps=bundlecaps) > source, bundlecaps=bundlecaps)
> bundler.newpart('output', data='changegroup1') > bundler.newpart('output', data='changegroup1')
> bundler.newpart('changegroup', data=cg.getchunks()) > bundler.newpart('changegroup', data=cg.getchunks())
> outgoing = discovery.outgoing(repo, common + intermediates, heads) > outgoing = discovery.outgoing(repo, common + intermediates, heads)
> cg = changegroup.getchangegroup(repo, source, outgoing, > cg = changegroup.makechangegroup(repo, outgoing, '01',
> bundlecaps=bundlecaps) > source, bundlecaps=bundlecaps)
> bundler.newpart('output', data='changegroup2') > bundler.newpart('output', data='changegroup2')
> bundler.newpart('changegroup', data=cg.getchunks()) > bundler.newpart('changegroup', data=cg.getchunks())
> >
> def _pull(repo, *args, **kwargs): > def _pull(repo, *args, **kwargs):
> pullop = _orig_pull(repo, *args, **kwargs) > pullop = _orig_pull(repo, *args, **kwargs)
> repo.ui.write('pullop.cgresult is %d\n' % pullop.cgresult) > repo.ui.write('pullop.cgresult is %d\n' % pullop.cgresult)
> return pullop > return pullop
> >

tests/test-bundle2-remote-changegroup.t

> part = newpart('remote-changegroup') > part = newpart('remote-changegroup')
> for k, v in eval(args).items(): > for k, v in eval(args).items():
> part.addparam(k, str(v)) > part.addparam(k, str(v))
> elif verb == 'changegroup': > elif verb == 'changegroup':
> _common, heads = args.split() > _common, heads = args.split()
> common.extend(repo.lookup(r) for r in repo.revs(_common)) > common.extend(repo.lookup(r) for r in repo.revs(_common))
> heads = [repo.lookup(r) for r in repo.revs(heads)] > heads = [repo.lookup(r) for r in repo.revs(heads)]
> outgoing = discovery.outgoing(repo, common, heads) > outgoing = discovery.outgoing(repo, common, heads)
> cg = changegroup.getchangegroup(repo, 'changegroup', outgoing) > cg = changegroup.makechangegroup(repo, outgoing, '01',
> 'changegroup')
> newpart('changegroup', cg.getchunks()) > newpart('changegroup', cg.getchunks())
> else: > else:
> raise Exception('unknown verb') > raise Exception('unknown verb')
> >
> exchange.getbundle2partsmapping['changegroup'] = _getbundlechangegrouppart > exchange.getbundle2partsmapping['changegroup'] = _getbundlechangegrouppart
> EOF > EOF
Start a simple HTTP server to serve bundles Start a simple HTTP server to serve bundles