[Request] [+-- ] D8909: localrepo: refactor logic to calculate sharedvfs in separate fn
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Aug 7 12:45:04 UTC 2020
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
We will be reusing this in an upcoming patch, so better to refactor it into a
separate function. Also the underlying handling deserves a function of it's own.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8909
AFFECTED FILES
mercurial/localrepo.py
CHANGE DETAILS
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -459,6 +459,31 @@
featuresetupfuncs = set()
+def _getsharedvfs(hgvfs, requirements):
+ """ returns the vfs object pointing to root of shared source
+ repo for a shared repository
+
+ hgvfs is vfs pointing at .hg/ of current repo (shared one)
+ requirements is a set of requirements of current repo (shared one)
+ """
+ # The ``shared`` or ``relshared`` requirements indicate the
+ # store lives in the path contained in the ``.hg/sharedpath`` file.
+ # This is an absolute path for ``shared`` and relative to
+ # ``.hg/`` for ``relshared``.
+ 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
+ )
+ return sharedvfs
+
+
def makelocalrepository(baseui, path, intents=None):
"""Create a local repository object.
@@ -500,6 +525,10 @@
# Main VFS for .hg/ directory.
hgpath = wdirvfs.join(b'.hg')
hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
+ # Whether this repository is shared one or not
+ shared = False
+ # If this repository is shared, vfs pointing to shared repo
+ sharedvfs = None
# The .hg/ path should exist and should be a directory. All other
# cases are errors.
@@ -567,27 +596,15 @@
features = set()
# The "store" part of the repository holds versioned data. How it is
- # accessed is determined by various requirements. The ``shared`` or
- # ``relshared`` requirements indicate the store lives in the path contained
- # in the ``.hg/sharedpath`` file. This is an absolute path for
- # ``shared`` and relative to ``.hg/`` for ``relshared``.
- if b'shared' in requirements or b'relshared' in requirements:
- 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)
-
+ # accessed is determined by various requirements. If `shared` or
+ # `relshared` requirements are present, this indicates current repository
+ # is a share and store exists in path mentioned in `.hg/sharedpath`
+ shared = b'shared' in requirements or b'relshared' in requirements
+ if shared:
+ sharedvfs = _getsharedvfs(hgvfs, requirements)
storebasepath = sharedvfs.base
cachepath = sharedvfs.join(b'cache')
+ features.add(repository.REPO_FEATURE_SHARED_STORAGE)
else:
storebasepath = hgvfs.base
cachepath = hgvfs.join(b'cache')
To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200807/e16caa56/attachment-0001.html>
More information about the Mercurial-patches
mailing list