This revision was automatically updated to reflect the committed changes. Closed by commit rHG7542e97c7867: tests: conditionalize tests for various repo features (authored by indygreg, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3096?vs=7678&id=7822 REVISION DETAIL https://phab.mercurial-scm.org/D3096 AFFECTED FILES tests/test-contrib-perf.t tests/test-convert-hg-source.t tests/test-debugcommands.t tests/test-http.t tests/test-inherit-mode.t tests/test-narrow-exchange.t tests/test-narrow-patterns.t tests/test-narrow-strip.t tests/test-obsolete.t tests/test-permissions.t tests/test-phases-exchange.t tests/test-strip.t tests/test-subrepo-deep-nested-change.t CHANGE DETAILS diff --git a/tests/test-subrepo-deep-nested-change.t b/tests/test-subrepo-deep-nested-change.t --- a/tests/test-subrepo-deep-nested-change.t +++ b/tests/test-subrepo-deep-nested-change.t @@ -183,18 +183,18 @@ updating [===========================================>] 3/3\r (no-eol) (esc) \r (no-eol) (esc) \r (no-eol) (esc) - linking [ <=> ] 1\r (no-eol) (esc) (no-reposimplestore !) - linking [ <=> ] 2\r (no-eol) (esc) (no-reposimplestore !) - linking [ <=> ] 3\r (no-eol) (esc) (no-reposimplestore !) - linking [ <=> ] 4\r (no-eol) (esc) (no-reposimplestore !) - linking [ <=> ] 5\r (no-eol) (esc) (no-reposimplestore !) - linking [ <=> ] 6\r (no-eol) (esc) (no-reposimplestore !) - linking [ <=> ] 1\r (no-eol) (esc) (reposimplestore !) - linking [ <=> ] 2\r (no-eol) (esc) (reposimplestore !) - linking [ <=> ] 3\r (no-eol) (esc) (reposimplestore !) - linking [ <=> ] 4\r (no-eol) (esc) (reposimplestore !) - linking [ <=> ] 5\r (no-eol) (esc) (reposimplestore !) - linking [ <=> ] 6\r (no-eol) (esc) (reposimplestore !) + linking [ <=> ] 1\r (no-eol) (esc) (reporevlogstore !) + linking [ <=> ] 2\r (no-eol) (esc) (reporevlogstore !) + linking [ <=> ] 3\r (no-eol) (esc) (reporevlogstore !) + linking [ <=> ] 4\r (no-eol) (esc) (reporevlogstore !) + linking [ <=> ] 5\r (no-eol) (esc) (reporevlogstore !) + linking [ <=> ] 6\r (no-eol) (esc) (reporevlogstore !) + linking [ <=> ] 1\r (no-eol) (esc) (reposimplestore !) + linking [ <=> ] 2\r (no-eol) (esc) (reposimplestore !) + linking [ <=> ] 3\r (no-eol) (esc) (reposimplestore !) + linking [ <=> ] 4\r (no-eol) (esc) (reposimplestore !) + linking [ <=> ] 5\r (no-eol) (esc) (reposimplestore !) + linking [ <=> ] 6\r (no-eol) (esc) (reposimplestore !) updating [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) updating to branch default diff --git a/tests/test-strip.t b/tests/test-strip.t --- a/tests/test-strip.t +++ b/tests/test-strip.t @@ -742,12 +742,14 @@ saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg $ ls .hg/strip-backup 3903775176ed-e68910bd-backup.hg +#if repobundlerepo $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg $ hg strip -r 0 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg $ ls .hg/strip-backup 3903775176ed-54390173-backup.hg 3903775176ed-e68910bd-backup.hg +#endif $ cd .. Test that we only bundle the stripped changesets (issue4736) @@ -813,6 +815,7 @@ $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg 2 changesets found +#if repobundlerepo $ hg log -r 'bundle()' -R ../issue4736.hg changeset: 3:6625a5168474 parent: 1:eca11cf91c71 @@ -828,6 +831,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: mergeCD +#endif check strip behavior @@ -872,6 +876,7 @@ strip backup content +#if repobundlerepo $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg changeset: 3:6625a5168474 parent: 1:eca11cf91c71 @@ -887,6 +892,9 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: mergeCD + +#endif + Check that the phase cache is properly invalidated after a strip with bookmark. $ cat > ../stripstalephasecache.py << EOF diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t --- a/tests/test-phases-exchange.t +++ b/tests/test-phases-exchange.t @@ -539,6 +539,7 @@ Pulling from bundle does not alter phases of changeset not present in the bundle +#if repobundlerepo $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg 5 changesets found $ hg pull ../partial-bundle.hg @@ -568,6 +569,7 @@ | o 0 public a-A - 054250a37db4 +#endif Pushing to Publish=False (unknown changeset) diff --git a/tests/test-permissions.t b/tests/test-permissions.t --- a/tests/test-permissions.t +++ b/tests/test-permissions.t @@ -1,4 +1,4 @@ -#require unix-permissions no-root +#require unix-permissions no-root reporevlogstore $ hg init t $ cd t diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -1449,10 +1449,12 @@ phase-heads -- {} e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft +#if repobundlerepo $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg searching for changes no changes found +#endif $ hg debugobsolete e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} $ hg log -G diff --git a/tests/test-narrow-strip.t b/tests/test-narrow-strip.t --- a/tests/test-narrow-strip.t +++ b/tests/test-narrow-strip.t @@ -116,6 +116,7 @@ $ hg strip . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) +#if repobundlerepo $ hg pull .hg/strip-backup/*-backup.hg pulling from .hg/strip-backup/*-backup.hg (glob) searching for changes @@ -131,7 +132,6 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) -#if repobundlerepo $ hg incoming .hg/strip-backup/*-backup.hg comparing with .hg/strip-backup/*-backup.hg (glob) changeset: 0:* (glob) diff --git a/tests/test-narrow-patterns.t b/tests/test-narrow-patterns.t --- a/tests/test-narrow-patterns.t +++ b/tests/test-narrow-patterns.t @@ -196,7 +196,9 @@ comparing with ssh://user@dummy/master searching for changes looking for local changes to affected paths - deleting data/dir1/dirA/bar.i + deleting data/dir1/dirA/bar.i (reporevlogstore !) + deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !) + deleting data/dir1/dirA/bar/index (reposimplestore !) no changes found saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) adding changesets @@ -254,7 +256,9 @@ comparing with ssh://user@dummy/master searching for changes looking for local changes to affected paths - deleting data/dir1/dirA/foo.i + deleting data/dir1/dirA/foo.i (reporevlogstore !) + deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !) + deleting data/dir1/dirA/foo/index (reposimplestore !) no changes found saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) adding changesets diff --git a/tests/test-narrow-exchange.t b/tests/test-narrow-exchange.t --- a/tests/test-narrow-exchange.t +++ b/tests/test-narrow-exchange.t @@ -97,7 +97,8 @@ remote: adding file changes remote: transaction abort! remote: rollback completed - remote: abort: data/inside2/f.i@4a1aa07735e6: unknown parent! + remote: abort: data/inside2/f.i@4a1aa07735e6: unknown parent! (reporevlogstore !) + remote: abort: data/inside2/f/index@4a1aa07735e6: no node! (reposimplestore !) abort: stream ended unexpectedly (got 0 bytes, expected 4) [255] diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t --- a/tests/test-inherit-mode.t +++ b/tests/test-inherit-mode.t @@ -80,8 +80,14 @@ 00660 ./.hg/store/00manifest.i 00770 ./.hg/store/data/ 00770 ./.hg/store/data/dir/ - 00660 ./.hg/store/data/dir/bar.i - 00660 ./.hg/store/data/foo.i + 00660 ./.hg/store/data/dir/bar.i (reporevlogstore !) + 00660 ./.hg/store/data/foo.i (reporevlogstore !) + 00770 ./.hg/store/data/dir/bar/ (reposimplestore !) + 00660 ./.hg/store/data/dir/bar/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) + 00660 ./.hg/store/data/dir/bar/index (reposimplestore !) + 00770 ./.hg/store/data/foo/ (reposimplestore !) + 00660 ./.hg/store/data/foo/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) + 00660 ./.hg/store/data/foo/index (reposimplestore !) 00660 ./.hg/store/fncache (repofncache !) 00660 ./.hg/store/phaseroots 00660 ./.hg/store/undo @@ -126,8 +132,14 @@ 00660 ../push/.hg/store/00manifest.i 00770 ../push/.hg/store/data/ 00770 ../push/.hg/store/data/dir/ - 00660 ../push/.hg/store/data/dir/bar.i - 00660 ../push/.hg/store/data/foo.i + 00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !) + 00660 ../push/.hg/store/data/foo.i (reporevlogstore !) + 00770 ../push/.hg/store/data/dir/bar/ (reposimplestore !) + 00660 ../push/.hg/store/data/dir/bar/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) + 00660 ../push/.hg/store/data/dir/bar/index (reposimplestore !) + 00770 ../push/.hg/store/data/foo/ (reposimplestore !) + 00660 ../push/.hg/store/data/foo/b80de5d138758541c5f05265ad144ab9fa86d1db (reposimplestore !) + 00660 ../push/.hg/store/data/foo/index (reposimplestore !) 00660 ../push/.hg/store/fncache (repofncache !) 00660 ../push/.hg/store/undo 00660 ../push/.hg/store/undo.backupfiles diff --git a/tests/test-http.t b/tests/test-http.t --- a/tests/test-http.t +++ b/tests/test-http.t @@ -470,6 +470,7 @@ (remove --pull if specified or upgrade Mercurial) [255] +#if no-reposimplestore ... but keep stream clones working $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone @@ -479,6 +480,7 @@ searching for changes no changes found $ cat error.log +#endif ... and also keep partial clones and pulls working $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone diff --git a/tests/test-debugcommands.t b/tests/test-debugcommands.t --- a/tests/test-debugcommands.t +++ b/tests/test-debugcommands.t @@ -8,6 +8,7 @@ $ echo a > a $ hg ci -Am adda adding a +#if reporevlogstore $ hg debugrevlog -m format : 1 flags : inline, generaldelta @@ -35,34 +36,40 @@ uncompressed data size (min/max/avg) : 43 / 43 / 43 full revision size (min/max/avg) : 44 / 44 / 44 delta size (min/max/avg) : 0 / 0 / 0 +#endif Test debugindex, with and without the --verbose/--debug flag $ hg debugindex a rev linkrev nodeid p1 p2 0 0 b789fdd96dc2 000000000000 000000000000 +#if no-reposimplestore $ hg --verbose debugindex a rev offset length linkrev nodeid p1 p2 0 0 3 0 b789fdd96dc2 000000000000 000000000000 $ hg --debug debugindex a rev offset length linkrev nodeid p1 p2 0 0 3 0 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 +#endif $ hg debugindex -f 1 a rev flag size link p1 p2 nodeid 0 0000 2 0 -1 -1 b789fdd96dc2 +#if no-reposimplestore $ hg --verbose debugindex -f 1 a rev flag offset length size link p1 p2 nodeid 0 0000 0 3 2 0 -1 -1 b789fdd96dc2 $ hg --debug debugindex -f 1 a rev flag offset length size link p1 p2 nodeid 0 0000 0 3 2 0 -1 -1 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 +#endif debugdelta chain basic output +#if reporevlogstore $ hg debugdeltachain -m rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 0 1 1 -1 base 44 43 44 1.02326 44 0 0.00000 @@ -176,6 +183,7 @@ $ hg ci -m a $ printf 'h\n' >> a $ hg ci -m a + $ hg debugrevlog -d a # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen 0 -1 -1 0 ??? 0 0 0 0 ??? ???? ? 1 0 (glob) @@ -187,6 +195,7 @@ 6 5 -1 ??? ??? ??? ??? ??? 0 ??? ???? ? 1 1 (glob) 7 6 -1 ??? ??? ??? ??? ??? 0 ??? ???? ? 1 2 (glob) 8 7 -1 ??? ??? ??? ??? ??? 0 ??? ???? ? 1 3 (glob) +#endif Test debuglocks command: diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t --- a/tests/test-convert-hg-source.t +++ b/tests/test-convert-hg-source.t @@ -182,7 +182,8 @@ sorting... converting... 4 init - ignoring: data/b.i@1e88685f5dde: no match found + ignoring: data/b.i@1e88685f5dde: no match found (reporevlogstore !) + ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !) 3 changeall 2 changebagain 1 merge diff --git a/tests/test-contrib-perf.t b/tests/test-contrib-perf.t --- a/tests/test-contrib-perf.t +++ b/tests/test-contrib-perf.t @@ -142,9 +142,11 @@ $ hg perfdirstatedirs $ hg perfdirstatefoldmap $ hg perfdirstatewrite +#if repofncache $ hg perffncacheencode $ hg perffncacheload $ hg perffncachewrite +#endif $ hg perfheads $ hg perfindex $ hg perfloadmarkers To: indygreg, durin42, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
