SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY With this, the new format receives some testing every time someone runs tests with Rust extensions enabled, including on CI. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10720 AFFECTED FILES tests/test-dirstate-race.t tests/test-dirstate-race2.t tests/test-dirstate.t tests/test-hgignore.t tests/test-permissions.t tests/test-purge.t tests/test-status.t tests/test-symlinks.t CHANGE DETAILS diff --git a/tests/test-symlinks.t b/tests/test-symlinks.t --- a/tests/test-symlinks.t +++ b/tests/test-symlinks.t @@ -1,6 +1,6 @@ #require symlink -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -8,6 +8,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + == tests added in 0.7 == $ hg init test-symlinks-0.7; cd test-symlinks-0.7; diff --git a/tests/test-status.t b/tests/test-status.t --- a/tests/test-status.t +++ b/tests/test-status.t @@ -1,4 +1,10 @@ -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 + +#if no-rust + $ hg init repo0 --config format.exp-dirstate-v2=1 + abort: dirstate v2 format requested by config but not supported (requires Rust extensions) + [255] +#endif #if dirstate-v1-tree #require rust @@ -6,6 +12,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + $ hg init repo1 $ cd repo1 $ mkdir a b a/1 b/1 b/2 diff --git a/tests/test-purge.t b/tests/test-purge.t --- a/tests/test-purge.t +++ b/tests/test-purge.t @@ -1,4 +1,4 @@ -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -6,6 +6,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + init $ hg init t diff --git a/tests/test-permissions.t b/tests/test-permissions.t --- a/tests/test-permissions.t +++ b/tests/test-permissions.t @@ -1,6 +1,6 @@ #require unix-permissions no-root reporevlogstore -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -8,6 +8,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + $ hg init t $ cd t diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t --- a/tests/test-hgignore.t +++ b/tests/test-hgignore.t @@ -1,4 +1,4 @@ -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -6,6 +6,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + $ hg init ignorerepo $ cd ignorerepo diff --git a/tests/test-dirstate.t b/tests/test-dirstate.t --- a/tests/test-dirstate.t +++ b/tests/test-dirstate.t @@ -1,4 +1,4 @@ -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -6,6 +6,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + ------ Test dirstate._dirs refcounting $ hg init t diff --git a/tests/test-dirstate-race2.t b/tests/test-dirstate-race2.t --- a/tests/test-dirstate-race2.t +++ b/tests/test-dirstate-race2.t @@ -1,4 +1,4 @@ -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -6,6 +6,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + Checking the size/permissions/file-type of files stored in the dirstate after an update where the files are changed concurrently outside of hg's control. diff --git a/tests/test-dirstate-race.t b/tests/test-dirstate-race.t --- a/tests/test-dirstate-race.t +++ b/tests/test-dirstate-race.t @@ -1,4 +1,4 @@ -#testcases dirstate-v1 dirstate-v1-tree +#testcases dirstate-v1 dirstate-v1-tree dirstate-v2 #if dirstate-v1-tree #require rust @@ -6,6 +6,12 @@ $ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH #endif +#if dirstate-v2 +#require rust + $ echo '[format]' >> $HGRCPATH + $ echo 'exp-dirstate-v2=1' >> $HGRCPATH +#endif + $ hg init repo $ cd repo $ echo a > a To: SimonSapin, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
