This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1955

bundlespec: add support for some variants
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa2b350d9f6ae: bundlespec: add support for some variants
Summary

This way the stream v2 bundle spec can disable the changegroup part while
enabling the stream v2 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:25 AM
indygreg accepted this revision.Mar 19 2018, 5:21 PM
indygreg added a subscriber: indygreg.

This looks reasonable to me.

I'll hold off landing due to requirements on an earlier, not yet accepted patch.

This revision is now accepted and ready to land.Mar 19 2018, 5:21 PM
lothiraldan updated this revision to Diff 7377.Mar 30 2018, 8:55 AM
indygreg accepted this revision.Mar 30 2018, 1:11 PM
Closed by commit rHGa2b350d9f6ae: bundlespec: add support for some variants (authored by lothiraldan). · Explain WhyMar 30 2018, 1:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (16 lines)
Mtests/test-stream-bundle-v2.t (11 lines)

Diff 7386

mercurial/exchange.py

'revbranchcache': True 'revbranchcache': True
}, },
'packed1' : { 'packed1' : {
'cg.version': 's1' 'cg.version': 's1'
} }
} }
_bundlespeccontentopts['bundle2'] = _bundlespeccontentopts['v2'] _bundlespeccontentopts['bundle2'] = _bundlespeccontentopts['v2']
_bundlespecvariants = {"streamv2": {"changegroup": False, "streamv2": True,
"tagsfnodescache": False,
"revbranchcache": False}}
# Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE.
_bundlespecv1compengines = {'gzip', 'bzip2', 'none'} _bundlespecv1compengines = {'gzip', 'bzip2', 'none'}
@attr.s @attr.s
class bundlespec(object): class bundlespec(object):
compression = attr.ib() compression = attr.ib()
version = attr.ib() version = attr.ib()
params = attr.ib() params = attr.ib()
if missingreqs: if missingreqs:
raise error.UnsupportedBundleSpecification( raise error.UnsupportedBundleSpecification(
_('missing support for repository features: %s') % _('missing support for repository features: %s') %
', '.join(sorted(missingreqs))) ', '.join(sorted(missingreqs)))
# Compute contentopts based on the version # Compute contentopts based on the version
contentopts = _bundlespeccontentopts.get(version, {}).copy() contentopts = _bundlespeccontentopts.get(version, {}).copy()
# Process the variants
if "stream" in params and params["stream"] == "v2":
variant = _bundlespecvariants["streamv2"]
contentopts.update(variant)
if not externalnames: if not externalnames:
engine = util.compengines.forbundlename(compression) engine = util.compengines.forbundlename(compression)
compression = engine.bundletype()[1] compression = engine.bundletype()[1]
version = _bundlespeccgversions[version] version = _bundlespeccgversions[version]
return bundlespec(compression, version, params, contentopts) return bundlespec(compression, version, params, contentopts)
def readbundle(ui, fh, fname, vfs=None): def readbundle(ui, fh, fname, vfs=None):
version = part.params['version'] version = part.params['version']
if version in ('01', '02'): if version in ('01', '02'):
version = 'v2' version = 'v2'
else: else:
raise error.Abort(_('changegroup version %s does not have ' raise error.Abort(_('changegroup version %s does not have '
'a known bundlespec') % version, 'a known bundlespec') % version,
hint=_('try upgrading your Mercurial ' hint=_('try upgrading your Mercurial '
'client')) 'client'))
elif part.type == 'stream2' and version is None:
# A stream2 part requires to be part of a v2 bundle
version = "v2"
requirements = urlreq.unquote(part.params['requirements'])
splitted = requirements.split()
params = bundle2._formatrequirementsparams(splitted)
return 'none-v2;stream=v2;%s' % params
if not version: if not version:
raise error.Abort(_('could not identify changegroup version in ' raise error.Abort(_('could not identify changegroup version in '
'bundle')) 'bundle'))
return '%s-%s' % (comp, version) return '%s-%s' % (comp, version)
elif isinstance(b, streamclone.streamcloneapplier): elif isinstance(b, streamclone.streamcloneapplier):
requirements = streamclone.readbundle1header(fh)[2] requirements = streamclone.readbundle1header(fh)[2]

tests/test-stream-bundle-v2.t

> C > C
> | > |
> B > B
> | > |
> A > A
> EOF > EOF
$ hg bundle -a --type="none-v2;stream=v2" bundle.hg $ hg bundle -a --type="none-v2;stream=v2" bundle.hg
5 changesets found
$ hg debugbundle bundle.hg $ hg debugbundle bundle.hg
Stream params: {} Stream params: {}
changegroup -- {nbchanges: 5, version: 02} stream2 -- {bytecount: 1693, filecount: 11, requirements: dotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Cstore}
426bada5c67598ca65036d57d9e4b64b0c1ce7a0
112478962961147124edd43549aedd1a335e44bf
26805aba1e600a82e93661149f2313866a221a7b
f585351a92f85104bff7c284233c338b10eb1df7
9bc730a19041f9ec7cb33c626e811aa233efb18c
cache:rev-branch-cache -- {}
$ hg debugbundle --spec bundle.hg $ hg debugbundle --spec bundle.hg
none-v2 none-v2;stream=v2;requirements%3Ddotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Cstore