| indygreg |
| hg-reviewers |
We now have a dedicated module for requirements constant, let's move the ones in
localrepo there.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (63 lines) | |||
| M | mercurial/requirements.py (24 lines) | |||
| M | mercurial/upgrade.py (40 lines) | |||
| M | tests/testlib/ext-sidedata.py (4 lines) |
| outgoing = discovery.outgoing( | outgoing = discovery.outgoing( | ||||
| self._repo, missingroots=bases, ancestorsof=heads | self._repo, missingroots=bases, ancestorsof=heads | ||||
| ) | ) | ||||
| return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | ||||
| # End of baselegacywirecommands interface. | # End of baselegacywirecommands interface. | ||||
| # Increment the sub-version when the revlog v2 format changes to lock out old | |||||
| # clients. | |||||
| REVLOGV2_REQUIREMENT = b'exp-revlogv2.1' | |||||
| # A repository with the sparserevlog feature will have delta chains that | |||||
| # can spread over a larger span. Sparse reading cuts these large spans into | |||||
| # pieces, so that each piece isn't too big. | |||||
| # Without the sparserevlog capability, reading from the repository could use | |||||
| # huge amounts of memory, because the whole span would be read at once, | |||||
| # including all the intermediate revisions that aren't pertinent for the chain. | |||||
| # This is why once a repository has enabled sparse-read, it becomes required. | |||||
| SPARSEREVLOG_REQUIREMENT = b'sparserevlog' | |||||
| # A repository with the sidedataflag requirement will allow to store extra | |||||
| # information for revision without altering their original hashes. | |||||
| SIDEDATA_REQUIREMENT = b'exp-sidedata-flag' | |||||
| # A repository with the the copies-sidedata-changeset requirement will store | |||||
| # copies related information in changeset's sidedata. | |||||
| COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' | |||||
| # The repository use persistent nodemap for the changelog and the manifest. | |||||
| NODEMAP_REQUIREMENT = b'persistent-nodemap' | |||||
| # Functions receiving (ui, features) that extensions can register to impact | # Functions receiving (ui, features) that extensions can register to impact | ||||
| # the ability to load repositories with custom requirements. Only | # the ability to load repositories with custom requirements. Only | ||||
| # functions defined in loaded extensions are called. | # functions defined in loaded extensions are called. | ||||
| # | # | ||||
| # The function receives a set of requirement strings that the repository | # The function receives a set of requirement strings that the repository | ||||
| # is capable of opening. Functions will typically add elements to the | # is capable of opening. Functions will typically add elements to the | ||||
| # set to reflect that the extension knows how to handle that requirements. | # set to reflect that the extension knows how to handle that requirements. | ||||
| featuresetupfuncs = set() | featuresetupfuncs = set() | ||||
| if manifestcachesize is not None: | if manifestcachesize is not None: | ||||
| options[b'manifestcachesize'] = manifestcachesize | options[b'manifestcachesize'] = manifestcachesize | ||||
| # In the absence of another requirement superseding a revlog-related | # In the absence of another requirement superseding a revlog-related | ||||
| # requirement, we have to assume the repo is using revlog version 0. | # requirement, we have to assume the repo is using revlog version 0. | ||||
| # This revlog format is super old and we don't bother trying to parse | # This revlog format is super old and we don't bother trying to parse | ||||
| # opener options for it because those options wouldn't do anything | # opener options for it because those options wouldn't do anything | ||||
| # meaningful on such old repos. | # meaningful on such old repos. | ||||
| if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements: | if ( | ||||
| b'revlogv1' in requirements | |||||
| or requirementsmod.REVLOGV2_REQUIREMENT in requirements | |||||
| ): | |||||
| options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | ||||
| else: # explicitly mark repo as using revlogv0 | else: # explicitly mark repo as using revlogv0 | ||||
| options[b'revlogv0'] = True | options[b'revlogv0'] = True | ||||
| if COPIESSDC_REQUIREMENT in requirements: | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: | ||||
| options[b'copies-storage'] = b'changeset-sidedata' | options[b'copies-storage'] = b'changeset-sidedata' | ||||
| else: | else: | ||||
| writecopiesto = ui.config(b'experimental', b'copies.write-to') | writecopiesto = ui.config(b'experimental', b'copies.write-to') | ||||
| copiesextramode = (b'changeset-only', b'compatibility') | copiesextramode = (b'changeset-only', b'compatibility') | ||||
| if writecopiesto in copiesextramode: | if writecopiesto in copiesextramode: | ||||
| options[b'copies-storage'] = b'extra' | options[b'copies-storage'] = b'extra' | ||||
| return options | return options | ||||
| def resolverevlogstorevfsoptions(ui, requirements, features): | def resolverevlogstorevfsoptions(ui, requirements, features): | ||||
| """Resolve opener options specific to revlogs.""" | """Resolve opener options specific to revlogs.""" | ||||
| options = {} | options = {} | ||||
| options[b'flagprocessors'] = {} | options[b'flagprocessors'] = {} | ||||
| if b'revlogv1' in requirements: | if b'revlogv1' in requirements: | ||||
| options[b'revlogv1'] = True | options[b'revlogv1'] = True | ||||
| if REVLOGV2_REQUIREMENT in requirements: | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: | ||||
| options[b'revlogv2'] = True | options[b'revlogv2'] = True | ||||
| if b'generaldelta' in requirements: | if b'generaldelta' in requirements: | ||||
| options[b'generaldelta'] = True | options[b'generaldelta'] = True | ||||
| # experimental config: format.chunkcachesize | # experimental config: format.chunkcachesize | ||||
| chunkcachesize = ui.configint(b'format', b'chunkcachesize') | chunkcachesize = ui.configint(b'format', b'chunkcachesize') | ||||
| if chunkcachesize is not None: | if chunkcachesize is not None: | ||||
| srdensitythres = float( | srdensitythres = float( | ||||
| ui.config(b'experimental', b'sparse-read.density-threshold') | ui.config(b'experimental', b'sparse-read.density-threshold') | ||||
| ) | ) | ||||
| srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') | ||||
| options[b'with-sparse-read'] = withsparseread | options[b'with-sparse-read'] = withsparseread | ||||
| options[b'sparse-read-density-threshold'] = srdensitythres | options[b'sparse-read-density-threshold'] = srdensitythres | ||||
| options[b'sparse-read-min-gap-size'] = srmingapsize | options[b'sparse-read-min-gap-size'] = srmingapsize | ||||
| sparserevlog = SPARSEREVLOG_REQUIREMENT in requirements | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements | ||||
| options[b'sparse-revlog'] = sparserevlog | options[b'sparse-revlog'] = sparserevlog | ||||
| if sparserevlog: | if sparserevlog: | ||||
| options[b'generaldelta'] = True | options[b'generaldelta'] = True | ||||
| sidedata = SIDEDATA_REQUIREMENT in requirements | sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements | ||||
| options[b'side-data'] = sidedata | options[b'side-data'] = sidedata | ||||
| maxchainlen = None | maxchainlen = None | ||||
| if sparserevlog: | if sparserevlog: | ||||
| maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | ||||
| # experimental config: format.maxchainlen | # experimental config: format.maxchainlen | ||||
| maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) | ||||
| if maxchainlen is not None: | if maxchainlen is not None: | ||||
| msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') | ||||
| raise error.Abort(msg % options[b'zstd.level']) | raise error.Abort(msg % options[b'zstd.level']) | ||||
| if requirementsmod.NARROW_REQUIREMENT in requirements: | if requirementsmod.NARROW_REQUIREMENT in requirements: | ||||
| options[b'enableellipsis'] = True | options[b'enableellipsis'] = True | ||||
| if ui.configbool(b'experimental', b'rust.index'): | if ui.configbool(b'experimental', b'rust.index'): | ||||
| options[b'rust.index'] = True | options[b'rust.index'] = True | ||||
| if NODEMAP_REQUIREMENT in requirements: | if requirementsmod.NODEMAP_REQUIREMENT in requirements: | ||||
| options[b'persistent-nodemap'] = True | options[b'persistent-nodemap'] = True | ||||
| if ui.configbool(b'storage', b'revlog.nodemap.mmap'): | if ui.configbool(b'storage', b'revlog.nodemap.mmap'): | ||||
| options[b'persistent-nodemap.mmap'] = True | options[b'persistent-nodemap.mmap'] = True | ||||
| epnm = ui.config(b'storage', b'revlog.nodemap.mode') | epnm = ui.config(b'storage', b'revlog.nodemap.mode') | ||||
| options[b'persistent-nodemap.mode'] = epnm | options[b'persistent-nodemap.mode'] = epnm | ||||
| if ui.configbool(b'devel', b'persistent-nodemap'): | if ui.configbool(b'devel', b'persistent-nodemap'): | ||||
| options[b'devel-force-nodemap'] = True | options[b'devel-force-nodemap'] = True | ||||
| # - manifestv2: An experimental new manifest format that allowed | # - manifestv2: An experimental new manifest format that allowed | ||||
| # for stem compression of long paths. Experiment ended up not | # for stem compression of long paths. Experiment ended up not | ||||
| # being successful (repository sizes went up due to worse delta | # being successful (repository sizes went up due to worse delta | ||||
| # chains), and the code was deleted in 4.6. | # chains), and the code was deleted in 4.6. | ||||
| supportedformats = { | supportedformats = { | ||||
| b'revlogv1', | b'revlogv1', | ||||
| b'generaldelta', | b'generaldelta', | ||||
| requirementsmod.TREEMANIFEST_REQUIREMENT, | requirementsmod.TREEMANIFEST_REQUIREMENT, | ||||
| COPIESSDC_REQUIREMENT, | requirementsmod.COPIESSDC_REQUIREMENT, | ||||
| REVLOGV2_REQUIREMENT, | requirementsmod.REVLOGV2_REQUIREMENT, | ||||
| SIDEDATA_REQUIREMENT, | requirementsmod.SIDEDATA_REQUIREMENT, | ||||
| SPARSEREVLOG_REQUIREMENT, | requirementsmod.SPARSEREVLOG_REQUIREMENT, | ||||
| NODEMAP_REQUIREMENT, | requirementsmod.NODEMAP_REQUIREMENT, | ||||
| bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, | ||||
| } | } | ||||
| _basesupported = supportedformats | { | _basesupported = supportedformats | { | ||||
| b'store', | b'store', | ||||
| b'fncache', | b'fncache', | ||||
| b'shared', | b'shared', | ||||
| b'relshared', | b'relshared', | ||||
| b'dotencode', | b'dotencode', | ||||
| # Key to signature value. | # Key to signature value. | ||||
| self._sparsesignaturecache = {} | self._sparsesignaturecache = {} | ||||
| # Signature to cached matcher instance. | # Signature to cached matcher instance. | ||||
| self._sparsematchercache = {} | self._sparsematchercache = {} | ||||
| self._extrafilterid = repoview.extrafilter(ui) | self._extrafilterid = repoview.extrafilter(ui) | ||||
| self.filecopiesmode = None | self.filecopiesmode = None | ||||
| if COPIESSDC_REQUIREMENT in self.requirements: | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: | ||||
| self.filecopiesmode = b'changeset-sidedata' | self.filecopiesmode = b'changeset-sidedata' | ||||
| def _getvfsward(self, origfunc): | def _getvfsward(self, origfunc): | ||||
| """build a ward for self.vfs""" | """build a ward for self.vfs""" | ||||
| rref = weakref.ref(self) | rref = weakref.ref(self) | ||||
| def checkvfs(path, mode=None): | def checkvfs(path, mode=None): | ||||
| ret = origfunc(path, mode=mode) | ret = origfunc(path, mode=mode) | ||||
| if compengine == b'zstd': | if compengine == b'zstd': | ||||
| requirements.add(b'revlog-compression-zstd') | requirements.add(b'revlog-compression-zstd') | ||||
| elif compengine != b'zlib': | elif compengine != b'zlib': | ||||
| requirements.add(b'exp-compression-%s' % compengine) | requirements.add(b'exp-compression-%s' % compengine) | ||||
| if scmutil.gdinitconfig(ui): | if scmutil.gdinitconfig(ui): | ||||
| requirements.add(b'generaldelta') | requirements.add(b'generaldelta') | ||||
| if ui.configbool(b'format', b'sparse-revlog'): | if ui.configbool(b'format', b'sparse-revlog'): | ||||
| requirements.add(SPARSEREVLOG_REQUIREMENT) | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) | ||||
| # experimental config: format.exp-use-side-data | # experimental config: format.exp-use-side-data | ||||
| if ui.configbool(b'format', b'exp-use-side-data'): | if ui.configbool(b'format', b'exp-use-side-data'): | ||||
| requirements.add(SIDEDATA_REQUIREMENT) | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) | ||||
| # experimental config: format.exp-use-copies-side-data-changeset | # experimental config: format.exp-use-copies-side-data-changeset | ||||
| if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | ||||
| requirements.add(SIDEDATA_REQUIREMENT) | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) | ||||
| requirements.add(COPIESSDC_REQUIREMENT) | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) | ||||
| if ui.configbool(b'experimental', b'treemanifest'): | if ui.configbool(b'experimental', b'treemanifest'): | ||||
| requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) | ||||
| revlogv2 = ui.config(b'experimental', b'revlogv2') | revlogv2 = ui.config(b'experimental', b'revlogv2') | ||||
| if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': | ||||
| requirements.remove(b'revlogv1') | requirements.remove(b'revlogv1') | ||||
| # generaldelta is implied by revlogv2. | # generaldelta is implied by revlogv2. | ||||
| requirements.discard(b'generaldelta') | requirements.discard(b'generaldelta') | ||||
| requirements.add(REVLOGV2_REQUIREMENT) | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) | ||||
| # experimental config: format.internal-phase | # experimental config: format.internal-phase | ||||
| if ui.configbool(b'format', b'internal-phase'): | if ui.configbool(b'format', b'internal-phase'): | ||||
| requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) | ||||
| if createopts.get(b'narrowfiles'): | if createopts.get(b'narrowfiles'): | ||||
| requirements.add(requirementsmod.NARROW_REQUIREMENT) | requirements.add(requirementsmod.NARROW_REQUIREMENT) | ||||
| if createopts.get(b'lfs'): | if createopts.get(b'lfs'): | ||||
| requirements.add(b'lfs') | requirements.add(b'lfs') | ||||
| if ui.configbool(b'format', b'bookmarks-in-store'): | if ui.configbool(b'format', b'bookmarks-in-store'): | ||||
| requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | ||||
| if ui.configbool(b'format', b'use-persistent-nodemap'): | if ui.configbool(b'format', b'use-persistent-nodemap'): | ||||
| requirements.add(NODEMAP_REQUIREMENT) | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) | ||||
| return requirements | return requirements | ||||
| def checkrequirementscompat(ui, requirements): | def checkrequirementscompat(ui, requirements): | ||||
| """ Checks compatibility of repository requirements enabled and disabled. | """ Checks compatibility of repository requirements enabled and disabled. | ||||
| Returns a set of requirements which needs to be dropped because dependend | Returns a set of requirements which needs to be dropped because dependend | ||||
| SPARSE_REQUIREMENT = b'exp-sparse' | SPARSE_REQUIREMENT = b'exp-sparse' | ||||
| # Enables the internal phase which is used to hide changesets instead | # Enables the internal phase which is used to hide changesets instead | ||||
| # of stripping them | # of stripping them | ||||
| INTERNAL_PHASE_REQUIREMENT = b'internal-phase' | INTERNAL_PHASE_REQUIREMENT = b'internal-phase' | ||||
| # Stores manifest in Tree structure | # Stores manifest in Tree structure | ||||
| TREEMANIFEST_REQUIREMENT = b'treemanifest' | TREEMANIFEST_REQUIREMENT = b'treemanifest' | ||||
| # Increment the sub-version when the revlog v2 format changes to lock out old | |||||
| # clients. | |||||
| REVLOGV2_REQUIREMENT = b'exp-revlogv2.1' | |||||
| # A repository with the sparserevlog feature will have delta chains that | |||||
| # can spread over a larger span. Sparse reading cuts these large spans into | |||||
| # pieces, so that each piece isn't too big. | |||||
| # Without the sparserevlog capability, reading from the repository could use | |||||
| # huge amounts of memory, because the whole span would be read at once, | |||||
| # including all the intermediate revisions that aren't pertinent for the chain. | |||||
| # This is why once a repository has enabled sparse-read, it becomes required. | |||||
| SPARSEREVLOG_REQUIREMENT = b'sparserevlog' | |||||
| # A repository with the sidedataflag requirement will allow to store extra | |||||
| # information for revision without altering their original hashes. | |||||
| SIDEDATA_REQUIREMENT = b'exp-sidedata-flag' | |||||
| # A repository with the the copies-sidedata-changeset requirement will store | |||||
| # copies related information in changeset's sidedata. | |||||
| COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' | |||||
| # The repository use persistent nodemap for the changelog and the manifest. | |||||
| NODEMAP_REQUIREMENT = b'persistent-nodemap' | |||||
| vfs as vfsmod, | vfs as vfsmod, | ||||
| ) | ) | ||||
| from .utils import compression | from .utils import compression | ||||
| # list of requirements that request a clone of all revlog if added/removed | # list of requirements that request a clone of all revlog if added/removed | ||||
| RECLONES_REQUIREMENTS = { | RECLONES_REQUIREMENTS = { | ||||
| b'generaldelta', | b'generaldelta', | ||||
| localrepo.SPARSEREVLOG_REQUIREMENT, | requirements.SPARSEREVLOG_REQUIREMENT, | ||||
| } | } | ||||
| def requiredsourcerequirements(repo): | def requiredsourcerequirements(repo): | ||||
| """Obtain requirements required to be present to upgrade a repo. | """Obtain requirements required to be present to upgrade a repo. | ||||
| An upgrade will not be allowed if the repository doesn't have the | An upgrade will not be allowed if the repository doesn't have the | ||||
| requirements returned by this function. | requirements returned by this function. | ||||
| def supportremovedrequirements(repo): | def supportremovedrequirements(repo): | ||||
| """Obtain requirements that can be removed during an upgrade. | """Obtain requirements that can be removed during an upgrade. | ||||
| If an upgrade were to create a repository that dropped a requirement, | If an upgrade were to create a repository that dropped a requirement, | ||||
| the dropped requirement must appear in the returned set for the upgrade | the dropped requirement must appear in the returned set for the upgrade | ||||
| to be allowed. | to be allowed. | ||||
| """ | """ | ||||
| supported = { | supported = { | ||||
| localrepo.SPARSEREVLOG_REQUIREMENT, | requirements.SPARSEREVLOG_REQUIREMENT, | ||||
| localrepo.SIDEDATA_REQUIREMENT, | requirements.SIDEDATA_REQUIREMENT, | ||||
| localrepo.COPIESSDC_REQUIREMENT, | requirements.COPIESSDC_REQUIREMENT, | ||||
| localrepo.NODEMAP_REQUIREMENT, | requirements.NODEMAP_REQUIREMENT, | ||||
| } | } | ||||
| for name in compression.compengines: | for name in compression.compengines: | ||||
| engine = compression.compengines[name] | engine = compression.compengines[name] | ||||
| if engine.available() and engine.revlogheader(): | if engine.available() and engine.revlogheader(): | ||||
| supported.add(b'exp-compression-%s' % name) | supported.add(b'exp-compression-%s' % name) | ||||
| if engine.name() == b'zstd': | if engine.name() == b'zstd': | ||||
| supported.add(b'revlog-compression-zstd') | supported.add(b'revlog-compression-zstd') | ||||
| return supported | return supported | ||||
| def supporteddestrequirements(repo): | def supporteddestrequirements(repo): | ||||
| """Obtain requirements that upgrade supports in the destination. | """Obtain requirements that upgrade supports in the destination. | ||||
| If the result of the upgrade would create requirements not in this set, | If the result of the upgrade would create requirements not in this set, | ||||
| the upgrade is disallowed. | the upgrade is disallowed. | ||||
| Extensions should monkeypatch this to add their custom requirements. | Extensions should monkeypatch this to add their custom requirements. | ||||
| """ | """ | ||||
| supported = { | supported = { | ||||
| b'dotencode', | b'dotencode', | ||||
| b'fncache', | b'fncache', | ||||
| b'generaldelta', | b'generaldelta', | ||||
| b'revlogv1', | b'revlogv1', | ||||
| b'store', | b'store', | ||||
| localrepo.SPARSEREVLOG_REQUIREMENT, | requirements.SPARSEREVLOG_REQUIREMENT, | ||||
| localrepo.SIDEDATA_REQUIREMENT, | requirements.SIDEDATA_REQUIREMENT, | ||||
| localrepo.COPIESSDC_REQUIREMENT, | requirements.COPIESSDC_REQUIREMENT, | ||||
| localrepo.NODEMAP_REQUIREMENT, | requirements.NODEMAP_REQUIREMENT, | ||||
| } | } | ||||
| for name in compression.compengines: | for name in compression.compengines: | ||||
| engine = compression.compengines[name] | engine = compression.compengines[name] | ||||
| if engine.available() and engine.revlogheader(): | if engine.available() and engine.revlogheader(): | ||||
| supported.add(b'exp-compression-%s' % name) | supported.add(b'exp-compression-%s' % name) | ||||
| if engine.name() == b'zstd': | if engine.name() == b'zstd': | ||||
| supported.add(b'revlog-compression-zstd') | supported.add(b'revlog-compression-zstd') | ||||
| return supported | return supported | ||||
| def allowednewrequirements(repo): | def allowednewrequirements(repo): | ||||
| """Obtain requirements that can be added to a repository during upgrade. | """Obtain requirements that can be added to a repository during upgrade. | ||||
| This is used to disallow proposed requirements from being added when | This is used to disallow proposed requirements from being added when | ||||
| they weren't present before. | they weren't present before. | ||||
| We use a list of allowed requirement additions instead of a list of known | We use a list of allowed requirement additions instead of a list of known | ||||
| bad additions because the whitelist approach is safer and will prevent | bad additions because the whitelist approach is safer and will prevent | ||||
| future, unknown requirements from accidentally being added. | future, unknown requirements from accidentally being added. | ||||
| """ | """ | ||||
| supported = { | supported = { | ||||
| b'dotencode', | b'dotencode', | ||||
| b'fncache', | b'fncache', | ||||
| b'generaldelta', | b'generaldelta', | ||||
| localrepo.SPARSEREVLOG_REQUIREMENT, | requirements.SPARSEREVLOG_REQUIREMENT, | ||||
| localrepo.SIDEDATA_REQUIREMENT, | requirements.SIDEDATA_REQUIREMENT, | ||||
| localrepo.COPIESSDC_REQUIREMENT, | requirements.COPIESSDC_REQUIREMENT, | ||||
| localrepo.NODEMAP_REQUIREMENT, | requirements.NODEMAP_REQUIREMENT, | ||||
| } | } | ||||
| for name in compression.compengines: | for name in compression.compengines: | ||||
| engine = compression.compengines[name] | engine = compression.compengines[name] | ||||
| if engine.available() and engine.revlogheader(): | if engine.available() and engine.revlogheader(): | ||||
| supported.add(b'exp-compression-%s' % name) | supported.add(b'exp-compression-%s' % name) | ||||
| if engine.name() == b'zstd': | if engine.name() == b'zstd': | ||||
| supported.add(b'revlog-compression-zstd') | supported.add(b'revlog-compression-zstd') | ||||
| return supported | return supported | ||||
| b'faster' | b'faster' | ||||
| ) | ) | ||||
| @registerformatvariant | @registerformatvariant | ||||
| class sparserevlog(requirementformatvariant): | class sparserevlog(requirementformatvariant): | ||||
| name = b'sparserevlog' | name = b'sparserevlog' | ||||
| _requirement = localrepo.SPARSEREVLOG_REQUIREMENT | _requirement = requirements.SPARSEREVLOG_REQUIREMENT | ||||
| default = True | default = True | ||||
| description = _( | description = _( | ||||
| b'in order to limit disk reading and memory usage on older ' | b'in order to limit disk reading and memory usage on older ' | ||||
| b'version, the span of a delta chain from its root to its ' | b'version, the span of a delta chain from its root to its ' | ||||
| b'end is limited, whatever the relevant data in this span. ' | b'end is limited, whatever the relevant data in this span. ' | ||||
| b'This can severly limit Mercurial ability to build good ' | b'This can severly limit Mercurial ability to build good ' | ||||
| b'better compression and faster exchange with server.' | b'better compression and faster exchange with server.' | ||||
| ) | ) | ||||
| @registerformatvariant | @registerformatvariant | ||||
| class sidedata(requirementformatvariant): | class sidedata(requirementformatvariant): | ||||
| name = b'sidedata' | name = b'sidedata' | ||||
| _requirement = localrepo.SIDEDATA_REQUIREMENT | _requirement = requirements.SIDEDATA_REQUIREMENT | ||||
| default = False | default = False | ||||
| description = _( | description = _( | ||||
| b'Allows storage of extra data alongside a revision, ' | b'Allows storage of extra data alongside a revision, ' | ||||
| b'unlocking various caching options.' | b'unlocking various caching options.' | ||||
| ) | ) | ||||
| upgrademessage = _(b'Allows storage of extra data alongside a revision.') | upgrademessage = _(b'Allows storage of extra data alongside a revision.') | ||||
| @registerformatvariant | @registerformatvariant | ||||
| class persistentnodemap(requirementformatvariant): | class persistentnodemap(requirementformatvariant): | ||||
| name = b'persistent-nodemap' | name = b'persistent-nodemap' | ||||
| _requirement = localrepo.NODEMAP_REQUIREMENT | _requirement = requirements.NODEMAP_REQUIREMENT | ||||
| default = False | default = False | ||||
| description = _( | description = _( | ||||
| b'persist the node -> rev mapping on disk to speedup lookup' | b'persist the node -> rev mapping on disk to speedup lookup' | ||||
| ) | ) | ||||
| upgrademessage = _(b'Speedup revision lookup by node id.') | upgrademessage = _(b'Speedup revision lookup by node id.') | ||||
| @registerformatvariant | @registerformatvariant | ||||
| class copiessdc(requirementformatvariant): | class copiessdc(requirementformatvariant): | ||||
| name = b'copies-sdc' | name = b'copies-sdc' | ||||
| _requirement = localrepo.COPIESSDC_REQUIREMENT | _requirement = requirements.COPIESSDC_REQUIREMENT | ||||
| default = False | default = False | ||||
| description = _(b'Stores copies information alongside changesets.') | description = _(b'Stores copies information alongside changesets.') | ||||
| upgrademessage = _( | upgrademessage = _( | ||||
| b'Allows to use more efficient algorithm to deal with ' b'copy tracing.' | b'Allows to use more efficient algorithm to deal with ' b'copy tracing.' | ||||
| ) | ) | ||||
| [UPGRADE_CHANGELOG, UPGRADE_MANIFEST, UPGRADE_FILELOG] | [UPGRADE_CHANGELOG, UPGRADE_MANIFEST, UPGRADE_FILELOG] | ||||
| ) | ) | ||||
| def getsidedatacompanion(srcrepo, dstrepo): | def getsidedatacompanion(srcrepo, dstrepo): | ||||
| sidedatacompanion = None | sidedatacompanion = None | ||||
| removedreqs = srcrepo.requirements - dstrepo.requirements | removedreqs = srcrepo.requirements - dstrepo.requirements | ||||
| addedreqs = dstrepo.requirements - srcrepo.requirements | addedreqs = dstrepo.requirements - srcrepo.requirements | ||||
| if localrepo.SIDEDATA_REQUIREMENT in removedreqs: | if requirements.SIDEDATA_REQUIREMENT in removedreqs: | ||||
| def sidedatacompanion(rl, rev): | def sidedatacompanion(rl, rev): | ||||
| rl = getattr(rl, '_revlog', rl) | rl = getattr(rl, '_revlog', rl) | ||||
| if rl.flags(rev) & revlog.REVIDX_SIDEDATA: | if rl.flags(rev) & revlog.REVIDX_SIDEDATA: | ||||
| return True, (), {} | return True, (), {} | ||||
| return False, (), {} | return False, (), {} | ||||
| elif localrepo.COPIESSDC_REQUIREMENT in addedreqs: | elif requirements.COPIESSDC_REQUIREMENT in addedreqs: | ||||
| sidedatacompanion = metadata.getsidedataadder(srcrepo, dstrepo) | sidedatacompanion = metadata.getsidedataadder(srcrepo, dstrepo) | ||||
| elif localrepo.COPIESSDC_REQUIREMENT in removedreqs: | elif requirements.COPIESSDC_REQUIREMENT in removedreqs: | ||||
| sidedatacompanion = metadata.getsidedataremover(srcrepo, dstrepo) | sidedatacompanion = metadata.getsidedataremover(srcrepo, dstrepo) | ||||
| return sidedatacompanion | return sidedatacompanion | ||||
| def matchrevlog(revlogfilter, entry): | def matchrevlog(revlogfilter, entry): | ||||
| """check is a revlog is selected for cloning | """check is a revlog is selected for cloning | ||||
| The store entry is checked against the passed filter""" | The store entry is checked against the passed filter""" | ||||
| # ext-sidedata.py - small extension to test the sidedata logic | # ext-sidedata.py - small extension to test the sidedata logic | ||||
| # | # | ||||
| # Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net) | # Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net) | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import hashlib | import hashlib | ||||
| import struct | import struct | ||||
| from mercurial import ( | from mercurial import ( | ||||
| extensions, | extensions, | ||||
| localrepo, | |||||
| node, | node, | ||||
| requirements, | |||||
| revlog, | revlog, | ||||
| upgrade, | upgrade, | ||||
| ) | ) | ||||
| from mercurial.revlogutils import sidedata | from mercurial.revlogutils import sidedata | ||||
| def wrapaddrevision( | def wrapaddrevision( | ||||
| if got != expected: | if got != expected: | ||||
| raise RuntimeError('sha256 mismatch') | raise RuntimeError('sha256 mismatch') | ||||
| return text | return text | ||||
| def wrapgetsidedatacompanion(orig, srcrepo, dstrepo): | def wrapgetsidedatacompanion(orig, srcrepo, dstrepo): | ||||
| sidedatacompanion = orig(srcrepo, dstrepo) | sidedatacompanion = orig(srcrepo, dstrepo) | ||||
| addedreqs = dstrepo.requirements - srcrepo.requirements | addedreqs = dstrepo.requirements - srcrepo.requirements | ||||
| if localrepo.SIDEDATA_REQUIREMENT in addedreqs: | if requirements.SIDEDATA_REQUIREMENT in addedreqs: | ||||
| assert sidedatacompanion is None # deal with composition later | assert sidedatacompanion is None # deal with composition later | ||||
| def sidedatacompanion(revlog, rev): | def sidedatacompanion(revlog, rev): | ||||
| update = {} | update = {} | ||||
| revlog.sidedatanocheck = True | revlog.sidedatanocheck = True | ||||
| try: | try: | ||||
| text = revlog.revision(rev) | text = revlog.revision(rev) | ||||
| finally: | finally: | ||||