| indygreg |
| hg-reviewers |
We add them to WORKING_DIR_REQUIREMENTS too as they should be stored in
.hg/requires and have information about the type of working copy.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hg.py (4 lines) | |||
| M | mercurial/localrepo.py (20 lines) | |||
| M | mercurial/requirements.py (18 lines) | |||
| M | mercurial/upgrade.py (2 lines) |
| # not pointed to by changesets, thus causing verify to | # not pointed to by changesets, thus causing verify to | ||||
| # fail | # fail | ||||
| destlock = copystore(ui, repo, repo.path) | destlock = copystore(ui, repo, repo.path) | ||||
| with destlock or util.nullcontextmanager(): | with destlock or util.nullcontextmanager(): | ||||
| sharefile = repo.vfs.join(b'sharedpath') | sharefile = repo.vfs.join(b'sharedpath') | ||||
| util.rename(sharefile, sharefile + b'.old') | util.rename(sharefile, sharefile + b'.old') | ||||
| repo.requirements.discard(b'shared') | repo.requirements.discard(requirements.SHARED_REQUIREMENT) | ||||
| repo.requirements.discard(b'relshared') | repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT) | ||||
| scmutil.writereporequirements(repo) | scmutil.writereporequirements(repo) | ||||
| # Removing share changes some fundamental properties of the repo instance. | # Removing share changes some fundamental properties of the repo instance. | ||||
| # So we instantiate a new repo object and operate on it rather than | # So we instantiate a new repo object and operate on it rather than | ||||
| # try to keep the existing repo usable. | # try to keep the existing repo usable. | ||||
| newrepo = repository(repo.baseui, repo.root, create=False) | newrepo = repository(repo.baseui, repo.root, create=False) | ||||
| # TODO: figure out how to access subrepos that exist, but were previously | # TODO: figure out how to access subrepos that exist, but were previously | ||||
| hgvfs is vfs pointing at .hg/ of current repo (shared one) | hgvfs is vfs pointing at .hg/ of current repo (shared one) | ||||
| requirements is a set of requirements of current repo (shared one) | requirements is a set of requirements of current repo (shared one) | ||||
| """ | """ | ||||
| # The ``shared`` or ``relshared`` requirements indicate the | # The ``shared`` or ``relshared`` requirements indicate the | ||||
| # store lives in the path contained in the ``.hg/sharedpath`` file. | # store lives in the path contained in the ``.hg/sharedpath`` file. | ||||
| # This is an absolute path for ``shared`` and relative to | # This is an absolute path for ``shared`` and relative to | ||||
| # ``.hg/`` for ``relshared``. | # ``.hg/`` for ``relshared``. | ||||
| sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | ||||
| if b'relshared' in requirements: | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: | ||||
| sharedpath = hgvfs.join(sharedpath) | sharedpath = hgvfs.join(sharedpath) | ||||
| sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | ||||
| if not sharedvfs.exists(): | if not sharedvfs.exists(): | ||||
| raise error.RepoError( | raise error.RepoError( | ||||
| _(b'.hg/sharedpath points to nonexistent directory %s') | _(b'.hg/sharedpath points to nonexistent directory %s') | ||||
| % sharedvfs.base | % sharedvfs.base | ||||
| # Now get on with doing that. | # Now get on with doing that. | ||||
| features = set() | features = set() | ||||
| # The "store" part of the repository holds versioned data. How it is | # The "store" part of the repository holds versioned data. How it is | ||||
| # accessed is determined by various requirements. If `shared` or | # accessed is determined by various requirements. If `shared` or | ||||
| # `relshared` requirements are present, this indicates current repository | # `relshared` requirements are present, this indicates current repository | ||||
| # is a share and store exists in path mentioned in `.hg/sharedpath` | # is a share and store exists in path mentioned in `.hg/sharedpath` | ||||
| shared = b'shared' in requirements or b'relshared' in requirements | shared = ( | ||||
| requirementsmod.SHARED_REQUIREMENT in requirements | |||||
| or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |||||
| ) | |||||
| if shared: | if shared: | ||||
| sharedvfs = _getsharedvfs(hgvfs, requirements) | sharedvfs = _getsharedvfs(hgvfs, requirements) | ||||
| storebasepath = sharedvfs.base | storebasepath = sharedvfs.base | ||||
| cachepath = sharedvfs.join(b'cache') | cachepath = sharedvfs.join(b'cache') | ||||
| features.add(repository.REPO_FEATURE_SHARED_STORAGE) | features.add(repository.REPO_FEATURE_SHARED_STORAGE) | ||||
| else: | else: | ||||
| storebasepath = hgvfs.base | storebasepath = hgvfs.base | ||||
| cachepath = hgvfs.join(b'cache') | cachepath = hgvfs.join(b'cache') | ||||
| requirementsmod.SIDEDATA_REQUIREMENT, | requirementsmod.SIDEDATA_REQUIREMENT, | ||||
| requirementsmod.SPARSEREVLOG_REQUIREMENT, | requirementsmod.SPARSEREVLOG_REQUIREMENT, | ||||
| requirementsmod.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', | requirementsmod.SHARED_REQUIREMENT, | ||||
| b'relshared', | requirementsmod.RELATIVE_SHARED_REQUIREMENT, | ||||
| b'dotencode', | b'dotencode', | ||||
| requirementsmod.SPARSE_REQUIREMENT, | requirementsmod.SPARSE_REQUIREMENT, | ||||
| requirementsmod.INTERNAL_PHASE_REQUIREMENT, | requirementsmod.INTERNAL_PHASE_REQUIREMENT, | ||||
| } | } | ||||
| # list of prefix for file which can be written without 'wlock' | # list of prefix for file which can be written without 'wlock' | ||||
| # Extensions should extend this list when needed | # Extensions should extend this list when needed | ||||
| _wlockfreeprefix = { | _wlockfreeprefix = { | ||||
| Extensions can wrap this function to specify custom requirements for | Extensions can wrap this function to specify custom requirements for | ||||
| new repositories. | new repositories. | ||||
| """ | """ | ||||
| # If the repo is being created from a shared repository, we copy | # If the repo is being created from a shared repository, we copy | ||||
| # its requirements. | # its requirements. | ||||
| if b'sharedrepo' in createopts: | if b'sharedrepo' in createopts: | ||||
| requirements = set(createopts[b'sharedrepo'].requirements) | requirements = set(createopts[b'sharedrepo'].requirements) | ||||
| if createopts.get(b'sharedrelative'): | if createopts.get(b'sharedrelative'): | ||||
| requirements.add(b'relshared') | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) | ||||
| else: | else: | ||||
| requirements.add(b'shared') | requirements.add(requirementsmod.SHARED_REQUIREMENT) | ||||
| return requirements | return requirements | ||||
| if b'backend' not in createopts: | if b'backend' not in createopts: | ||||
| raise error.ProgrammingError( | raise error.ProgrammingError( | ||||
| b'backend key not present in createopts; ' | b'backend key not present in createopts; ' | ||||
| b'was defaultcreateopts() called?' | b'was defaultcreateopts() called?' | ||||
| ) | ) | ||||
| _( | _( | ||||
| b'ignoring enabled \'format.bookmarks-in-store\' config ' | b'ignoring enabled \'format.bookmarks-in-store\' config ' | ||||
| b'beacuse it is incompatible with disabled ' | b'beacuse it is incompatible with disabled ' | ||||
| b'\'format.usestore\' config\n' | b'\'format.usestore\' config\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | ||||
| if b'shared' in requirements or b'relshared' in requirements: | if ( | ||||
| requirementsmod.SHARED_REQUIREMENT in requirements | |||||
| or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |||||
| ): | |||||
| raise error.Abort( | raise error.Abort( | ||||
| _( | _( | ||||
| b"cannot create shared repository as source was created" | b"cannot create shared repository as source was created" | ||||
| b" with 'format.usestore' config disabled" | b" with 'format.usestore' config disabled" | ||||
| ) | ) | ||||
| ) | ) | ||||
| return dropped | return dropped | ||||
| # A repository with the the copies-sidedata-changeset requirement will store | # A repository with the the copies-sidedata-changeset requirement will store | ||||
| # copies related information in changeset's sidedata. | # copies related information in changeset's sidedata. | ||||
| COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' | ||||
| # The repository use persistent nodemap for the changelog and the manifest. | # The repository use persistent nodemap for the changelog and the manifest. | ||||
| NODEMAP_REQUIREMENT = b'persistent-nodemap' | NODEMAP_REQUIREMENT = b'persistent-nodemap' | ||||
| # Denotes that the current repository is a share | |||||
| SHARED_REQUIREMENT = b'shared' | |||||
| # Denotes that current repository is a share and the shared source path is | |||||
| # relative to the current repository root path | |||||
| RELATIVE_SHARED_REQUIREMENT = b'relshared' | |||||
| # List of requirements which are working directory specific | # List of requirements which are working directory specific | ||||
| # These requirements cannot be shared between repositories if they | # These requirements cannot be shared between repositories if they | ||||
| # share the same store | # share the same store | ||||
| WORKING_DIR_REQUIREMENTS = {SPARSE_REQUIREMENT} | # * sparse is a working directory specific functionality and hence working | ||||
| # directory specific requirement | |||||
| # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which | |||||
| # represents that the current working copy/repository shares store of another | |||||
| # repo. Hence both of them should be stored in working copy | |||||
| WORKING_DIR_REQUIREMENTS = { | |||||
| SPARSE_REQUIREMENT, | |||||
| SHARED_REQUIREMENT, | |||||
| RELATIVE_SHARED_REQUIREMENT, | |||||
| } | |||||
| return { | return { | ||||
| # The upgrade code does not yet support these experimental features. | # The upgrade code does not yet support these experimental features. | ||||
| # This is an artificial limitation. | # This is an artificial limitation. | ||||
| requirements.TREEMANIFEST_REQUIREMENT, | requirements.TREEMANIFEST_REQUIREMENT, | ||||
| # This was a precursor to generaldelta and was never enabled by default. | # This was a precursor to generaldelta and was never enabled by default. | ||||
| # It should (hopefully) not exist in the wild. | # It should (hopefully) not exist in the wild. | ||||
| b'parentdelta', | b'parentdelta', | ||||
| # Upgrade should operate on the actual store, not the shared link. | # Upgrade should operate on the actual store, not the shared link. | ||||
| b'shared', | requirements.SHARED_REQUIREMENT, | ||||
| } | } | ||||
| 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 | ||||