This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1951

bundle: condition the changegroup part when creating a new bundle
ClosedPublic

Authored by lothiraldan on Jan 31 2018, 11:24 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG66c0ff381cfc: bundle: condition the changegroup part when creating a new bundle
Summary

We will generate stream bundle in the next changesets which doesn't need the
changegroup part.

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

lothiraldan created this revision.Jan 31 2018, 11:24 AM
lothiraldan updated this revision to Diff 5150.Feb 2 2018, 4:30 AM
indygreg accepted this revision.Feb 20 2018, 11:41 PM
This revision is now accepted and ready to land.Feb 20 2018, 11:41 PM
Closed by commit rHG66c0ff381cfc: bundle: condition the changegroup part when creating a new bundle (authored by lothiraldan). · Explain WhyMar 19 2018, 4:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (28 lines)
Mmercurial/commands.py (2 lines)

Diff 7129

mercurial/bundle2.py

def _addpartsfromopts(ui, repo, bundler, source, outgoing, opts): def _addpartsfromopts(ui, repo, bundler, source, outgoing, opts):
# We should eventually reconcile this logic with the one behind # We should eventually reconcile this logic with the one behind
# 'exchange.getbundle2partsgenerator'. # 'exchange.getbundle2partsgenerator'.
# #
# 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 might not always want a changegroup in such bundle, for example in
# stream bundles
if opts.get('changegroup', True):
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.makechangegroup(repo, outgoing, cgversion, source) cg = changegroup.makechangegroup(repo, outgoing, cgversion, source)
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', '%d' % cg.extras['clcount'], part.addparam('nbchanges', '%d' % 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)
addparttagsfnodescache(repo, bundler, outgoing) addparttagsfnodescache(repo, bundler, outgoing)
addpartrevbranchcache(repo, bundler, outgoing) addpartrevbranchcache(repo, bundler, outgoing)
if opts.get('obsolescence', False): if opts.get('obsolescence', False):
obsmarkers = repo.obsstore.relevantmarkers(outgoing.missing) obsmarkers = repo.obsstore.relevantmarkers(outgoing.missing)
buildobsmarkerspart(bundler, obsmarkers) buildobsmarkerspart(bundler, obsmarkers)

mercurial/commands.py

# level without a) formalizing the bundlespec changes to declare it # level without a) formalizing the bundlespec changes to declare it
# b) introducing a command flag. # b) introducing a command flag.
compopts = {} compopts = {}
complevel = ui.configint('experimental', 'bundlecomplevel') complevel = ui.configint('experimental', 'bundlecomplevel')
if complevel is not None: if complevel is not None:
compopts['level'] = complevel compopts['level'] = complevel
contentopts = {'cg.version': cgversion} contentopts = {'cg.version': cgversion, 'changegroup': True}
if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
contentopts['obsolescence'] = True contentopts['obsolescence'] = True
if repo.ui.configbool('experimental', 'bundle-phases'): if repo.ui.configbool('experimental', 'bundle-phases'):
contentopts['phases'] = True contentopts['phases'] = True
bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
contentopts, compression=bcompression, contentopts, compression=bcompression,
compopts=compopts) compopts=compopts)