| indygreg |
| hg-reviewers |
We will add support of contentops in the next patch, introduce a class instead
of returning a 4-items tuple.
| 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 (5 lines) | |||
| M | mercurial/exchange.py (29 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan |
| if 'rev' in opts: | if 'rev' in opts: | ||||
| revstrings = opts['rev'] | revstrings = opts['rev'] | ||||
| revs = scmutil.revrange(repo, revstrings) | revs = scmutil.revrange(repo, revstrings) | ||||
| if revstrings and not revs: | if revstrings and not revs: | ||||
| raise error.Abort(_('no commits to bundle')) | raise error.Abort(_('no commits to bundle')) | ||||
| bundletype = opts.get('type', 'bzip2').lower() | bundletype = opts.get('type', 'bzip2').lower() | ||||
| try: | try: | ||||
| bcompression, cgversion, params = exchange.parsebundlespec( | bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False) | ||||
| repo, bundletype, strict=False) | |||||
| except error.UnsupportedBundleSpecification as e: | except error.UnsupportedBundleSpecification as e: | ||||
| raise error.Abort(pycompat.bytestr(e), | raise error.Abort(pycompat.bytestr(e), | ||||
| hint=_("see 'hg help bundlespec' for supported " | hint=_("see 'hg help bundlespec' for supported " | ||||
| "values for --type")) | "values for --type")) | ||||
| cgversion = bundlespec.version | |||||
| # Packed bundles are a pseudo bundle format for now. | # Packed bundles are a pseudo bundle format for now. | ||||
| if cgversion == 's1': | if cgversion == 's1': | ||||
| raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | ||||
| hint=_("use 'hg debugcreatestreamclonebundle'")) | hint=_("use 'hg debugcreatestreamclonebundle'")) | ||||
| if opts.get('all'): | if opts.get('all'): | ||||
| if dest: | if dest: | ||||
| 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: | if bcompression is None: | ||||
| bcompression = 'UN' | bcompression = 'UN' | ||||
| bversion = 'HG10' + bcompression | bversion = 'HG10' + bcompression | ||||
| bcompression = None | bcompression = None | ||||
| elif cgversion in ('02', '03'): | elif cgversion in ('02', '03'): | ||||
| bversion = 'HG20' | bversion = 'HG20' | ||||
| else: | else: | ||||
| import hashlib | import hashlib | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| bin, | bin, | ||||
| hex, | hex, | ||||
| nullid, | nullid, | ||||
| ) | ) | ||||
| from .thirdparty import ( | |||||
| attr, | |||||
| ) | |||||
| from . import ( | from . import ( | ||||
| bookmarks as bookmod, | bookmarks as bookmod, | ||||
| bundle2, | bundle2, | ||||
| changegroup, | changegroup, | ||||
| discovery, | discovery, | ||||
| error, | error, | ||||
| lock as lockmod, | lock as lockmod, | ||||
| logexchange, | logexchange, | ||||
| 'v2': '02', | 'v2': '02', | ||||
| 'packed1': 's1', | 'packed1': 's1', | ||||
| 'bundle2': '02', #legacy | 'bundle2': '02', #legacy | ||||
| } | } | ||||
| # 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 | |||||
| class bundlespec(object): | |||||
| compression = attr.ib() | |||||
| version = attr.ib() | |||||
| params = attr.ib() | |||||
| def parsebundlespec(repo, spec, strict=True, externalnames=False): | def parsebundlespec(repo, spec, strict=True, externalnames=False): | ||||
| """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 | If ``externalnames`` is False (the default), the human-centric names will | ||||
| be converted to their internal representation. | be converted to their internal representation. | ||||
| Returns a 3-tuple of (compression, version, parameters). Compression will | Returns a bundlespec object of (compression, version, parameters). | ||||
| be ``None`` if not in strict mode and a compression isn't defined. | Compression will be ``None`` if not in strict mode and a compression isn't | ||||
| 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 | ||||
| bundle type/version is not recognized. | bundle type/version is not recognized. | ||||
| Note: this function will likely eventually return a more complex data | Note: this function will likely eventually return a more complex data | ||||
| raise error.UnsupportedBundleSpecification( | raise error.UnsupportedBundleSpecification( | ||||
| _('missing support for repository features: %s') % | _('missing support for repository features: %s') % | ||||
| ', '.join(sorted(missingreqs))) | ', '.join(sorted(missingreqs))) | ||||
| 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 compression, version, params | |||||
| return bundlespec(compression, version, params) | |||||
| 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: | ||||
| comp, version, params = parsebundlespec(repo, value, | bundlespec = parsebundlespec(repo, value, | ||||
| externalnames=True) | externalnames=True) | ||||
| attrs['COMPRESSION'] = comp | attrs['COMPRESSION'] = bundlespec.compression | ||||
| attrs['VERSION'] = 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 filterclonebundleentries(repo, entries, streamclonerequested=False): | def filterclonebundleentries(repo, entries, streamclonerequested=False): | ||||
| """Remove incompatible clone bundle manifest entries. | """Remove incompatible clone bundle manifest entries. | ||||
| Accepts a list of entries parsed with ``parseclonebundlesmanifest`` | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` | ||||
| and returns a new list consisting of only the entries that this client | and returns a new list consisting of only the entries that this client | ||||
| should be able to apply. | should be able to apply. | ||||
| There is no guarantee we'll be able to apply all returned entries because | There is no guarantee we'll be able to apply all returned entries because | ||||
| the metadata we use to filter on may be missing or wrong. | the metadata we use to filter on may be missing or wrong. | ||||
| """ | """ | ||||
| newentries = [] | newentries = [] | ||||
| for entry in entries: | for entry in entries: | ||||
| spec = entry.get('BUNDLESPEC') | spec = entry.get('BUNDLESPEC') | ||||
| if spec: | if spec: | ||||
| try: | try: | ||||
| comp, version, params = parsebundlespec(repo, spec, strict=True) | bundlespec = parsebundlespec(repo, spec, strict=True) | ||||
| # If a stream clone was requested, filter out non-streamclone | # If a stream clone was requested, filter out non-streamclone | ||||
| # entries. | # entries. | ||||
| comp = bundlespec.compression | |||||
| version = bundlespec.version | |||||
| if streamclonerequested and (comp != 'UN' or version != 's1'): | if streamclonerequested and (comp != 'UN' or version != 's1'): | ||||
| repo.ui.debug('filtering %s because not a stream clone\n' % | repo.ui.debug('filtering %s because not a stream clone\n' % | ||||
| entry['URL']) | entry['URL']) | ||||
| continue | continue | ||||
| except error.InvalidBundleSpecification as e: | except error.InvalidBundleSpecification as e: | ||||
| repo.ui.debug(str(e) + '\n') | repo.ui.debug(str(e) + '\n') | ||||
| continue | continue | ||||