# HG changeset patch # User Raphaël Gomès # Date 2022-05-02 15:47:38 # Node ID 2f2682f40ea02b824aa1d25a4052146c77532420 # Parent fdd227585d5a99f5d712803abf59835d212037e6 tests: use the `--quiet` flag for verify when applicable This reduces a lot of the test output that was otherwise useless, and also makes it a lot easier to add things to verify without breaking the test suite because of additional output. diff --git a/tests/test-bundle-r.t b/tests/test-bundle-r.t --- a/tests/test-bundle-r.t +++ b/tests/test-bundle-r.t @@ -17,7 +17,7 @@ > hg -R test bundle -r "$i" test-"$i".hg test-"$i" > cd test-"$i" > hg unbundle ../test-"$i".hg - > hg verify + > hg verify -q > hg tip -q > cd .. > done @@ -29,11 +29,6 @@ added 1 changesets with 1 changes to 1 files new changesets bfaf4b5cbf01 (1 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files 0:bfaf4b5cbf01 searching for changes 2 changesets found @@ -43,11 +38,6 @@ added 2 changesets with 2 changes to 1 files new changesets bfaf4b5cbf01:21f32785131f (2 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files 1:21f32785131f searching for changes 3 changesets found @@ -57,11 +47,6 @@ added 3 changesets with 3 changes to 1 files new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files 2:4ce51a113780 searching for changes 4 changesets found @@ -71,11 +56,6 @@ added 4 changesets with 4 changes to 1 files new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 4 changes to 1 files 3:93ee6ab32777 searching for changes 2 changesets found @@ -85,11 +65,6 @@ added 2 changesets with 2 changes to 1 files new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files 1:c70afb1ee985 searching for changes 3 changesets found @@ -99,11 +74,6 @@ added 3 changesets with 3 changes to 1 files new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files 2:f03ae5a9b979 searching for changes 4 changesets found @@ -113,11 +83,6 @@ added 4 changesets with 5 changes to 2 files new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 5 changes to 2 files 3:095cb14b1b4d searching for changes 5 changesets found @@ -127,11 +92,6 @@ added 5 changesets with 6 changes to 3 files new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 6 changes to 3 files 4:faa2e4234c7a searching for changes 5 changesets found @@ -141,11 +101,6 @@ added 5 changesets with 5 changes to 2 files new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts) (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files 4:916f1afdef90 $ cd test-8 $ hg pull ../test-7 @@ -158,12 +113,7 @@ new changesets c70afb1ee985:faa2e4234c7a 1 local changesets published (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ hg rollback repository tip rolled back to revision 4 (undo pull) $ cd .. @@ -243,12 +193,7 @@ revision 8 $ hg tip -q 8:916f1afdef90 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ hg rollback repository tip rolled back to revision 2 (undo unbundle) @@ -268,12 +213,7 @@ revision 4 $ hg tip -q 4:916f1afdef90 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files + $ hg verify -q $ hg rollback repository tip rolled back to revision 2 (undo unbundle) $ hg unbundle ../test-bundle-branch2.hg @@ -288,12 +228,7 @@ revision 6 $ hg tip -q 6:faa2e4234c7a - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 7 changesets with 6 changes to 3 files + $ hg verify -q $ hg rollback repository tip rolled back to revision 2 (undo unbundle) $ hg unbundle ../test-bundle-cset-7.hg @@ -308,12 +243,7 @@ revision 4 $ hg tip -q 4:916f1afdef90 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files + $ hg verify -q $ cd ../test $ hg merge 7 @@ -342,11 +272,6 @@ revision 9 $ hg tip -q 9:03fc0b0e347c - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 10 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. diff --git a/tests/test-bundle.t b/tests/test-bundle.t --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -28,12 +28,7 @@ Setting up test 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg mv afile anotherfile $ hg commit -m "0.3m" - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. $ hg init empty @@ -70,12 +65,7 @@ Verify empty $ hg -R empty heads [1] - $ hg -R empty verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 0 changesets with 0 changes to 0 files + $ hg -R empty verify -q #if repobundlerepo @@ -853,12 +843,7 @@ full history bundle, refuses to verify n but, regular verify must continue to work - $ hg -R orig verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files + $ hg -R orig verify -q #if repobundlerepo diff against bundle @@ -939,12 +924,7 @@ bundle single branch $ hg clone -q -r0 . part2 $ hg -q -R part2 pull bundle.hg - $ hg -R part2 verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 5 changes to 4 files + $ hg -R part2 verify -q #endif == Test bundling no commits diff --git a/tests/test-censor.t b/tests/test-censor.t --- a/tests/test-censor.t +++ b/tests/test-censor.t @@ -205,12 +205,7 @@ Set censor policy to ignore in trusted $ Repo passes verification with warnings with explicit config - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 7 changes to 2 files + $ hg verify -q May update to revision with censored data with explicit config @@ -330,24 +325,14 @@ Repo with censored nodes can be cloned a $ hg cat -r $C1 target | head -n 10 $ hg cat -r 0 target | head -n 10 Initially untainted file - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 12 changesets with 13 changes to 2 files + $ hg verify -q Repo cloned before tainted content introduced can pull censored nodes $ cd ../rpull $ hg cat -r tip target | head -n 10 Initially untainted file - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 2 changes to 2 files + $ hg verify -q $ hg pull -r $H1 -r $H2 pulling from $TESTTMP/r searching for changes @@ -369,12 +354,7 @@ Repo cloned before tainted content intro $ hg cat -r $C1 target | head -n 10 $ hg cat -r 0 target | head -n 10 Initially untainted file - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 12 changesets with 13 changes to 2 files + $ hg verify -q Censored nodes can be pushed if they censor previously unexchanged nodes @@ -429,12 +409,7 @@ Censored nodes can be bundled up and unb 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat target | head -n 10 Re-sanitized; nothing to see here - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 14 changesets with 15 changes to 2 files + $ hg verify -q Grepping only warns, doesn't error out @@ -488,12 +463,7 @@ Censored nodes can be imported on top of 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat target | head -n 10 Re-sanitized; nothing to see here - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 14 changesets with 15 changes to 2 files + $ hg verify -q $ cd ../r Can import bundle where first revision of a file is censored diff --git a/tests/test-clone-pull-corruption.t b/tests/test-clone-pull-corruption.t --- a/tests/test-clone-pull-corruption.t +++ b/tests/test-clone-pull-corruption.t @@ -43,11 +43,6 @@ start a commit... see what happened $ wait - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files + $ hg verify -q $ cd .. diff --git a/tests/test-clone-r.t b/tests/test-clone-r.t --- a/tests/test-clone-r.t +++ b/tests/test-clone-r.t @@ -66,12 +66,7 @@ 5 7 09bb521d218d de68e904d169 000000000000 6 8 1fde233dfb0f f54c32f13478 000000000000 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. @@ -80,7 +75,7 @@ > echo ---- hg clone -r "$i" test test-"$i" > hg clone -r "$i" test test-"$i" > cd test-"$i" - > hg verify + > hg verify -q > cd .. > done @@ -92,11 +87,6 @@ new changesets f9ee2f85a263 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files ---- hg clone -r 1 test test-1 adding changesets @@ -106,11 +96,6 @@ new changesets f9ee2f85a263:34c2bf6b0626 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files ---- hg clone -r 2 test test-2 adding changesets @@ -120,11 +105,6 @@ new changesets f9ee2f85a263:e38ba6f5b7e0 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files ---- hg clone -r 3 test test-3 adding changesets @@ -134,11 +114,6 @@ new changesets f9ee2f85a263:eebf5a27f8ca updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 4 changes to 1 files ---- hg clone -r 4 test test-4 adding changesets @@ -148,11 +123,6 @@ new changesets f9ee2f85a263:095197eb4973 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files ---- hg clone -r 5 test test-5 adding changesets @@ -162,11 +132,6 @@ new changesets f9ee2f85a263:1bb50a9436a7 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files ---- hg clone -r 6 test test-6 adding changesets @@ -176,11 +141,6 @@ new changesets f9ee2f85a263:7373c1169842 updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 5 changes to 2 files ---- hg clone -r 7 test test-7 adding changesets @@ -190,11 +150,6 @@ new changesets f9ee2f85a263:a6a34bfa0076 updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 6 changes to 3 files ---- hg clone -r 8 test test-8 adding changesets @@ -204,11 +159,6 @@ new changesets f9ee2f85a263:aa35859c02ea updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files $ cd test-8 $ hg pull ../test-7 @@ -220,12 +170,7 @@ added 4 changesets with 2 changes to 3 files (+1 heads) new changesets 095197eb4973:a6a34bfa0076 (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. $ hg clone test test-9 diff --git a/tests/test-clone-stream-format.t b/tests/test-clone-stream-format.t --- a/tests/test-clone-stream-format.t +++ b/tests/test-clone-stream-format.t @@ -110,12 +110,7 @@ tests, and dot-encode need the store ena new changesets 96ee1d7354c4:06ddac466af5 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R server-no-store - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg verify -R server-no-store -q $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt $ cat hg-1.pid > $DAEMON_PIDS $ hg -R server-no-store serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt @@ -129,12 +124,7 @@ store → no-store cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-store --config format.usestore=no $ cat errors-1.txt - $ hg -R clone-remove-store verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-remove-store verify -q $ hg debugrequires -R clone-remove-store | grep store [1] @@ -143,12 +133,7 @@ no-store → store cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-store --config format.usestore=yes $ cat errors-2.txt - $ hg -R clone-add-store verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-add-store verify -q $ hg debugrequires -R clone-add-store | grep store store @@ -171,12 +156,7 @@ Test streaming from/to repository withou new changesets 96ee1d7354c4:06ddac466af5 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R server-no-fncache - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg verify -R server-no-fncache -q $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt $ cat hg-1.pid > $DAEMON_PIDS $ hg -R server-no-fncache serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt @@ -190,12 +170,7 @@ fncache → no-fncache cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-fncache --config format.usefncache=no $ cat errors-1.txt - $ hg -R clone-remove-fncache verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-remove-fncache verify -q $ hg debugrequires -R clone-remove-fncache | grep fncache [1] @@ -204,12 +179,7 @@ no-fncache → fncache cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-fncache --config format.usefncache=yes $ cat errors-2.txt - $ hg -R clone-add-fncache verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-add-fncache verify -q $ hg debugrequires -R clone-add-fncache | grep fncache fncache @@ -231,12 +201,7 @@ Test streaming from/to repository withou new changesets 96ee1d7354c4:06ddac466af5 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R server-no-dotencode - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg verify -R server-no-dotencode -q $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt $ cat hg-1.pid > $DAEMON_PIDS $ hg -R server-no-dotencode serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt @@ -250,12 +215,7 @@ dotencode → no-dotencode cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-dotencode --config format.dotencode=no $ cat errors-1.txt - $ hg -R clone-remove-dotencode verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-remove-dotencode verify -q $ hg debugrequires -R clone-remove-dotencode | grep dotencode [1] @@ -264,12 +224,7 @@ no-dotencode → dotencode cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-dotencode --config format.dotencode=yes $ cat errors-2.txt - $ hg -R clone-add-dotencode verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-add-dotencode verify -q $ hg debugrequires -R clone-add-dotencode | grep dotencode dotencode @@ -289,12 +244,7 @@ The resulting clone should not use share $ cat hg-1.pid > $DAEMON_PIDS $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-from-share - $ hg -R clone-from-share verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-from-share verify -q $ hg debugrequires -R clone-from-share | egrep 'share$' [1] @@ -313,12 +263,7 @@ Test streaming from/to repository withou new changesets 96ee1d7354c4:06ddac466af5 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R server-no-share-safe - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg verify -R server-no-share-safe -q $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt $ cat hg-1.pid > $DAEMON_PIDS $ hg -R server-no-share-safe serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt @@ -332,12 +277,7 @@ share-safe → no-share-safe cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-share-safe --config format.use-share-safe=no $ cat errors-1.txt - $ hg -R clone-remove-share-safe verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-remove-share-safe verify -q $ hg debugrequires -R clone-remove-share-safe | grep share-safe [1] @@ -346,12 +286,7 @@ no-share-safe → share-safe cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-share-safe --config format.use-share-safe=yes $ cat errors-2.txt - $ hg -R clone-add-share-safe verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-add-share-safe verify -q $ hg debugrequires -R clone-add-share-safe | grep share-safe share-safe @@ -374,12 +309,7 @@ persistent nodemap affects revlog, but t new changesets 96ee1d7354c4:06ddac466af5 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R server-no-persistent-nodemap - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg verify -R server-no-persistent-nodemap -q $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt $ cat hg-1.pid > $DAEMON_PIDS $ hg -R server-no-persistent-nodemap serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt @@ -401,12 +331,7 @@ persistent-nodemap → no-persistent-nodemap cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-persistent-nodemap --config format.use-persistent-nodemap=no $ cat errors-1.txt - $ hg -R clone-remove-persistent-nodemap verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-remove-persistent-nodemap verify -q $ hg debugrequires -R clone-remove-persistent-nodemap | grep persistent-nodemap [1] @@ -421,12 +346,7 @@ no-persistent-nodemap → persistent-nodemap cloning $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-persistent-nodemap --config format.use-persistent-nodemap=yes $ cat errors-2.txt - $ hg -R clone-add-persistent-nodemap verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5004 changesets with 1088 changes to 1088 files + $ hg -R clone-add-persistent-nodemap verify -q $ hg debugrequires -R clone-add-persistent-nodemap | grep persistent-nodemap persistent-nodemap diff --git a/tests/test-clone-stream.t b/tests/test-clone-stream.t --- a/tests/test-clone-stream.t +++ b/tests/test-clone-stream.t @@ -94,12 +94,7 @@ This is present here to reuse the testin Check that the clone went well - $ hg verify -R local-clone - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 1088 changes to 1088 files + $ hg verify -R local-clone -q Check uncompressed ================== @@ -651,12 +646,7 @@ clone it updating to branch default 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved #endif - $ hg verify -R with-bookmarks - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 1088 changes to 1088 files + $ hg verify -R with-bookmarks -q $ hg -R with-bookmarks bookmarks some-bookmark 2:5223b5e3265f @@ -692,12 +682,7 @@ Clone as publishing updating to branch default 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved #endif - $ hg verify -R phase-publish - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 1088 changes to 1088 files + $ hg verify -R phase-publish -q $ hg -R phase-publish phase -r 'all()' 0: public 1: public @@ -747,12 +732,7 @@ stream v1 unsuitable for non-publishing 1: draft 2: draft #endif - $ hg verify -R phase-no-publish - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 1088 changes to 1088 files + $ hg verify -R phase-no-publish -q $ killdaemons.py @@ -801,12 +781,7 @@ Clone non-publishing with obsolescence 0: draft $ hg debugobsolete -R with-obsolescence 8c206a663911c1f97f2f9d7382e417ae55872cfa 0 {5223b5e3265f0df40bb743da62249413d74ac70f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - $ hg verify -R with-obsolescence - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 1089 changes to 1088 files + $ hg verify -R with-obsolescence -q $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution streaming all changes diff --git a/tests/test-clone.t b/tests/test-clone.t --- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -59,12 +59,7 @@ Ensure branchcache got copied over: $ cat a a - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 11 changes to 2 files + $ hg verify -q Invalid dest '' must abort: @@ -122,12 +117,7 @@ Ensure branchcache got copied over: $ cat a 2>/dev/null || echo "a not present" a not present - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 11 changes to 2 files + $ hg verify -q Default destination: @@ -167,12 +157,7 @@ Use --pull: new changesets acb14030fe0a:a7949464abda updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R g verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 11 changes to 2 files + $ hg -R g verify -q Invalid dest '' with --pull must abort (issue2528): diff --git a/tests/test-contrib-dumprevlog.t b/tests/test-contrib-dumprevlog.t --- a/tests/test-contrib-dumprevlog.t +++ b/tests/test-contrib-dumprevlog.t @@ -14,12 +14,7 @@ $ echo adding more to file a >> a $ hg commit -m third - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files + $ hg verify -q Dumping revlog of file a to stdout: $ "$PYTHON" "$CONTRIBDIR/dumprevlog" .hg/store/data/a.i @@ -79,12 +74,7 @@ Rebuild fncache with clone --pull: Verify: - $ hg -R repo-c verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files + $ hg -R repo-c verify -q Compare repos: diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t --- a/tests/test-convert-filemap.t +++ b/tests/test-convert-filemap.t @@ -312,12 +312,7 @@ ensure that the filemap contains duplica | o 0 "0: add foo baz dir/" files: dir2/dir3/file dir2/dir3/subdir/file3 foo2 - $ hg -R renames.repo verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 7 changes to 4 files + $ hg -R renames.repo verify -q $ hg -R renames.repo manifest --debug d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 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 @@ -188,12 +188,7 @@ break it 2 changebagain 1 merge 0 moveb - $ hg -R fixed verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 3 files + $ hg -R fixed verify -q manifest -r 0 diff --git a/tests/test-copy.t b/tests/test-copy.t --- a/tests/test-copy.t +++ b/tests/test-copy.t @@ -96,12 +96,7 @@ this should show the rename information $ hg cat a > asum $ md5sum.py asum 60b725f10c9c85c70d97880dfe8191b3 asum - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files + $ hg verify -q $ cd .. diff --git a/tests/test-empty.t b/tests/test-empty.t --- a/tests/test-empty.t +++ b/tests/test-empty.t @@ -9,12 +9,7 @@ Try some commands: $ hg grep wah [1] $ hg manifest - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 0 changesets with 0 changes to 0 files + $ hg verify -q Check the basic files created: @@ -37,12 +32,7 @@ Poke at a clone: updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd b - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 0 changesets with 0 changes to 0 files + $ hg verify -q $ ls .hg 00changelog.i cache diff --git a/tests/test-excessive-merge.t b/tests/test-excessive-merge.t --- a/tests/test-excessive-merge.t +++ b/tests/test-excessive-merge.t @@ -93,9 +93,4 @@ revision 4 0 0 2ed2a3912a0b 000000000000 000000000000 1 1 79d7492df40a 2ed2a3912a0b 000000000000 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 4 changes to 2 files + $ hg verify -q diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t --- a/tests/test-filebranch.t +++ b/tests/test-filebranch.t @@ -135,11 +135,6 @@ Everything should be clean now: $ hg status - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 10 changes to 4 files + $ hg verify -q $ cd .. diff --git a/tests/test-fncache.t b/tests/test-fncache.t --- a/tests/test-fncache.t +++ b/tests/test-fncache.t @@ -49,12 +49,7 @@ Testing a.i.hg/c: Testing verify: - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q $ rm .hg/store/fncache @@ -78,12 +73,7 @@ Follow the hint to make sure it works adding data/a.i/b.i 3 items added, 0 removed from fncache - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q $ cd .. diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t --- a/tests/test-hardlinks.t +++ b/tests/test-hardlinks.t @@ -151,12 +151,7 @@ Create a non-inlined filelog in r3: Push to repo r1 should break up most hardlinks in r2: - $ hg -R r2 verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files + $ hg -R r2 verify -q $ cd r3 $ hg push @@ -182,13 +177,7 @@ Push to repo r1 should break up most har 1 r2/.hg/store/fncache #endif - $ hg -R r2 verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files - + $ hg -R r2 verify -q $ cd r1 $ hg up diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t --- a/tests/test-http-bundle1.t +++ b/tests/test-http-bundle1.t @@ -45,12 +45,7 @@ clone via stream no changes found updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R copy - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 4 changes to 4 files + $ hg verify -R copy -q #endif try to clone via stream, should use pull instead @@ -99,12 +94,7 @@ clone via pull new changesets 8b6053c928fe updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R copy-pull - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 4 changes to 4 files + $ hg verify -R copy-pull -q $ cd test $ echo bar > bar $ hg commit -A -d '1 0' -m 2 diff --git a/tests/test-http-clone-r.t b/tests/test-http-clone-r.t --- a/tests/test-http-clone-r.t +++ b/tests/test-http-clone-r.t @@ -25,7 +25,7 @@ clone remote via stream $ for i in 0 1 2 3 4 5 6 7 8; do > hg clone -r "$i" http://localhost:$HGPORT/ test-"$i" > if cd test-"$i"; then - > hg verify + > hg verify -q > cd .. > fi > done @@ -36,11 +36,6 @@ clone remote via stream new changesets bfaf4b5cbf01 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes @@ -48,11 +43,6 @@ clone remote via stream new changesets bfaf4b5cbf01:21f32785131f updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -60,11 +50,6 @@ clone remote via stream new changesets bfaf4b5cbf01:4ce51a113780 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -72,11 +57,6 @@ clone remote via stream new changesets bfaf4b5cbf01:93ee6ab32777 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 4 changes to 1 files adding changesets adding manifests adding file changes @@ -84,11 +64,6 @@ clone remote via stream new changesets bfaf4b5cbf01:c70afb1ee985 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -96,11 +71,6 @@ clone remote via stream new changesets bfaf4b5cbf01:f03ae5a9b979 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -108,11 +78,6 @@ clone remote via stream new changesets bfaf4b5cbf01:095cb14b1b4d updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 5 changes to 2 files adding changesets adding manifests adding file changes @@ -120,11 +85,6 @@ clone remote via stream new changesets bfaf4b5cbf01:faa2e4234c7a updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 6 changes to 3 files adding changesets adding manifests adding file changes @@ -132,11 +92,6 @@ clone remote via stream new changesets bfaf4b5cbf01:916f1afdef90 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files $ cd test-8 $ hg pull ../test-7 pulling from ../test-7 @@ -147,12 +102,7 @@ clone remote via stream added 4 changesets with 2 changes to 3 files (+1 heads) new changesets c70afb1ee985:faa2e4234c7a (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. $ cd test-1 $ hg pull -r 4 http://localhost:$HGPORT/ @@ -164,12 +114,7 @@ clone remote via stream added 1 changesets with 0 changes to 0 files (+1 heads) new changesets c70afb1ee985 (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 2 changes to 1 files + $ hg verify -q $ hg pull http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/ searching for changes @@ -190,12 +135,7 @@ clone remote via stream added 2 changesets with 0 changes to 0 files (+1 heads) new changesets c70afb1ee985:f03ae5a9b979 (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 3 changes to 1 files + $ hg verify -q $ hg pull http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/ searching for changes @@ -205,12 +145,7 @@ clone remote via stream added 4 changesets with 4 changes to 4 files new changesets 93ee6ab32777:916f1afdef90 (run 'hg update' to get a working copy) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. no default destination if url has no path: diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t --- a/tests/test-http-proxy.t +++ b/tests/test-http-proxy.t @@ -22,12 +22,7 @@ url for proxy, stream updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd b - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ cd .. url for proxy, pull @@ -42,12 +37,7 @@ url for proxy, pull updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd b-pull - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ cd .. host:port for proxy diff --git a/tests/test-http.t b/tests/test-http.t --- a/tests/test-http.t +++ b/tests/test-http.t @@ -34,12 +34,7 @@ clone via stream transferred * bytes in * seconds (*/sec) (glob) updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R copy - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 4 changes to 4 files + $ hg verify -R copy -q #endif try to clone via stream, should use pull instead @@ -88,12 +83,7 @@ clone via pull new changesets 8b6053c928fe updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R copy-pull - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 4 changes to 4 files + $ hg verify -R copy-pull -q $ cd test $ echo bar > bar $ hg commit -A -d '1 0' -m 2 diff --git a/tests/test-https.t b/tests/test-https.t --- a/tests/test-https.t +++ b/tests/test-https.t @@ -137,12 +137,7 @@ Inability to verify peer certificate wil new changesets 8b6053c928fe updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg verify -R copy-pull - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 4 changes to 4 files + $ hg verify -R copy-pull -q $ cd test $ echo bar > bar $ hg commit -A -d '1 0' -m 2 diff --git a/tests/test-import-merge.t b/tests/test-import-merge.t --- a/tests/test-import-merge.t +++ b/tests/test-import-merge.t @@ -159,9 +159,4 @@ Test that --exact on a bad header doesn' rollback completed abort: patch is damaged or loses information [255] - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files + $ hg verify -q diff --git a/tests/test-incoming-outgoing.t b/tests/test-incoming-outgoing.t --- a/tests/test-incoming-outgoing.t +++ b/tests/test-incoming-outgoing.t @@ -7,12 +7,7 @@ > hg commit -A -m $i > done adding foo - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 9 changes to 1 files + $ hg verify -q $ hg serve -p $HGPORT -d --pid-file=hg.pid $ cat hg.pid >> $DAEMON_PIDS $ cd .. @@ -365,12 +360,7 @@ test outgoing > echo $i >> foo > hg commit -A -m $i > done - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 14 changesets with 14 changes to 1 files + $ hg verify -q $ cd .. $ hg -R test-dev outgoing test comparing with test diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t --- a/tests/test-issue1175.t +++ b/tests/test-issue1175.t @@ -37,12 +37,7 @@ https://bz.mercurial-scm.org/1175 updating the branch cache committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 6 changesets with 4 changes to 4 files + $ hg verify -q $ hg export --git tip # HG changeset patch diff --git a/tests/test-journal-exists.t b/tests/test-journal-exists.t --- a/tests/test-journal-exists.t +++ b/tests/test-journal-exists.t @@ -25,13 +25,7 @@ recover, explicit verify abort: abandoned transaction found (run 'hg recover' to clean up transaction) [255] - $ hg recover --verify - rolling back interrupted transaction - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg recover --verify -q recover, no verify diff --git a/tests/test-keyword.t b/tests/test-keyword.t --- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -838,12 +838,7 @@ Stat, verify and show custom expansion ( $ hg status ? c - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 4 changes to 3 files + $ hg verify -q $ cat a b expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t --- a/tests/test-largefiles-wireproto.t +++ b/tests/test-largefiles-wireproto.t @@ -151,14 +151,7 @@ largefiles clients refuse to push largef $ hg commit -m "m2" Invoking status precommit hook A f2 - $ hg verify --large - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files - searching 1 changesets for largefiles - verified existence of 1 revisions of 1 largefiles + $ hg verify --large -q $ hg serve --config extensions.largefiles=! -R ../r6 -d -p $HGPORT --pid-file ../hg.pid $ cat ../hg.pid >> $DAEMON_PIDS $ hg push http://localhost:$HGPORT @@ -280,14 +273,7 @@ largefiles pulled on update - a largefil $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] $ [ ! -f http-clone/f1 ] $ [ ! -f http-clone-usercache ] - $ hg -R http-clone verify --large --lfc - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files - searching 1 changesets for largefiles - verified contents of 1 revisions of 1 largefiles + $ hg -R http-clone verify --large --lfc -q $ hg -R http-clone up -Cqr null largefiles pulled on update - no server side problems: @@ -343,14 +329,7 @@ largefiles should batch verify remote ca adding file changes added 2 changesets with 2 changes to 2 files new changesets 567253b0f523:04d19c27a332 (2 drafts) - $ hg -R batchverifyclone verify --large --lfa - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files - searching 2 changesets for largefiles - verified existence of 2 revisions of 2 largefiles + $ hg -R batchverifyclone verify --large --lfa -q $ tail -1 access.log $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=statlfile+sha%3D972a1a11f19934401291cc99117ec614933374ce%3Bstatlfile+sha%3Dc801c9cfe94400963fcb683246217d5db77f9a9a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $ hg -R batchverifyclone update @@ -381,14 +360,7 @@ available locally. added 1 changesets with 1 changes to 1 files new changesets 6bba8cb6935d (1 drafts) (run 'hg update' to get a working copy) - $ hg -R batchverifyclone verify --lfa - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files - searching 3 changesets for largefiles - verified existence of 3 revisions of 3 largefiles + $ hg -R batchverifyclone verify --lfa -q $ tail -1 access.log $LOCALIP - - [$LOGDATE$] "GET /?cmd=statlfile HTTP/1.1" 200 - x-hgarg-1:sha=c8559c3c9cfb42131794b7d8009230403b9b454c x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t --- a/tests/test-largefiles.t +++ b/tests/test-largefiles.t @@ -1029,14 +1029,7 @@ Test cloning with --all-largefiles flag 2 largefiles updated, 0 removed 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 8 additional largefiles cached - $ hg -R a-clone1 verify --large --lfa --lfc - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 8 changesets with 24 changes to 10 files - searching 8 changesets for largefiles - verified contents of 13 revisions of 6 largefiles + $ hg -R a-clone1 verify --large --lfa --lfc -q $ hg -R a-clone1 sum parent: 1:ce8896473775 edit files @@ -1561,15 +1554,8 @@ and make sure that this is caught: $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 . $ rm .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 - $ hg verify --large - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 10 changesets with 28 changes to 10 files - searching 1 changesets for largefiles + $ hg verify --large -q changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 - verified existence of 3 revisions of 3 largefiles [1] - introduce corruption and make sure that it is caught when checking content: diff --git a/tests/test-manifest.t b/tests/test-manifest.t --- a/tests/test-manifest.t +++ b/tests/test-manifest.t @@ -246,12 +246,7 @@ Pure removes should actually remove all $ hg up -qC . - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 8 changes to 8 files + $ hg verify -q $ hg rollback -q --config ui.rollback=True $ hg rm b.txt d.txt @@ -270,12 +265,7 @@ A mix of adds and removes should remove ccc.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc) e.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 9 changes to 9 files + $ hg verify -q $ cd .. Test manifest cache interraction with shares 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 @@ -164,12 +164,7 @@ Check that the resulting history is vali remote: adding file changes remote: added 4 changesets with 4 changes to 2 files $ cd ../master - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 8 changesets with 10 changes to 3 files + $ hg verify -q Can not push to wider repo if change affects paths in wider repo that are not also in narrower repo 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 @@ -161,13 +161,7 @@ We should also be able to unshare withou 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd share-unshare $ hg unshare - $ hg verify - checking changesets - checking manifests - checking directory manifests (tree !) - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 3 changes to 3 files + $ hg verify -q $ cd .. Dirstate should be left alone when upgrading from version of hg that didn't support narrow+share diff --git a/tests/test-narrow-widen-no-ellipsis.t b/tests/test-narrow-widen-no-ellipsis.t --- a/tests/test-narrow-widen-no-ellipsis.t +++ b/tests/test-narrow-widen-no-ellipsis.t @@ -274,13 +274,7 @@ make narrow clone with every third node. I path:d3 I path:d6 I path:d9 - $ hg verify - checking changesets - checking manifests - checking directory manifests (tree !) - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 4 changes to 4 files + $ hg verify -q $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" 10: add d10/f 9: add d9/f @@ -321,13 +315,7 @@ make narrow clone with every third node. Verify shouldn't claim the repo is corrupt after a widen. - $ hg verify - checking changesets - checking manifests - checking directory manifests (tree !) - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 5 changes to 5 files + $ hg verify -q Widening preserves parent of local commit diff --git a/tests/test-narrow-widen.t b/tests/test-narrow-widen.t --- a/tests/test-narrow-widen.t +++ b/tests/test-narrow-widen.t @@ -280,13 +280,7 @@ make narrow clone with every third node. I path:d3 I path:d6 I path:d9 - $ hg verify - checking changesets - checking manifests - checking directory manifests (tree !) - crosschecking files in changesets and manifests - checking files - checked 8 changesets with 4 changes to 4 files + $ hg verify -q $ hg l @ ...7: add d10/f | @@ -340,13 +334,7 @@ make narrow clone with every third node. Verify shouldn't claim the repo is corrupt after a widen. - $ hg verify - checking changesets - checking manifests - checking directory manifests (tree !) - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 5 changes to 5 files + $ hg verify -q Widening preserves parent of local commit diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t --- a/tests/test-obsolete-changeset-exchange.t +++ b/tests/test-obsolete-changeset-exchange.t @@ -47,12 +47,7 @@ Push it. The bundle should not refer to adding manifests adding file changes added 2 changesets with 2 changes to 2 files - $ hg -R ../other verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files + $ hg -R ../other verify -q Adding a changeset going extinct locally ------------------------------------------ diff --git a/tests/test-permissions.t b/tests/test-permissions.t --- a/tests/test-permissions.t +++ b/tests/test-permissions.t @@ -19,31 +19,17 @@ $ hg commit -m "1" - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ chmod -r .hg/store/data/a.i - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files + $ hg verify -q abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i' [255] $ chmod +r .hg/store/data/a.i - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ chmod -w .hg/store/data/a.i diff --git a/tests/test-phases.t b/tests/test-phases.t --- a/tests/test-phases.t +++ b/tests/test-phases.t @@ -800,12 +800,7 @@ test verify repo containing hidden chang because repo.cancopy() is False $ cd ../initialrepo - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 8 changesets with 7 changes to 7 files + $ hg verify -q $ cd .. diff --git a/tests/test-pull-network.t b/tests/test-pull-network.t --- a/tests/test-pull-network.t +++ b/tests/test-pull-network.t @@ -8,12 +8,7 @@ adding foo $ hg commit -m 1 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ hg serve -p $HGPORT -d --pid-file=hg.pid $ cat hg.pid >> $DAEMON_PIDS @@ -30,12 +25,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ hg co 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-pull-permission.t b/tests/test-pull-permission.t --- a/tests/test-pull-permission.t +++ b/tests/test-pull-permission.t @@ -23,11 +23,6 @@ $ chmod +w a/.hg/store # let test clean up $ cd b - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ cd .. diff --git a/tests/test-pull-pull-corruption.t b/tests/test-pull-pull-corruption.t --- a/tests/test-pull-pull-corruption.t +++ b/tests/test-pull-pull-corruption.t @@ -65,11 +65,6 @@ start a pull... see the result $ wait - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 11 changes to 1 files + $ hg verify -q $ cd .. diff --git a/tests/test-push.t b/tests/test-push.t --- a/tests/test-push.t +++ b/tests/test-push.t @@ -18,7 +18,7 @@ Testing of the '--rev' flag > echo > hg init test-revflag-"$i" > hg -R test-revflag push -r "$i" test-revflag-"$i" - > hg -R test-revflag-"$i" verify + > hg -R test-revflag-"$i" verify -q > done pushing to test-revflag-0 @@ -27,11 +27,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 1 changesets with 1 changes to 1 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files pushing to test-revflag-1 searching for changes @@ -39,11 +34,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 2 changesets with 2 changes to 1 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files pushing to test-revflag-2 searching for changes @@ -51,11 +41,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 3 changesets with 3 changes to 1 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files pushing to test-revflag-3 searching for changes @@ -63,11 +48,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 4 changesets with 4 changes to 1 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 4 changes to 1 files pushing to test-revflag-4 searching for changes @@ -75,11 +55,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 2 changesets with 2 changes to 1 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files pushing to test-revflag-5 searching for changes @@ -87,11 +62,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 3 changesets with 3 changes to 1 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files pushing to test-revflag-6 searching for changes @@ -99,11 +69,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 4 changesets with 5 changes to 2 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 5 changes to 2 files pushing to test-revflag-7 searching for changes @@ -111,11 +76,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 5 changesets with 6 changes to 3 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 6 changes to 3 files pushing to test-revflag-8 searching for changes @@ -123,11 +83,6 @@ Testing of the '--rev' flag adding manifests adding file changes added 5 changesets with 5 changes to 2 files - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files $ cd test-revflag-8 @@ -141,12 +96,7 @@ Testing of the '--rev' flag new changesets c70afb1ee985:faa2e4234c7a (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. @@ -189,13 +139,8 @@ Test spurious filelog entries: Expected to fail: - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files + $ hg verify -q beta@1: dddc47b3ba30 not in manifests - checked 2 changesets with 4 changes to 2 files 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] @@ -224,13 +169,8 @@ Test missing filelog entries: Expected to fail: - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files + $ hg verify -q beta@1: manifest refers to unknown revision dddc47b3ba30 - checked 2 changesets with 2 changes to 2 files 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] diff --git a/tests/test-revlog-v2.t b/tests/test-revlog-v2.t --- a/tests/test-revlog-v2.t +++ b/tests/test-revlog-v2.t @@ -117,16 +117,6 @@ The two repository should be identical, hg verify should be happy ------------------------- - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q - $ hg verify -R ../cloned-repo - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -R ../cloned-repo -q diff --git a/tests/test-rhg-sparse-narrow.t b/tests/test-rhg-sparse-narrow.t --- a/tests/test-rhg-sparse-narrow.t +++ b/tests/test-rhg-sparse-narrow.t @@ -96,12 +96,7 @@ Adding "orphaned" index files: $ (cd ..; cp repo-sparse/.hg/store/data/hide.i repo-narrow/.hg/store/data/hide.i) $ (cd ..; mkdir repo-narrow/.hg/store/data/dir2; cp repo-sparse/.hg/store/data/dir2/z.i repo-narrow/.hg/store/data/dir2/z.i) - $ "$real_hg" verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 2 changes to 2 files + $ "$real_hg" verify -q $ "$real_hg" files -r "$tip" dir1/x diff --git a/tests/test-rollback.t b/tests/test-rollback.t --- a/tests/test-rollback.t +++ b/tests/test-rollback.t @@ -4,12 +4,7 @@ setup repo $ echo a > a $ hg commit -Am'add a' adding a - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ hg parents changeset: 0:1f0dee641bb7 tag: tip @@ -23,12 +18,7 @@ rollback to null revision $ hg rollback repository tip rolled back to revision -1 (undo commit) working directory now based on revision -1 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 0 changesets with 0 changes to 0 files + $ hg verify -q $ hg parents $ hg status A a @@ -191,14 +181,8 @@ same again, but emulate an old client th corrupt journal test $ echo "foo" > .hg/store/journal - $ hg recover --verify - rolling back interrupted transaction + $ hg recover --verify -q couldn't read journal entry 'foo\n'! - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files rollback disabled by config $ cat >> $HGRCPATH <> .hg/hgrc < [hooks] > changegroup = sh -c "printenv.py --line changegroup-in-local 0 ../dummylog" @@ -214,12 +204,7 @@ check remote tip date: Thu Jan 01 00:00:00 1970 +0000 summary: add - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 3 changes to 2 files + $ hg verify -q $ hg cat -r tip foo bleah $ echo z > z diff --git a/tests/test-ssh-clone-r.t b/tests/test-ssh-clone-r.t --- a/tests/test-ssh-clone-r.t +++ b/tests/test-ssh-clone-r.t @@ -20,7 +20,7 @@ clone remote via stream $ for i in 0 1 2 3 4 5 6 7 8; do > hg clone --stream -r "$i" ssh://user@dummy/remote test-"$i" > if cd test-"$i"; then - > hg verify + > hg verify -q > cd .. > fi > done @@ -31,11 +31,6 @@ clone remote via stream new changesets bfaf4b5cbf01 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes @@ -43,11 +38,6 @@ clone remote via stream new changesets bfaf4b5cbf01:21f32785131f updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -55,11 +45,6 @@ clone remote via stream new changesets bfaf4b5cbf01:4ce51a113780 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -67,11 +52,6 @@ clone remote via stream new changesets bfaf4b5cbf01:93ee6ab32777 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 4 changes to 1 files adding changesets adding manifests adding file changes @@ -79,11 +59,6 @@ clone remote via stream new changesets bfaf4b5cbf01:c70afb1ee985 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -91,11 +66,6 @@ clone remote via stream new changesets bfaf4b5cbf01:f03ae5a9b979 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -103,11 +73,6 @@ clone remote via stream new changesets bfaf4b5cbf01:095cb14b1b4d updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 5 changes to 2 files adding changesets adding manifests adding file changes @@ -115,11 +80,6 @@ clone remote via stream new changesets bfaf4b5cbf01:faa2e4234c7a updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 6 changes to 3 files adding changesets adding manifests adding file changes @@ -127,11 +87,6 @@ clone remote via stream new changesets bfaf4b5cbf01:916f1afdef90 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files $ cd test-8 $ hg pull ../test-7 pulling from ../test-7 @@ -142,12 +97,7 @@ clone remote via stream added 4 changesets with 2 changes to 3 files (+1 heads) new changesets c70afb1ee985:faa2e4234c7a (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. $ cd test-1 $ hg pull -r 4 ssh://user@dummy/remote @@ -159,12 +109,7 @@ clone remote via stream added 1 changesets with 0 changes to 0 files (+1 heads) new changesets c70afb1ee985 (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 2 changes to 1 files + $ hg verify -q $ hg pull ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes @@ -185,12 +130,7 @@ clone remote via stream added 2 changesets with 0 changes to 0 files (+1 heads) new changesets c70afb1ee985:f03ae5a9b979 (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 3 changes to 1 files + $ hg verify -q $ hg pull ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes @@ -200,11 +140,6 @@ clone remote via stream added 4 changesets with 4 changes to 4 files new changesets 93ee6ab32777:916f1afdef90 (run 'hg update' to get a working copy) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 9 changesets with 7 changes to 4 files + $ hg verify -q $ cd .. diff --git a/tests/test-ssh.t b/tests/test-ssh.t --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -61,12 +61,7 @@ clone remote via stream updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd local-stream - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 2 changes to 2 files + $ hg verify -q $ hg branches default 0:1160648e36ce $ cd $TESTTMP @@ -103,12 +98,7 @@ clone remote via pull verify $ cd local - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 2 changes to 2 files + $ hg verify -q $ cat >> .hg/hgrc < [hooks] > changegroup = sh -c "printenv.py changegroup-in-local 0 ../dummylog" @@ -200,12 +190,7 @@ check remote tip date: Thu Jan 01 00:00:00 1970 +0000 summary: add - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 3 changes to 2 files + $ hg verify -q $ hg cat -r tip foo bleah $ echo z > z diff --git a/tests/test-static-http.t b/tests/test-static-http.t --- a/tests/test-static-http.t +++ b/tests/test-static-http.t @@ -38,12 +38,7 @@ one pull updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd local - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 2 changes to 2 files + $ hg verify -q $ cat bar foo $ cd ../remote @@ -134,13 +129,7 @@ test with "/" URI (issue747) and subrepo new changesets be090ea66256:322ea90975df 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd local2 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 3 changes to 3 files - checking subrepo links + $ hg verify -q $ cat a a $ hg paths @@ -155,12 +144,7 @@ test with empty repo (issue965) updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd local3 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 0 changesets with 0 changes to 0 files + $ hg verify -q $ hg paths default = static-http://localhost:$HGPORT/remotempty diff --git a/tests/test-strip-cross.t b/tests/test-strip-cross.t --- a/tests/test-strip-cross.t +++ b/tests/test-strip-cross.t @@ -80,35 +80,20 @@ 2 1 0 2 0 1 2 > echo "% Trying to strip revision $i" > hg --cwd $i strip $i > echo "% Verifying" - > hg --cwd $i verify + > hg --cwd $i verify -q > echo > done % Trying to strip revision 0 saved backup bundle to $TESTTMP/files/0/.hg/strip-backup/cbb8c2f0a2e3-239800b9-backup.hg % Verifying - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 12 changes to 6 files % Trying to strip revision 1 saved backup bundle to $TESTTMP/files/1/.hg/strip-backup/124ecc0cbec9-6104543f-backup.hg % Verifying - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 12 changes to 6 files % Trying to strip revision 2 saved backup bundle to $TESTTMP/files/2/.hg/strip-backup/f6439b304a1a-c6505a5f-backup.hg % Verifying - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 12 changes to 6 files $ cd .. @@ -139,26 +124,16 @@ Do a similar test where the manifest rev > echo "% Trying to strip revision $i" > hg --cwd $i strip $i > echo "% Verifying" - > hg --cwd $i verify + > hg --cwd $i verify -q > echo > done % Trying to strip revision 2 saved backup bundle to $TESTTMP/manifests/2/.hg/strip-backup/f3015ad03c03-4d98bdc2-backup.hg % Verifying - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 2 files % Trying to strip revision 3 saved backup bundle to $TESTTMP/manifests/3/.hg/strip-backup/9632aa303aa4-69192e3f-backup.hg % Verifying - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 2 files $ cd .. @@ -194,27 +169,16 @@ Now a similar test for a non-root manife > echo "% Trying to strip revision $i" > hg --cwd $i strip $i > echo "% Verifying" - > hg --cwd $i verify + > hg --cwd $i verify -q > echo > done % Trying to strip revision 2 saved backup bundle to $TESTTMP/treemanifests/2/.hg/strip-backup/145f5c75f9ac-a105cfbe-backup.hg % Verifying - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 4 changes to 3 files % Trying to strip revision 3 saved backup bundle to $TESTTMP/treemanifests/3/.hg/strip-backup/e4e3de5c3cb2-f4c70376-backup.hg % Verifying - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 4 changes to 3 files + $ cd .. diff --git a/tests/test-subrepo-missing.t b/tests/test-subrepo-missing.t --- a/tests/test-subrepo-missing.t +++ b/tests/test-subrepo-missing.t @@ -111,13 +111,7 @@ verify will warn if locked-in subrepo re $ hg ci -m "amended subrepo (again)" $ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip' --config devel.strip-obsmarkers=no - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files - checking subrepo links + $ hg verify -q subrepo 'subrepo' is hidden in revision a66de08943b6 subrepo 'subrepo' is hidden in revision 674d05939c1e subrepo 'subrepo' not found in revision a7d05d9055a4 @@ -125,13 +119,7 @@ verify will warn if locked-in subrepo re verifying shouldn't init a new subrepo if the reference doesn't exist $ mv subrepo b - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 5 changesets with 5 changes to 2 files - checking subrepo links + $ hg verify -q 0: repository $TESTTMP/repo/subrepo not found 1: repository $TESTTMP/repo/subrepo not found 3: repository $TESTTMP/repo/subrepo not found diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t --- a/tests/test-treemanifest.t +++ b/tests/test-treemanifest.t @@ -399,13 +399,7 @@ Pushing to an empty repo works added 11 changesets with 15 changes to 10 files (+3 heads) $ hg debugrequires -R clone | grep treemanifest treemanifest - $ hg -R clone verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 11 changesets with 15 changes to 10 files + $ hg -R clone verify -q Create deeper repo with tree manifests. @@ -567,13 +561,7 @@ Add some more changes to the deep repo $ hg ci -m troz Verify works - $ hg verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg verify -q #if repofncache Dirlogs are included in fncache @@ -707,13 +695,7 @@ Tree manifest revlogs exist. deepclone/.hg/store/meta/~2e_a/00manifest.i (reporevlogstore !) Verify passes. $ cd deepclone - $ hg verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg verify -q $ cd .. #if reporevlogstore @@ -755,33 +737,15 @@ Create clones using old repo formats to Local clone with basicstore $ hg clone -U deeprepo-basicstore local-clone-basicstore - $ hg -R local-clone-basicstore verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg -R local-clone-basicstore verify -q Local clone with encodedstore $ hg clone -U deeprepo-encodedstore local-clone-encodedstore - $ hg -R local-clone-encodedstore verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg -R local-clone-encodedstore verify -q Local clone with fncachestore $ hg clone -U deeprepo local-clone-fncachestore - $ hg -R local-clone-fncachestore verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg -R local-clone-fncachestore verify -q Stream clone with basicstore $ hg clone --config experimental.changegroup3=True --stream -U \ @@ -789,13 +753,7 @@ Stream clone with basicstore streaming all changes 28 files to transfer, * of data (glob) transferred * in * seconds (*) (glob) - $ hg -R stream-clone-basicstore verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg -R stream-clone-basicstore verify -q Stream clone with encodedstore $ hg clone --config experimental.changegroup3=True --stream -U \ @@ -803,13 +761,7 @@ Stream clone with encodedstore streaming all changes 28 files to transfer, * of data (glob) transferred * in * seconds (*) (glob) - $ hg -R stream-clone-encodedstore verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg -R stream-clone-encodedstore verify -q Stream clone with fncachestore $ hg clone --config experimental.changegroup3=True --stream -U \ @@ -817,13 +769,7 @@ Stream clone with fncachestore streaming all changes 22 files to transfer, * of data (glob) transferred * in * seconds (*) (glob) - $ hg -R stream-clone-fncachestore verify - checking changesets - checking manifests - checking directory manifests - crosschecking files in changesets and manifests - checking files - checked 4 changesets with 18 changes to 8 files + $ hg -R stream-clone-fncachestore verify -q Packed bundle $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg diff --git a/tests/test-unamend.t b/tests/test-unamend.t --- a/tests/test-unamend.t +++ b/tests/test-unamend.t @@ -363,13 +363,7 @@ Testing whether unamend retains copies o $ hg mv c wat $ hg unamend - $ hg verify -v - repository uses revlog format 1 - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 28 changesets with 16 changes to 11 files + $ hg verify -q Retained copies in new prdecessor commit diff --git a/tests/test-unionrepo.t b/tests/test-unionrepo.t --- a/tests/test-unionrepo.t +++ b/tests/test-unionrepo.t @@ -133,12 +133,7 @@ union repos can be cloned ... and clones $ hg -R repo3 paths default = union:repo1+repo2 - $ hg -R repo3 verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 6 changesets with 11 changes to 6 files + $ hg -R repo3 verify -q $ hg -R repo3 heads --template '{rev}:{node|short} {desc|firstline}\n' 5:2f0d178c469c repo2-3 diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t --- a/tests/test-upgrade-repo.t +++ b/tests/test-upgrade-repo.t @@ -853,12 +853,7 @@ manifest should be generaldelta verify should be happy - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q old store should be backed up @@ -995,12 +990,7 @@ Check that the repo still works fine - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q Check we can select negatively @@ -1047,12 +1037,7 @@ Check we can select negatively store replacement complete; repository was inconsistent for *s (glob) finalizing requirements file and making repository readable again removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q Check that we can select changelog only @@ -1098,12 +1083,7 @@ Check that we can select changelog only store replacement complete; repository was inconsistent for *s (glob) finalizing requirements file and making repository readable again removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q Check that we can select filelog only @@ -1149,12 +1129,7 @@ Check that we can select filelog only store replacement complete; repository was inconsistent for *s (glob) finalizing requirements file and making repository readable again removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q Check you can't skip revlog clone during important format downgrade @@ -1224,12 +1199,7 @@ Check you can't skip revlog clone during store replacement complete; repository was inconsistent for *s (glob) finalizing requirements file and making repository readable again removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q Check you can't skip revlog clone during important format upgrade @@ -1285,12 +1255,7 @@ Check you can't skip revlog clone during store replacement complete; repository was inconsistent for *s (glob) finalizing requirements file and making repository readable again removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 3 changesets with 3 changes to 3 files + $ hg verify -q $ cd .. @@ -1413,12 +1378,7 @@ Check upgrading a large file repository lfs $ find .hg/store/lfs -type f .hg/store/lfs/objects/d0/beab232adff5ba365880366ad30b1edb85c4c5372442b5d2fe27adc96d653f - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 2 changesets with 2 changes to 2 files + $ hg verify -q $ hg debugdata lfs.bin 0 version https://git-lfs.github.com/spec/v1 oid sha256:d0beab232adff5ba365880366ad30b1edb85c4c5372442b5d2fe27adc96d653f diff --git a/tests/test-verify.t b/tests/test-verify.t --- a/tests/test-verify.t +++ b/tests/test-verify.t @@ -275,12 +275,7 @@ test changelog without a manifest marked working directory as branch foo (branches are permanent and global, did you want a bookmark?) $ hg ci -m branchfoo - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 0 changes to 0 files + $ hg verify -q test revlog corruption @@ -292,14 +287,9 @@ test revlog corruption $ dd if=.hg/store/data/a.i of=start bs=1 count=20 2>/dev/null $ cat start b > .hg/store/data/a.i - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files + $ hg verify -q a@1: broken revlog! (index a is corrupted) warning: orphan data file 'data/a.i' - checked 2 changesets with 0 changes to 1 files 1 warnings encountered! 1 integrity errors encountered! (first damaged changeset appears to be 1) @@ -330,12 +320,7 @@ test flag processor and skipflags > EOF $ echo '[BASE64]content' > base64 $ hg commit -Aqm 'flag processor content' base64 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify -q $ cat >> $TESTTMP/break-base64.py < import base64 @@ -345,20 +330,10 @@ test flag processor and skipflags > breakbase64=$TESTTMP/break-base64.py > EOF - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files + $ hg verify -q base64@0: unpacking 794cee7777cb: integrity check failed on base64:0 - checked 1 changesets with 1 changes to 1 files 1 integrity errors encountered! (first damaged changeset appears to be 0) [1] - $ hg verify --config verify.skipflags=2147483647 - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - checked 1 changesets with 1 changes to 1 files + $ hg verify --config verify.skipflags=2147483647 -q