| lothiraldan | |
| indygreg |
| hg-reviewers |
Always provide the human readable version of compression and version.
Add the translated wire format name in the new wirecompression and
wireversion fields.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (6 lines) | |||
| M | mercurial/exchange.py (25 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger |
| onlyheads=heads, | onlyheads=heads, | ||||
| force=opts.get('force'), | force=opts.get('force'), | ||||
| portable=True) | portable=True) | ||||
| if not outgoing.missing: | if not outgoing.missing: | ||||
| scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) | ||||
| return 1 | return 1 | ||||
| bcompression = bundlespec.compression | |||||
| if cgversion == '01': #bundle1 | if cgversion == '01': #bundle1 | ||||
| if bcompression is None: | bversion = 'HG10' + bundlespec.wirecompression | ||||
| bcompression = 'UN' | |||||
| bversion = 'HG10' + bcompression | |||||
| bcompression = None | bcompression = None | ||||
| elif cgversion in ('02', '03'): | elif cgversion in ('02', '03'): | ||||
| bversion = 'HG20' | bversion = 'HG20' | ||||
| bcompression = bundlespec.wirecompression | |||||
| else: | else: | ||||
| raise error.ProgrammingError( | raise error.ProgrammingError( | ||||
| 'bundle: unexpected changegroup version %s' % cgversion) | 'bundle: unexpected changegroup version %s' % cgversion) | ||||
| # TODO compression options should be derived from bundlespec parsing. | # TODO compression options should be derived from bundlespec parsing. | ||||
| # This is a temporary hack to allow adjusting bundle compression | # This is a temporary hack to allow adjusting bundle compression | ||||
| # 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. | ||||
| "revbranchcache": 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() | ||||
| wirecompression = attr.ib() | |||||
| version = attr.ib() | version = attr.ib() | ||||
| wireversion = attr.ib() | |||||
| params = attr.ib() | params = attr.ib() | ||||
| contentopts = attr.ib() | contentopts = attr.ib() | ||||
| def parsebundlespec(repo, spec, strict=True, externalnames=False): | def parsebundlespec(repo, spec, strict=True): | ||||
| """Parse a bundle string specification into parts. | """Parse a bundle string specification into parts. | ||||
| Bundle specifications denote a well-defined bundle/exchange format. | Bundle specifications denote a well-defined bundle/exchange format. | ||||
| The content of a given specification should not change over time in | The content of a given specification should not change over time in | ||||
| order to ensure that bundles produced by a newer version of Mercurial are | order to ensure that bundles produced by a newer version of Mercurial are | ||||
| readable from an older version. | readable from an older version. | ||||
| The string currently has the form: | The string currently has the form: | ||||
| <compression>-<type>[;<parameter0>[;<parameter1>]] | <compression>-<type>[;<parameter0>[;<parameter1>]] | ||||
| Where <compression> is one of the supported compression formats | Where <compression> is one of the supported compression formats | ||||
| and <type> is (currently) a version string. A ";" can follow the type and | and <type> is (currently) a version string. A ";" can follow the type and | ||||
| all text afterwards is interpreted as URI encoded, ";" delimited key=value | all text afterwards is interpreted as URI encoded, ";" delimited key=value | ||||
| pairs. | pairs. | ||||
| If ``strict`` is True (the default) <compression> is required. Otherwise, | If ``strict`` is True (the default) <compression> is required. Otherwise, | ||||
| it is optional. | it is optional. | ||||
| If ``externalnames`` is False (the default), the human-centric names will | |||||
| be converted to their internal representation. | |||||
| Returns a bundlespec object of (compression, version, parameters). | Returns a bundlespec object of (compression, version, parameters). | ||||
| Compression will be ``None`` if not in strict mode and a compression isn't | Compression will be ``None`` if not in strict mode and a compression isn't | ||||
| defined. | defined. | ||||
| An ``InvalidBundleSpecification`` is raised when the specification is | An ``InvalidBundleSpecification`` is raised when the specification is | ||||
| not syntactically well formed. | not syntactically well formed. | ||||
| An ``UnsupportedBundleSpecification`` is raised when the compression or | An ``UnsupportedBundleSpecification`` is raised when the compression or | ||||
| # 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 | # Process the variants | ||||
| if "stream" in params and params["stream"] == "v2": | if "stream" in params and params["stream"] == "v2": | ||||
| variant = _bundlespecvariants["streamv2"] | variant = _bundlespecvariants["streamv2"] | ||||
| contentopts.update(variant) | contentopts.update(variant) | ||||
| if not externalnames: | |||||
| engine = util.compengines.forbundlename(compression) | engine = util.compengines.forbundlename(compression) | ||||
| compression = engine.bundletype()[1] | compression, wirecompression = engine.bundletype() | ||||
| version = _bundlespeccgversions[version] | wireversion = _bundlespeccgversions[version] | ||||
| return bundlespec(compression, version, params, contentopts) | return bundlespec(compression, wirecompression, version, wireversion, | ||||
| params, contentopts) | |||||
| def readbundle(ui, fh, fname, vfs=None): | def readbundle(ui, fh, fname, vfs=None): | ||||
| header = changegroup.readexactly(fh, 4) | header = changegroup.readexactly(fh, 4) | ||||
| alg = None | alg = None | ||||
| if not fname: | if not fname: | ||||
| fname = "stream" | fname = "stream" | ||||
| if not header.startswith('HG') and header.startswith('\0'): | if not header.startswith('HG') and header.startswith('\0'): | ||||
| value = urlreq.unquote(value) | value = urlreq.unquote(value) | ||||
| attrs[key] = value | attrs[key] = value | ||||
| # Parse BUNDLESPEC into components. This makes client-side | # Parse BUNDLESPEC into components. This makes client-side | ||||
| # preferences easier to specify since you can prefer a single | # preferences easier to specify since you can prefer a single | ||||
| # component of the BUNDLESPEC. | # component of the BUNDLESPEC. | ||||
| if key == 'BUNDLESPEC': | if key == 'BUNDLESPEC': | ||||
| try: | try: | ||||
| bundlespec = parsebundlespec(repo, value, | bundlespec = parsebundlespec(repo, value) | ||||
| externalnames=True) | |||||
| attrs['COMPRESSION'] = bundlespec.compression | attrs['COMPRESSION'] = bundlespec.compression | ||||
| attrs['VERSION'] = bundlespec.version | attrs['VERSION'] = bundlespec.version | ||||
| except error.InvalidBundleSpecification: | except error.InvalidBundleSpecification: | ||||
| pass | pass | ||||
| except error.UnsupportedBundleSpecification: | except error.UnsupportedBundleSpecification: | ||||
| pass | pass | ||||
| m.append(attrs) | m.append(attrs) | ||||
| return m | return m | ||||
| def isstreamclonespec(bundlespec): | def isstreamclonespec(bundlespec): | ||||
| # Stream clone v1 | # Stream clone v1 | ||||
| if (bundlespec.compression == 'UN' and bundlespec.version == 's1'): | if (bundlespec.wirecompression == 'UN' and bundlespec.wireversion == 's1'): | ||||
| return True | return True | ||||
| # Stream clone v2 | # Stream clone v2 | ||||
| if (bundlespec.compression == 'UN' and bundlespec.version == '02' and \ | if (bundlespec.wirecompression == 'UN' and \ | ||||
| bundlespec.wireversion == '02' and \ | |||||
| bundlespec.contentopts.get('streamv2')): | bundlespec.contentopts.get('streamv2')): | ||||
| return True | return True | ||||
| return False | return False | ||||
| def filterclonebundleentries(repo, entries, streamclonerequested=False): | def filterclonebundleentries(repo, entries, streamclonerequested=False): | ||||
| """Remove incompatible clone bundle manifest entries. | """Remove incompatible clone bundle manifest entries. | ||||