| marmoute |
| hg-reviewers |
This makes code cleaner. I might have done it in previous patch too but now the
cleanup is much easier to understand.
| No Linters Available |
| No Unit Test Coverage |
| # a missing file translates to no requirements. | # a missing file translates to no requirements. | ||||
| try: | try: | ||||
| requirements = set(hgvfs.read(b'requires').splitlines()) | requirements = set(hgvfs.read(b'requires').splitlines()) | ||||
| except IOError as e: | except IOError as e: | ||||
| if e.errno != errno.ENOENT: | if e.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| requirements = set() | requirements = set() | ||||
| # if .hg/requires contains the sharesafe requirement, it means | shared = False | ||||
| # there exists a `.hg/store/requires` too and we should read it | sharedpath = None | ||||
| if SHARESAFE_REQUIREMENT in requirements: | sharedvfs = None | ||||
| if hgvfs.exists(b'sharedpath'): | if b'shared' in requirements or b'relshared' in requirements: | ||||
| # This is a shared repo | shared = True | ||||
| sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | ||||
| if b'relshared' in requirements: | if b'relshared' in requirements: | ||||
| sharedpath = hgvfs.join(sharedpath) | sharedpath = hgvfs.join(sharedpath) | ||||
| storevfs = vfsmod.vfs(vfsmod.vfs(sharedpath).join(b'store')) | |||||
| sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | |||||
| if not sharedvfs.exists(): | |||||
| raise error.RepoError( | |||||
| _(b'.hg/sharedpath points to nonexistent directory %s') | |||||
| % sharedvfs.base | |||||
| ) | |||||
| # if .hg/requires contains the sharesafe requirement, it means | |||||
| # there exists a `.hg/store/requires` too and we should read it | |||||
| if SHARESAFE_REQUIREMENT in requirements: | |||||
| if shared: | |||||
| storevfs = vfsmod.vfs(sharedvfs.join(b'store')) | |||||
| else: | else: | ||||
| storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) | ||||
| try: | try: | ||||
| store_requirements = set(storevfs.read(b'requires').splitlines()) | store_requirements = set(storevfs.read(b'requires').splitlines()) | ||||
| requirements |= store_requirements | requirements |= store_requirements | ||||
| except IOError as e: | except IOError as e: | ||||
| if e.errno != errno.ENOENT: | if e.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| 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. The ``shared`` or | # accessed is determined by various requirements. The ``shared`` or | ||||
| # ``relshared`` requirements indicate the store lives in the path contained | # ``relshared`` requirements indicate the store lives in the path contained | ||||
| # in the ``.hg/sharedpath`` file. This is an absolute path for | # in the ``.hg/sharedpath`` file. This is an absolute path for | ||||
| # ``shared`` and relative to ``.hg/`` for ``relshared``. | # ``shared`` and relative to ``.hg/`` for ``relshared``. | ||||
| if b'shared' in requirements or b'relshared' in requirements: | if shared: | ||||
| sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | |||||
| if b'relshared' in requirements: | |||||
| sharedpath = hgvfs.join(sharedpath) | |||||
| sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | |||||
| if not sharedvfs.exists(): | |||||
| raise error.RepoError( | |||||
| _(b'.hg/sharedpath points to nonexistent directory %s') | |||||
| % sharedvfs.base | |||||
| ) | |||||
| features.add(repository.REPO_FEATURE_SHARED_STORAGE) | features.add(repository.REPO_FEATURE_SHARED_STORAGE) | ||||
| storebasepath = sharedvfs.base | storebasepath = sharedvfs.base | ||||
| cachepath = sharedvfs.join(b'cache') | cachepath = sharedvfs.join(b'cache') | ||||
| else: | else: | ||||
| storebasepath = hgvfs.base | storebasepath = hgvfs.base | ||||
| cachepath = hgvfs.join(b'cache') | cachepath = hgvfs.join(b'cache') | ||||
| wcachepath = hgvfs.join(b'wcache') | wcachepath = hgvfs.join(b'wcache') | ||||
| # The store has changed over time and the exact layout is dictated by | # The store has changed over time and the exact layout is dictated by | ||||