[Updated] D8633: share: introduce config option to store requires in .hg/store
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Aug 7 12:52:29 UTC 2020
pulkit marked 4 inline comments as done.
pulkit updated this revision to Diff 22328.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8633?vs=22171&id=22328
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8633/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8633
AFFECTED FILES
mercurial/configitems.py
mercurial/localrepo.py
mercurial/scmutil.py
mercurial/store.py
tests/test-journal-share.t
tests/test-narrow-share.t
tests/test-remotefilelog-share.t
tests/test-share-bookmarks.t
tests/test-share-safe.t
tests/test-share.t
CHANGE DETAILS
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -1,3 +1,10 @@
+#testcases safe normal
+
+#if safe
+ $ echo "[format]" >> $HGRCPATH
+ $ echo "exp-share-safe = True" >> $HGRCPATH
+#endif
+
$ echo "[extensions]" >> $HGRCPATH
$ echo "share = " >> $HGRCPATH
@@ -255,6 +262,7 @@
Test sharing a repository which was created with store requirement disable
$ hg init nostore --config format.usestore=false
+ ignoring enabled 'format.exp-share-safe' config because it is incompatible with disabled 'format.usestore' config (safe !)
$ hg share nostore sharednostore
abort: cannot create shared repository as source was created with 'format.usestore' config disabled
[255]
diff --git a/tests/test-share-safe.t b/tests/test-share-safe.t
new file mode 100644
--- /dev/null
+++ b/tests/test-share-safe.t
@@ -0,0 +1,69 @@
+setup
+
+ $ cat >> $HGRCPATH <<EOF
+ > [extensions]
+ > share =
+ > [format]
+ > exp-share-safe = True
+ > EOF
+
+prepare source repo
+
+ $ hg init source
+ $ cd source
+ $ cat .hg/requires
+ exp-sharesafe
+ $ cat .hg/store/requires
+ dotencode
+ fncache
+ generaldelta
+ revlogv1
+ sparserevlog
+ store
+ $ hg debugrequirements
+ dotencode
+ exp-sharesafe
+ fncache
+ generaldelta
+ revlogv1
+ sparserevlog
+ store
+
+ $ echo a > a
+ $ hg ci -Aqm "added a"
+ $ echo b > b
+ $ hg ci -Aqm "added b"
+ $ cd ..
+
+Create a shared repo and check the requirements are shared and read correctly
+ $ hg share source shared1
+ updating working directory
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cd shared1
+ $ cat .hg/requires
+ exp-sharesafe
+ shared
+
+ $ hg debugrequirements -R ../source
+ dotencode
+ exp-sharesafe
+ fncache
+ generaldelta
+ revlogv1
+ sparserevlog
+ store
+
+ $ hg debugrequirements
+ dotencode
+ exp-sharesafe
+ fncache
+ generaldelta
+ revlogv1
+ shared
+ sparserevlog
+ store
+
+ $ echo c > c
+ $ hg ci -Aqm "added c"
+
+ $ hg unshare
diff --git a/tests/test-share-bookmarks.t b/tests/test-share-bookmarks.t
--- a/tests/test-share-bookmarks.t
+++ b/tests/test-share-bookmarks.t
@@ -1,4 +1,10 @@
#testcases vfs svfs
+#testcases safe normal
+
+#if safe
+ $ echo "[format]" >> $HGRCPATH
+ $ echo "exp-share-safe = True" >> $HGRCPATH
+#endif
$ echo "[extensions]" >> $HGRCPATH
$ echo "share = " >> $HGRCPATH
@@ -284,3 +290,4 @@
$ hg init brokenrepo --config format.bookmarks-in-store=True --config format.usestore=false
ignoring enabled 'format.bookmarks-in-store' config beacuse it is incompatible with disabled 'format.usestore' config
+ ignoring enabled 'format.exp-share-safe' config because it is incompatible with disabled 'format.usestore' config (safe !)
diff --git a/tests/test-remotefilelog-share.t b/tests/test-remotefilelog-share.t
--- a/tests/test-remotefilelog-share.t
+++ b/tests/test-remotefilelog-share.t
@@ -1,5 +1,12 @@
#require no-windows
+#testcases safe normal
+
+#if safe
+ $ echo "[format]" >> $HGRCPATH
+ $ echo "exp-share-safe = True" >> $HGRCPATH
+#endif
+
$ . "$TESTDIR/remotefilelog-library.sh"
$ cat >> $HGRCPATH <<EOF
diff --git a/tests/test-narrow-share.t b/tests/test-narrow-share.t
--- a/tests/test-narrow-share.t
+++ b/tests/test-narrow-share.t
@@ -1,4 +1,10 @@
#testcases flat tree
+#testcases safe normal
+
+#if safe
+ $ echo "[format]" >> $HGRCPATH
+ $ echo "exp-share-safe = True" >> $HGRCPATH
+#endif
$ . "$TESTDIR/narrow-library.sh"
diff --git a/tests/test-journal-share.t b/tests/test-journal-share.t
--- a/tests/test-journal-share.t
+++ b/tests/test-journal-share.t
@@ -1,3 +1,10 @@
+#testcases safe normal
+
+#if safe
+ $ echo "[format]" >> $HGRCPATH
+ $ echo "exp-share-safe = True" >> $HGRCPATH
+#endif
+
Journal extension test: tests the share extension support
$ cat >> testmocks.py << EOF
diff --git a/mercurial/store.py b/mercurial/store.py
--- a/mercurial/store.py
+++ b/mercurial/store.py
@@ -384,6 +384,7 @@
b'00changelog.i',
b'phaseroots',
b'obsstore',
+ b'requires',
)
@@ -455,7 +456,7 @@
yield x
def copylist(self):
- return [b'requires'] + _data
+ return _data
def write(self, tr):
pass
@@ -704,6 +705,7 @@
b'00manifest.i',
b'00changelog.d',
b'00changelog.i',
+ b'requires',
)
return [b'requires', b'00changelog.i'] + [b'store/' + f for f in d]
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1478,6 +1478,8 @@
Returns (wcreq, storereq)
"""
+ if b'exp-sharesafe' in requirements:
+ return set([b'exp-sharesafe']), requirements
return requirements, None
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -449,6 +449,11 @@
# The repository use persistent nodemap for the changelog and the manifest.
NODEMAP_REQUIREMENT = b'persistent-nodemap'
+# A repository with share implemented safely. The repository has different
+# store and working copy requirements i.e. both `.hg/requires` and
+# `.hg/store/requires` are present.
+SHARESAFE_REQUIREMENT = b'exp-sharesafe'
+
# Functions receiving (ui, features) that extensions can register to impact
# the ability to load repositories with custom requirements. Only
# functions defined in loaded extensions are called.
@@ -566,6 +571,20 @@
raise error.RepoError(_(b'repository %s not found') % path)
requirements = _readrequires(hgvfs, True)
+ shared = b'shared' in requirements or b'relshared' in requirements
+ if shared:
+ sharedvfs = _getsharedvfs(hgvfs, requirements)
+
+ # 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:
+ # This is a shared repo
+ storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
+ else:
+ storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
+
+ requirements |= _readrequires(storevfs, False)
# The .hg/hgrc file may load extensions or contain config options
# that influence repository construction. Attempt to load it and
@@ -608,9 +627,7 @@
# 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)
@@ -1060,6 +1077,7 @@
SPARSEREVLOG_REQUIREMENT,
NODEMAP_REQUIREMENT,
bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
+ SHARESAFE_REQUIREMENT,
}
_basesupported = supportedformats | {
b'store',
@@ -3338,6 +3356,11 @@
if ui.configbool(b'format', b'use-persistent-nodemap'):
requirements.add(NODEMAP_REQUIREMENT)
+ # if share-safe is enabled, let's create the new repository with the new
+ # requirement
+ if ui.configbool(b'format', b'exp-share-safe'):
+ requirements.add(SHARESAFE_REQUIREMENT)
+
return requirements
@@ -3368,6 +3391,16 @@
)
)
+ if SHARESAFE_REQUIREMENT in requirements:
+ ui.warn(
+ _(
+ b"ignoring enabled 'format.exp-share-safe' config because "
+ b"it is incompatible with disabled 'format.usestore'"
+ b" config\n"
+ )
+ )
+ dropped.add(SHARESAFE_REQUIREMENT)
+
return dropped
@@ -3492,7 +3525,20 @@
b'layout',
)
- scmutil.writerequires(hgvfs, requirements)
+ if SHARESAFE_REQUIREMENT in requirements and b'store' in requirements:
+ if b'sharedrepo' in createopts:
+ req = set([b'shared', SHARESAFE_REQUIREMENT])
+ if b'relshared' in requirements:
+ req.add(b'relshared')
+ scmutil.writerequires(hgvfs, req)
+ else:
+ scmutil.writerequires(hgvfs, set([SHARESAFE_REQUIREMENT]))
+ storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
+ scmutil.writerequires(
+ storevfs, requirements - set([SHARESAFE_REQUIREMENT])
+ )
+ else:
+ scmutil.writerequires(hgvfs, requirements)
# Write out file telling readers where to find the shared store.
if b'sharedrepo' in createopts:
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -784,6 +784,9 @@
b'format', b'exp-use-side-data', default=False, experimental=True,
)
coreconfigitem(
+ b'format', b'exp-share-safe', default=False, experimental=True,
+)
+coreconfigitem(
b'format', b'internal-phase', default=False, experimental=True,
)
coreconfigitem(
To: pulkit, #hg-reviewers, durin42, marmoute
Cc: indygreg, marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200807/b046e306/attachment-0001.html>
More information about the Mercurial-patches
mailing list