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.

tests/test-bundle-r.t

@@ -1,352 +1,277
   $ hg init test
   $ cd test
   $ hg unbundle "$TESTDIR/bundles/remote.hg"
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >    mkdir test-"$i"
   >    hg --cwd test-"$i" init
   >    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
   searching for changes
   1 changesets found
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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
   pulling from ../test-7
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 2 changes to 3 files (+1 heads)
   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 ..
 
 should fail
 
   $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
   abort: --base is incompatible with specifying destinations
   [10]
   $ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3
   abort: --all is incompatible with specifying destinations
   [10]
   $ hg -R test bundle -r tip test-bundle-branch1.hg
   config error: default repository not configured!
   (see 'hg help config.paths')
   [30]
 
   $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
   2 changesets found
   $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
   4 changesets found
   $ hg -R test bundle --base 2 test-bundle-all.hg
   6 changesets found
   $ hg -R test bundle --base 2 --all test-bundle-all-2.hg
   ignoring --base because --all was specified
   9 changesets found
   $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
   1 changesets found
 
 empty bundle
 
   $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
   no changes found
   [1]
 
 issue76 msg2163
 
   $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
   no changes found
   [1]
 
 Issue1910: 'hg bundle --base $head' does not exclude $head from
 result
 
   $ hg -R test bundle --base 7 test-bundle-cset-7.hg
   4 changesets found
 
   $ hg clone test-2 test-9
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-9
 
 revision 2
 
   $ hg tip -q
   2:4ce51a113780
   $ hg unbundle ../test-bundle-should-fail.hg
   adding changesets
   transaction abort!
   rollback completed
   abort: 00changelog@93ee6ab32777cd430e07da694794fb6a4f917712: unknown parent
   [50]
 
 revision 2
 
   $ hg tip -q
   2:4ce51a113780
   $ hg unbundle ../test-bundle-all.hg
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 4 changes to 4 files (+1 heads)
   new changesets 93ee6ab32777:916f1afdef90 (6 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 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)
 
 revision 2
 
   $ hg tip -q
   2:4ce51a113780
   $ hg unbundle ../test-bundle-branch1.hg
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
   (run 'hg update' to get a working copy)
 
 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
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 3 changes to 3 files (+1 heads)
   new changesets c70afb1ee985:faa2e4234c7a (4 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 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
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
   (run 'hg update' to get a working copy)
 
 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
   note: possible conflict - afile was renamed multiple times to:
    adifferentfile
    anotherfile
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ cd ..
   $ hg -R test bundle --base 2 test-bundle-head.hg
   7 changesets found
   $ hg clone test-2 test-10
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-10
   $ hg unbundle ../test-bundle-head.hg
   adding changesets
   adding manifests
   adding file changes
   added 7 changesets with 4 changes to 4 files
   new changesets 93ee6ab32777:03fc0b0e347c (7 drafts)
   (run 'hg update' to get a working copy)
 
 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 ..

tests/test-bundle.t

@@ -1,1127 +1,1107
 Setting up test
 
   $ hg init test
   $ cd test
   $ echo 0 > afile
   $ hg add afile
   $ hg commit -m "0.0"
   $ echo 1 >> afile
   $ hg commit -m "0.1"
   $ echo 2 >> afile
   $ hg commit -m "0.2"
   $ echo 3 >> afile
   $ hg commit -m "0.3"
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 >> afile
   $ hg commit -m "1.1"
   created new head
   $ echo 2 >> afile
   $ hg commit -m "1.2"
   $ echo "a line" > fred
   $ echo 3 >> afile
   $ hg add fred
   $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
   $ hg commit -m "1.3m"
   $ hg update -C 3
   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
 
 Bundle and phase
 
   $ hg -R test phase --force --secret 0
   $ hg -R test bundle phase.hg empty
   searching for changes
   no changes found (ignored 9 secret changesets)
   [1]
   $ hg -R test phase --draft -r 'head()'
 
 Bundle --all
 
   $ hg -R test bundle --all all.hg
   9 changesets found
 
 Bundle test to full.hg
 
   $ hg -R test bundle full.hg empty
   searching for changes
   9 changesets found
 
 Unbundle full.hg in test
 
   $ hg -R test unbundle full.hg
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 4 files
   (run 'hg update' to get a working copy)
 
 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
 
 Pull full.hg into test (using --cwd)
 
   $ hg --cwd test pull ../full.hg
   pulling from ../full.hg
   searching for changes
   no changes found
 
 Verify that there are no leaked temporary files after pull (issue2797)
 
   $ ls test/.hg | grep .hg10un
   [1]
 
 Pull full.hg into empty (using --cwd)
 
   $ hg --cwd empty pull ../full.hg
   pulling from ../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty
 
   $ hg -R empty rollback
   repository tip rolled back to revision -1 (undo pull)
 
 Pull full.hg into empty again (using --cwd)
 
   $ hg --cwd empty pull ../full.hg
   pulling from ../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Pull full.hg into test (using -R)
 
   $ hg -R test pull full.hg
   pulling from full.hg
   searching for changes
   no changes found
 
 Pull full.hg into empty (using -R)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   searching for changes
   no changes found
 
 Rollback empty
 
   $ hg -R empty rollback
   repository tip rolled back to revision -1 (undo pull)
 
 Pull full.hg into empty again (using -R)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Log -R full.hg in fresh empty
 
   $ rm -r empty
   $ hg init empty
   $ cd empty
   $ hg -R bundle://../full.hg log
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
   changeset:   2:e38ba6f5b7e0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
   changeset:   1:34c2bf6b0626
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
   changeset:   0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
 Make sure bundlerepo doesn't leak tempfiles (issue2491)
 
   $ ls .hg
   00changelog.i
   cache
   requires
   store
   wcache
 
 Pull ../full.hg into empty (with hook)
 
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup"
   > EOF
 
 doesn't work (yet ?)
 NOTE: msys is mangling the URL below
 
 hg -R bundle://../full.hg verify
 
   $ hg pull bundle://../full.hg
   pulling from bundle:../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735
   HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   bundle:../full.hg (no-msys !)
   bundle;../full.hg (msys !)
   HG_URL=bundle:../full.hg (no-msys !)
   HG_URL=bundle;../full.hg (msys !)
   
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty
 
   $ hg rollback
   repository tip rolled back to revision -1 (undo pull)
   $ cd ..
 
 Log -R bundle:empty+full.hg
 
   $ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
   8 7 6 5 4 3 2 1 0 
 
 Pull full.hg into empty again (using -R; with hook)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735
   HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   bundle:empty+full.hg
   HG_URL=bundle:empty+full.hg
   
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 #endif
 
 Cannot produce streaming clone bundles with "hg bundle"
 
   $ hg -R test bundle -t packed1 packed.hg
   abort: packed bundles cannot be produced by "hg bundle"
   (use 'hg debugcreatestreamclonebundle')
   [10]
 
 packed1 is produced properly
 
 
 #if reporevlogstore rust
 
   $ hg -R test debugcreatestreamclonebundle packed.hg
   writing 2665 bytes for 6 files
   bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
 
   $ f -B 64 --size --sha1 --hexdump packed.hg
   packed.hg: size=2865, sha1=353d10311f4befa195d9a1ca4b8e26518115c702
   0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
   0010: 00 00 00 00 0a 69 00 3b 67 65 6e 65 72 61 6c 64 |.....i.;generald|
   0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 2d 63 6f 6d 70 |elta,revlog-comp|
   0030: 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c 72 65 76 |ression-zstd,rev|
   $ hg debugbundle --spec packed.hg
   none-packed1;requirements%3Dgeneraldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog
 #endif
 
 #if reporevlogstore no-rust zstd
 
   $ hg -R test debugcreatestreamclonebundle packed.hg
   writing 2665 bytes for 6 files
   bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
 
   $ f -B 64 --size --sha1 --hexdump packed.hg
   packed.hg: size=2865, sha1=353d10311f4befa195d9a1ca4b8e26518115c702
   0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
   0010: 00 00 00 00 0a 69 00 3b 67 65 6e 65 72 61 6c 64 |.....i.;generald|
   0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 2d 63 6f 6d 70 |elta,revlog-comp|
   0030: 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c 72 65 76 |ression-zstd,rev|
   $ hg debugbundle --spec packed.hg
   none-packed1;requirements%3Dgeneraldelta%2Crevlog-compression-zstd%2Crevlogv1%2Csparserevlog
 #endif
 
 #if reporevlogstore no-rust no-zstd
 
   $ hg -R test debugcreatestreamclonebundle packed.hg
   writing 2664 bytes for 6 files
   bundle requirements: generaldelta, revlogv1, sparserevlog
 
   $ f -B 64 --size --sha1 --hexdump packed.hg
   packed.hg: size=2840, sha1=12bf3eee3eb8a04c503ce2d29b48f0135c7edff5
   0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
   0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald|
   0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp|
   0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/|
   $ hg debugbundle --spec packed.hg
   none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog
 #endif
 
 #if reporevlogstore
 
 generaldelta requirement is not listed in stream clone bundles unless used
 
   $ hg --config format.usegeneraldelta=false init testnongd
   $ cd testnongd
   $ touch foo
   $ hg -q commit -A -m initial
   $ cd ..
 
 #endif
 
 #if reporevlogstore rust
 
   $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
   writing 301 bytes for 3 files
   bundle requirements: revlog-compression-zstd, revlogv1
 
   $ f -B 64 --size --sha1 --hexdump packednongd.hg
   packednongd.hg: size=407, sha1=0b8714422b785ba8eb98c916b41ffd5fb994c9b5
   0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
   0010: 00 00 00 00 01 2d 00 21 72 65 76 6c 6f 67 2d 63 |.....-.!revlog-c|
   0020: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c |ompression-zstd,|
   0030: 72 65 76 6c 6f 67 76 31 00 64 61 74 61 2f 66 6f |revlogv1.data/fo|
 
   $ hg debugbundle --spec packednongd.hg
   none-packed1;requirements%3Drevlog-compression-zstd%2Crevlogv1
 
 #endif
 
 #if reporevlogstore no-rust zstd
 
   $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
   writing 301 bytes for 3 files
   bundle requirements: revlog-compression-zstd, revlogv1
 
   $ f -B 64 --size --sha1 --hexdump packednongd.hg
   packednongd.hg: size=407, sha1=0b8714422b785ba8eb98c916b41ffd5fb994c9b5
   0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
   0010: 00 00 00 00 01 2d 00 21 72 65 76 6c 6f 67 2d 63 |.....-.!revlog-c|
   0020: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 2c |ompression-zstd,|
   0030: 72 65 76 6c 6f 67 76 31 00 64 61 74 61 2f 66 6f |revlogv1.data/fo|
 
   $ hg debugbundle --spec packednongd.hg
   none-packed1;requirements%3Drevlog-compression-zstd%2Crevlogv1
 
 
 #endif
 
 #if reporevlogstore no-rust no-zstd
 
   $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
   writing 301 bytes for 3 files
   bundle requirements: revlogv1
 
   $ f -B 64 --size --sha1 --hexdump packednongd.hg
   packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f
   0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
   0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
   0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
   0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
 
   $ hg debugbundle --spec packednongd.hg
   none-packed1;requirements%3Drevlogv1
 
 
 #endif
 
 #if reporevlogstore
 
 Warning emitted when packed bundles contain secret changesets
 
   $ hg init testsecret
   $ cd testsecret
   $ touch foo
   $ hg -q commit -A -m initial
   $ hg phase --force --secret -r .
   $ cd ..
 
 #endif
 
 #if reporevlogstore rust
 
   $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
   (warning: stream clone bundle will contain secret revisions)
   writing 301 bytes for 3 files
   bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
 
 #endif
 
 #if reporevlogstore no-rust zstd
 
   $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
   (warning: stream clone bundle will contain secret revisions)
   writing 301 bytes for 3 files
   bundle requirements: generaldelta, revlog-compression-zstd, revlogv1, sparserevlog
 
 #endif
 
 #if reporevlogstore no-rust no-zstd
 
   $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
   (warning: stream clone bundle will contain secret revisions)
   writing 301 bytes for 3 files
   bundle requirements: generaldelta, revlogv1, sparserevlog
 
 #endif
 
 #if reporevlogstore
 
 Unpacking packed1 bundles with "hg unbundle" isn't allowed
 
   $ hg init packed
   $ hg -R packed unbundle packed.hg
   abort: packed bundles cannot be applied with "hg unbundle"
   (use "hg debugapplystreamclonebundle")
   [10]
 
 packed1 can be consumed from debug command
 
 (this also confirms that streamclone-ed changes are visible via
 @filecache properties to in-process procedures before closing
 transaction)
 
   $ cat > $TESTTMP/showtip.py <<EOF
   > 
   > def showtip(ui, repo, hooktype, **kwargs):
   >     ui.warn(b'%s: %s\n' % (hooktype, repo[b'tip'].hex()[:12]))
   > 
   > def reposetup(ui, repo):
   >     # this confirms (and ensures) that (empty) 00changelog.i
   >     # before streamclone is already cached as repo.changelog
   >     ui.setconfig(b'hooks', b'pretxnopen.showtip', showtip)
   > 
   >     # this confirms that streamclone-ed changes are visible to
   >     # in-process procedures before closing transaction
   >     ui.setconfig(b'hooks', b'pretxnclose.showtip', showtip)
   > 
   >     # this confirms that streamclone-ed changes are still visible
   >     # after closing transaction
   >     ui.setconfig(b'hooks', b'txnclose.showtip', showtip)
   > EOF
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > showtip = $TESTTMP/showtip.py
   > EOF
 
   $ hg -R packed debugapplystreamclonebundle packed.hg
   6 files to transfer, 2.60 KB of data
   pretxnopen: 000000000000
   pretxnclose: aa35859c02ea
   transferred 2.60 KB in * seconds (* */sec) (glob)
   txnclose: aa35859c02ea
 
 (for safety, confirm visibility of streamclone-ed changes by another
 process, too)
 
   $ hg -R packed tip -T "{node|short}\n"
   aa35859c02ea
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > showtip = !
   > EOF
 
 Does not work on non-empty repo
 
   $ hg -R packed debugapplystreamclonebundle packed.hg
   abort: cannot apply stream clone bundle on non-empty repo
   [255]
 
 #endif
 
 Create partial clones
 
   $ rm -r empty
   $ hg init empty
   $ hg clone -r 3 test partial
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files
   new changesets f9ee2f85a263:eebf5a27f8ca
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone partial partial2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
 
 #if repobundlerepo
 
 Log -R full.hg in partial
 
   $ hg -R bundle://../full.hg log -T phases
   changeset:   8:aa35859c02ea
   tag:         tip
   phase:       draft
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
   changeset:   7:a6a34bfa0076
   phase:       draft
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   6:7373c1169842
   phase:       draft
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   5:1bb50a9436a7
   phase:       draft
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   4:095197eb4973
   phase:       draft
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   3:eebf5a27f8ca
   phase:       public
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
   changeset:   2:e38ba6f5b7e0
   phase:       public
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
   changeset:   1:34c2bf6b0626
   phase:       public
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
   changeset:   0:f9ee2f85a263
   phase:       public
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
 
 Incoming full.hg in partial
 
   $ hg incoming bundle://../full.hg
   comparing with bundle:../full.hg
   searching for changes
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
 
 Outgoing -R full.hg vs partial2 in partial
 
   $ hg -R bundle://../full.hg outgoing ../partial2
   comparing with ../partial2
   searching for changes
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
 
 Outgoing -R does-not-exist.hg vs partial2 in partial
 
   $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
   abort: *../does-not-exist.hg* (glob)
   [255]
 
 #endif
 
   $ cd ..
 
 hide outer repo
   $ hg init
 
 Direct clone from bundle (all-history)
 
 #if repobundlerepo
 
   $ hg clone full.hg full-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R full-clone heads
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   $ rm -r full-clone
 
 When cloning from a non-copiable repository into '', do not
 recurse infinitely (issue2528)
 
   $ hg clone full.hg ''
   abort: empty destination path is not valid
   [10]
 
 test for https://bz.mercurial-scm.org/216
 
 Unbundle incremental bundles into fresh empty in one go
 
   $ rm -r empty
   $ hg init empty
   $ hg -R test bundle --base null -r 0 ../0.hg
   1 changesets found
   $ hg -R test bundle --exact -r 1 ../1.hg
   1 changesets found
   $ hg -R empty unbundle -u ../0.hg ../1.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets f9ee2f85a263 (1 drafts)
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 34c2bf6b0626 (1 drafts)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 View full contents of the bundle
   $ hg -R test bundle --base null -r 3  ../partial.hg
   4 changesets found
   $ cd test
   $ hg -R ../../partial.hg log -r "bundle()"
   changeset:   0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
   changeset:   1:34c2bf6b0626
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
   changeset:   2:e38ba6f5b7e0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
   changeset:   3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
   $ cd ..
 
 #endif
 
 test for 540d1059c802
 
   $ hg init orig
   $ cd orig
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
 
   $ hg clone . ../copy
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag foo
 
   $ cd ../copy
   $ echo >> foo
   $ hg ci -m 'change foo'
   $ hg bundle ../bundle.hg ../orig
   searching for changes
   1 changesets found
 
   $ cd ..
 
 #if repobundlerepo
   $ cd orig
   $ hg incoming ../bundle.hg
   comparing with ../bundle.hg
   searching for changes
   changeset:   2:ed1b79f46b9a
   tag:         tip
   parent:      0:bbd179dfa0a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo
   
   $ cd ..
 
 test bundle with # in the filename (issue2154):
 
   $ cp bundle.hg 'test#bundle.hg'
   $ cd orig
   $ hg incoming '../test#bundle.hg'
   comparing with ../test
   abort: unknown revision 'bundle.hg'
   [10]
 
 note that percent encoding is not handled:
 
   $ hg incoming ../test%23bundle.hg
   abort: repository ../test%23bundle.hg not found
   [255]
   $ cd ..
 
 #endif
 
 test to bundle revisions on the newly created branch (issue3828):
 
   $ hg -q clone -U test test-clone
   $ cd test
 
   $ hg -q branch foo
   $ hg commit -m "create foo branch"
   $ hg -q outgoing ../test-clone
   9:b4f5acb1ee27
   $ hg -q bundle --branch foo foo.hg ../test-clone
 #if repobundlerepo
   $ hg -R foo.hg -q log -r "bundle()"
   9:b4f5acb1ee27
 #endif
 
   $ cd ..
 
 test for https://bz.mercurial-scm.org/1144
 
 test that verify bundle does not traceback
 
 partial history bundle, fails w/ unknown parent
 
   $ hg -R bundle.hg verify
   abort: 00changelog@bbd179dfa0a71671c253b3ae0aa1513b60d199fa: unknown parent
   [50]
 
 full history bundle, refuses to verify non-local repo
 
 #if repobundlerepo
   $ hg -R all.hg verify
   abort: cannot verify bundle or remote repos
   [255]
 #endif
 
 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
 
   $ hg init b
   $ cd b
   $ hg -R ../all.hg diff -r tip
   diff -r aa35859c02ea anotherfile
   --- a/anotherfile	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +0,0 @@
   -0
   -1
   -2
   -3
   $ cd ..
 #endif
 
 bundle single branch
 
   $ hg init branchy
   $ cd branchy
   $ echo a >a
   $ echo x >x
   $ hg ci -Ama
   adding a
   adding x
   $ echo c >c
   $ echo xx >x
   $ hg ci -Amc
   adding c
   $ echo c1 >c1
   $ hg ci -Amc1
   adding c1
   $ hg up 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo b >b
   $ hg ci -Amb
   adding b
   created new head
   $ echo b1 >b1
   $ echo xx >x
   $ hg ci -Amb1
   adding b1
   $ hg clone -q -r2 . part
 
 == bundling via incoming
 
   $ hg in -R part --bundle incoming.hg --template "{node}\n" .
   comparing with .
   searching for changes
   1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
   057f4db07f61970e1c11e83be79e9d08adc4dc31
 
 == bundling
 
   $ hg bundle bundle.hg part --debug --config progress.debug=true
   query 1; heads
   searching for changes
   all remote heads known locally
   2 changesets found
   list of changesets:
   1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
   057f4db07f61970e1c11e83be79e9d08adc4dc31
   bundle2-output-bundle: "HG20", (1 params) 2 parts total
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   changesets: 1/2 chunks (50.00%)
   changesets: 2/2 chunks (100.00%)
   manifests: 1/2 chunks (50.00%)
   manifests: 2/2 chunks (100.00%)
   files: b 1/3 files (33.33%)
   files: b1 2/3 files (66.67%)
   files: x 3/3 files (100.00%)
   bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
 
 #if repobundlerepo
 == Test for issue3441
 
   $ 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
 
   $ hg bundle -r 'public()' no-output.hg
   abort: no commits to bundle
   [10]
 
   $ cd ..
 
 When user merges to the revision existing only in the bundle,
 it should show warning that second parent of the working
 directory does not exist
 
   $ hg init update2bundled
   $ cd update2bundled
   $ cat <<EOF >> .hg/hgrc
   > [extensions]
   > strip =
   > EOF
   $ echo "aaa" >> a
   $ hg commit -A -m 0
   adding a
   $ echo "bbb" >> b
   $ hg commit -A -m 1
   adding b
   $ echo "ccc" >> c
   $ hg commit -A -m 2
   adding c
   $ hg update -r 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "ddd" >> d
   $ hg commit -A -m 3
   adding d
   created new head
   $ hg update -r 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   o  changeset:   3:8bd3e1f196af
   |  tag:         tip
   |  parent:      1:a01eca7af26d
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     3
   |
   | @  changeset:   2:4652c276ac4f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     2
   |
   o  changeset:   1:a01eca7af26d
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     1
   |
   o  changeset:   0:4fe08cd4693e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     0
   
 
 #if repobundlerepo
   $ hg bundle --base 1 -r 3 ../update2bundled.hg
   1 changesets found
   $ hg strip -r 3
   saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg
   $ hg merge -R ../update2bundled.hg -r 3
   setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 When user updates to the revision existing only in the bundle,
 it should show warning
 
   $ hg update -R ../update2bundled.hg --clean -r 3
   setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 When user updates to the revision existing in the local repository
 the warning shouldn't be emitted
 
   $ hg update -R ../update2bundled.hg -r 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 #endif
 
 Test the option that create slim bundle
 
   $ hg bundle -a --config devel.bundle.delta=p1 ./slim.hg
   3 changesets found
 
 Test the option that create and no-delta's bundle
   $ hg bundle -a --config devel.bundle.delta=full ./full.hg
   3 changesets found
 
 
 Test the debug statistic when building a bundle
 -----------------------------------------------
 
   $ hg bundle -a ./default.hg --config debug.bundling-stats=yes
   3 changesets found
   DEBUG-BUNDLING: revisions:                9
   DEBUG-BUNDLING:   changelog:              3
   DEBUG-BUNDLING:   manifest:               3
   DEBUG-BUNDLING:   files:                  3 (for 3 revlogs)
   DEBUG-BUNDLING: deltas:
   DEBUG-BUNDLING:   from-storage:           2 (100% of available 2)
   DEBUG-BUNDLING:   computed:               7
   DEBUG-BUNDLING:     full:                 7 (100% of native 7)
   DEBUG-BUNDLING:       changelog:          3 (100% of native 3)
   DEBUG-BUNDLING:       manifests:          1 (100% of native 1)
   DEBUG-BUNDLING:       files:              3 (100% of native 3)
 
 Test the debug output when applying delta
 -----------------------------------------
 
   $ hg init foo
   $ hg -R foo unbundle ./slim.hg \
   > --config debug.revlog.debug-delta=yes \
   > --config storage.revlog.reuse-external-delta=no \
   > --config storage.revlog.reuse-external-delta-parent=no
   adding changesets
   DBG-DELTAS: CHANGELOG:   rev=0: delta-base=0 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=-1 p2-chain-length=-1 - duration=* (glob)
   DBG-DELTAS: CHANGELOG:   rev=1: delta-base=1 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=0 p2-chain-length=-1 - duration=* (glob)
   DBG-DELTAS: CHANGELOG:   rev=2: delta-base=2 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=0 p2-chain-length=-1 - duration=* (glob)
   adding manifests
   DBG-DELTAS: MANIFESTLOG: rev=0: delta-base=0 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=-1 p2-chain-length=-1 - duration=* (glob)
   DBG-DELTAS: MANIFESTLOG: rev=1: delta-base=0 is-cached=1 - search-rounds=1 try-count=1 - delta-type=delta  snap-depth=0 - p1-chain-length=0 p2-chain-length=-1 - duration=* (glob)
   DBG-DELTAS: MANIFESTLOG: rev=2: delta-base=1 is-cached=1 - search-rounds=1 try-count=1 - delta-type=delta  snap-depth=0 - p1-chain-length=1 p2-chain-length=-1 - duration=* (glob)
   adding file changes
   DBG-DELTAS: FILELOG:a:   rev=0: delta-base=0 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=-1 p2-chain-length=-1 - duration=* (glob)
   DBG-DELTAS: FILELOG:b:   rev=0: delta-base=0 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=-1 p2-chain-length=-1 - duration=* (glob)
   DBG-DELTAS: FILELOG:c:   rev=0: delta-base=0 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full   snap-depth=0 - p1-chain-length=-1 p2-chain-length=-1 - duration=* (glob)
   added 3 changesets with 3 changes to 3 files
   new changesets 4fe08cd4693e:4652c276ac4f (3 drafts)
   (run 'hg update' to get a working copy)
 
 
 Test the debug statistic when applying a bundle
 -----------------------------------------------
 
   $ hg init bar
   $ hg -R bar unbundle ./default.hg  --config debug.unbundling-stats=yes
   adding changesets
   adding manifests
   adding file changes
   DEBUG-UNBUNDLING: revisions:                9
   DEBUG-UNBUNDLING:   changelog:              3             ( 33%)
   DEBUG-UNBUNDLING:   manifests:              3             ( 33%)
   DEBUG-UNBUNDLING:   files:                  3             ( 33%)
   DEBUG-UNBUNDLING: total-time:      ?????????????? seconds (glob)
   DEBUG-UNBUNDLING:   changelog:     ?????????????? seconds (???%) (glob)
   DEBUG-UNBUNDLING:   manifests:     ?????????????? seconds (???%) (glob)
   DEBUG-UNBUNDLING:   files:         ?????????????? seconds (???%) (glob)
   DEBUG-UNBUNDLING: type-count:
   DEBUG-UNBUNDLING:   changelog:
   DEBUG-UNBUNDLING:     full:                 3
   DEBUG-UNBUNDLING:       cached:             3             (100%)
   DEBUG-UNBUNDLING:   manifests:
   DEBUG-UNBUNDLING:     full:                 1
   DEBUG-UNBUNDLING:       cached:             1             (100%)
   DEBUG-UNBUNDLING:     delta:                2
   DEBUG-UNBUNDLING:       cached:             2             (100%)
   DEBUG-UNBUNDLING:   files:
   DEBUG-UNBUNDLING:     full:                 3
   DEBUG-UNBUNDLING:       cached:             3             (100%)
   DEBUG-UNBUNDLING: type-time:
   DEBUG-UNBUNDLING:   changelog:
   DEBUG-UNBUNDLING:     full:        ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:       cached:    ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:   manifests:
   DEBUG-UNBUNDLING:     full:        ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:       cached:    ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:     delta:       ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:       cached:    ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:   files:
   DEBUG-UNBUNDLING:     full:        ?????????????? seconds (???% of total) (glob)
   DEBUG-UNBUNDLING:       cached:    ?????????????? seconds (???% of total) (glob)
   added 3 changesets with 3 changes to 3 files
   new changesets 4fe08cd4693e:4652c276ac4f (3 drafts)
   (run 'hg update' to get a working copy)

tests/test-censor.t

@@ -1,561 +1,531
 #require no-reposimplestore
 #testcases revlogv1 revlogv2
 
 #if revlogv2
 
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > revlogv2=enable-unstable-format-and-corrupt-my-data
   > EOF
 
 #endif
 
   $ cp $HGRCPATH $HGRCPATH.orig
 
 Create repo with unimpeachable content
 
   $ hg init r
   $ cd r
   $ echo 'Initially untainted file' > target
   $ echo 'Normal file here' > bystander
   $ hg add target bystander
   $ hg ci -m init
 
 Clone repo so we can test pull later
 
   $ cd ..
   $ hg clone r rpull
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd r
 
 Introduce content which will ultimately require censorship. Name the first
 censored node C1, second C2, and so on
 
   $ echo 'Tainted file' > target
   $ echo 'Passwords: hunter2' >> target
   $ hg ci -m taint target
   $ C1=`hg id --debug -i`
 
   $ echo 'hunter3' >> target
   $ echo 'Normal file v2' > bystander
   $ hg ci -m moretaint target bystander
   $ C2=`hg id --debug -i`
 
 Add a new sanitized versions to correct our mistake. Name the first head H1,
 the second head H2, and so on
 
   $ echo 'Tainted file is now sanitized' > target
   $ hg ci -m sanitized target
   $ H1=`hg id --debug -i`
 
   $ hg update -r $C2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'Tainted file now super sanitized' > target
   $ hg ci -m 'super sanitized' target
   created new head
   $ H2=`hg id --debug -i`
 
 Verify target contents before censorship at each revision
 
   $ hg cat -r $H1 target | head -n 10
   Tainted file is now sanitized
   $ hg cat -r $H2 target | head -n 10
   Tainted file now super sanitized
   $ hg cat -r $C2 target | head -n 10
   Tainted file
   Passwords: hunter2
   hunter3
   $ hg cat -r $C1 target | head -n 10
   Tainted file
   Passwords: hunter2
   $ hg cat -r 0 target | head -n 10
   Initially untainted file
 
 Censor revision with 2 offenses
 
 (this also tests file pattern matching: path relative to cwd case)
 
   $ mkdir -p foo/bar/baz
   $ hg --config extensions.censor= --cwd foo/bar/baz censor -r $C2 -t "remove password" ../../../target
   $ hg cat -r $H1 target | head -n 10
   Tainted file is now sanitized
   $ hg cat -r $H2 target | head -n 10
   Tainted file now super sanitized
   $ hg cat -r $C2 target | head -n 10
   abort: censored node: 1e0247a9a4b7
   (set censor.policy to ignore errors)
   $ hg cat -r $C1 target | head -n 10
   Tainted file
   Passwords: hunter2
   $ hg cat -r 0 target | head -n 10
   Initially untainted file
 
 Censor revision with 1 offense
 
 (this also tests file pattern matching: with 'path:' scheme)
 
   $ hg --config extensions.censor= --cwd foo/bar/baz censor -r $C1 path:target
   $ hg cat -r $H1 target | head -n 10
   Tainted file is now sanitized
   $ hg cat -r $H2 target | head -n 10
   Tainted file now super sanitized
   $ hg cat -r $C2 target | head -n 10
   abort: censored node: 1e0247a9a4b7
   (set censor.policy to ignore errors)
   $ hg cat -r $C1 target | head -n 10
   abort: censored node: 613bc869fceb
   (set censor.policy to ignore errors)
   $ hg cat -r 0 target | head -n 10
   Initially untainted file
 
 Can only checkout target at uncensored revisions, -X is workaround for --all
 
   $ hg revert -r $C2 target | head -n 10
   abort: censored node: 1e0247a9a4b7
   (set censor.policy to ignore errors)
   $ hg revert -r $C1 target | head -n 10
   abort: censored node: 613bc869fceb
   (set censor.policy to ignore errors)
   $ hg revert -r $C1 --all
   reverting bystander
   reverting target
   abort: censored node: 613bc869fceb
   (set censor.policy to ignore errors)
   [255]
   $ hg revert -r $C1 --all -X target
   $ cat target | head -n 10
   Tainted file now super sanitized
   $ hg revert -r 0 --all
   reverting target
   $ cat target | head -n 10
   Initially untainted file
   $ hg revert -r $H2 --all
   reverting bystander
   reverting target
   $ cat target | head -n 10
   Tainted file now super sanitized
 
 Uncensored file can be viewed at any revision
 
   $ hg cat -r $H1 bystander | head -n 10
   Normal file v2
   $ hg cat -r $C2 bystander | head -n 10
   Normal file v2
   $ hg cat -r $C1 bystander | head -n 10
   Normal file here
   $ hg cat -r 0 bystander | head -n 10
   Normal file here
 
 Can update to children of censored revision
 
   $ hg update -r $H1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   Tainted file is now sanitized
   $ hg update -r $H2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   Tainted file now super sanitized
 
 Set censor policy to abort in trusted $HGRC so hg verify fails
 
   $ cp $HGRCPATH.orig $HGRCPATH
   $ cat >> $HGRCPATH <<EOF
   > [censor]
   > policy = abort
   > EOF
 
 Repo fails verification due to censorship
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    target@1: censored file data
    target@2: censored file data
   checked 5 changesets with 7 changes to 2 files
   2 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
 
 Cannot update to revision with censored data
 
   $ hg update -r $C2
   abort: censored node: 1e0247a9a4b7
   (set censor.policy to ignore errors)
   [255]
   $ hg update -r $C1
   abort: censored node: 613bc869fceb
   (set censor.policy to ignore errors)
   [255]
   $ hg update -r 0
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg update -r $H2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Set censor policy to ignore in trusted $HGRC so hg verify passes
 
   $ cp $HGRCPATH.orig $HGRCPATH
   $ cat >> $HGRCPATH <<EOF
   > [censor]
   > policy = ignore
   > EOF
 
 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
 
   $ hg update -r $C2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   $ hg update -r $C1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   $ hg update -r 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   Initially untainted file
   $ hg update -r $H2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   Tainted file now super sanitized
 
 Can merge in revision with censored data. Test requires one branch of history
 with the file censored, but we can't censor at a head, so advance H1.
 
   $ hg update -r $H1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ C3=$H1
   $ echo 'advanced head H1' > target
   $ hg ci -m 'advance head H1' target
   $ H1=`hg id --debug -i`
   $ hg --config extensions.censor= censor -r $C3 target
   $ hg update -r $H2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge -r $C3
   merging target
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 Revisions present in repository heads may not be censored
 
   $ hg update -C -r $H2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --config extensions.censor= censor -r $H2 target
   abort: cannot censor file in heads (78a8fc215e79)
   (clean/delete and commit first)
   [255]
   $ echo 'twiddling thumbs' > bystander
   $ hg ci -m 'bystander commit'
   $ H2=`hg id --debug -i`
   $ hg --config extensions.censor= censor -r "$H2^" target
   abort: cannot censor file in heads (efbe78065929)
   (clean/delete and commit first)
   [255]
 
 Cannot censor working directory
 
   $ echo 'seriously no passwords' > target
   $ hg ci -m 'extend second head arbitrarily' target
   $ H2=`hg id --debug -i`
   $ hg update -r "$H2^"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --config extensions.censor= censor -r . target
   abort: cannot censor working directory
   (clean/delete/update first)
   [255]
   $ hg update -r $H2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Can re-add file after being deleted + censored
 
   $ C4=$H2
   $ hg rm target
   $ hg ci -m 'delete target so it may be censored'
   $ H2=`hg id --debug -i`
   $ hg --config extensions.censor= censor -r $C4 target
   $ hg cat -r $C4 target | head -n 10
   $ hg cat -r "$H2^^" target | head -n 10
   Tainted file now super sanitized
   $ echo 'fresh start' > target
   $ hg add target
   $ hg ci -m reincarnated target
   $ H2=`hg id --debug -i`
   $ hg cat -r $H2 target | head -n 10
   fresh start
   $ hg cat -r "$H2^" target | head -n 10
   target: no such file in rev 452ec1762369
   $ hg cat -r $C4 target | head -n 10
   $ hg cat -r "$H2^^^" target | head -n 10
   Tainted file now super sanitized
 
 Can censor after revlog has expanded to no longer permit inline storage
 
   $ for x in `"$PYTHON" $TESTDIR/seq.py 0 50000`
   > do
   >   echo "Password: hunter$x" >> target
   > done
   $ hg ci -m 'add 100k passwords'
   $ H2=`hg id --debug -i`
   $ C5=$H2
   $ hg revert -r "$H2^" target
   $ hg ci -m 'cleaned 100k passwords'
   $ H2=`hg id --debug -i`
   $ hg --config extensions.censor= censor -r $C5 target
   $ hg cat -r $C5 target | head -n 10
   $ hg cat -r $H2 target | head -n 10
   fresh start
 
 Repo with censored nodes can be cloned and cloned nodes are censored
 
   $ cd ..
   $ hg clone r rclone
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd rclone
   $ hg cat -r $H1 target | head -n 10
   advanced head H1
   $ hg cat -r $H2~5 target | head -n 10
   Tainted file now super sanitized
   $ hg cat -r $C2 target | head -n 10
   $ 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
   adding changesets
   adding manifests
   adding file changes
   added 11 changesets with 11 changes to 2 files (+1 heads)
   new changesets 186fb27560c3:683e4645fded
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg update 4
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   Tainted file now super sanitized
   $ hg cat -r $H1 target | head -n 10
   advanced head H1
   $ hg cat -r $H2~5 target | head -n 10
   Tainted file now super sanitized
   $ hg cat -r $C2 target | head -n 10
   $ 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
 
   $ echo 'Passwords: hunter2hunter2' > target
   $ hg ci -m 're-add password from clone' target
   created new head
   $ H3=`hg id --debug -i`
   $ REV=$H3
   $ echo 'Re-sanitized; nothing to see here' > target
   $ hg ci -m 're-sanitized' target
   $ H2=`hg id --debug -i`
   $ CLEANREV=$H2
   $ hg cat -r $REV target | head -n 10
   Passwords: hunter2hunter2
   $ hg --config extensions.censor= censor -r $REV target
   $ hg cat -r $REV target | head -n 10
   $ hg cat -r $CLEANREV target | head -n 10
   Re-sanitized; nothing to see here
   $ hg push -f -r $H2
   pushing to $TESTTMP/r
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
 
   $ cd ../r
   $ hg cat -r $REV target | head -n 10
   $ hg cat -r $CLEANREV target | head -n 10
   Re-sanitized; nothing to see here
   $ hg update $CLEANREV
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat target | head -n 10
   Re-sanitized; nothing to see here
 
 Censored nodes can be bundled up and unbundled in another repo
 
   $ hg bundle --base 0 ../pwbundle
   13 changesets found
   $ cd ../rclone
   $ hg unbundle ../pwbundle
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   new changesets 075be80ac777:dcbaf17bf3a1 (2 drafts)
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ hg cat -r $REV target | head -n 10
   $ hg cat -r $CLEANREV target | head -n 10
   Re-sanitized; nothing to see here
   $ hg update $CLEANREV
   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
 
   $ cd ../rpull
   $ hg grep 'Normal file'
   bystander:Normal file v2
   $ hg grep nothing
   target:Re-sanitized; nothing to see here
   $ hg grep --diff 'Normal file'
   cannot search in censored file: target:7
   cannot search in censored file: target:10
   cannot search in censored file: target:12
   bystander:6:-:Normal file v2
   cannot search in censored file: target:1
   cannot search in censored file: target:2
   cannot search in censored file: target:3
   bystander:2:-:Normal file here
   bystander:2:+:Normal file v2
   bystander:0:+:Normal file here
   $ hg grep --diff nothing
   cannot search in censored file: target:7
   cannot search in censored file: target:10
   cannot search in censored file: target:12
   target:13:+:Re-sanitized; nothing to see here
   cannot search in censored file: target:1
   cannot search in censored file: target:2
   cannot search in censored file: target:3
 
 Censored nodes can be imported on top of censored nodes, consecutively
 
   $ hg init ../rimport
   $ hg bundle --base 1 ../rimport/splitbundle
   12 changesets found
   $ cd ../rimport
   $ hg pull -r $H1 -r $H2 ../r
   pulling from ../r
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 10 changes to 2 files (+1 heads)
   new changesets e97f55b2665a:dcbaf17bf3a1
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg unbundle splitbundle
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 2 files (+1 heads)
   new changesets efbe78065929:683e4645fded (6 drafts)
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ hg update $H2
   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
 
   $ hg init ../rinit
   $ hg --config extensions.censor= censor -r 0 target
   $ hg bundle -r 0 --base null ../rinit/initbundle
   1 changesets found
   $ cd ../rinit
   $ hg unbundle initbundle
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets e97f55b2665a (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg cat -r 0 target | head -n 10
 
 #if revlogv2
 
 Testing feature that does not work in revlog v1
 ===============================================
 
 Censoring a revision that is used as delta base
 -----------------------------------------------
 
   $ cd ..
   $ hg init censor-with-delta
   $ cd censor-with-delta
   $ echo root > target
   $ hg add target
   $ hg commit -m root
   $ B0=`hg id --debug -i`
   $ for x in `"$PYTHON" $TESTDIR/seq.py 0 50000`
   > do
   >   echo "Password: hunter$x" >> target
   > done
   $ hg ci -m 'write a long file'
   $ B1=`hg id --debug -i`
   $ echo 'small change (should create a delta)' >> target
   $ hg ci -m 'create a delta over the password'
 (should show that the last revision is a delta, not a snapshot)
   $ B2=`hg id --debug -i`
 
 Make sure the last revision is a delta against the revision we will censor
 
   $ hg debugdeltachain target -T '{rev} {chainid} {chainlen} {prevrev}\n'
   0 1 1 -1
   1 2 1 -1
   2 2 2 1
 
 Censor the file
 
   $ hg cat -r $B1 target | wc -l
    *50002 (re)
   $ hg --config extensions.censor= censor -r $B1 target
   $ hg cat -r $B1 target | wc -l
    *0 (re)
 
 Check the children is fine
 
   $ hg cat -r $B2 target | wc -l
    *50003 (re)
 
 #endif

tests/test-clone-pull-corruption.t

@@ -1,53 +1,48
 Corrupt an hg repo with a pull started during an aborted commit
 Create two repos, so that one of them can pull from the other one.
 
   $ hg init source
   $ cd source
   $ touch foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg clone . ../corrupted
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo'
 
 Add a hook to wait 5 seconds and then abort the commit
 
   $ cd ../corrupted
   $ echo "[hooks]" >> .hg/hgrc
   $ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc
 
 start a commit...
 
   $ touch bar
   $ hg add bar
   $ hg ci -m 'add bar' &
 
 ... and start a pull while the commit is still running
 
   $ sleep 1
   $ hg pull ../source 2>/dev/null
   pulling from ../source
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status 1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 52998019f625
   (run 'hg update' to get a working copy)
 
 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 ..

tests/test-clone-r.t

@@ -1,254 +1,199
   $ hg init test
   $ cd test
 
   $ echo 0 >> afile
   $ hg add afile
   $ hg commit -m "0.0"
 
   $ echo 1 >> afile
   $ hg commit -m "0.1"
 
   $ echo 2 >> afile
   $ hg commit -m "0.2"
 
   $ echo 3 >> afile
   $ hg commit -m "0.3"
 
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo 1 >> afile
   $ hg commit -m "1.1"
   created new head
 
   $ echo 2 >> afile
   $ hg commit -m "1.2"
 
   $ echo a line > fred
   $ echo 3 >> afile
   $ hg add fred
   $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
   $ hg commit -m "1.3m"
 
   $ hg update -C 3
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ hg mv afile anotherfile
   $ hg commit -m "0.3m"
 
   $ hg debugrevlogindex -f 1 afile
      rev flag     size   link     p1     p2       nodeid
        0 0000        2      0     -1     -1 362fef284ce2
        1 0000        4      1      0     -1 125144f7e028
        2 0000        6      2      1     -1 4c982badb186
        3 0000        8      3      2     -1 19b1fc555737
 
   $ hg debugindex adifferentfile
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       7 2565f3199a74 000000000000 000000000000
 
   $ hg debugindex anotherfile
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       8 2565f3199a74 000000000000 000000000000
 
   $ hg debugindex fred
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       6 12ab3bcc5ea4 000000000000 000000000000
 
   $ hg debugindex --manifest
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 43eadb1d2d06 000000000000 000000000000
        1       1 8b89697eba2c 43eadb1d2d06 000000000000
        2       2 626a32663c2f 8b89697eba2c 000000000000
        3       3 f54c32f13478 626a32663c2f 000000000000
        4       6 de68e904d169 626a32663c2f 000000000000
        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 ..
 
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >   echo
   >   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
   
   ---- hg clone -r 0 test test-0
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   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
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   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
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   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
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files
   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
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   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
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   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
   adding manifests
   adding file changes
   added 4 changesets with 5 changes to 2 files
   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
   adding manifests
   adding file changes
   added 5 changesets with 6 changes to 3 files
   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
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 2 files
   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
   pulling from ../test-7
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-9
   $ hg branch foobar
   marked working directory as branch foobar
   (branches are permanent and global, did you want a bookmark?)
   $ echo file2 >> file2
   $ hg add file2
   $ hg commit -m "changeset9"
   $ echo file3 >> file3
   $ hg add file3
   $ hg commit -m "changeset10"
   $ cd ..
   $ hg clone -r 9 -u foobar test-9 test-10
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 6 changes to 3 files
   new changesets f9ee2f85a263:7100abb79635
   updating to branch foobar
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 

tests/test-clone-stream-format.t

@@ -1,442 +1,362
 This file contains tests case that deal with format change accross stream clone
 
 #require serve no-reposimplestore no-chg
 
 #testcases stream-legacy stream-bundle2
 
   $ cat << EOF >> $HGRCPATH
   > [storage]
   > revlog.persistent-nodemap.slow-path=allow
   > EOF
 
 #if stream-legacy
   $ cat << EOF >> $HGRCPATH
   > [server]
   > bundle2.stream = no
   > EOF
 #endif
 
 Initialize repository
 
   $ hg init server --config format.use-share-safe=yes --config format.use-persistent-nodemap=yes
   $ cd server
   $ sh $TESTDIR/testlib/stream_clone_setup.sh
   adding 00changelog-ab349180a0405010.nd
   adding 00changelog.d
   adding 00changelog.i
   adding 00changelog.n
   adding 00manifest.d
   adding 00manifest.i
   adding container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
   adding data/foo.d
   adding data/foo.i
   adding data/foo.n
   adding data/undo.babar
   adding data/undo.d
   adding data/undo.foo.d
   adding data/undo.foo.i
   adding data/undo.foo.n
   adding data/undo.i
   adding data/undo.n
   adding data/undo.py
   adding foo.d
   adding foo.i
   adding foo.n
   adding meta/foo.d
   adding meta/foo.i
   adding meta/foo.n
   adding meta/undo.babar
   adding meta/undo.d
   adding meta/undo.foo.d
   adding meta/undo.foo.i
   adding meta/undo.foo.n
   adding meta/undo.i
   adding meta/undo.n
   adding meta/undo.py
   adding savanah/foo.d
   adding savanah/foo.i
   adding savanah/foo.n
   adding savanah/undo.babar
   adding savanah/undo.d
   adding savanah/undo.foo.d
   adding savanah/undo.foo.i
   adding savanah/undo.foo.n
   adding savanah/undo.i
   adding savanah/undo.n
   adding savanah/undo.py
   adding store/C\xc3\xa9lesteVille_is_a_Capital_City (esc)
   adding store/foo.d
   adding store/foo.i
   adding store/foo.n
   adding store/undo.babar
   adding store/undo.d
   adding store/undo.foo.d
   adding store/undo.foo.i
   adding store/undo.foo.n
   adding store/undo.i
   adding store/undo.n
   adding store/undo.py
   adding undo.babar
   adding undo.d
   adding undo.foo.d
   adding undo.foo.i
   adding undo.foo.n
   adding undo.i
   adding undo.n
   adding undo.py
   $ hg debugbuilddag .+5000 --from-existing
   $ ls -1 .hg/store/00changelog*
   .hg/store/00changelog-*.nd (glob)
   .hg/store/00changelog.d
   .hg/store/00changelog.i
   .hg/store/00changelog.n
   $ cd ..
 
 
 #if no-windows
 
 Test streaming from/to repository without a store:
 ==================================================
 
 This is skipped Windows needs dot-encode to handle some of the file in this
 tests, and dot-encode need the store enabled.
 
   $ hg clone --pull --config format.usestore=no server server-no-store
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5004 changesets with 1088 changes to 1088 files (+1 heads)
   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
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep store
   store
   $ hg debugrequires -R server-no-store | grep store
   [1]
 
 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]
 
 
 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
 
 
   $ killdaemons.py
   $ rm hg-*.pid errors-*.txt
 
 #endif
 
 
 Test streaming from/to repository without a fncache
 ===================================================
 
   $ hg clone --pull --config format.usefncache=no server server-no-fncache
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5004 changesets with 1088 changes to 1088 files (+1 heads)
   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
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep fncache
   fncache
   $ hg debugrequires -R server-no-fncache | grep fncache
   [1]
 
 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]
 
 
 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
 
 
   $ killdaemons.py
 
 
 
 Test streaming from/to repository without a dotencode
 ===================================================
 
   $ rm hg-*.pid errors-*.txt
   $ hg clone --pull --config format.dotencode=no server server-no-dotencode
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5004 changesets with 1088 changes to 1088 files (+1 heads)
   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
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep dotencode
   dotencode
   $ hg debugrequires -R server-no-dotencode | grep dotencode
   [1]
 
 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]
 
 
 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
 
 
   $ killdaemons.py
 
 Cloning from a share
 --------------------
 
 We should be able to clone from a "share" repository, it will use the source store for streaming.
 
 The resulting clone should not use share.
 
   $ rm hg-*.pid errors-*.txt
   $ hg share --config extensions.share= server server-share -U
   $ hg -R server-share serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ 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]
 
   $ killdaemons.py
 
 Test streaming from/to repository without a share-safe
 ======================================================
 
   $ rm hg-*.pid errors-*.txt
   $ hg clone --pull --config format.use-share-safe=no server server-no-share-safe
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5004 changesets with 1088 changes to 1088 files (+1 heads)
   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
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep share-safe
   share-safe
   $ hg debugrequires -R server-no-share-safe | grep share-safe
   [1]
 
 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]
 
 
 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
 
 
   $ killdaemons.py
 
 
 Test streaming from/to repository without a persistent-nodemap
 ==============================================================
 
 persistent nodemap affects revlog, but they are easy to generate locally, so we allow it to be changed over a stream clone
 
   $ rm hg-*.pid errors-*.txt
   $ hg clone --pull --config format.use-persistent-nodemap=no server server-no-persistent-nodemap
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5004 changesets with 1088 changes to 1088 files (+1 heads)
   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
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep persistent-nodemap
   persistent-nodemap
   $ hg debugrequires -R server-no-persistent-nodemap | grep persistent-nodemap
   [1]
   $ ls -1 server/.hg/store/00changelog*
   server/.hg/store/00changelog-*.nd (glob)
   server/.hg/store/00changelog.d
   server/.hg/store/00changelog.i
   server/.hg/store/00changelog.n
   $ ls -1 server-no-persistent-nodemap/.hg/store/00changelog*
   server-no-persistent-nodemap/.hg/store/00changelog.d
   server-no-persistent-nodemap/.hg/store/00changelog.i
 
 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]
 
 The persistent-nodemap files should no longer exists
 
   $ ls -1 clone-remove-persistent-nodemap/.hg/store/00changelog*
   clone-remove-persistent-nodemap/.hg/store/00changelog.d
   clone-remove-persistent-nodemap/.hg/store/00changelog.i
 
 
 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
 
 The persistent-nodemap files should exists
 
   $ ls -1 clone-add-persistent-nodemap/.hg/store/00changelog*
   clone-add-persistent-nodemap/.hg/store/00changelog-*.nd (glob)
   clone-add-persistent-nodemap/.hg/store/00changelog.d
   clone-add-persistent-nodemap/.hg/store/00changelog.i
   clone-add-persistent-nodemap/.hg/store/00changelog.n
 
 
   $ killdaemons.py

tests/test-clone-stream.t

@@ -1,825 +1,800
 #require serve no-reposimplestore no-chg
 
 #testcases stream-legacy stream-bundle2
 
 #if stream-legacy
   $ cat << EOF >> $HGRCPATH
   > [server]
   > bundle2.stream = no
   > EOF
 #endif
 
 Initialize repository
 
   $ hg init server
   $ cd server
   $ sh $TESTDIR/testlib/stream_clone_setup.sh
   adding 00changelog-ab349180a0405010.nd
   adding 00changelog.d
   adding 00changelog.i
   adding 00changelog.n
   adding 00manifest.d
   adding 00manifest.i
   adding container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
   adding data/foo.d
   adding data/foo.i
   adding data/foo.n
   adding data/undo.babar
   adding data/undo.d
   adding data/undo.foo.d
   adding data/undo.foo.i
   adding data/undo.foo.n
   adding data/undo.i
   adding data/undo.n
   adding data/undo.py
   adding foo.d
   adding foo.i
   adding foo.n
   adding meta/foo.d
   adding meta/foo.i
   adding meta/foo.n
   adding meta/undo.babar
   adding meta/undo.d
   adding meta/undo.foo.d
   adding meta/undo.foo.i
   adding meta/undo.foo.n
   adding meta/undo.i
   adding meta/undo.n
   adding meta/undo.py
   adding savanah/foo.d
   adding savanah/foo.i
   adding savanah/foo.n
   adding savanah/undo.babar
   adding savanah/undo.d
   adding savanah/undo.foo.d
   adding savanah/undo.foo.i
   adding savanah/undo.foo.n
   adding savanah/undo.i
   adding savanah/undo.n
   adding savanah/undo.py
   adding store/C\xc3\xa9lesteVille_is_a_Capital_City (esc)
   adding store/foo.d
   adding store/foo.i
   adding store/foo.n
   adding store/undo.babar
   adding store/undo.d
   adding store/undo.foo.d
   adding store/undo.foo.i
   adding store/undo.foo.n
   adding store/undo.i
   adding store/undo.n
   adding store/undo.py
   adding undo.babar
   adding undo.d
   adding undo.foo.d
   adding undo.foo.i
   adding undo.foo.n
   adding undo.i
   adding undo.n
   adding undo.py
 
   $ hg --config server.uncompressed=false serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
 Check local clone
 ==================
 
 The logic is close enough of uncompressed.
 This is present here to reuse the testing around file with "special" names.
 
   $ hg clone server local-clone
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 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
 ==================
 
 Cannot stream clone when server.uncompressed is set
 
   $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=stream_out'
   200 Script output follows
   
   1
 
 #if stream-legacy
   $ hg debugcapabilities http://localhost:$HGPORT
   Main capabilities:
     batch
     branchmap
     $USUAL_BUNDLE2_CAPS_SERVER$
     changegroupsubset
     compression=$BUNDLE2_COMPRESSIONS$
     getbundle
     httpheader=1024
     httpmediatype=0.1rx,0.1tx,0.2tx
     known
     lookup
     pushkey
     unbundle=HG10GZ,HG10BZ,HG10UN
     unbundlehash
   Bundle2 capabilities:
     HG20
     bookmarks
     changegroup
       01
       02
     checkheads
       related
     digests
       md5
       sha1
       sha512
     error
       abort
       unsupportedcontent
       pushraced
       pushkey
     hgtagsfnodes
     listkeys
     phases
       heads
     pushkey
     remote-changegroup
       http
       https
 
   $ hg clone --stream -U http://localhost:$HGPORT server-disabled
   warning: stream clone requested but server has them disabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1088 changes to 1088 files
   new changesets 96ee1d7354c4:5223b5e3265f
 
   $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto 0.2 --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
   200 Script output follows
   content-type: application/mercurial-0.2
   
 
   $ f --size body --hexdump --bytes 100
   body: size=232
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: cf 0b 45 52 52 4f 52 3a 41 42 4f 52 54 00 00 00 |..ERROR:ABORT...|
   0020: 00 01 01 07 3c 04 72 6d 65 73 73 61 67 65 73 74 |....<.rmessagest|
   0030: 72 65 61 6d 20 64 61 74 61 20 72 65 71 75 65 73 |ream data reques|
   0040: 74 65 64 20 62 75 74 20 73 65 72 76 65 72 20 64 |ted but server d|
   0050: 6f 65 73 20 6e 6f 74 20 61 6c 6c 6f 77 20 74 68 |oes not allow th|
   0060: 69 73 20 66                                     |is f|
 
 #endif
 #if stream-bundle2
   $ hg debugcapabilities http://localhost:$HGPORT
   Main capabilities:
     batch
     branchmap
     $USUAL_BUNDLE2_CAPS_SERVER$
     changegroupsubset
     compression=$BUNDLE2_COMPRESSIONS$
     getbundle
     httpheader=1024
     httpmediatype=0.1rx,0.1tx,0.2tx
     known
     lookup
     pushkey
     unbundle=HG10GZ,HG10BZ,HG10UN
     unbundlehash
   Bundle2 capabilities:
     HG20
     bookmarks
     changegroup
       01
       02
     checkheads
       related
     digests
       md5
       sha1
       sha512
     error
       abort
       unsupportedcontent
       pushraced
       pushkey
     hgtagsfnodes
     listkeys
     phases
       heads
     pushkey
     remote-changegroup
       http
       https
 
   $ hg clone --stream -U http://localhost:$HGPORT server-disabled
   warning: stream clone requested but server has them disabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1088 changes to 1088 files
   new changesets 96ee1d7354c4:5223b5e3265f
 
   $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto 0.2 --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
   200 Script output follows
   content-type: application/mercurial-0.2
   
 
   $ f --size body --hexdump --bytes 100
   body: size=232
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: cf 0b 45 52 52 4f 52 3a 41 42 4f 52 54 00 00 00 |..ERROR:ABORT...|
   0020: 00 01 01 07 3c 04 72 6d 65 73 73 61 67 65 73 74 |....<.rmessagest|
   0030: 72 65 61 6d 20 64 61 74 61 20 72 65 71 75 65 73 |ream data reques|
   0040: 74 65 64 20 62 75 74 20 73 65 72 76 65 72 20 64 |ted but server d|
   0050: 6f 65 73 20 6e 6f 74 20 61 6c 6c 6f 77 20 74 68 |oes not allow th|
   0060: 69 73 20 66                                     |is f|
 
 #endif
 
   $ killdaemons.py
   $ cd server
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --error errors.txt
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
 Basic clone
 
 #if stream-legacy
   $ hg clone --stream -U http://localhost:$HGPORT clone1
   streaming all changes
   1090 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
   $ cat server/errors.txt
 #endif
 #if stream-bundle2
   $ hg clone --stream -U http://localhost:$HGPORT clone1
   streaming all changes
   1093 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1093 files to transfer, 98.9 KB of data (zstd !)
   transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
 
   $ ls -1 clone1/.hg/cache
   branch2-base
   branch2-immutable
   branch2-served
   branch2-served.hidden
   branch2-visible
   branch2-visible-hidden
   rbc-names-v1
   rbc-revs-v1
   tags2
   tags2-served
   $ cat server/errors.txt
 #endif
 
 getbundle requests with stream=1 are uncompressed
 
   $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto '0.1 0.2 comp=zlib,none' --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
   200 Script output follows
   content-type: application/mercurial-0.2
   
 
 #if no-zstd no-rust
   $ f --size --hex --bytes 256 body
   body: size=119123
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: 62 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |b.STREAM2.......|
   0020: 06 09 04 0c 26 62 79 74 65 63 6f 75 6e 74 31 30 |....&bytecount10|
   0030: 34 31 31 35 66 69 6c 65 63 6f 75 6e 74 31 30 39 |4115filecount109|
   0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen|
   0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
   0060: 6f 67 76 31 25 32 43 73 70 61 72 73 65 72 65 76 |ogv1%2Csparserev|
   0070: 6c 6f 67 00 00 80 00 73 08 42 64 61 74 61 2f 30 |log....s.Bdata/0|
   0080: 2e 69 00 03 00 01 00 00 00 00 00 00 00 02 00 00 |.i..............|
   0090: 00 01 00 00 00 00 00 00 00 01 ff ff ff ff ff ff |................|
   00a0: ff ff 80 29 63 a0 49 d3 23 87 bf ce fe 56 67 92 |...)c.I.#....Vg.|
   00b0: 67 2c 69 d1 ec 39 00 00 00 00 00 00 00 00 00 00 |g,i..9..........|
   00c0: 00 00 75 30 73 26 45 64 61 74 61 2f 30 30 63 68 |..u0s&Edata/00ch|
   00d0: 61 6e 67 65 6c 6f 67 2d 61 62 33 34 39 31 38 30 |angelog-ab349180|
   00e0: 61 30 34 30 35 30 31 30 2e 6e 64 2e 69 00 03 00 |a0405010.nd.i...|
   00f0: 01 00 00 00 00 00 00 00 05 00 00 00 04 00 00 00 |................|
 #endif
 #if zstd no-rust
   $ f --size --hex --bytes 256 body
   body: size=116310 (no-bigendian !)
   body: size=116305 (bigendian !)
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......|
   0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10|
   0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-bigendian !)
   0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (bigendian !)
   0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen|
   0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
   0060: 6f 67 2d 63 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a |og-compression-z|
   0070: 73 74 64 25 32 43 72 65 76 6c 6f 67 76 31 25 32 |std%2Crevlogv1%2|
   0080: 43 73 70 61 72 73 65 72 65 76 6c 6f 67 00 00 80 |Csparserevlog...|
   0090: 00 73 08 42 64 61 74 61 2f 30 2e 69 00 03 00 01 |.s.Bdata/0.i....|
   00a0: 00 00 00 00 00 00 00 02 00 00 00 01 00 00 00 00 |................|
   00b0: 00 00 00 01 ff ff ff ff ff ff ff ff 80 29 63 a0 |.............)c.|
   00c0: 49 d3 23 87 bf ce fe 56 67 92 67 2c 69 d1 ec 39 |I.#....Vg.g,i..9|
   00d0: 00 00 00 00 00 00 00 00 00 00 00 00 75 30 73 26 |............u0s&|
   00e0: 45 64 61 74 61 2f 30 30 63 68 61 6e 67 65 6c 6f |Edata/00changelo|
   00f0: 67 2d 61 62 33 34 39 31 38 30 61 30 34 30 35 30 |g-ab349180a04050|
 #endif
 #if zstd rust no-dirstate-v2
   $ f --size --hex --bytes 256 body
   body: size=116310
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......|
   0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10|
   0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
   0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 67 65 6e |3requirementsgen|
   0050: 65 72 61 6c 64 65 6c 74 61 25 32 43 72 65 76 6c |eraldelta%2Crevl|
   0060: 6f 67 2d 63 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a |og-compression-z|
   0070: 73 74 64 25 32 43 72 65 76 6c 6f 67 76 31 25 32 |std%2Crevlogv1%2|
   0080: 43 73 70 61 72 73 65 72 65 76 6c 6f 67 00 00 80 |Csparserevlog...|
   0090: 00 73 08 42 64 61 74 61 2f 30 2e 69 00 03 00 01 |.s.Bdata/0.i....|
   00a0: 00 00 00 00 00 00 00 02 00 00 00 01 00 00 00 00 |................|
   00b0: 00 00 00 01 ff ff ff ff ff ff ff ff 80 29 63 a0 |.............)c.|
   00c0: 49 d3 23 87 bf ce fe 56 67 92 67 2c 69 d1 ec 39 |I.#....Vg.g,i..9|
   00d0: 00 00 00 00 00 00 00 00 00 00 00 00 75 30 73 26 |............u0s&|
   00e0: 45 64 61 74 61 2f 30 30 63 68 61 6e 67 65 6c 6f |Edata/00changelo|
   00f0: 67 2d 61 62 33 34 39 31 38 30 61 30 34 30 35 30 |g-ab349180a04050|
 #endif
 #if zstd dirstate-v2
   $ f --size --hex --bytes 256 body
   body: size=109549
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: c0 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
   0020: 05 09 04 0c 85 62 79 74 65 63 6f 75 6e 74 39 35 |.....bytecount95|
   0030: 38 39 37 66 69 6c 65 63 6f 75 6e 74 31 30 33 30 |897filecount1030|
   0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote|
   0050: 6e 63 6f 64 65 25 32 43 65 78 70 2d 64 69 72 73 |ncode%2Cexp-dirs|
   0060: 74 61 74 65 2d 76 32 25 32 43 66 6e 63 61 63 68 |tate-v2%2Cfncach|
   0070: 65 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 |e%2Cgeneraldelta|
   0080: 25 32 43 70 65 72 73 69 73 74 65 6e 74 2d 6e 6f |%2Cpersistent-no|
   0090: 64 65 6d 61 70 25 32 43 72 65 76 6c 6f 67 2d 63 |demap%2Crevlog-c|
   00a0: 6f 6d 70 72 65 73 73 69 6f 6e 2d 7a 73 74 64 25 |ompression-zstd%|
   00b0: 32 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 |2Crevlogv1%2Cspa|
   00c0: 72 73 65 72 65 76 6c 6f 67 25 32 43 73 74 6f 72 |rserevlog%2Cstor|
   00d0: 65 00 00 80 00 73 08 42 64 61 74 61 2f 30 2e 69 |e....s.Bdata/0.i|
   00e0: 00 03 00 01 00 00 00 00 00 00 00 02 00 00 00 01 |................|
   00f0: 00 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff |................|
 #endif
 
 --uncompressed is an alias to --stream
 
 #if stream-legacy
   $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
   streaming all changes
   1090 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
 #endif
 #if stream-bundle2
   $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
   streaming all changes
   1093 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1093 files to transfer, 98.9 KB of data (zstd !)
   transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
 #endif
 
 Clone with background file closing enabled
 
 #if stream-legacy
   $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding
   using http://localhost:$HGPORT/
   sending capabilities command
   sending branchmap command
   streaming all changes
   sending stream_out command
   1090 files to transfer, 102 KB of data (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   starting 4 threads for background file closing
   updating the branch cache
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   query 1; heads
   sending batch command
   searching for changes
   all remote heads known locally
   no changes found
   sending getbundle command
   bundle2-input-bundle: with-transaction
   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size 24
   bundle2-input-bundle: 2 parts total
   checking for updated bookmarks
   updating the branch cache
   (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
 #endif
 #if stream-bundle2
   $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding
   using http://localhost:$HGPORT/
   sending capabilities command
   query 1; heads
   sending batch command
   streaming all changes
   sending getbundle command
   bundle2-input-bundle: with-transaction
   bundle2-input-part: "stream2" (params: 3 mandatory) supported
   applying stream bundle
   1093 files to transfer, 102 KB of data (no-zstd !)
   1093 files to transfer, 98.9 KB of data (zstd !)
   starting 4 threads for background file closing
   starting 4 threads for background file closing
   updating the branch cache
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   bundle2-input-part: total payload size 118984 (no-zstd !)
   transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
   bundle2-input-part: total payload size 116145 (zstd no-bigendian !)
   bundle2-input-part: total payload size 116140 (zstd bigendian !)
   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
   bundle2-input-bundle: 2 parts total
   checking for updated bookmarks
   updating the branch cache
   (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
 #endif
 
 Cannot stream clone when there are secret changesets
 
   $ hg -R server phase --force --secret -r tip
   $ hg clone --stream -U http://localhost:$HGPORT secret-denied
   warning: stream clone requested but server has them disabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1025 changes to 1025 files
   new changesets 96ee1d7354c4:c17445101a72
 
   $ killdaemons.py
 
 Streaming of secrets can be overridden by server config
 
   $ cd server
   $ hg serve --config server.uncompressedallowsecret=true -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
 #if stream-legacy
   $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
   streaming all changes
   1090 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
 #endif
 #if stream-bundle2
   $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
   streaming all changes
   1093 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1093 files to transfer, 98.9 KB of data (zstd !)
   transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
 #endif
 
   $ killdaemons.py
 
 Verify interaction between preferuncompressed and secret presence
 
   $ cd server
   $ hg serve --config server.preferuncompressed=true -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
   $ hg clone -U http://localhost:$HGPORT preferuncompressed-secret
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1025 changes to 1025 files
   new changesets 96ee1d7354c4:c17445101a72
 
   $ killdaemons.py
 
 Clone not allowed when full bundles disabled and can't serve secrets
 
   $ cd server
   $ hg serve --config server.disablefullbundle=true -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
   $ hg clone --stream http://localhost:$HGPORT secret-full-disabled
   warning: stream clone requested but server has them disabled
   requesting all changes
   remote: abort: server has pull-based clones disabled
   abort: pull failed on remote
   (remove --pull if specified or upgrade Mercurial)
   [100]
 
 Local stream clone with secrets involved
 (This is just a test over behavior: if you have access to the repo's files,
 there is no security so it isn't important to prevent a clone here.)
 
   $ hg clone -U --stream server local-secret
   warning: stream clone requested but server has them disabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1025 changes to 1025 files
   new changesets 96ee1d7354c4:c17445101a72
 
 Stream clone while repo is changing:
 
   $ mkdir changing
   $ cd changing
 
 extension for delaying the server process so we reliably can modify the repo
 while cloning
 
   $ cat > stream_steps.py <<EOF
   > import os
   > import sys
   > from mercurial import (
   >     encoding,
   >     extensions,
   >     streamclone,
   >     testing,
   > )
   > WALKED_FILE_1 = encoding.environ[b'HG_TEST_STREAM_WALKED_FILE_1']
   > WALKED_FILE_2 = encoding.environ[b'HG_TEST_STREAM_WALKED_FILE_2']
   > 
   > def _test_sync_point_walk_1(orig, repo):
   >     testing.write_file(WALKED_FILE_1)
   > 
   > def _test_sync_point_walk_2(orig, repo):
   >     assert repo._currentlock(repo._lockref) is None
   >     testing.wait_file(WALKED_FILE_2)
   > 
   > extensions.wrapfunction(
   >     streamclone,
   >     '_test_sync_point_walk_1',
   >     _test_sync_point_walk_1
   > )
   > extensions.wrapfunction(
   >     streamclone,
   >     '_test_sync_point_walk_2',
   >     _test_sync_point_walk_2
   > )
   > EOF
 
 prepare repo with small and big file to cover both code paths in emitrevlogdata
 
   $ hg init repo
   $ touch repo/f1
   $ $TESTDIR/seq.py 50000 > repo/f2
   $ hg -R repo ci -Aqm "0"
   $ HG_TEST_STREAM_WALKED_FILE_1="$TESTTMP/sync_file_walked_1"
   $ export HG_TEST_STREAM_WALKED_FILE_1
   $ HG_TEST_STREAM_WALKED_FILE_2="$TESTTMP/sync_file_walked_2"
   $ export HG_TEST_STREAM_WALKED_FILE_2
   $ HG_TEST_STREAM_WALKED_FILE_3="$TESTTMP/sync_file_walked_3"
   $ export HG_TEST_STREAM_WALKED_FILE_3
 #   $ cat << EOF >> $HGRCPATH
 #   > [hooks]
 #   > pre-clone=rm -f "$TESTTMP/sync_file_walked_*"
 #   > EOF
   $ hg serve -R repo -p $HGPORT1 -d --error errors.log --pid-file=hg.pid --config extensions.stream_steps="$RUNTESTDIR/testlib/ext-stream-clone-steps.py"
   $ cat hg.pid >> $DAEMON_PIDS
 
 clone while modifying the repo between stating file with write lock and
 actually serving file content
 
   $ (hg clone -q --stream -U http://localhost:$HGPORT1 clone; touch "$HG_TEST_STREAM_WALKED_FILE_3") &
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1
   $ echo >> repo/f1
   $ echo >> repo/f2
   $ hg -R repo ci -m "1" --config ui.timeout.warn=-1
   $ touch $HG_TEST_STREAM_WALKED_FILE_2
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
   $ hg -R clone id
   000000000000
   $ cat errors.log
   $ cd ..
 
 Stream repository with bookmarks
 --------------------------------
 
 (revert introduction of secret changeset)
 
   $ hg -R server phase --draft 'secret()'
 
 add a bookmark
 
   $ hg -R server bookmark -r tip some-bookmark
 
 clone it
 
 #if stream-legacy
   $ hg clone --stream http://localhost:$HGPORT with-bookmarks
   streaming all changes
   1090 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 #if stream-bundle2
   $ hg clone --stream http://localhost:$HGPORT with-bookmarks
   streaming all changes
   1096 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1096 files to transfer, 99.1 KB of data (zstd !)
   transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
   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
 
 Stream repository with phases
 -----------------------------
 
 Clone as publishing
 
   $ hg -R server phase -r 'all()'
   0: draft
   1: draft
   2: draft
 
 #if stream-legacy
   $ hg clone --stream http://localhost:$HGPORT phase-publish
   streaming all changes
   1090 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 #if stream-bundle2
   $ hg clone --stream http://localhost:$HGPORT phase-publish
   streaming all changes
   1096 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1096 files to transfer, 99.1 KB of data (zstd !)
   transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
   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
   2: public
 
 Clone as non publishing
 
   $ cat << EOF >> server/.hg/hgrc
   > [phases]
   > publish = False
   > EOF
   $ killdaemons.py
   $ hg -R server serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
 
 #if stream-legacy
 
 With v1 of the stream protocol, changeset are always cloned as public. It make
 stream v1 unsuitable for non-publishing repository.
 
   $ hg clone --stream http://localhost:$HGPORT phase-no-publish
   streaming all changes
   1090 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1090 files to transfer, 98.8 KB of data (zstd !)
   transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R phase-no-publish phase -r 'all()'
   0: public
   1: public
   2: public
 #endif
 #if stream-bundle2
   $ hg clone --stream http://localhost:$HGPORT phase-no-publish
   streaming all changes
   1097 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1097 files to transfer, 99.1 KB of data (zstd !)
   transferred 99.1 KB in * seconds (* */sec) (glob) (zstd !)
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R phase-no-publish phase -r 'all()'
   0: draft
   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
 
 #if stream-legacy
 
 With v1 of the stream protocol, changeset are always cloned as public. There's
 no obsolescence markers exchange in stream v1.
 
 #endif
 #if stream-bundle2
 
 Stream repository with obsolescence
 -----------------------------------
 
 Clone non-publishing with obsolescence
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution=all
   > EOF
 
   $ cd server
   $ echo foo > foo
   $ hg -q commit -m 'about to be pruned'
   $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up null -q
   $ hg log -T '{rev}: {phase}\n'
   2: draft
   1: draft
   0: draft
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
   $ cd ..
 
   $ hg clone -U --stream http://localhost:$HGPORT with-obsolescence
   streaming all changes
   1098 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
   1098 files to transfer, 99.5 KB of data (zstd !)
   transferred 99.5 KB in * seconds (* */sec) (glob) (zstd !)
   $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
   2: draft
   1: draft
   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
   remote: abort: server has obsolescence markers, but client cannot receive them via stream clone
   abort: pull failed on remote
   [100]
 
   $ killdaemons.py
 
 #endif
 
 Cloning a repo with no requirements doesn't give some obscure error
 
   $ mkdir -p empty-repo/.hg
   $ hg clone -q --stream ssh://user@dummy/empty-repo empty-repo2
   $ hg --cwd empty-repo2 verify -q

tests/test-clone.t

@@ -1,1311 +1,1296
 Prepare repo a:
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg add a
   $ hg commit -m test
   $ echo first line > b
   $ hg add b
 
 Create a non-inlined filelog:
 
   $ "$PYTHON" -c 'open("data1", "wb").write(b"".join(b"%d\n" % x for x in range(10000)))'
   $ for j in 0 1 2 3 4 5 6 7 8 9; do
   >   cat data1 >> b
   >   hg commit -m test
   > done
 
 List files in store/data (should show a 'b.d'):
 
 #if reporevlogstore
   $ for i in .hg/store/data/*; do
   >   echo $i
   > done
   .hg/store/data/a.i
   .hg/store/data/b.d
   .hg/store/data/b.i
 #endif
 
 Trigger branchcache creation:
 
   $ hg branches
   default                       10:a7949464abda
   $ ls .hg/cache
   branch2-served
   rbc-names-v1
   rbc-revs-v1
 
 Default operation:
 
   $ hg clone . ../b
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../b
 
 Ensure branchcache got copied over:
 
   $ ls .hg/cache
   branch2-base
   branch2-immutable
   branch2-served
   branch2-served.hidden
   branch2-visible
   branch2-visible-hidden
   rbc-names-v1
   rbc-revs-v1
   tags2
   tags2-served
 
   $ 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:
 
   $ hg clone . ''
   abort: empty destination path is not valid
   [10]
 
 No update, with debug option:
 
 #if hardlink
   $ hg --debug clone -U . ../c --config progress.debug=true
   linking: 1/15 files (6.67%)
   linking: 2/15 files (13.33%)
   linking: 3/15 files (20.00%)
   linking: 4/15 files (26.67%)
   linking: 5/15 files (33.33%)
   linking: 6/15 files (40.00%)
   linking: 7/15 files (46.67%)
   linking: 8/15 files (53.33%)
   linking: 9/15 files (60.00%)
   linking: 10/15 files (66.67%)
   linking: 11/15 files (73.33%)
   linking: 12/15 files (80.00%)
   linking: 13/15 files (86.67%)
   linking: 14/15 files (93.33%)
   linking: 15/15 files (100.00%)
   linked 15 files
   updating the branch cache
 #else
   $ hg --debug clone -U . ../c --config progress.debug=true
   linking: 1 files
   copying: 2 files
   copying: 3 files
   copying: 4 files
   copying: 5 files
   copying: 6 files
   copying: 7 files
   copying: 8 files
 #endif
   $ cd ../c
 
 Ensure branchcache got copied over:
 
   $ ls .hg/cache
   branch2-base
   branch2-immutable
   branch2-served
   branch2-served.hidden
   branch2-visible
   branch2-visible-hidden
   rbc-names-v1
   rbc-revs-v1
   tags2
   tags2-served
 
   $ 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:
 
   $ mkdir ../d
   $ cd ../d
   $ hg clone ../a
   destination directory: a
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd a
   $ hg cat a
   a
   $ cd ../..
 
 Check that we drop the 'file:' from the path before writing the .hgrc:
 
   $ hg clone file:a e
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ grep 'file:' e/.hg/hgrc
   [1]
 
 Check that path aliases are expanded:
 
   $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
   $ hg -R f showconfig paths.default
   $TESTTMP/a#0
 
 Use --pull:
 
   $ hg clone --pull a g
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 11 changesets with 11 changes to 2 files
   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):
 
   $ hg clone --pull a ''
   abort: empty destination path is not valid
   [10]
 
 Clone to '.':
 
   $ mkdir h
   $ cd h
   $ hg clone ../a .
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 
 *** Tests for option -u ***
 
 Adding some more history to repo a:
 
   $ cd a
   $ hg tag ref1
   $ echo the quick brown fox >a
   $ hg ci -m "hacked default"
   $ hg up ref1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch stable
   marked working directory as branch stable
   (branches are permanent and global, did you want a bookmark?)
   $ echo some text >a
   $ hg ci -m "starting branch stable"
   $ hg tag ref2
   $ echo some more text >a
   $ hg ci -m "another change for branch stable"
   $ hg up ref2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg parents
   changeset:   13:e8ece76546a6
   branch:      stable
   tag:         ref2
   parent:      10:a7949464abda
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     starting branch stable
   
 
 Repo a has two heads:
 
   $ hg heads
   changeset:   15:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 
   $ cd ..
 
 
 Testing --noupdate with --updaterev (must abort):
 
   $ hg clone --noupdate --updaterev 1 a ua
   abort: cannot specify both --noupdate and --updaterev
   [10]
 
 
 Testing clone -u:
 
   $ hg clone -u . a ua
   updating to branch stable
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has both heads:
 
   $ hg -R ua heads
   changeset:   15:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 
 Same revision checked out in repo a and ua:
 
   $ hg -R a parents --template "{node|short}\n"
   e8ece76546a6
   $ hg -R ua parents --template "{node|short}\n"
   e8ece76546a6
 
   $ rm -r ua
 
 
 Testing clone --pull -u:
 
   $ hg clone --pull -u . a ua
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 16 changesets with 16 changes to 3 files (+1 heads)
   new changesets acb14030fe0a:0aae7cf88f0d
   updating to branch stable
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has both heads:
 
   $ hg -R ua heads
   changeset:   15:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 
 Same revision checked out in repo a and ua:
 
   $ hg -R a parents --template "{node|short}\n"
   e8ece76546a6
   $ hg -R ua parents --template "{node|short}\n"
   e8ece76546a6
 
   $ rm -r ua
 
 
 Testing clone -u <branch>:
 
   $ hg clone -u stable a ua
   updating to branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has both heads:
 
   $ hg -R ua heads
   changeset:   15:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 
 Branch 'stable' is checked out:
 
   $ hg -R ua parents
   changeset:   15:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
 
   $ rm -r ua
 
 
 Testing default checkout:
 
   $ hg clone a ua
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has both heads:
 
   $ hg -R ua heads
   changeset:   15:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 
 Branch 'default' is checked out:
 
   $ hg -R ua parents
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 Test clone with a branch named "@" (issue3677)
 
   $ hg -R ua branch @
   marked working directory as branch @
   $ hg -R ua commit -m 'created branch @'
   $ hg clone ua atbranch
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R atbranch heads
   changeset:   16:798b6d97153e
   branch:      @
   tag:         tip
   parent:      12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     created branch @
   
   changeset:   15:0aae7cf88f0d
   branch:      stable
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
   $ hg -R atbranch parents
   changeset:   12:f21241060d6a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     hacked default
   
 
   $ rm -r ua atbranch
 
 
 Testing #<branch>:
 
   $ hg clone -u . a#stable ua
   adding changesets
   adding manifests
   adding file changes
   added 14 changesets with 14 changes to 3 files
   new changesets acb14030fe0a:0aae7cf88f0d
   updating to branch stable
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
 
   $ hg -R ua heads
   changeset:   13:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   10:a7949464abda
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
 Same revision checked out in repo a and ua:
 
   $ hg -R a parents --template "{node|short}\n"
   e8ece76546a6
   $ hg -R ua parents --template "{node|short}\n"
   e8ece76546a6
 
   $ rm -r ua
 
 
 Testing -u -r <branch>:
 
   $ hg clone -u . -r stable a ua
   adding changesets
   adding manifests
   adding file changes
   added 14 changesets with 14 changes to 3 files
   new changesets acb14030fe0a:0aae7cf88f0d
   updating to branch stable
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
 
   $ hg -R ua heads
   changeset:   13:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   10:a7949464abda
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
 Same revision checked out in repo a and ua:
 
   $ hg -R a parents --template "{node|short}\n"
   e8ece76546a6
   $ hg -R ua parents --template "{node|short}\n"
   e8ece76546a6
 
   $ rm -r ua
 
 
 Testing -r <branch>:
 
   $ hg clone -r stable a ua
   adding changesets
   adding manifests
   adding file changes
   added 14 changesets with 14 changes to 3 files
   new changesets acb14030fe0a:0aae7cf88f0d
   updating to branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
 
   $ hg -R ua heads
   changeset:   13:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
   changeset:   10:a7949464abda
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
 Branch 'stable' is checked out:
 
   $ hg -R ua parents
   changeset:   13:0aae7cf88f0d
   branch:      stable
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another change for branch stable
   
 
   $ rm -r ua
 
 
 Issue2267: Error in 1.6 hg.py: TypeError: 'NoneType' object is not
 iterable in addbranchrevs()
 
   $ cat <<EOF > simpleclone.py
   > from mercurial import hg, ui as uimod
   > myui = uimod.ui.load()
   > repo = hg.repository(myui, b'a')
   > hg.clone(myui, {}, repo, dest=b"ua")
   > EOF
 
   $ "$PYTHON" simpleclone.py
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ rm -r ua
 
   $ cat <<EOF > branchclone.py
   > from mercurial import extensions, hg, ui as uimod
   > myui = uimod.ui.load()
   > extensions.loadall(myui)
   > extensions.populateui(myui)
   > repo = hg.repository(myui, b'a')
   > hg.clone(myui, {}, repo, dest=b"ua", branch=[b"stable"])
   > EOF
 
   $ "$PYTHON" branchclone.py
   adding changesets
   adding manifests
   adding file changes
   added 14 changesets with 14 changes to 3 files
   new changesets acb14030fe0a:0aae7cf88f0d
   updating to branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -r ua
 
 Local clones don't get confused by unusual experimental.evolution options
 
   $ hg clone \
   >   --config experimental.evolution=allowunstable,allowdivergence,exchange \
   >   a ua
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -r ua
 
   $ hg clone \
   >   --config experimental.evolution.createmarkers=no \
   >   --config experimental.evolution.allowunstable=yes \
   >   --config experimental.evolution.allowdivergence=yes \
   >   --config experimental.evolution.exchange=yes \
   >   a ua
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -r ua
 
 Test clone with special '@' bookmark:
   $ cd a
   $ hg bookmark -r a7949464abda @  # branch point of stable from default
   $ hg clone . ../i
   updating to bookmark @
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -i ../i
   a7949464abda
   $ rm -r ../i
 
   $ hg bookmark -f -r stable @
   $ hg bookmarks
      @                         15:0aae7cf88f0d
   $ hg clone . ../i
   updating to bookmark @ on branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -i ../i
   0aae7cf88f0d
   $ cd "$TESTTMP"
 
 
 Testing failures:
 
   $ mkdir fail
   $ cd fail
 
 No local source
 
   $ hg clone a b
   abort: repository a not found
   [255]
 
 Invalid URL
 
   $ hg clone http://invalid:url/a b
   abort: error: nonnumeric port: 'url'
   [100]
 
 No remote source
 
 #if windows
   $ hg clone http://$LOCALIP:3121/a b
   abort: error: * (glob)
   [100]
 #else
   $ hg clone http://$LOCALIP:3121/a b
   abort: error: *refused* (glob)
   [100]
 #endif
   $ rm -rf b # work around bug with http clone
 
 
 #if unix-permissions no-root
 
 Inaccessible source
 
   $ mkdir a
   $ chmod 000 a
   $ hg clone a b
   abort: Permission denied: *$TESTTMP/fail/a/.hg* (glob)
   [255]
 
 Inaccessible destination
 
   $ hg init b
   $ cd b
   $ hg clone . ../a
   abort: Permission denied: *../a* (glob)
   [255]
   $ cd ..
   $ chmod 700 a
   $ rm -r a b
 
 #endif
 
 
 #if fifo
 
 Source of wrong type
 
   $ mkfifo a
   $ hg clone a b
   abort: $ENOTDIR$: *$TESTTMP/fail/a/.hg* (glob)
   [255]
   $ rm a
 
 #endif
 
 Default destination, same directory
 
   $ hg init q
   $ hg clone q
   destination directory: q
   abort: destination 'q' is not empty
   [10]
 
 destination directory not empty
 
   $ mkdir a
   $ echo stuff > a/a
   $ hg clone q a
   abort: destination 'a' is not empty
   [10]
 
 
 #if unix-permissions no-root
 
 leave existing directory in place after clone failure
 
   $ hg init c
   $ cd c
   $ echo c > c
   $ hg commit -A -m test
   adding c
   $ chmod -rx .hg/store/data
   $ cd ..
   $ mkdir d
   $ hg clone c d 2> err
   [255]
   $ test -d d
   $ test -d d/.hg
   [1]
 
 re-enable perm to allow deletion
 
   $ chmod +rx c/.hg/store/data
 
 #endif
 
   $ cd ..
 
 Test clone from the repository in (emulated) revlog format 0 (issue4203):
 
   $ mkdir issue4203
   $ mkdir -p src/.hg
   $ echo foo > src/foo
   $ hg -R src add src/foo
   $ hg -R src commit -m '#0'
   $ hg -R src log -q
   0:e1bab28bca43
   $ hg -R src debugrevlog -c | egrep 'format|flags'
   format : 0
   flags  : (none)
   $ hg root -R src -T json | sed 's|\\\\|\\|g'
   [
    {
     "hgpath": "$TESTTMP/src/.hg",
     "reporoot": "$TESTTMP/src",
     "storepath": "$TESTTMP/src/.hg"
    }
   ]
   $ hg clone -U -q src dst
   $ hg -R dst log -q
   0:e1bab28bca43
 
 Create repositories to test auto sharing functionality
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > share=
   > EOF
 
   $ hg init empty
   $ hg init source1a
   $ cd source1a
   $ echo initial1 > foo
   $ hg -q commit -A -m initial
   $ echo second > foo
   $ hg commit -m second
   $ cd ..
 
   $ hg init filteredrev0
   $ cd filteredrev0
   $ cat >> .hg/hgrc << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
   $ echo initial1 > foo
   $ hg -q commit -A -m initial0
   $ hg -q up -r null
   $ echo initial2 > foo
   $ hg -q commit -A -m initial1
   $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
   1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ..
 
   $ hg -q clone --pull source1a source1b
   $ cd source1a
   $ hg bookmark bookA
   $ echo 1a > foo
   $ hg commit -m 1a
   $ cd ../source1b
   $ hg -q up -r 0
   $ echo head1 > foo
   $ hg commit -m head1
   created new head
   $ hg bookmark head1
   $ hg -q up -r 0
   $ echo head2 > foo
   $ hg commit -m head2
   created new head
   $ hg bookmark head2
   $ hg -q up -r 0
   $ hg branch branch1
   marked working directory as branch branch1
   (branches are permanent and global, did you want a bookmark?)
   $ echo branch1 > foo
   $ hg commit -m branch1
   $ hg -q up -r 0
   $ hg branch branch2
   marked working directory as branch branch2
   $ echo branch2 > foo
   $ hg commit -m branch2
   $ cd ..
   $ hg init source2
   $ cd source2
   $ echo initial2 > foo
   $ hg -q commit -A -m initial2
   $ echo second > foo
   $ hg commit -m second
   $ cd ..
 
 Clone with auto share from an empty repo should not result in share
 
   $ mkdir share
   $ hg --config share.pool=share clone empty share-empty
   (not using pooled storage: remote appears to be empty)
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ ls share
   $ test -d share-empty/.hg/store
   $ test -f share-empty/.hg/sharedpath
   [1]
 
 Clone with auto share from a repo with filtered revision 0 should not result in share
 
   $ hg --config share.pool=share clone filteredrev0 share-filtered
   (not using pooled storage: unable to resolve identity of remote)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets e082c1832e09
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Clone from repo with content should result in shared store being created
 
   $ hg --config share.pool=share clone source1a share-dest1a
   (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets b5f04eac9d8f:e5bfe23c0b47
   searching for changes
   no changes found
   adding remote bookmark bookA
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 The shared repo should have been created
 
   $ ls share
   b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1
 
 The destination should point to it
 
   $ cat share-dest1a/.hg/sharedpath; echo
   $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg
 
 The destination should have bookmarks
 
   $ hg -R share-dest1a bookmarks
      bookA                     2:e5bfe23c0b47
 
 The default path should be the remote, not the share
 
   $ hg -R share-dest1a config paths.default
   $TESTTMP/source1a
 
 Clone with existing share dir should result in pull + share
 
   $ hg --config share.pool=share clone source1b share-dest1b
   (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   adding remote bookmark head1
   adding remote bookmark head2
   added 4 changesets with 4 changes to 1 files (+4 heads)
   new changesets 4a8dc1ab4c13:6bacf4683960
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ ls share
   b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1
 
   $ cat share-dest1b/.hg/sharedpath; echo
   $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg
 
 We only get bookmarks from the remote, not everything in the share
 
   $ hg -R share-dest1b bookmarks
      head1                     3:4a8dc1ab4c13
      head2                     4:99f71071f117
 
 Default path should be source, not share.
 
   $ hg -R share-dest1b config paths.default
   $TESTTMP/source1b
 
 Checked out revision should be head of default branch
 
   $ hg -R share-dest1b log -r .
   changeset:   4:99f71071f117
   bookmark:    head2
   parent:      0:b5f04eac9d8f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     head2
   
 
 Clone from unrelated repo should result in new share
 
   $ hg --config share.pool=share clone source2 share-dest2
   (sharing from new pooled repository 22aeff664783fd44c6d9b435618173c118c3448e)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   new changesets 22aeff664783:63cf6c3dba4a
   searching for changes
   no changes found
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ ls share
   22aeff664783fd44c6d9b435618173c118c3448e
   b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1
 
 remote naming mode works as advertised
 
   $ hg --config share.pool=shareremote --config share.poolnaming=remote clone source1a share-remote1a
   (sharing from new pooled repository 195bb1fcdb595c14a6c13e0269129ed78f6debde)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets b5f04eac9d8f:e5bfe23c0b47
   searching for changes
   no changes found
   adding remote bookmark bookA
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ ls shareremote
   195bb1fcdb595c14a6c13e0269129ed78f6debde
 
   $ hg --config share.pool=shareremote --config share.poolnaming=remote clone source1b share-remote1b
   (sharing from new pooled repository c0d4f83847ca2a873741feb7048a45085fd47c46)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 6 changes to 1 files (+4 heads)
   new changesets b5f04eac9d8f:6bacf4683960
   searching for changes
   no changes found
   adding remote bookmark head1
   adding remote bookmark head2
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ ls shareremote
   195bb1fcdb595c14a6c13e0269129ed78f6debde
   c0d4f83847ca2a873741feb7048a45085fd47c46
 
 request to clone a single revision is respected in sharing mode
 
   $ hg --config share.pool=sharerevs clone -r 4a8dc1ab4c13 source1b share-1arev
   (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   new changesets b5f04eac9d8f:4a8dc1ab4c13
   no changes found
   adding remote bookmark head1
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R share-1arev log -G
   @  changeset:   1:4a8dc1ab4c13
   |  bookmark:    head1
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     head1
   |
   o  changeset:   0:b5f04eac9d8f
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial
   
 
 making another clone should only pull down requested rev
 
   $ hg --config share.pool=sharerevs clone -r 99f71071f117 source1b share-1brev
   (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   adding remote bookmark head1
   adding remote bookmark head2
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 99f71071f117
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R share-1brev log -G
   @  changeset:   2:99f71071f117
   |  bookmark:    head2
   |  tag:         tip
   |  parent:      0:b5f04eac9d8f
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     head2
   |
   | o  changeset:   1:4a8dc1ab4c13
   |/   bookmark:    head1
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     head1
   |
   o  changeset:   0:b5f04eac9d8f
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial
   
 
 Request to clone a single branch is respected in sharing mode
 
   $ hg --config share.pool=sharebranch clone -b branch1 source1b share-1bbranch1
   (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   new changesets b5f04eac9d8f:5f92a6c1a1b1
   no changes found
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R share-1bbranch1 log -G
   o  changeset:   1:5f92a6c1a1b1
   |  branch:      branch1
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     branch1
   |
   @  changeset:   0:b5f04eac9d8f
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial
   
 
   $ hg --config share.pool=sharebranch clone -b branch2 source1b share-1bbranch2
   (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 6bacf4683960
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R share-1bbranch2 log -G
   o  changeset:   2:6bacf4683960
   |  branch:      branch2
   |  tag:         tip
   |  parent:      0:b5f04eac9d8f
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     branch2
   |
   | o  changeset:   1:5f92a6c1a1b1
   |/   branch:      branch1
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     branch1
   |
   @  changeset:   0:b5f04eac9d8f
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial
   
 
 -U is respected in share clone mode
 
   $ hg --config share.pool=share clone -U source1a share-1anowc
   (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   searching for changes
   no changes found
   adding remote bookmark bookA
 
   $ ls -A share-1anowc
   .hg
 
 Test that auto sharing doesn't cause failure of "hg clone local remote"
 
   $ cd $TESTTMP
   $ hg -R a id -r 0
   acb14030fe0a
   $ hg id -R remote -r 0
   abort: repository remote not found
   [255]
   $ hg --config share.pool=share -q clone a ssh://user@dummy/remote
   $ hg -R remote id -r 0
   acb14030fe0a
 
 Cloning into pooled storage doesn't race (issue5104)
 
   $ HGPOSTLOCKDELAY=2.0 hg --config share.pool=racepool --config extensions.lockdelay=$TESTDIR/lockdelay.py clone source1a share-destrace1 > race1.log 2>&1 &
   $ HGPRELOCKDELAY=1.0 hg --config share.pool=racepool --config extensions.lockdelay=$TESTDIR/lockdelay.py clone source1a share-destrace2  > race2.log 2>&1
   $ wait
 
   $ hg -R share-destrace1 log -r tip
   changeset:   2:e5bfe23c0b47
   bookmark:    bookA
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1a
   
 
   $ hg -R share-destrace2 log -r tip
   changeset:   2:e5bfe23c0b47
   bookmark:    bookA
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1a
   
 One repo should be new, the other should be shared from the pool. We
 don't care which is which, so we just make sure we always print the
 one containing "new pooled" first, then one one containing "existing
 pooled".
 
   $ (grep 'new pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock
   (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets b5f04eac9d8f:e5bfe23c0b47
   searching for changes
   no changes found
   adding remote bookmark bookA
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ (grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock
   (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
   searching for changes
   no changes found
   adding remote bookmark bookA
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 SEC: check for unsafe ssh url
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > ssh = sh -c "read l; read l; read l"
   > EOF
 
   $ hg clone 'ssh://-oProxyCommand=touch${IFS}owned/path'
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg clone 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg clone 'ssh://fakehost|touch%20owned/path'
   abort: no suitable response from remote hg
   [255]
   $ hg clone 'ssh://fakehost%7Ctouch%20owned/path'
   abort: no suitable response from remote hg
   [255]
 
   $ hg clone 'ssh://-oProxyCommand=touch [e-mail]/nonexistent/path'
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned [e-mail]/nonexistent/path'
   [255]
 
 #if windows
   $ hg clone "ssh://%26touch%20owned%20/" --debug
   running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio"
   sending hello command
   sending between command
   abort: no suitable response from remote hg
   [255]
   $ hg clone "ssh://example.com:%26touch%20owned%20/" --debug
   running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio"
   sending hello command
   sending between command
   abort: no suitable response from remote hg
   [255]
 #else
   $ hg clone "ssh://%3btouch%20owned%20/" --debug
   running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio'
   sending hello command
   sending between command
   abort: no suitable response from remote hg
   [255]
   $ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug
   running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio'
   sending hello command
   sending between command
   abort: no suitable response from remote hg
   [255]
 #endif
 
   $ hg clone "ssh://v-alid.example.com/" --debug
   running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re)
   sending hello command
   sending between command
   abort: no suitable response from remote hg
   [255]
 
 We should not have created a file named owned - if it exists, the
 attack succeeded.
   $ if test -f owned; then echo 'you got owned'; fi
 
 Cloning without fsmonitor enabled does not print a warning for small repos
 
   $ hg clone a fsmonitor-default
   updating to bookmark @ on branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Lower the warning threshold to simulate a large repo
 
   $ cat >> $HGRCPATH << EOF
   > [fsmonitor]
   > warn_update_file_count = 2
   > warn_update_file_count_rust = 2
   > EOF
 
 We should see a warning about no fsmonitor on supported platforms
 
 #if linuxormacos no-fsmonitor
   $ hg clone a nofsmonitor
   updating to bookmark @ on branch stable
   (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor")
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #else
   $ hg clone a nofsmonitor
   updating to bookmark @ on branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
 We should not see warning about fsmonitor when it is enabled
 
 #if fsmonitor
   $ hg clone a fsmonitor-enabled
   updating to bookmark @ on branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
 We can disable the fsmonitor warning
 
   $ hg --config fsmonitor.warn_when_unused=false clone a fsmonitor-disable-warning
   updating to bookmark @ on branch stable
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Loaded fsmonitor but disabled in config should still print warning
 
 #if linuxormacos fsmonitor
   $ hg --config fsmonitor.mode=off clone a fsmonitor-mode-off
   updating to bookmark @ on branch stable
   (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (fsmonitor !)
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
 Warning not printed if working directory isn't empty
 
   $ hg -q clone a fsmonitor-update
   (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (?)
   $ cd fsmonitor-update
   $ hg up acb14030fe0a
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (leaving bookmark @)
   $ hg up cf0fe1914066
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 `hg update` from null revision also prints
 
   $ hg up null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
 #if linuxormacos no-fsmonitor
   $ hg up cf0fe1914066
   (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor")
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #else
   $ hg up cf0fe1914066
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
   $ cd ..
 

tests/test-contrib-dumprevlog.t

@@ -1,101 +1,91
 #require reporevlogstore
 
   $ CONTRIBDIR="$TESTDIR/../contrib"
 
   $ hg init repo-a
   $ cd repo-a
 
   $ echo this is file a > a
   $ hg add a
   $ hg commit -m first
 
   $ echo adding to file a >> a
   $ hg commit -m second
 
   $ 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
   file: .hg/store/data/a.i
   node: 183d2312b35066fb6b3b449b84efc370d50993d0
   linkrev: 0
   parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
   length: 15
   -start-
   this is file a
   
   -end-
   node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
   linkrev: 1
   parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
   length: 32
   -start-
   this is file a
   adding to file a
   
   -end-
   node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
   linkrev: 2
   parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
   length: 54
   -start-
   this is file a
   adding to file a
   adding more to file a
   
   -end-
 
 Dump all revlogs to file repo.dump:
 
   $ find .hg/store -name "*.i" | sort | xargs "$PYTHON" "$CONTRIBDIR/dumprevlog" > ../repo.dump
   $ cd ..
 
 Undumping into repo-b:
 
   $ hg init repo-b
   $ cd repo-b
   $ "$PYTHON" "$CONTRIBDIR/undumprevlog" < ../repo.dump
   .hg/store/00changelog.i
   .hg/store/00manifest.i
   .hg/store/data/a.i
   $ cd ..
 
 Rebuild fncache with clone --pull:
 
   $ hg clone --pull -U repo-b repo-c
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets de1da620e7d8:46946d278c50
 
 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:
 
   $ hg -R repo-c incoming repo-a
   comparing with repo-a
   searching for changes
   no changes found
   [1]
 
   $ hg -R repo-a incoming repo-c
   comparing with repo-c
   searching for changes
   no changes found
   [1]

tests/test-convert-filemap.t

@@ -1,821 +1,816
 
   $ HGMERGE=true; export HGMERGE
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'convert =' >> $HGRCPATH
   $ glog()
   > {
   >     hg log -G --template '{rev} "{desc}" files: {files}\n' "$@"
   > }
   $ hg init source
   $ cd source
   $ echo foo > foo
   $ echo baz > baz
   $ mkdir -p dir/subdir
   $ echo dir/file >> dir/file
   $ echo dir/file2 >> dir/file2
   $ echo dir/file3 >> dir/file3 # to be corrupted in rev 0
   $ echo dir/subdir/file3 >> dir/subdir/file3
   $ echo dir/subdir/file4 >> dir/subdir/file4
   $ hg ci -d '0 0' -qAm '0: add foo baz dir/'
   $ echo bar > bar
   $ echo quux > quux
   $ echo dir/file4 >> dir/file4 # to be corrupted in rev 1
   $ hg copy foo copied
   $ hg ci -d '1 0' -qAm '1: add bar quux; copy foo to copied'
   $ echo >> foo
   $ hg ci -d '2 0' -m '2: change foo'
   $ hg up -qC 1
   $ echo >> bar
   $ echo >> quux
   $ hg ci -d '3 0' -m '3: change bar quux'
   created new head
   $ hg up -qC 2
   $ hg merge -qr 3
   $ echo >> bar
   $ echo >> baz
   $ hg ci -d '4 0' -m '4: first merge; change bar baz'
   $ echo >> bar
   $ echo 1 >> baz
   $ echo >> quux
   $ hg ci -d '5 0' -m '5: change bar baz quux'
   $ hg up -qC 4
   $ echo >> foo
   $ echo 2 >> baz
   $ hg ci -d '6 0' -m '6: change foo baz'
   created new head
   $ hg up -qC 5
   $ hg merge -qr 6
   $ echo >> bar
   $ hg ci -d '7 0' -m '7: second merge; change bar'
   $ echo >> foo
   $ hg ci -m '8: change foo'
   $ glog
   @  8 "8: change foo" files: foo
   |
   o    7 "7: second merge; change bar" files: bar baz
   |\
   | o  6 "6: change foo baz" files: baz foo
   | |
   o |  5 "5: change bar baz quux" files: bar baz quux
   |/
   o    4 "4: first merge; change bar baz" files: bar baz
   |\
   | o  3 "3: change bar quux" files: bar quux
   | |
   o |  2 "2: change foo" files: foo
   |/
   o  1 "1: add bar quux; copy foo to copied" files: bar copied dir/file4 quux
   |
   o  0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/file3 dir/subdir/file3 dir/subdir/file4 foo
   
 
 final file versions in this repo:
 
   $ hg manifest --debug
   9463f52fe115e377cf2878d4fc548117211063f2 644   bar
   94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644   baz
   7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644   copied
   3e20847584beff41d7cd16136b7331ab3d754be0 644   dir/file
   75e6d3f8328f5f6ace6bf10b98df793416a09dca 644   dir/file2
   e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c 644   dir/file3
   6edd55f559cdce67132b12ca09e09cee08b60442 644   dir/file4
   5fe139720576e18e34bcc9f79174db8897c8afe9 644   dir/subdir/file3
   57a1c1511590f3de52874adfa04effe8a77d64af 644   dir/subdir/file4
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ hg debugrename copied
   copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
   $ cd ..
 
 
 Test interaction with startrev and verify that changing it is handled properly:
 
   $ > empty
   $ hg convert --filemap empty source movingstart --config convert.hg.startrev=3 -r4
   initializing destination movingstart repository
   scanning source...
   sorting...
   converting...
   1 3: change bar quux
   0 4: first merge; change bar baz
   $ hg convert --filemap empty source movingstart
   scanning source...
   sorting...
   converting...
   3 5: change bar baz quux
   2 6: change foo baz
   1 7: second merge; change bar
   warning: af455ce4166b3c9c88e6309c2b9332171dcea595 parent 61e22ca76c3b3e93df20338c4e02ce286898e825 is missing
   warning: cf908b3eeedc301c9272ebae931da966d5b326c7 parent 59e1ab45c888289513b7354484dac8a88217beab is missing
   0 8: change foo
 
 
 splitrepo tests
 
   $ splitrepo()
   > {
   >     msg="$1"
   >     files="$2"
   >     opts=$3
   >     echo "% $files: $msg"
   >     prefix=`echo "$files" | sed -e 's/ /-/g'`
   >     fmap="$prefix.fmap"
   >     repo="$prefix.repo"
   >     for i in $files; do
   >         echo "include $i" >> "$fmap"
   >     done
   >     hg -q convert $opts --filemap "$fmap" --datesort source "$repo"
   >     hg up -q -R "$repo"
   >     glog -R "$repo"
   >     hg -R "$repo" manifest --debug
   > }
   $ splitrepo 'skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd' foo
   % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
   @  3 "8: change foo" files: foo
   |
   o  2 "6: change foo baz" files: foo
   |
   o  1 "2: change foo" files: foo
   |
   o  0 "0: add foo baz dir/" files: foo
   
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   $ splitrepo 'merges are not merges anymore' bar
   % bar: merges are not merges anymore
   @  4 "7: second merge; change bar" files: bar
   |
   o  3 "5: change bar baz quux" files: bar
   |
   o  2 "4: first merge; change bar baz" files: bar
   |
   o  1 "3: change bar quux" files: bar
   |
   o  0 "1: add bar quux; copy foo to copied" files: bar
   
   9463f52fe115e377cf2878d4fc548117211063f2 644   bar
   $ splitrepo '1st merge is not a merge anymore; 2nd still is' baz
   % baz: 1st merge is not a merge anymore; 2nd still is
   @    4 "7: second merge; change bar" files: baz
   |\
   | o  3 "6: change foo baz" files: baz
   | |
   o |  2 "5: change bar baz quux" files: baz
   |/
   o  1 "4: first merge; change bar baz" files: baz
   |
   o  0 "0: add foo baz dir/" files: baz
   
   94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644   baz
   $ splitrepo 'we add additional merges when they are interesting' 'foo quux'
   % foo quux: we add additional merges when they are interesting
   @  8 "8: change foo" files: foo
   |
   o    7 "7: second merge; change bar" files:
   |\
   | o  6 "6: change foo baz" files: foo
   | |
   o |  5 "5: change bar baz quux" files: quux
   |/
   o    4 "4: first merge; change bar baz" files:
   |\
   | o  3 "3: change bar quux" files: quux
   | |
   o |  2 "2: change foo" files: foo
   |/
   o  1 "1: add bar quux; copy foo to copied" files: quux
   |
   o  0 "0: add foo baz dir/" files: foo
   
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ splitrepo 'partial conversion' 'bar quux' '-r 3'
   % bar quux: partial conversion
   @  1 "3: change bar quux" files: bar quux
   |
   o  0 "1: add bar quux; copy foo to copied" files: bar quux
   
   b79105bedc55102f394e90a789c9c380117c1b4a 644   bar
   db0421cc6b685a458c8d86c7d5c004f94429ea23 644   quux
   $ splitrepo 'complete the partial conversion' 'bar quux'
   % bar quux: complete the partial conversion
   @  4 "7: second merge; change bar" files: bar
   |
   o  3 "5: change bar baz quux" files: bar quux
   |
   o  2 "4: first merge; change bar baz" files: bar
   |
   o  1 "3: change bar quux" files: bar quux
   |
   o  0 "1: add bar quux; copy foo to copied" files: bar quux
   
   9463f52fe115e377cf2878d4fc548117211063f2 644   bar
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ rm -r foo.repo
   $ splitrepo 'partial conversion' 'foo' '-r 3'
   % foo: partial conversion
   @  0 "0: add foo baz dir/" files: foo
   
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
   $ splitrepo 'complete the partial conversion' 'foo'
   % foo: complete the partial conversion
   @  3 "8: change foo" files: foo
   |
   o  2 "6: change foo baz" files: foo
   |
   o  1 "2: change foo" files: foo
   |
   o  0 "0: add foo baz dir/" files: foo
   
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   $ splitrepo 'copied file; source not included in new repo' copied
   % copied: copied file; source not included in new repo
   @  0 "1: add bar quux; copy foo to copied" files: copied
   
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   copied
   $ hg --cwd copied.repo debugrename copied
   copied not renamed
   $ splitrepo 'copied file; source included in new repo' 'foo copied'
   % foo copied: copied file; source included in new repo
   @  4 "8: change foo" files: foo
   |
   o  3 "6: change foo baz" files: foo
   |
   o  2 "2: change foo" files: foo
   |
   o  1 "1: add bar quux; copy foo to copied" files: copied
   |
   o  0 "0: add foo baz dir/" files: foo
   
   7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644   copied
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   $ hg --cwd foo-copied.repo debugrename copied
   copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
 verify the top level 'include .' if there is no other includes:
 
   $ echo "exclude something" > default.fmap
   $ hg convert -q --filemap default.fmap -r1 source dummydest2
   $ hg -R dummydest2 log --template '{rev} {node|short} {desc|firstline}\n'
   1 61e22ca76c3b 1: add bar quux; copy foo to copied
   0 c085cf2ee7fe 0: add foo baz dir/
 
   $ echo "include somethingelse" >> default.fmap
   $ hg convert -q --filemap default.fmap -r1 source dummydest3
   $ hg -R dummydest3 log --template '{rev} {node|short} {desc|firstline}\n'
 
   $ echo "include ." >> default.fmap
   $ hg convert -q --filemap default.fmap -r1 source dummydest4
   $ hg -R dummydest4 log --template '{rev} {node|short} {desc|firstline}\n'
   1 61e22ca76c3b 1: add bar quux; copy foo to copied
   0 c085cf2ee7fe 0: add foo baz dir/
 
 ensure that the filemap contains duplicated slashes (issue3612)
 
   $ cat > renames.fmap <<EOF
   > include dir
   > exclude dir/file2
   > rename dir dir2//dir3
   > include foo
   > include copied
   > rename foo foo2/
   > rename copied ./copied2
   > exclude dir/subdir
   > include dir/subdir/file3
   > EOF
 #if reporevlogstore
   $ rm source/.hg/store/data/dir/file3.i
   $ rm source/.hg/store/data/dir/file4.i
 #endif
 #if reposimplestore
   $ rm -rf source/.hg/store/data/dir/file3
   $ rm -rf source/.hg/store/data/dir/file4
 #endif
   $ hg -q convert --filemap renames.fmap --datesort source dummydest
   abort: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !)
   abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
   [50]
   $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
   ignoring: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !)
   ignoring: dir/file4@6edd55f559cdce67132b12ca09e09cee08b60442: no match found (reporevlogstore !)
   ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
   ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !)
   $ hg up -q -R renames.repo
   $ glog -R renames.repo
   @  4 "8: change foo" files: foo2
   |
   o  3 "6: change foo baz" files: foo2
   |
   o  2 "2: change foo" files: foo2
   |
   o  1 "1: add bar quux; copy foo to copied" files: copied2
   |
   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
   3e20847584beff41d7cd16136b7331ab3d754be0 644   dir2/dir3/file
   5fe139720576e18e34bcc9f79174db8897c8afe9 644   dir2/dir3/subdir/file3
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo2
   $ hg --cwd renames.repo debugrename copied2
   copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
 copied:
 
   $ hg --cwd source cat copied
   foo
 
 copied2:
 
   $ hg --cwd renames.repo cat copied2
   foo
 
 filemap errors
 
   $ cat > errors.fmap <<EOF
   > include dir/ # beware that comments changes error line numbers!
   > exclude /dir
   > rename dir//dir /dir//dir/ "out of sync"
   > include
   > EOF
   $ hg -q convert --filemap errors.fmap source errors.repo
   errors.fmap:3: superfluous / in include '/dir'
   errors.fmap:3: superfluous / in rename '/dir'
   errors.fmap:4: unknown directive 'out of sync'
   errors.fmap:5: path to exclude is missing
   abort: errors in filemap
   [255]
 
 test branch closing revision pruning if branch is pruned
 
   $ hg init branchpruning
   $ cd branchpruning
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ hg ci --close-branch -m closefoo
   $ hg up 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch empty
   marked working directory as branch empty
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m emptybranch
   $ hg ci --close-branch -m closeempty
   $ hg up 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch default
   marked working directory as branch default
   (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -Am addb
   adding b
   $ hg ci --close-branch -m closedefault
   $ cat > filemap <<EOF
   > include b
   > EOF
   $ cd ..
   $ hg convert branchpruning branchpruning-hg1
   initializing destination branchpruning-hg1 repository
   scanning source...
   sorting...
   converting...
   5 adda
   4 closefoo
   3 emptybranch
   2 closeempty
   1 addb
   0 closedefault
   $ glog -R branchpruning-hg1
   _  5 "closedefault" files:
   |
   o  4 "addb" files: b
   |
   | _  3 "closeempty" files:
   | |
   | o  2 "emptybranch" files:
   |/
   | _  1 "closefoo" files:
   |/
   o  0 "adda" files: a
   
 
 exercise incremental conversion at the same time
 
   $ hg convert -r0 --filemap branchpruning/filemap branchpruning branchpruning-hg2
   initializing destination branchpruning-hg2 repository
   scanning source...
   sorting...
   converting...
   0 adda
   $ hg convert -r4 --filemap branchpruning/filemap branchpruning branchpruning-hg2
   scanning source...
   sorting...
   converting...
   0 addb
   $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2
   scanning source...
   sorting...
   converting...
   3 closefoo
   2 emptybranch
   1 closeempty
   0 closedefault
   $ glog -R branchpruning-hg2
   _  1 "closedefault" files:
   |
   o  0 "addb" files: b
   
 Include directives dropped empty commits, but other directives don't
 
   $ cat > branchpruning/exclude_filemap <<EOF
   > exclude a
   > EOF
   $ hg convert --filemap branchpruning/exclude_filemap branchpruning branchpruning-hg-exclude
   initializing destination branchpruning-hg-exclude repository
   scanning source...
   sorting...
   converting...
   5 adda
   4 closefoo
   3 emptybranch
   2 closeempty
   1 addb
   0 closedefault
 
   $ glog -R branchpruning-hg-exclude
   _  3 "closedefault" files:
   |
   o  2 "addb" files: b
   
   _  1 "closeempty" files:
   |
   o  0 "emptybranch" files:
   
 
 Test rebuilding of map with unknown revisions in shamap - it used to crash
 
   $ cd branchpruning
   $ hg up -r 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merging something'
   $ cd ..
   $ echo "53792d18237d2b64971fa571936869156655338d 6d955580116e82c4b029bd30f321323bae71a7f0" >> branchpruning-hg2/.hg/shamap
   $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug --config progress.debug=true
   run hg source pre-conversion action
   run hg sink pre-conversion action
   scanning source...
   scanning: 1/7 revisions (14.29%)
   sorting...
   converting...
   0 merging something
   source: 2503605b178fe50e8fbbb0e77b97939540aa8c87
   converting: 0/1 revisions (0.00%)
   unknown revmap source: 53792d18237d2b64971fa571936869156655338d
   run hg sink post-conversion action
   run hg source post-conversion action
 
 
 filemap rename undoing revision rename
 
   $ hg init renameundo
   $ cd renameundo
   $ echo 1 > a
   $ echo 1 > c
   $ hg ci -qAm add
   $ hg mv -q a b/a
   $ hg mv -q c b/c
   $ hg ci -qm rename
   $ echo 2 > b/a
   $ echo 2 > b/c
   $ hg ci -qm modify
   $ cd ..
 
   $ echo "rename b ." > renameundo.fmap
   $ hg convert --filemap renameundo.fmap renameundo renameundo2
   initializing destination renameundo2 repository
   scanning source...
   sorting...
   converting...
   2 add
   1 rename
   filtering out empty revision
   repository tip rolled back to revision 0 (undo convert)
   0 modify
   $ glog -R renameundo2
   o  1 "modify" files: a c
   |
   o  0 "add" files: a c
   
 
 
 test merge parents/empty merges pruning
 
   $ glog()
   > {
   >     hg log -G --template '{rev}:{node|short}@{branch} "{desc}" files: {files}\n' "$@"
   > }
 
 test anonymous branch pruning
 
   $ hg init anonymousbranch
   $ cd anonymousbranch
   $ echo a > a
   $ echo b > b
   $ hg ci -Am add
   adding a
   adding b
   $ echo a >> a
   $ hg ci -m changea
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b >> b
   $ hg ci -m changeb
   created new head
   $ hg up 1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ cd ..
 
   $ cat > filemap <<EOF
   > include a
   > EOF
   $ hg convert --filemap filemap anonymousbranch anonymousbranch-hg
   initializing destination anonymousbranch-hg repository
   scanning source...
   sorting...
   converting...
   3 add
   2 changea
   1 changeb
   0 merge
   $ glog -R anonymousbranch
   @    3:c71d5201a498@default "merge" files:
   |\
   | o  2:607eb44b17f9@default "changeb" files: b
   | |
   o |  1:1f60ea617824@default "changea" files: a
   |/
   o  0:0146e6129113@default "add" files: a b
   
   $ glog -R anonymousbranch-hg
   o  1:cda818e7219b@default "changea" files: a
   |
   o  0:c334dc3be0da@default "add" files: a
   
   $ cat anonymousbranch-hg/.hg/shamap
   0146e6129113dba9ac90207cfdf2d7ed35257ae5 c334dc3be0daa2a4e9ce4d2e2bdcba40c09d4916
   1f60ea61782421edf8d051ff4fcb61b330f26a4a cda818e7219b5f7f3fb9f49780054ed6a1905ec3
   607eb44b17f9348cd5cbd26e16af87ba77b0b037 c334dc3be0daa2a4e9ce4d2e2bdcba40c09d4916
   c71d5201a498b2658d105a6bf69d7a0df2649aea cda818e7219b5f7f3fb9f49780054ed6a1905ec3
 
   $ cat > filemap <<EOF
   > include b
   > EOF
   $ hg convert --filemap filemap anonymousbranch anonymousbranch-hg2
   initializing destination anonymousbranch-hg2 repository
   scanning source...
   sorting...
   converting...
   3 add
   2 changea
   1 changeb
   0 merge
   $ glog -R anonymousbranch
   @    3:c71d5201a498@default "merge" files:
   |\
   | o  2:607eb44b17f9@default "changeb" files: b
   | |
   o |  1:1f60ea617824@default "changea" files: a
   |/
   o  0:0146e6129113@default "add" files: a b
   
   $ glog -R anonymousbranch-hg2
   o  1:62dd350b0df6@default "changeb" files: b
   |
   o  0:4b9ced861657@default "add" files: b
   
   $ cat anonymousbranch-hg2/.hg/shamap
   0146e6129113dba9ac90207cfdf2d7ed35257ae5 4b9ced86165703791653059a1db6ed864630a523
   1f60ea61782421edf8d051ff4fcb61b330f26a4a 4b9ced86165703791653059a1db6ed864630a523
   607eb44b17f9348cd5cbd26e16af87ba77b0b037 62dd350b0df695f7d2c82a02e0499b16fd790f22
   c71d5201a498b2658d105a6bf69d7a0df2649aea 62dd350b0df695f7d2c82a02e0499b16fd790f22
 
 test named branch pruning
 
   $ hg init namedbranch
   $ cd namedbranch
   $ echo a > a
   $ echo b > b
   $ hg ci -Am add
   adding a
   adding b
   $ echo a >> a
   $ hg ci -m changea
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ echo b >> b
   $ hg ci -m changeb
   $ hg up default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ cd ..
 
   $ cat > filemap <<EOF
   > include a
   > EOF
   $ hg convert --filemap filemap namedbranch namedbranch-hg
   initializing destination namedbranch-hg repository
   scanning source...
   sorting...
   converting...
   3 add
   2 changea
   1 changeb
   0 merge
   $ glog -R namedbranch
   @    3:73899bcbe45c@default "merge" files:
   |\
   | o  2:8097982d19fc@foo "changeb" files: b
   | |
   o |  1:1f60ea617824@default "changea" files: a
   |/
   o  0:0146e6129113@default "add" files: a b
   
   $ glog -R namedbranch-hg
   o  1:cda818e7219b@default "changea" files: a
   |
   o  0:c334dc3be0da@default "add" files: a
   
 
   $ cd namedbranch
   $ hg --config extensions.mq= strip tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg
   $ hg up foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ cd ..
 
   $ hg convert --filemap filemap namedbranch namedbranch-hg2
   initializing destination namedbranch-hg2 repository
   scanning source...
   sorting...
   converting...
   3 add
   2 changea
   1 changeb
   0 merge
   $ glog -R namedbranch
   @    3:e1959de76e1b@foo "merge" files:
   |\
   | o  2:8097982d19fc@foo "changeb" files: b
   | |
   o |  1:1f60ea617824@default "changea" files: a
   |/
   o  0:0146e6129113@default "add" files: a b
   
   $ glog -R namedbranch-hg2
   o    2:dcf314454667@foo "merge" files:
   |\
   | o  1:cda818e7219b@default "changea" files: a
   |/
   o  0:c334dc3be0da@default "add" files: a
   
   $ cd ..
 
 test converting merges into a repo that contains other files
 
   $ hg init merge-test1
   $ cd merge-test1
   $ touch a && hg commit -Aqm 'add a'
   $ echo a > a && hg commit -Aqm 'edit a'
   $ hg up -q 0
   $ touch b && hg commit -Aqm 'add b'
   $ hg merge -q 1 && hg commit -qm 'merge a & b'
 
   $ cd ..
   $ hg init merge-test2
   $ cd merge-test2
   $ mkdir converted
   $ touch converted/a toberemoved && hg commit -Aqm 'add converted/a & toberemoved'
   $ touch x && rm toberemoved && hg commit -Aqm 'add x & remove tobremoved'
   $ cd ..
   $ hg log -G -T '{shortest(node)} {desc}' -R merge-test1
   @    1191 merge a & b
   |\
   | o  9077 add b
   | |
   o |  d19f edit a
   |/
   o  ac82 add a
   
   $ hg log -G -T '{shortest(node)} {desc}' -R merge-test2
   @  150e add x & remove tobremoved
   |
   o  bbac add converted/a & toberemoved
   
 - Build a shamap where the target converted/a is in on top of an unrelated
 - change to 'x'. This simulates using convert to merge several repositories
 - together.
   $ cat >> merge-test2/.hg/shamap <<EOF
   > $(hg -R merge-test1 log -r 0 -T '{node}') $(hg -R merge-test2 log -r 0 -T '{node}')
   > $(hg -R merge-test1 log -r 1 -T '{node}') $(hg -R merge-test2 log -r 1 -T '{node}')
   > EOF
   $ cat >> merge-test-filemap <<EOF
   > rename . converted/
   > EOF
   $ hg convert --filemap merge-test-filemap merge-test1 merge-test2 --traceback
   scanning source...
   sorting...
   converting...
   1 add b
   0 merge a & b
   $ hg -R merge-test2 manifest -r tip
   converted/a
   converted/b
   x
   $ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n'
   o    e2ff merge a & b
   |\   - converted/a
   | |
   | o  2995 add b
   | |  - converted/b
   | |
   @ |  150e add x & remove tobremoved
   |/   - toberemoved
   |    - x
   |
   o  bbac add converted/a & toberemoved
      - converted/a
      - toberemoved
   
   $ cd ..
 
 Test case where cleanp2 contains a file that doesn't exist in p2 - for
 example because filemap changed.
 
   $ hg init cleanp2
   $ cd cleanp2
   $ touch f f1 f2 && hg ci -Aqm '0'
   $ echo f1 > f1 && echo >> f && hg ci -m '1'
   $ hg up -qr0 && echo f2 > f2 && echo >> f && hg ci -qm '2'
   $ echo "include f" > filemap
   $ hg convert --filemap filemap .
   assuming destination .-hg
   initializing destination .-hg repository
   scanning source...
   sorting...
   converting...
   2 0
   1 1
   0 2
   $ hg merge && hg ci -qm '3'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ echo "include ." > filemap
   $ hg convert --filemap filemap .
   assuming destination .-hg
   scanning source...
   sorting...
   converting...
   0 3
   $ hg -R .-hg log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n'
   o    bbfe 3
   |\
   | o  33a0 2
   | |  - f
   | |
   o |  f73e 1
   |/   - f
   |
   o  d681 0
      - f
   
   $ hg -R .-hg mani -r tip
   f
   $ cd ..

tests/test-convert-hg-source.t

@@ -1,227 +1,222
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert=
   > [convert]
   > hg.saverev=False
   > EOF
   $ hg init orig
   $ cd orig
   $ echo foo > foo
   $ echo bar > bar
   $ hg ci -qAm 'add foo bar' -d '0 0'
   $ echo >> foo
   $ hg ci -m 'change foo' -d '1 0'
   $ hg up -qC 0
   $ hg copy --after --force foo bar
   $ hg copy foo baz
   $ hg ci -m 'make bar and baz copies of foo' -d '2 0'
   created new head
 
 Test that template can print all file copies (issue4362)
   $ hg log -r . --template "{file_copies % ' File: {file_copy}\n'}"
    File: bar (foo)
    File: baz (foo)
 
   $ hg bookmark premerge1
   $ hg merge -r 1
   merging baz and foo to baz
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge local copy' -d '3 0'
   $ hg up -C 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark premerge1)
   $ hg bookmark premerge2
   $ hg merge 2
   merging foo and baz to baz
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge remote copy' -d '4 0'
   created new head
 
 Make and delete some tags
 
   $ hg tag that
   $ hg tag --remove that
   $ hg tag this
 
 #if execbit
   $ chmod +x baz
 #else
   $ echo some other change to make sure we get a rev 5 > baz
 #endif
   $ hg ci -m 'mark baz executable' -d '5 0'
   $ cd ..
   $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
   initializing destination new repository
   scanning source...
   sorting...
   converting...
   8 add foo bar
   7 change foo
   6 make bar and baz copies of foo
   5 merge local copy
   4 merge remote copy
   3 Added tag that for changeset 8601262d7472
   2 Removed tag that
   1 Added tag this for changeset 706614b458c1
   0 mark baz executable
   updating bookmarks
   $ cd new
   $ hg out ../orig
   comparing with ../orig
   searching for changes
   no changes found
   [1]
 #if execbit
   $ hg bookmarks
      premerge1                 3:973ef48a98a4
      premerge2                 8:c4968fdf2e5d
 #else
 Different hash because no x bit
   $ hg bookmarks
      premerge1                 3:973ef48a98a4
      premerge2                 8:1cc21e701444
 #endif
 
 Test that redoing a convert results in an identical graph
   $ cd ../
   $ rm new/.hg/shamap
   $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
   scanning source...
   sorting...
   converting...
   8 add foo bar
   7 change foo
   6 make bar and baz copies of foo
   5 merge local copy
   4 merge remote copy
   3 Added tag that for changeset 8601262d7472
   2 Removed tag that
   1 Added tag this for changeset 706614b458c1
   0 mark baz executable
   updating bookmarks
   $ hg -R new log -G -T '{rev} {desc}'
   o  8 mark baz executable
   |
   o  7 Added tag this for changeset 706614b458c1
   |
   o  6 Removed tag that
   |
   o  5 Added tag that for changeset 8601262d7472
   |
   o    4 merge remote copy
   |\
   +---o  3 merge local copy
   | |/
   | o  2 make bar and baz copies of foo
   | |
   o |  1 change foo
   |/
   o  0 add foo bar
   
 
 check shamap LF and CRLF handling
 
   $ cat > rewrite.py <<EOF
   > import sys
   > # Interlace LF and CRLF
   > lines = [(l.rstrip() + ((i % 2) and b'\n' or b'\r\n'))
   >          for i, l in enumerate(open(sys.argv[1], 'rb'))]
   > open(sys.argv[1], 'wb').write(b''.join(lines))
   > EOF
   $ "$PYTHON" rewrite.py new/.hg/shamap
   $ cd orig
   $ hg up -qC 1
   $ echo foo >> foo
   $ hg ci -qm 'change foo again'
   $ hg up -qC 2
   $ echo foo >> foo
   $ hg ci -qm 'change foo again again'
   $ cd ..
   $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
   scanning source...
   sorting...
   converting...
   1 change foo again again
   0 change foo again
   updating bookmarks
 
 init broken repository
 
   $ hg init broken
   $ cd broken
   $ echo a >> a
   $ echo b >> b
   $ hg ci -qAm init
   $ echo a >> a
   $ echo b >> b
   $ hg copy b c
   $ hg ci -qAm changeall
   $ hg up -qC 0
   $ echo bc >> b
   $ hg ci -m changebagain
   created new head
   $ HGMERGE=internal:local hg -q merge
   $ hg ci -m merge
   $ hg mv b d
   $ hg ci -m moveb
 
 break it
 
 #if reporevlogstore
   $ rm .hg/store/data/b.*
 #endif
 #if reposimplestore
   $ rm .hg/store/data/b/*
 #endif
   $ cd ..
   $ hg --config convert.hg.ignoreerrors=True convert broken fixed
   initializing destination fixed repository
   scanning source...
   sorting...
   converting...
   4 init
   ignoring: b@1e88685f5ddec574a34c70af492f95b6debc8741: no match found (reporevlogstore !)
   ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !)
   3 changeall
   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
 
   $ hg -R fixed manifest -r 0
   a
 
 manifest -r tip
 
   $ hg -R fixed manifest -r tip
   a
   c
   d
   $ cd ..
 
   $ hg init commit-references
   $ cd commit-references
   $ echo a > a
   $ hg ci -Aqm initial
   $ echo b > b
   $ hg ci -Aqm 'the previous commit was 1451231c8757'
   $ echo c > c
   $ hg ci -Aqm 'the working copy is called ffffffffffff'
 
   $ cd ..
   $ hg convert commit-references new-commit-references -q \
   >     --config convert.hg.sourcename=yes
   $ cd new-commit-references
   $ hg log -T '{node|short} {desc}\n'
   fe295c9e6bc6 the working copy is called ffffffffffff
   642508659503 the previous commit was c2491f685436
   c2491f685436 initial

tests/test-copy.t

@@ -1,416 +1,411
   $ mkdir part1
   $ cd part1
 
   $ hg init
   $ echo a > a
   $ hg add a
   $ hg commit -m "1"
   $ hg status
   $ hg copy a b
   $ hg --config ui.portablefilenames=abort copy a con.xml
   abort: filename contains 'con', which is reserved on Windows: con.xml
   [10]
   $ hg status
   A b
   $ hg sum
   parent: 0:c19d34741b0a tip
    1
   branch: default
   commit: 1 copied
   update: (current)
   phases: 1 draft
   $ hg --debug commit -m "2"
   committing files:
   b
    b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
   committing manifest
   committing changelog
   updating the branch cache
   committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4
 
 we should see two history entries
 
   $ hg history -v
   changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b
   description:
   2
   
   
   changeset:   0:c19d34741b0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   1
   
   
 
 we should see one log entry for a
 
   $ hg log a
   changeset:   0:c19d34741b0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
 
 this should show a revision linked to changeset 0
 
   $ hg debugindex a
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b789fdd96dc2 000000000000 000000000000
 
 we should see one log entry for b
 
   $ hg log b
   changeset:   1:93580a2c28a5
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 
 this should show a revision linked to changeset 1
 
   $ hg debugindex b
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 37d9b5d994ea 000000000000 000000000000
 
 this should show the rename information in the metadata
 
   $ hg debugdata b 0 | head -3 | tail -2
   copy: a
   copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 
 #if reporevlogstore
   $ md5sum.py .hg/store/data/b.i
   44913824c8f5890ae218f9829535922e  .hg/store/data/b.i
 #endif
   $ hg cat b > bsum
   $ md5sum.py bsum
   60b725f10c9c85c70d97880dfe8191b3  bsum
   $ 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 ..
 
 
   $ mkdir part2
   $ cd part2
 
   $ hg init
   $ echo foo > foo
 should fail - foo is not managed
   $ hg mv foo bar
   foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg st -A
   ? foo
 respects ui.relative-paths
   $ mkdir dir
   $ cd dir
   $ hg mv ../foo ../bar
   ../foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg mv ../foo ../bar --config ui.relative-paths=yes
   ../foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg mv ../foo ../bar --config ui.relative-paths=no
   foo: not copying - file is not managed
   abort: no files to copy
   (maybe you meant to use --after --at-rev=.)
   [10]
   $ cd ..
   $ rmdir dir
   $ hg add foo
 dry-run; print a warning that this is not a real copy; foo is added
   $ hg mv --dry-run foo bar
   foo has not been committed yet, so no copy data will be stored for bar.
   $ hg st -A
   A foo
 should print a warning that this is not a real copy; bar is added
   $ hg mv foo bar
   foo has not been committed yet, so no copy data will be stored for bar.
   $ hg st -A
   A bar
 should print a warning that this is not a real copy; foo is added
   $ hg cp bar foo
   bar has not been committed yet, so no copy data will be stored for foo.
   $ hg rm -f bar
   $ rm bar
   $ hg st -A
   A foo
   $ hg commit -m1
 
 moving a missing file
   $ rm foo
   $ hg mv foo foo3
   foo: deleted in working directory
   foo3 does not exist!
   $ hg up -qC .
 
 copy --after to a nonexistent target filename
   $ hg cp -A foo dummy
   foo: not recording copy - dummy does not exist
   [1]
 
 dry-run; should show that foo is clean
   $ hg copy --dry-run foo bar
   $ hg st -A
   C foo
 should show copy
   $ hg copy foo bar
   $ hg st -C
   A bar
     foo
 
 shouldn't show copy
   $ hg commit -m2
   $ hg st -C
 
 should match
   $ hg debugindex foo
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
   $ hg debugrename bar
   bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
   $ echo bleah > foo
   $ echo quux > bar
   $ hg commit -m3
 
 should not be renamed
   $ hg debugrename bar
   bar not renamed
 
   $ hg copy -f foo bar
 should show copy
   $ hg st -C
   M bar
     foo
 
 XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be
 displayed.
   $ hg st -C --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   M bar
     foo
 
   $ hg commit -m3
 
 should show no parents for tip
   $ hg debugindex bar
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 7711d36246cc 000000000000 000000000000
        1       2 bdf70a2b8d03 7711d36246cc 000000000000
        2       3 b2558327ea8d 000000000000 000000000000
 should match
   $ hg debugindex foo
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 2ed2a3912a0b 000000000000 000000000000
        1       2 dd12c926cf16 2ed2a3912a0b 000000000000
   $ hg debugrename bar
   bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
 
 should show no copies
   $ hg st -C
 
 note: since filelog based copy tracing only trace copy for new file, the copy information here is not displayed.
 
   $ hg status --copies --change .
   M bar
 
 They are a devel option to walk all file and fine this information anyway.
 
   $ hg status --copies --change . --config devel.copy-tracing.trace-all-files=yes
   M bar
     foo
 
 copy --after on an added file
   $ cp bar baz
   $ hg add baz
   $ hg cp -A bar baz
   $ hg st -C
   A baz
     bar
 
 foo was clean:
   $ hg st -AC foo
   C foo
 Trying to copy on top of an existing file fails,
   $ hg copy -A bar foo
   foo: not overwriting - file already committed
   ('hg copy --after --force' to replace the file by recording a copy)
   [1]
 same error without the --after, so the user doesn't have to go through
 two hints:
   $ hg copy bar foo
   foo: not overwriting - file already committed
   ('hg copy --force' to replace the file by recording a copy)
   [1]
 but it's considered modified after a copy --after --force
   $ hg copy -Af bar foo
   $ hg st -AC foo
   M foo
     bar
 The hint for a file that exists but is not in file history doesn't
 mention --force:
   $ touch xyzzy
   $ hg cp bar xyzzy
   xyzzy: not overwriting - file exists
   ('hg copy --after' to record the copy)
   [1]
   $ hg co -qC .
   $ rm baz xyzzy
 
 
 Test unmarking copy/rename of a single file
 
 # Set up by creating a copy
   $ hg cp bar baz
 # Test unmarking as copy a non-existent file
   $ hg copy --forget non-existent
   non-existent: $ENOENT$
   $ hg rename --forget non-existent
   non-existent: $ENOENT$
 # Test unmarking as copy an tracked but unrelated file
   $ hg copy --forget foo
   foo: not unmarking as copy - file is not marked as copied
   $ hg rename --forget foo
   foo: not unmarking as copy - file is not marked as copied
 # Test unmarking as copy a copy source
   $ hg copy --forget bar
   bar: not unmarking as copy - file is not marked as copied
   $ hg rename --forget bar
   bar: not unmarking as copy - file is not marked as copied
 # baz should still be marked as a copy
   $ hg st -C
   A baz
     bar
 # Test the normal case
   $ hg copy --forget baz
   $ hg st -C
   A baz
   $ rm bar
   $ hg rename --after bar baz
   $ hg st -C
   A baz
     bar
   R bar
   $ hg rename --forget baz
   $ hg st -C
   A baz
   R bar
   $ hg revert bar
 # Test unmarking as copy with matching an non-matching patterns
   $ hg cp bar baz --after
   $ hg copy --forget bar baz
   bar: not unmarking as copy - file is not marked as copied
   $ hg cp bar baz --after
   $ hg rename --forget bar baz
   bar: not unmarking as copy - file is not marked as copied
   $ hg st -C
   A baz
 # Test unmarking as copy with no exact matches
   $ hg cp bar baz --after
   $ hg copy --forget .
   $ hg st -C
   A baz
   $ hg cp bar baz --after
   $ hg st -C
   A baz
     bar
   $ hg rename --forget .
   $ hg st -C
   A baz
   $ hg forget baz
   $ rm baz
 
 Test unmarking copy of a directory
 
   $ mkdir dir
   $ echo foo > dir/foo
   $ echo bar > dir/bar
   $ hg add dir
   adding dir/bar
   adding dir/foo
   $ hg ci -m 'add dir/'
   $ hg cp dir dir2
   copying dir/bar to dir2/bar
   copying dir/foo to dir2/foo
   $ touch dir2/untracked
   $ hg copy --forget dir2
   $ hg st -C
   A dir2/bar
   A dir2/foo
   ? dir2/untracked
 # Clean up for next test
   $ hg forget dir2
   removing dir2/bar
   removing dir2/foo
   $ rm -r dir2
 
 Test uncopy on committed copies
 
 # Commit some copies
   $ hg cp bar baz
   $ hg cp bar qux
   $ hg ci -m copies
   $ hg st -C --change .
   A baz
     bar
   A qux
     bar
   $ base=$(hg log -r '.^' -T '{rev}')
   $ hg log -G -T '{rev}:{node|short} {desc}\n' -r $base:
   @  5:a612dc2edfda copies
   |
   o  4:4800b1f1f38e add dir/
   |
   ~
 # Add a dirty change on top to show that it's unaffected
   $ echo dirty >> baz
   $ hg st
   M baz
   $ cat baz
   bleah
   dirty
   $ hg copy --forget --at-rev . baz
   saved backup bundle to $TESTTMP/part2/.hg/strip-backup/a612dc2edfda-e36b4448-uncopy.hg
 # The unwanted copy is no longer recorded, but the unrelated one is
   $ hg st -C --change .
   A baz
   A qux
     bar
 # The old commit is gone and we have updated to the new commit
   $ hg log -G -T '{rev}:{node|short} {desc}\n' -r $base:
   @  5:c45090e5effe copies
   |
   o  4:4800b1f1f38e add dir/
   |
   ~
 # Working copy still has the uncommitted change
   $ hg st
   M baz
   $ cat baz
   bleah
   dirty
 
   $ cd ..

tests/test-empty.t

@@ -1,60 +1,50
 Create an empty repo:
 
   $ hg init a
   $ cd a
 
 Try some commands:
 
   $ hg log
   $ 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:
 
   $ ls .hg
   00changelog.i
   cache
   requires
   store
   wcache
 
 Should be empty (except for the "basic" requires):
 
   $ ls .hg/store
   requires
 
 Poke at a clone:
 
   $ cd ..
   $ hg clone a b
   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
   dirstate
   hgrc
   requires
   store
   wcache
 
 Should be empty (except for the "basic" requires):
 
   $ ls .hg/store
   requires
 
   $ cd ..

tests/test-excessive-merge.t

@@ -1,101 +1,96
   $ hg init
 
   $ echo foo > a
   $ echo foo > b
   $ hg add a b
 
   $ hg ci -m "test"
 
   $ echo blah > a
 
   $ hg ci -m "branch a"
 
   $ hg co 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo blah > b
 
   $ hg ci -m "branch b"
   created new head
   $ HGMERGE=true hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg ci -m "merge b/a -> blah"
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ HGMERGE=true hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "merge a/b -> blah"
   created new head
 
   $ hg log
   changeset:   4:2ee31f665a86
   tag:         tip
   parent:      1:96155394af80
   parent:      2:92cc4c306b19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge a/b -> blah
   
   changeset:   3:e16a66a37edd
   parent:      2:92cc4c306b19
   parent:      1:96155394af80
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge b/a -> blah
   
   changeset:   2:92cc4c306b19
   parent:      0:5e0375449e74
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch b
   
   changeset:   1:96155394af80
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     branch a
   
   changeset:   0:5e0375449e74
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ hg debugindex --changelog
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 5e0375449e74 000000000000 000000000000
        1       1 96155394af80 5e0375449e74 000000000000
        2       2 92cc4c306b19 5e0375449e74 000000000000
        3       3 e16a66a37edd 92cc4c306b19 96155394af80
        4       4 2ee31f665a86 96155394af80 92cc4c306b19
 
 revision 1
   $ hg manifest --debug 1
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   b
 revision 2
   $ hg manifest --debug 2
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 revision 3
   $ hg manifest --debug 3
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 revision 4
   $ hg manifest --debug 4
   79d7492df40aa0fa093ec4209be78043c181f094 644   a
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 
   $ hg debugindex a
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        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

tests/test-filebranch.t

@@ -1,145 +1,140
 This test makes sure that we don't mark a file as merged with its ancestor
 when we do a merge.
 
   $ cat <<EOF > merge
   > import sys, os
   > print("merging for", os.path.basename(sys.argv[1]))
   > EOF
   $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE
 
 Creating base:
 
   $ hg init a
   $ cd a
   $ echo 1 > foo
   $ echo 1 > bar
   $ echo 1 > baz
   $ echo 1 > quux
   $ hg add foo bar baz quux
   $ hg commit -m "base"
 
   $ cd ..
   $ hg clone a b
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Creating branch a:
 
   $ cd a
   $ echo 2a > foo
   $ echo 2a > bar
   $ hg commit -m "branch a"
 
 Creating branch b:
 
   $ cd ..
   $ cd b
   $ echo 2b > foo
   $ echo 2b > baz
   $ hg commit -m "branch b"
 
 We shouldn't have anything but n state here:
 
   $ hg debugstate --no-dates | grep -v "^n"
   [1]
 
 Merging:
 
   $ hg pull ../a
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   new changesets bdd988058d16
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge -v
   resolving manifests
   getting bar
   merging foo
   merging for foo
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ echo 2m > foo
   $ echo 2b > baz
   $ echo new > quux
 
   $ hg ci -m "merge"
 
 main: we should have a merge here:
 
   $ hg debugindex --changelog
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 cdca01651b96 000000000000 000000000000
        1       1 f6718a9cb7f3 cdca01651b96 000000000000
        2       2 bdd988058d16 cdca01651b96 000000000000
        3       3 d8a521142a3c f6718a9cb7f3 bdd988058d16
 
 log should show foo and quux changed:
 
   $ hg log -v -r tip
   changeset:   3:d8a521142a3c
   tag:         tip
   parent:      1:f6718a9cb7f3
   parent:      2:bdd988058d16
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       foo quux
   description:
   merge
   
   
 
 foo: we should have a merge here:
 
   $ hg debugindex foo
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 2ffeddde1b65 b8e02f643373 000000000000
        2       2 33d1fb69067a b8e02f643373 000000000000
        3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a
 
 bar: we should not have a merge here:
 
   $ hg debugindex bar
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       2 33d1fb69067a b8e02f643373 000000000000
 
 baz: we should not have a merge here:
 
   $ hg debugindex baz
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 2ffeddde1b65 b8e02f643373 000000000000
 
 quux: we should not have a merge here:
 
   $ hg debugindex quux
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       3 6128c0f33108 b8e02f643373 000000000000
 
 Manifest entries should match tips of all files:
 
   $ hg manifest --debug
   33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644   bar
   2ffeddde1b65b4827f6746174a145474129fa2ce 644   baz
   aa27919ee4303cfd575e1fb932dd64d75aa08be4 644   foo
   6128c0f33108e8cfbb4e0824d13ae48b466d7280 644   quux
 
 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 ..

tests/test-fncache.t

@@ -1,545 +1,535
 #require repofncache
 
 An extension which will set fncache chunksize to 1 byte to make sure that logic
 does not break
 
   $ cat > chunksize.py <<EOF
   > from mercurial import store
   > store.fncache_chunksize = 1
   > EOF
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > chunksize = $TESTTMP/chunksize.py
   > EOF
 
 Init repo1:
 
   $ hg init repo1
   $ cd repo1
   $ echo "some text" > a
   $ hg add
   adding a
   $ hg ci -m first
   $ cat .hg/store/fncache | sort
   data/a.i
 
 Testing a.i/b:
 
   $ mkdir a.i
   $ echo "some other text" > a.i/b
   $ hg add
   adding a.i/b
   $ hg ci -m second
   $ cat .hg/store/fncache | sort
   data/a.i
   data/a.i.hg/b.i
 
 Testing a.i.hg/c:
 
   $ mkdir a.i.hg
   $ echo "yet another text" > a.i.hg/c
   $ hg add
   adding a.i.hg/c
   $ hg ci -m third
   $ cat .hg/store/fncache | sort
   data/a.i
   data/a.i.hg.hg/c.i
   data/a.i.hg/b.i
 
 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
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    warning: revlog 'data/a.i' not in fncache!
    warning: revlog 'data/a.i.hg/c.i' not in fncache!
    warning: revlog 'data/a.i/b.i' not in fncache!
   checked 3 changesets with 3 changes to 3 files
   3 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
 
 Follow the hint to make sure it works
 
   $ hg debugrebuildfncache
   adding data/a.i
   adding data/a.i.hg/c.i
   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 ..
 
 Non store repo:
 
   $ hg --config format.usestore=False init foo
   $ cd foo
   $ mkdir tst.d
   $ echo foo > tst.d/foo
   $ hg ci -Amfoo
   adding tst.d/foo
   $ find .hg | sort
   .hg
   .hg/00changelog.i
   .hg/00manifest.i
   .hg/cache
   .hg/cache/branch2-served
   .hg/cache/rbc-names-v1
   .hg/cache/rbc-revs-v1
   .hg/data
   .hg/data/tst.d.hg
   .hg/data/tst.d.hg/foo.i
   .hg/dirstate
   .hg/fsmonitor.state (fsmonitor !)
   .hg/last-message.txt
   .hg/phaseroots
   .hg/requires
   .hg/undo
   .hg/undo.backup.dirstate
   .hg/undo.backupfiles
   .hg/undo.bookmarks
   .hg/undo.branch
   .hg/undo.desc
   .hg/undo.dirstate
   .hg/undo.phaseroots
   .hg/wcache
   .hg/wcache/checkisexec (execbit !)
   .hg/wcache/checklink (symlink !)
   .hg/wcache/checklink-target (symlink !)
   .hg/wcache/manifestfulltextcache (reporevlogstore !)
   $ cd ..
 
 Non fncache repo:
 
   $ hg --config format.usefncache=False init bar
   $ cd bar
   $ mkdir tst.d
   $ echo foo > tst.d/Foo
   $ hg ci -Amfoo
   adding tst.d/Foo
   $ find .hg | sort
   .hg
   .hg/00changelog.i
   .hg/cache
   .hg/cache/branch2-served
   .hg/cache/rbc-names-v1
   .hg/cache/rbc-revs-v1
   .hg/dirstate
   .hg/fsmonitor.state (fsmonitor !)
   .hg/last-message.txt
   .hg/requires
   .hg/store
   .hg/store/00changelog.i
   .hg/store/00manifest.i
   .hg/store/data
   .hg/store/data/tst.d.hg
   .hg/store/data/tst.d.hg/_foo.i
   .hg/store/phaseroots
   .hg/store/requires
   .hg/store/undo
   .hg/store/undo.backupfiles
   .hg/store/undo.phaseroots
   .hg/undo.backup.dirstate
   .hg/undo.bookmarks
   .hg/undo.branch
   .hg/undo.desc
   .hg/undo.dirstate
   .hg/wcache
   .hg/wcache/checkisexec (execbit !)
   .hg/wcache/checklink (symlink !)
   .hg/wcache/checklink-target (symlink !)
   .hg/wcache/manifestfulltextcache (reporevlogstore !)
   $ cd ..
 
 Encoding of reserved / long paths in the store
 
   $ hg init r2
   $ cd r2
   $ cat <<EOF > .hg/hgrc
   > [ui]
   > portablefilenames = ignore
   > EOF
 
   $ hg import -q --bypass - <<EOF
   > # HG changeset patch
   > # User test
   > # Date 0 0
   > # Node ID 1c7a2f7cb77be1a0def34e4c7cabc562ad98fbd7
   > # Parent  0000000000000000000000000000000000000000
   > 1
   > 
   > diff --git a/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz b/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz
   > new file mode 100644
   > --- /dev/null
   > +++ b/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz
   > @@ -0,0 +1,1 @@
   > +foo
   > diff --git a/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT b/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT
   > new file mode 100644
   > --- /dev/null
   > +++ b/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT
   > @@ -0,0 +1,1 @@
   > +foo
   > diff --git a/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt b/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt
   > new file mode 100644
   > --- /dev/null
   > +++ b/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt	
   > @@ -0,0 +1,1 @@
   > +foo
   > diff --git a/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c b/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c
   > new file mode 100644
   > --- /dev/null
   > +++ b/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c
   > @@ -0,0 +1,1 @@
   > +foo
   > diff --git a/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider b/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider
   > new file mode 100644
   > --- /dev/null
   > +++ b/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider
   > @@ -0,0 +1,1 @@
   > +foo
   > EOF
 
   $ find .hg/store -name *.i  | sort
   .hg/store/00changelog.i
   .hg/store/00manifest.i
   .hg/store/data/bla.aux/pr~6e/_p_r_n/lpt/co~6d3/nu~6c/coma/foo._n_u_l/normal.c.i
   .hg/store/dh/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxx168e07b38e65eff86ab579afaaa8e30bfbe0f35f.i
   .hg/store/dh/au~78/second/x.prn/fourth/fi~3afth/sixth/seventh/eighth/nineth/tenth/loremia20419e358ddff1bf8751e38288aff1d7c32ec05.i
   .hg/store/dh/enterpri/openesba/contrib-/corba-bc/netbeans/wsdlexte/src/main/java/org.net7018f27961fdf338a598a40c4683429e7ffb9743.i
   .hg/store/dh/project_/resource/anotherl/followed/andanoth/andthenanextremelylongfilename0d8e1f4187c650e2f1fdca9fd90f786bc0976b6b.i
 
   $ cd ..
 
 Aborting lock does not prevent fncache writes
 
   $ cat > exceptionext.py <<EOF
   > import os
   > from mercurial import commands, error, extensions
   > 
   > def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs):
   >     def releasewrap():
   >         l.held = False # ensure __del__ is a noop
   >         raise error.Abort(b"forced lock failure")
   >     l = orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
   >     return l
   > 
   > def reposetup(ui, repo):
   >     extensions.wrapfunction(repo, '_lock', lockexception)
   > 
   > cmdtable = {}
   > 
   > # wrap "commit" command to prevent wlock from being '__del__()'-ed
   > # at the end of dispatching (for intentional "forced lcok failure")
   > def commitwrap(orig, ui, repo, *pats, **opts):
   >     repo = repo.unfiltered() # to use replaced repo._lock certainly
   >     wlock = repo.wlock()
   >     try:
   >         return orig(ui, repo, *pats, **opts)
   >     finally:
   >         # multiple 'relase()' is needed for complete releasing wlock,
   >         # because "forced" abort at last releasing store lock
   >         # prevents wlock from being released at same 'lockmod.release()'
   >         for i in range(wlock.held):
   >             wlock.release()
   > 
   > def extsetup(ui):
   >     extensions.wrapcommand(commands.table, b"commit", commitwrap)
   > EOF
   $ extpath=`pwd`/exceptionext.py
   $ hg init fncachetxn
   $ cd fncachetxn
   $ printf "[extensions]\nexceptionext=$extpath\n" >> .hg/hgrc
   $ touch y
   $ hg ci -qAm y
   abort: forced lock failure
   [255]
   $ cat .hg/store/fncache
   data/y.i
 
 Aborting transaction prevents fncache change
 
   $ cat > ../exceptionext.py <<EOF
   > import os
   > from mercurial import commands, error, extensions, localrepo
   > 
   > def wrapper(orig, self, *args, **kwargs):
   >     tr = orig(self, *args, **kwargs)
   >     def fail(tr):
   >         raise error.Abort(b"forced transaction failure")
   >     # zzz prefix to ensure it sorted after store.write
   >     tr.addfinalize(b'zzz-forcefails', fail)
   >     return tr
   > 
   > def uisetup(ui):
   >     extensions.wrapfunction(
   >         localrepo.localrepository, b'transaction', wrapper)
   > 
   > cmdtable = {}
   > 
   > EOF
 
 Clean cached version
   $ rm -f "${extpath}c"
   $ rm -Rf "`dirname $extpath`/__pycache__"
 
   $ touch z
   $ hg ci -qAm z
   transaction abort!
   rollback completed
   abort: forced transaction failure
   [255]
   $ cat .hg/store/fncache
   data/y.i
 
 Aborted transactions can be recovered later
 
   $ cat > ../exceptionext.py <<EOF
   > import os
   > from mercurial import (
   >   commands,
   >   error,
   >   extensions,
   >   localrepo,
   >   transaction,
   > )
   > 
   > def trwrapper(orig, self, *args, **kwargs):
   >     tr = orig(self, *args, **kwargs)
   >     def fail(tr):
   >         raise error.Abort(b"forced transaction failure")
   >     # zzz prefix to ensure it sorted after store.write
   >     tr.addfinalize(b'zzz-forcefails', fail)
   >     return tr
   > 
   > def abortwrapper(orig, self, *args, **kwargs):
   >     raise error.Abort(b"forced transaction failure")
   > 
   > def uisetup(ui):
   >     extensions.wrapfunction(localrepo.localrepository, 'transaction',
   >                             trwrapper)
   >     extensions.wrapfunction(transaction.transaction, '_abort',
   >                             abortwrapper)
   > 
   > cmdtable = {}
   > 
   > EOF
 
 Clean cached versions
   $ rm -f "${extpath}c"
   $ rm -Rf "`dirname $extpath`/__pycache__"
 
   $ hg up -q 1
   $ touch z
   $ hg ci -qAm z 2>/dev/null
   [255]
   $ cat .hg/store/fncache | sort
   data/y.i
   data/z.i
   $ 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
   $ cat .hg/store/fncache
   data/y.i
 
   $ cd ..
 
 debugrebuildfncache does nothing unless repo has fncache requirement
 
   $ hg --config format.usefncache=false init nofncache
   $ cd nofncache
   $ hg debugrebuildfncache
   (not rebuilding fncache because repository does not support fncache)
 
   $ cd ..
 
 debugrebuildfncache works on empty repository
 
   $ hg init empty
   $ cd empty
   $ hg debugrebuildfncache
   fncache already up to date
   $ cd ..
 
 debugrebuildfncache on an up to date repository no-ops
 
   $ hg init repo
   $ cd repo
   $ echo initial > foo
   $ echo initial > .bar
   $ hg commit -A -m initial
   adding .bar
   adding foo
 
   $ cat .hg/store/fncache | sort
   data/.bar.i
   data/foo.i
 
   $ hg debugrebuildfncache
   fncache already up to date
 
 debugrebuildfncache restores deleted fncache file
 
   $ rm -f .hg/store/fncache
   $ hg debugrebuildfncache
   adding data/.bar.i
   adding data/foo.i
   2 items added, 0 removed from fncache
 
   $ cat .hg/store/fncache | sort
   data/.bar.i
   data/foo.i
 
 Rebuild after rebuild should no-op
 
   $ hg debugrebuildfncache
   fncache already up to date
 
 A single missing file should get restored, an extra file should be removed
 
   $ cat > .hg/store/fncache << EOF
   > data/foo.i
   > data/bad-entry.i
   > EOF
 
   $ hg debugrebuildfncache
   removing data/bad-entry.i
   adding data/.bar.i
   1 items added, 1 removed from fncache
 
   $ cat .hg/store/fncache | sort
   data/.bar.i
   data/foo.i
 
 debugrebuildfncache recovers from truncated line in fncache
 
   $ printf a > .hg/store/fncache
   $ hg debugrebuildfncache
   fncache does not ends with a newline
   adding data/.bar.i
   adding data/foo.i
   2 items added, 0 removed from fncache
 
   $ cat .hg/store/fncache | sort
   data/.bar.i
   data/foo.i
 
   $ cd ..
 
 Try a simple variation without dotencode to ensure fncache is ignorant of encoding
 
   $ hg --config format.dotencode=false init nodotencode
   $ cd nodotencode
   $ echo initial > foo
   $ echo initial > .bar
   $ hg commit -A -m initial
   adding .bar
   adding foo
 
   $ cat .hg/store/fncache | sort
   data/.bar.i
   data/foo.i
 
   $ rm .hg/store/fncache
   $ hg debugrebuildfncache
   adding data/.bar.i
   adding data/foo.i
   2 items added, 0 removed from fncache
 
   $ cat .hg/store/fncache | sort
   data/.bar.i
   data/foo.i
 
   $ cd ..
 
 In repositories that have accumulated a large number of files over time, the
 fncache file is going to be large. If we possibly can avoid loading it, so much the better.
 The cache should not loaded when committing changes to existing files, or when unbundling
 changesets that only contain changes to existing files:
 
   $ cat > fncacheloadwarn.py << EOF
   > from mercurial import extensions, localrepo
   > 
   > def extsetup(ui):
   >     def wrapstore(orig, requirements, *args):
   >         store = orig(requirements, *args)
   >         if b'store' in requirements and b'fncache' in requirements:
   >             instrumentfncachestore(store, ui)
   >         return store
   >     extensions.wrapfunction(localrepo, 'makestore', wrapstore)
   > 
   > def instrumentfncachestore(fncachestore, ui):
   >     class instrumentedfncache(type(fncachestore.fncache)):
   >         def _load(self):
   >             ui.warn(b'fncache load triggered!\n')
   >             super(instrumentedfncache, self)._load()
   >     fncachestore.fncache.__class__ = instrumentedfncache
   > EOF
 
   $ fncachextpath=`pwd`/fncacheloadwarn.py
   $ hg init nofncacheload
   $ cd nofncacheload
   $ printf "[extensions]\nfncacheloadwarn=$fncachextpath\n" >> .hg/hgrc
 
 A new file should trigger a load, as we'd want to update the fncache set in that case:
 
   $ touch foo
   $ hg ci -qAm foo
   fncache load triggered!
 
 But modifying that file should not:
 
   $ echo bar >> foo
   $ hg ci -qm foo
 
 If a transaction has been aborted, the zero-size truncated index file will
 not prevent the fncache from being loaded; rather than actually abort
 a transaction, we simulate the situation by creating a zero-size index file:
 
   $ touch .hg/store/data/bar.i
   $ touch bar
   $ hg ci -qAm bar
   fncache load triggered!
 
 Unbundling should follow the same rules; existing files should not cause a load:
 
 (loading during the clone is expected)
   $ hg clone -q . tobundle
   fncache load triggered!
   fncache load triggered!
 
   $ echo 'new line' > tobundle/bar
   $ hg -R tobundle ci -qm bar
   $ hg -R tobundle bundle -q barupdated.hg
   $ hg unbundle -q barupdated.hg
 
 but adding new files should:
 
   $ touch tobundle/newfile
   $ hg -R tobundle ci -qAm newfile
   $ hg -R tobundle bundle -q newfile.hg
   $ hg unbundle -q newfile.hg
   fncache load triggered!
 
   $ cd ..

tests/test-hardlinks.t

@@ -1,452 +1,441
 #require hardlink reporevlogstore
 
   $ cat > nlinks.py <<EOF
   > import sys
   > from mercurial import pycompat, util
   > for f in sorted(sys.stdin.readlines()):
   >     f = f[:-1]
   >     print(util.nlinks(pycompat.fsencode(f)), f)
   > EOF
 
   $ nlinksdir()
   > {
   >     find "$@" -type f | "$PYTHON" $TESTTMP/nlinks.py
   > }
 
 Some implementations of cp can't create hardlinks (replaces 'cp -al' on Linux):
 
   $ cat > linkcp.py <<EOF
   > import sys
   > from mercurial import pycompat, util
   > util.copyfiles(pycompat.fsencode(sys.argv[1]),
   >                pycompat.fsencode(sys.argv[2]), hardlink=True)
   > EOF
 
   $ linkcp()
   > {
   >     "$PYTHON" $TESTTMP/linkcp.py $1 $2
   > }
 
 Prepare repo r1:
 
   $ hg init r1
   $ cd r1
 
   $ echo c1 > f1
   $ hg add f1
   $ hg ci -m0
 
   $ mkdir d1
   $ cd d1
   $ echo c2 > f2
   $ hg add f2
   $ hg ci -m1
   $ cd ../..
 
   $ nlinksdir r1/.hg/store
   1 r1/.hg/store/00changelog.i
   1 r1/.hg/store/00manifest.i
   1 r1/.hg/store/data/d1/f2.i
   1 r1/.hg/store/data/f1.i
   1 r1/.hg/store/fncache (repofncache !)
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.fncache (repofncache !)
   1 r1/.hg/store/undo.backupfiles
   1 r1/.hg/store/undo.phaseroots
 
 
 Create hardlinked clone r2:
 
   $ hg clone -U --debug r1 r2 --config progress.debug=true
   linking: 1/7 files (14.29%)
   linking: 2/7 files (28.57%)
   linking: 3/7 files (42.86%)
   linking: 4/7 files (57.14%)
   linking: 5/7 files (71.43%)
   linking: 6/7 files (85.71%)
   linking: 7/7 files (100.00%)
   linked 7 files
   updating the branch cache
 
 Create non-hardlinked clone r3:
 
   $ hg clone --pull r1 r3
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   new changesets 40d85e9847f2:7069c422939c
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 
 Repos r1 and r2 should now contain hardlinked files:
 
   $ nlinksdir r1/.hg/store
   2 r1/.hg/store/00changelog.i
   2 r1/.hg/store/00manifest.i
   2 r1/.hg/store/data/d1/f2.i
   2 r1/.hg/store/data/f1.i
   1 r1/.hg/store/fncache (repofncache !)
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.fncache (repofncache !)
   1 r1/.hg/store/undo.backupfiles
   1 r1/.hg/store/undo.phaseroots
 
   $ nlinksdir r2/.hg/store
   2 r2/.hg/store/00changelog.i
   2 r2/.hg/store/00manifest.i
   2 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
   1 r2/.hg/store/fncache (repofncache !)
   1 r2/.hg/store/requires
 
 Repo r3 should not be hardlinked:
 
   $ nlinksdir r3/.hg/store
   1 r3/.hg/store/00changelog.i
   1 r3/.hg/store/00manifest.i
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
   1 r3/.hg/store/fncache (repofncache !)
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/requires
   1 r3/.hg/store/undo
   1 r3/.hg/store/undo.backupfiles
   1 r3/.hg/store/undo.phaseroots
 
 
 Create a non-inlined filelog in r3:
 
   $ cd r3/d1
   >>> f = open('data1', 'wb')
   >>> for x in range(10000):
   ...     f.write(b"%d\n" % x) and None
   >>> f.close()
   $ for j in 0 1 2 3 4 5 6 7 8 9; do
   >   cat data1 >> f2
   >   hg commit -m$j
   > done
   $ cd ../..
 
   $ nlinksdir r3/.hg/store
   1 r3/.hg/store/00changelog.i
   1 r3/.hg/store/00manifest.i
   1 r3/.hg/store/data/d1/f2.d
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
   1 r3/.hg/store/fncache (repofncache !)
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/requires
   1 r3/.hg/store/undo
   1 r3/.hg/store/undo.backup.fncache (repofncache !)
   1 r3/.hg/store/undo.backup.phaseroots
   1 r3/.hg/store/undo.backupfiles
   1 r3/.hg/store/undo.phaseroots
 
 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
   pushing to $TESTTMP/r1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 10 changesets with 10 changes to 1 files
 
   $ cd ..
 
   $ nlinksdir r2/.hg/store
   1 r2/.hg/store/00changelog.i
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
   [12] r2/\.hg/store/fncache (re) (repofncache !)
   1 r2/.hg/store/requires
 
 #if hardlink-whitelisted repofncache
   $ nlinksdir r2/.hg/store/fncache
   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
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Committing a change to f1 in r1 must break up hardlink f1.i in r2:
 
   $ echo c1c1 >> f1
   $ hg ci -m00
   $ cd ..
 
   $ nlinksdir r2/.hg/store
   1 r2/.hg/store/00changelog.i
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   1 r2/.hg/store/data/f1.i
   1 r2/.hg/store/fncache (repofncache !)
   1 r2/.hg/store/requires
 
 #if hardlink-whitelisted repofncache
   $ nlinksdir r2/.hg/store/fncache
   1 r2/.hg/store/fncache
 #endif
 
 Create a file which exec permissions we will change
   $ cd r3
   $ echo "echo hello world" > f3
   $ hg add f3
   $ hg ci -mf3
   $ cd ..
 
   $ cd r3
   $ hg tip --template '{rev}:{node|short}\n'
   12:d3b77733a28a
   $ echo bla > f1
   $ chmod +x f3
   $ hg ci -m1
   $ cd ..
 
 Create hardlinked copy r4 of r3 (on Linux, we would call 'cp -al'):
 
   $ linkcp r3 r4
 
 'checklink' is produced by hardlinking a symlink, which is undefined whether
 the symlink should be followed or not. It does behave differently on Linux and
 BSD. Just remove it so the test pass on both platforms.
 
   $ rm -f r4/.hg/wcache/checklink
 
 r4 has hardlinks in the working dir (not just inside .hg):
 
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
   2 r4/.hg/branch
   2 r4/.hg/cache/branch2-base
   2 r4/.hg/cache/branch2-immutable
   2 r4/.hg/cache/branch2-served
   2 r4/.hg/cache/branch2-served.hidden
   2 r4/.hg/cache/branch2-visible
   2 r4/.hg/cache/branch2-visible-hidden
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   2 r4/.hg/cache/tags2
   2 r4/.hg/cache/tags2-served
   2 r4/.hg/dirstate
   2 r4/.hg/fsmonitor.state (fsmonitor !)
   2 r4/.hg/hgrc
   2 r4/.hg/last-message.txt
   2 r4/.hg/requires
   2 r4/.hg/store/00changelog.i
   2 r4/.hg/store/00manifest.i
   2 r4/.hg/store/data/d1/f2.d
   2 r4/.hg/store/data/d1/f2.i
   2 r4/.hg/store/data/f1.i
   2 r4/.hg/store/data/f3.i
   2 r4/.hg/store/fncache (repofncache !)
   2 r4/.hg/store/phaseroots
   2 r4/.hg/store/requires
   2 r4/.hg/store/undo
   2 r4/.hg/store/undo.backup.fncache (repofncache !)
   2 r4/.hg/store/undo.backup.phaseroots
   2 r4/.hg/store/undo.backupfiles
   2 r4/.hg/store/undo.phaseroots
   [24] r4/\.hg/undo\.backup\.dirstate (re)
   2 r4/.hg/undo.bookmarks
   2 r4/.hg/undo.branch
   2 r4/.hg/undo.desc
   [24] r4/\.hg/undo\.dirstate (re)
   2 r4/.hg/wcache/checkisexec (execbit !)
   2 r4/.hg/wcache/checklink-target (symlink !)
   2 r4/.hg/wcache/checknoexec (execbit !)
   2 r4/.hg/wcache/manifestfulltextcache (reporevlogstore !)
   2 r4/d1/data1
   2 r4/d1/f2
   2 r4/f1
   2 r4/f3
 
 Update back to revision 12 in r4 should break hardlink of file f1 and f3:
 #if hardlink-whitelisted
   $ nlinksdir r4/.hg/undo.backup.dirstate r4/.hg/undo.dirstate
   4 r4/.hg/undo.backup.dirstate
   4 r4/.hg/undo.dirstate
 #endif
 
 
   $ hg -R r4 up 12
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved (execbit !)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-execbit !)
 
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
   1 r4/.hg/branch
   2 r4/.hg/cache/branch2-base
   2 r4/.hg/cache/branch2-immutable
   2 r4/.hg/cache/branch2-served
   2 r4/.hg/cache/branch2-served.hidden
   2 r4/.hg/cache/branch2-visible
   2 r4/.hg/cache/branch2-visible-hidden
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   2 r4/.hg/cache/tags2
   2 r4/.hg/cache/tags2-served
   1 r4/.hg/dirstate
   1 r4/.hg/fsmonitor.state (fsmonitor !)
   2 r4/.hg/hgrc
   2 r4/.hg/last-message.txt
   2 r4/.hg/requires
   2 r4/.hg/store/00changelog.i
   2 r4/.hg/store/00manifest.i
   2 r4/.hg/store/data/d1/f2.d
   2 r4/.hg/store/data/d1/f2.i
   2 r4/.hg/store/data/f1.i
   2 r4/.hg/store/data/f3.i
   2 r4/.hg/store/fncache
   2 r4/.hg/store/phaseroots
   2 r4/.hg/store/requires
   2 r4/.hg/store/undo
   2 r4/.hg/store/undo.backup.fncache (repofncache !)
   2 r4/.hg/store/undo.backup.phaseroots
   2 r4/.hg/store/undo.backupfiles
   2 r4/.hg/store/undo.phaseroots
   [24] r4/\.hg/undo\.backup\.dirstate (re)
   2 r4/.hg/undo.bookmarks
   2 r4/.hg/undo.branch
   2 r4/.hg/undo.desc
   [24] r4/\.hg/undo\.dirstate (re)
   2 r4/.hg/wcache/checkisexec (execbit !)
   2 r4/.hg/wcache/checklink-target (symlink !)
   2 r4/.hg/wcache/checknoexec (execbit !)
   1 r4/.hg/wcache/manifestfulltextcache (reporevlogstore !)
   2 r4/d1/data1
   2 r4/d1/f2
   1 r4/f1
   1 r4/f3 (execbit !)
   2 r4/f3 (no-execbit !)
 
 #if hardlink-whitelisted
   $ nlinksdir r4/.hg/undo.backup.dirstate r4/.hg/undo.dirstate
   4 r4/.hg/undo.backup.dirstate
   4 r4/.hg/undo.dirstate
 #endif
 
 Test hardlinking outside hg:
 
   $ mkdir x
   $ echo foo > x/a
 
   $ linkcp x y
   $ echo bar >> y/a
 
 No diff if hardlink:
 
   $ diff x/a y/a
 
 Test mq hardlinking:
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init a
   $ cd a
 
   $ hg qimport -n foo - << EOF
   > # HG changeset patch
   > # Date 1 0
   > diff -r 2588a8b53d66 a
   > --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   > +++ b/a	Wed Jul 23 15:54:29 2008 +0200
   > @@ -0,0 +1,1 @@
   > +a
   > EOF
   adding foo to series file
 
   $ hg qpush
   applying foo
   now at: foo
 
   $ cd ..
   $ linkcp a b
   $ cd b
 
   $ hg qimport -n bar - << EOF
   > # HG changeset patch
   > # Date 2 0
   > diff -r 2588a8b53d66 a
   > --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   > +++ b/b	Wed Jul 23 15:54:29 2008 +0200
   > @@ -0,0 +1,1 @@
   > +b
   > EOF
   adding bar to series file
 
   $ hg qpush
   applying bar
   now at: bar
 
   $ cat .hg/patches/status
   430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar
 
   $ cat .hg/patches/series
   foo
   bar
 
   $ cat ../a/.hg/patches/status
   430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
 
   $ cat ../a/.hg/patches/series
   foo
 
 Test tags hardlinking:
 
   $ hg qdel -r qbase:qtip
   patch foo finalized without changeset message
   patch bar finalized without changeset message
 
   $ hg tag -l lfoo
   $ hg tag foo
 
   $ cd ..
   $ linkcp b c
   $ cd c
 
   $ hg tag -l -r 0 lbar
   $ hg tag -r 0 bar
 
   $ cat .hgtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
   430ed4828a74fa4047bc816a25500f7472ab4bfe bar
 
   $ cat .hg/localtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
   430ed4828a74fa4047bc816a25500f7472ab4bfe lbar
 
   $ cat ../b/.hgtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
 
   $ cat ../b/.hg/localtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
 
   $ cd ..

tests/test-http-bundle1.t

@@ -1,415 +1,405
 #require serve
 
 This test is a duplicate of 'test-http.t', feel free to factor out
 parts that are not bundle1/bundle2 specific.
 
   $ cat << EOF >> $HGRCPATH
   > [devel]
   > # This test is dedicated to interaction through old bundle
   > legacy.exchange = bundle1
   > EOF
 
   $ hg init test
   $ cd test
   $ echo foo>foo
   $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
   $ echo foo>foo.d/foo
   $ echo bar>foo.d/bAr.hg.d/BaR
   $ echo bar>foo.d/baR.d.hg/bAR
   $ hg commit -A -m 1
   adding foo
   adding foo.d/bAr.hg.d/BaR
   adding foo.d/baR.d.hg/bAR
   adding foo.d/foo
   $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log
   $ hg serve --config server.uncompressed=False -p $HGPORT1 -d --pid-file=../hg2.pid
 
 Test server address cannot be reused
 
   $ hg serve -p $HGPORT1 2>&1
   abort: cannot start server at 'localhost:$HGPORT1': $EADDRINUSE$
   [255]
 
   $ cd ..
   $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
 clone via stream
 
 #if no-reposimplestore
   $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
   streaming all changes
   6 files to transfer, 606 bytes of data (no-zstd !)
   6 files to transfer, 608 bytes of data (zstd !)
   transferred * bytes in * seconds (*/sec) (glob)
   searching for changes
   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
 
   $ hg clone --stream http://localhost:$HGPORT1/ copy2
   warning: stream clone requested but server has them disabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 try to clone via stream but missing requirements, so should use pull instead
 
   $ cat > $TESTTMP/removesupportedformat.py << EOF
   > from mercurial import localrepo
   > def reposetup(ui, repo):
   >     local = repo.local()
   >     if local is not None:
   >         local.supported.remove(b'generaldelta')
   > EOF
 
   $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
   warning: stream clone requested but client is missing requirements: generaldelta
   (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 clone via pull
 
   $ hg clone http://localhost:$HGPORT1/ copy-pull
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   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
   adding bar
   $ cd ..
 
 clone over http with --update
 
   $ hg clone http://localhost:$HGPORT1/ updated --update 0
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 5 changes to 5 files
   new changesets 8b6053c928fe:5fed3813f7f5
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -r . -R updated
   changeset:   0:8b6053c928fe
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   $ rm -rf updated
 
 incoming via HTTP
 
   $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
   $ touch LOCAL
   $ hg ci -qAm LOCAL
   $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
   comparing with http://localhost:$HGPORT1/
   searching for changes
   2
   $ cd ..
 
 pull
 
   $ cd copy-pull
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup"
   > EOF
   $ hg pull
   pulling from http://localhost:$HGPORT1/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 5fed3813f7f5
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
   HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   http://localhost:$HGPORT1/
   HG_URL=http://localhost:$HGPORT1/
   
   (run 'hg update' to get a working copy)
   $ cd ..
 
 clone from invalid URL
 
   $ hg clone http://localhost:$HGPORT/bad
   abort: HTTP Error 404: Not Found
   [100]
 
 test http authentication
 + use the same server to test server side streaming preference
 
   $ cd test
 
   $ hg serve --config extensions.x=$TESTDIR/httpserverauth.py -p $HGPORT2 -d \
   >    --pid-file=pid --config server.preferuncompressed=True \
   >    --config web.push_ssl=False --config web.allow_push=* -A ../access.log
   $ cat pid >> $DAEMON_PIDS
 
   $ cat << EOF > get_pass.py
   > from mercurial import util
   > def newgetpass():
   >   return "pass"
   > util.get_password = newgetpass
   > EOF
 
   $ hg id http://localhost:$HGPORT2/
   abort: http authorization required for http://localhost:$HGPORT2/
   [255]
   $ hg id http://localhost:$HGPORT2/
   abort: http authorization required for http://localhost:$HGPORT2/
   [255]
   $ hg id --config ui.interactive=true --config extensions.getpass=get_pass.py http://user@localhost:$HGPORT2/
   http authorization required for http://localhost:$HGPORT2/
   realm: mercurial
   user: user
   password: 5fed3813f7f5
   $ hg id http://user:pass@localhost:$HGPORT2/
   5fed3813f7f5
   $ echo '[auth]' >> .hg/hgrc
   $ echo 'l.schemes=http' >> .hg/hgrc
   $ echo 'l.prefix=lo' >> .hg/hgrc
   $ echo 'l.username=user' >> .hg/hgrc
   $ echo 'l.password=pass' >> .hg/hgrc
   $ hg id http://localhost:$HGPORT2/
   5fed3813f7f5
   $ hg id http://localhost:$HGPORT2/
   5fed3813f7f5
   $ hg id http://user@localhost:$HGPORT2/
   5fed3813f7f5
 
 #if no-reposimplestore
   $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
   streaming all changes
   7 files to transfer, 916 bytes of data (no-zstd !)
   7 files to transfer, 919 bytes of data (zstd !)
   transferred * bytes in * seconds (*/sec) (glob)
   searching for changes
   no changes found
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
 --pull should override server's preferuncompressed
 
   $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 5 changes to 5 files
   new changesets 8b6053c928fe:5fed3813f7f5
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg id http://user2@localhost:$HGPORT2/
   abort: http authorization required for http://localhost:$HGPORT2/
   [255]
   $ hg id http://user:pass2@localhost:$HGPORT2/
   abort: HTTP Error 403: no
   [100]
 
   $ hg -R dest-pull tag -r tip top
   $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/
   pushing to http://user:***@localhost:$HGPORT2/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ hg rollback -q
 
   $ sed 's/.*] "/"/' < ../access.log
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
   "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
   "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
   "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 403 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob)
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
 
   $ cd ..
 
 clone of serve with repo in root and unserved subrepo (issue2970)
 
   $ hg --cwd test init sub
   $ echo empty > test/sub/empty
   $ hg --cwd test/sub add empty
   $ hg --cwd test/sub commit -qm 'add empty'
   $ hg --cwd test/sub tag -r 0 something
   $ echo sub = sub > test/.hgsub
   $ hg --cwd test add .hgsub
   $ hg --cwd test commit -qm 'add subrepo'
   $ hg clone http://localhost:$HGPORT noslash-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 7 changes to 7 files
   new changesets 8b6053c928fe:56f9bc90cce6
   updating to branch default
   cloning subrepo sub from http://localhost:$HGPORT/sub
   abort: HTTP Error 404: Not Found
   [100]
   $ hg clone http://localhost:$HGPORT/ slash-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 7 changes to 7 files
   new changesets 8b6053c928fe:56f9bc90cce6
   updating to branch default
   cloning subrepo sub from http://localhost:$HGPORT/sub
   abort: HTTP Error 404: Not Found
   [100]
 
 check error log
 
   $ cat error.log
 
 Check error reporting while pulling/cloning
 
   $ $RUNTESTDIR/killdaemons.py
   $ hg serve -R test -p $HGPORT -d --pid-file=hg3.pid -E error.log --config extensions.crash=${TESTDIR}/crashgetbundler.py
   $ cat hg3.pid >> $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ abort-clone
   requesting all changes
   abort: remote error:
   this is an exercise
   [100]
   $ cat error.log
 
 disable pull-based clones
 
   $ hg serve -R test -p $HGPORT1 -d --pid-file=hg4.pid -E error.log --config server.disablefullbundle=True
   $ cat hg4.pid >> $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT1/ disable-pull-clone
   requesting all changes
   abort: remote error:
   server has pull-based clones disabled
   [100]
 
 #if no-reposimplestore
 ... but keep stream clones working
 
   $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
   streaming all changes
   * files to transfer, * of data (glob)
   transferred 1.36 KB in * seconds (* */sec) (glob) (no-zstd !)
   transferred 1.38 KB in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
 #endif
 
 ... and also keep partial clones and pulls working
   $ hg clone http://localhost:$HGPORT1 --rev 0 test-partial-clone
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg pull -R test-partial-clone
   pulling from http://localhost:$HGPORT1/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets 5fed3813f7f5:56f9bc90cce6
   (run 'hg update' to get a working copy)
 
   $ cat error.log

tests/test-http-clone-r.t

@@ -1,222 +1,157
 #require serve
 
 creating 'remote
 
   $ hg init remote
   $ cd remote
   $ hg unbundle "$TESTDIR/bundles/remote.hg"
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Starting server
 
   $ hg serve -p $HGPORT -E ../error.log -d --pid-file=../hg1.pid
   $ cd ..
   $ cat hg1.pid >> $DAEMON_PIDS
 
 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
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   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
   added 2 changesets with 2 changes to 1 files
   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
   added 3 changesets with 3 changes to 1 files
   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
   added 4 changesets with 4 changes to 1 files
   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
   added 2 changesets with 2 changes to 1 files
   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
   added 3 changesets with 3 changes to 1 files
   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
   added 4 changesets with 5 changes to 2 files
   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
   added 5 changesets with 6 changes to 3 files
   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
   added 5 changesets with 5 changes to 2 files
   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
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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/
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 4 files
   new changesets 4ce51a113780:916f1afdef90
   (run 'hg update' to get a working copy)
   $ cd ..
   $ cd test-2
   $ hg pull -r 5 http://localhost:$HGPORT/
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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:
 
   $ hg clone http://localhost:$HGPORT/
   abort: empty destination path is not valid
   [10]
 
   $ cat error.log

tests/test-http-proxy.t

@@ -1,131 +1,121
 #require serve
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg ci -Ama -d '1123456789 0'
   adding a
   $ hg serve --config server.uncompressed=True -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
   $ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null &
   $ while [ ! -f proxy.pid ]; do sleep 0; done
   $ cat proxy.pid >> $DAEMON_PIDS
 
 url for proxy, stream
 
   $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b
   streaming all changes
   6 files to transfer, 412 bytes of data (reporevlogstore !)
   4 files to transfer, 330 bytes of data (reposimplestore !)
   transferred * bytes in * seconds (*/sec) (glob)
   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
 
   $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 83180e7845de
   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
 
   $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 83180e7845de
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 proxy url with user name and password
 
   $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 83180e7845de
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 url with user name and password
 
   $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 83180e7845de
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 bad host:port for proxy ("Protocol not supported" can happen on
 misconfigured hosts)
 
   $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
   abort: error: (Connection refused|Protocol not supported|.* actively refused it|\$EADDRNOTAVAIL\$|No route to host) (re)
   [100]
 
 do not use the proxy if it is in the no list
 
   $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 83180e7845de
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 proxy can't connect to server
 
   $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT2/ h
   abort: HTTP Error 404: Connection refused
   [100]
 
   $ cat proxy.log
   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&stream=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
   * - - [*] code 404, message Connection refused (glob)
   $LOCALIP - - [$LOGDATE$] "GET http://localhost:$HGPORT2/?cmd=capabilities HTTP/1.1" 404 - (glob)

tests/test-http.t

@@ -1,619 +1,609
 #require serve
 
   $ hg init test
   $ cd test
   $ echo foo>foo
   $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
   $ echo foo>foo.d/foo
   $ echo bar>foo.d/bAr.hg.d/BaR
   $ echo bar>foo.d/baR.d.hg/bAR
   $ hg commit -A -m 1
   adding foo
   adding foo.d/bAr.hg.d/BaR
   adding foo.d/baR.d.hg/bAR
   adding foo.d/foo
   $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log
   $ hg serve --config server.uncompressed=False -p $HGPORT1 -d --pid-file=../hg2.pid
 
 Test server address cannot be reused
 
   $ hg serve -p $HGPORT1 2>&1
   abort: cannot start server at 'localhost:$HGPORT1': $EADDRINUSE$
   [255]
 
   $ cd ..
   $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
 clone via stream
 
 #if no-reposimplestore
   $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
   streaming all changes
   9 files to transfer, 715 bytes of data (no-zstd !)
   9 files to transfer, 717 bytes of data (zstd !)
   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
 
   $ hg clone --stream http://localhost:$HGPORT1/ copy2
   warning: stream clone requested but server has them disabled
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 try to clone via stream but missing requirements, so should use pull instead
 
   $ cat > $TESTTMP/removesupportedformat.py << EOF
   > from mercurial import localrepo
   > def reposetup(ui, repo):
   >     local = repo.local()
   >     if local is not None:
   >         local.supported.remove(b'generaldelta')
   > EOF
 
   $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
   warning: stream clone requested but client is missing requirements: generaldelta
   (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 clone via pull
 
   $ hg clone http://localhost:$HGPORT1/ copy-pull
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   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
   adding bar
   $ cd ..
 
 clone over http with --update
 
   $ hg clone http://localhost:$HGPORT1/ updated --update 0
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 5 changes to 5 files
   new changesets 8b6053c928fe:5fed3813f7f5
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -r . -R updated
   changeset:   0:8b6053c928fe
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   $ rm -rf updated
 
 incoming via HTTP
 
   $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
   $ touch LOCAL
   $ hg ci -qAm LOCAL
   $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
   comparing with http://localhost:$HGPORT1/
   searching for changes
   2
   $ cd ..
 
 pull
 
   $ cd copy-pull
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup"
   > EOF
   $ hg pull
   pulling from http://localhost:$HGPORT1/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 5fed3813f7f5
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
   HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   http://localhost:$HGPORT1/
   HG_URL=http://localhost:$HGPORT1/
   
   (run 'hg update' to get a working copy)
   $ cd ..
 
 clone from invalid URL
 
   $ hg clone http://localhost:$HGPORT/bad
   abort: HTTP Error 404: Not Found
   [100]
 
 test http authentication
 + use the same server to test server side streaming preference
 
   $ cd test
 
   $ hg serve --config extensions.x=$TESTDIR/httpserverauth.py -p $HGPORT2 -d \
   >    --pid-file=pid --config server.preferuncompressed=True -E ../errors2.log \
   >    --config web.push_ssl=False --config web.allow_push=* -A ../access.log
   $ cat pid >> $DAEMON_PIDS
 
   $ cat << EOF > get_pass.py
   > from mercurial import util
   > def newgetpass():
   >   return "pass"
   > util.get_password = newgetpass
   > EOF
 
   $ hg id http://localhost:$HGPORT2/
   abort: http authorization required for http://localhost:$HGPORT2/
   [255]
   $ hg id http://localhost:$HGPORT2/
   abort: http authorization required for http://localhost:$HGPORT2/
   [255]
   $ hg id --config ui.interactive=true --debug http://localhost:$HGPORT2/
   using http://localhost:$HGPORT2/
   sending capabilities command
   http authorization required for http://localhost:$HGPORT2/
   realm: mercurial
   user: abort: response expected
   [255]
   $ cat <<'EOF' | hg id --config ui.interactive=true --config ui.nontty=true --debug http://localhost:$HGPORT2/
   > 
   > EOF
   using http://localhost:$HGPORT2/
   sending capabilities command
   http authorization required for http://localhost:$HGPORT2/
   realm: mercurial
   user: 
   password: abort: response expected
   [255]
   $ cat <<'EOF' | hg id --config ui.interactive=true --config ui.nontty=true --debug http://localhost:$HGPORT2/
   > 
   > 
   > EOF
   using http://localhost:$HGPORT2/
   sending capabilities command
   http authorization required for http://localhost:$HGPORT2/
   realm: mercurial
   user: 
   password: abort: authorization failed
   [255]
   $ hg id --config ui.interactive=true --config extensions.getpass=get_pass.py http://user@localhost:$HGPORT2/
   http authorization required for http://localhost:$HGPORT2/
   realm: mercurial
   user: user
   password: 5fed3813f7f5
   $ hg id http://user:pass@localhost:$HGPORT2/
   5fed3813f7f5
   $ echo '[auth]' >> .hg/hgrc
   $ echo 'l.schemes=http' >> .hg/hgrc
   $ echo 'l.prefix=lo' >> .hg/hgrc
   $ echo 'l.username=user' >> .hg/hgrc
   $ echo 'l.password=pass' >> .hg/hgrc
   $ hg id http://localhost:$HGPORT2/
   5fed3813f7f5
   $ hg id http://localhost:$HGPORT2/
   5fed3813f7f5
   $ hg id http://user@localhost:$HGPORT2/
   5fed3813f7f5
 
   $ cat > use_digests.py << EOF
   > from mercurial import (
   >     exthelper,
   >     url,
   > )
   > 
   > eh = exthelper.exthelper()
   > uisetup = eh.finaluisetup
   > 
   > @eh.wrapfunction(url, 'opener')
   > def urlopener(orig, *args, **kwargs):
   >     opener = orig(*args, **kwargs)
   >     opener.addheaders.append((r'X-HgTest-AuthType', r'Digest'))
   >     return opener
   > EOF
 
   $ hg id http://localhost:$HGPORT2/ --config extensions.x=use_digests.py
   5fed3813f7f5
 
 #if no-reposimplestore
   $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
   streaming all changes
   10 files to transfer, 1.01 KB of data
   transferred * KB in * seconds (*/sec) (glob)
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
 --pull should override server's preferuncompressed
   $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 5 changes to 5 files
   new changesets 8b6053c928fe:5fed3813f7f5
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg id http://user2@localhost:$HGPORT2/
   abort: http authorization required for http://localhost:$HGPORT2/
   [255]
   $ hg id http://user:pass2@localhost:$HGPORT2/
   abort: HTTP Error 403: no
   [100]
 
   $ hg -R dest-pull tag -r tip top
   $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/
   pushing to http://user:***@localhost:$HGPORT2/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ hg rollback -q
   $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/ --debug --config devel.debug.peer-request=yes
   pushing to http://user:***@localhost:$HGPORT2/
   using http://localhost:$HGPORT2/
   http auth: user user, password ****
   sending capabilities command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=capabilities
   http auth: user user, password ****
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   query 1; heads
   devel-peer-request: batched-content
   devel-peer-request:    - heads (0 arguments)
   devel-peer-request:    - known (1 arguments)
   sending batch command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=batch
   devel-peer-request:   Vary X-HgArg-1,X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   68 bytes of commands arguments in headers
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   searching for changes
   all remote heads known locally
   preparing listkeys for "phases"
   sending listkeys command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
   devel-peer-request:   Vary X-HgArg-1,X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   16 bytes of commands arguments in headers
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   received listkey for "phases": 58 bytes
   checking for updated bookmarks
   preparing listkeys for "bookmarks"
   sending listkeys command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
   devel-peer-request:   Vary X-HgArg-1,X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   19 bytes of commands arguments in headers
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   received listkey for "bookmarks": 0 bytes
   sending branchmap command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=branchmap
   devel-peer-request:   Vary X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   preparing listkeys for "bookmarks"
   sending listkeys command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
   devel-peer-request:   Vary X-HgArg-1,X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   19 bytes of commands arguments in headers
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   received listkey for "bookmarks": 0 bytes
   1 changesets found
   list of changesets:
   7f4e523d01f2cc3765ac8934da3d14db775ff872
   bundle2-output-bundle: "HG20", 5 parts total
   bundle2-output-part: "replycaps" 207 bytes payload
   bundle2-output-part: "check:phases" 24 bytes payload
   bundle2-output-part: "check:updated-heads" streamed payload
   bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
   bundle2-output-part: "phase-heads" 24 bytes payload
   sending unbundle command
   sending 1023 bytes
   devel-peer-request: POST http://localhost:$HGPORT2/?cmd=unbundle
   devel-peer-request:   Content-length 1023
   devel-peer-request:   Content-type application/mercurial-0.1
   devel-peer-request:   Vary X-HgArg-1,X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   16 bytes of commands arguments in headers
   devel-peer-request:   1023 bytes of data
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   bundle2-input-bundle: no-transaction
   bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
   bundle2-input-part: "output" (advisory) (params: 0 advisory) supported
   bundle2-input-part: total payload size 55
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   bundle2-input-part: "output" (advisory) supported
   bundle2-input-part: total payload size 45
   remote: added 1 changesets with 1 changes to 1 files
   bundle2-input-bundle: 3 parts total
   preparing listkeys for "phases"
   sending listkeys command
   devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
   devel-peer-request:   Vary X-HgArg-1,X-HgProto-1
   devel-peer-request:   X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   devel-peer-request:   16 bytes of commands arguments in headers
   devel-peer-request:   finished in *.???? seconds (200) (glob)
   received listkey for "phases": 15 bytes
   (sent 9 HTTP requests and * bytes; received * bytes in responses) (glob) (?)
   $ hg rollback -q
 
   $ sed 's/.*] "/"/' < ../access.log
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 - x-hgtest-authtype:Digest
   "GET /?cmd=capabilities HTTP/1.1" 200 - x-hgtest-authtype:Digest
   "GET /?cmd=lookup HTTP/1.1" 401 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull x-hgtest-authtype:Digest
   "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
   "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&stream=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (no-reposimplestore !)
   "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
   "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 403 -
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob)
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=capabilities HTTP/1.1" 401 -
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
 
   $ cd ..
 
 clone of serve with repo in root and unserved subrepo (issue2970)
 
   $ hg --cwd test init sub
   $ echo empty > test/sub/empty
   $ hg --cwd test/sub add empty
   $ hg --cwd test/sub commit -qm 'add empty'
   $ hg --cwd test/sub tag -r 0 something
   $ echo sub = sub > test/.hgsub
   $ hg --cwd test add .hgsub
   $ hg --cwd test commit -qm 'add subrepo'
   $ hg clone http://localhost:$HGPORT noslash-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 7 changes to 7 files
   new changesets 8b6053c928fe:56f9bc90cce6
   updating to branch default
   cloning subrepo sub from http://localhost:$HGPORT/sub
   abort: HTTP Error 404: Not Found
   [100]
   $ hg clone http://localhost:$HGPORT/ slash-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 7 changes to 7 files
   new changesets 8b6053c928fe:56f9bc90cce6
   updating to branch default
   cloning subrepo sub from http://localhost:$HGPORT/sub
   abort: HTTP Error 404: Not Found
   [100]
 
 check error log
 
   $ cat error.log
 
   $ cat errors2.log
 
 check abort error reporting while pulling/cloning
 
   $ $RUNTESTDIR/killdaemons.py
   $ hg serve -R test -p $HGPORT -d --pid-file=hg3.pid -E error.log --config extensions.crash=${TESTDIR}/crashgetbundler.py
   $ cat hg3.pid >> $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ abort-clone
   requesting all changes
   remote: abort: this is an exercise
   abort: pull failed on remote
   [100]
   $ cat error.log
 
 disable pull-based clones
 
   $ hg serve -R test -p $HGPORT1 -d --pid-file=hg4.pid -E error.log --config server.disablefullbundle=True
   $ cat hg4.pid >> $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT1/ disable-pull-clone
   requesting all changes
   remote: abort: server has pull-based clones disabled
   abort: pull failed on remote
   (remove --pull if specified or upgrade Mercurial)
   [100]
 
 #if no-reposimplestore
 ... but keep stream clones working
 
   $ hg clone --stream --noupdate http://localhost:$HGPORT1/ test-stream-clone
   streaming all changes
   * files to transfer, * of data (glob)
   transferred * in * seconds (*/sec) (glob)
   $ cat error.log
 #endif
 
 ... and also keep partial clones and pulls working
   $ hg clone http://localhost:$HGPORT1 --rev 0 test/partial/clone
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg pull -R test/partial/clone
   pulling from http://localhost:$HGPORT1/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets 5fed3813f7f5:56f9bc90cce6
   (run 'hg update' to get a working copy)
 
   $ hg clone -U -r 0 test/partial/clone test/another/clone
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
 
 corrupt cookies file should yield a warning
 
   $ cat > $TESTTMP/cookies.txt << EOF
   > bad format
   > EOF
 
   $ hg --config auth.cookiefile=$TESTTMP/cookies.txt id http://localhost:$HGPORT/
   (error loading cookie file $TESTTMP/cookies.txt: '*/cookies.txt' does not look like a Netscape format cookies file; continuing without cookies) (glob)
   56f9bc90cce6
 
   $ killdaemons.py
 
 Create dummy authentication handler that looks for cookies. It doesn't do anything
 useful. It just raises an HTTP 500 with details about the Cookie request header.
 We raise HTTP 500 because its message is printed in the abort message.
 
   $ cat > cookieauth.py << EOF
   > from mercurial import util
   > from mercurial.hgweb import common
   > def perform_authentication(hgweb, req, op):
   >     cookie = req.headers.get(b'Cookie')
   >     if not cookie:
   >         raise common.ErrorResponse(common.HTTP_SERVER_ERROR, b'no-cookie')
   >     raise common.ErrorResponse(common.HTTP_SERVER_ERROR, b'Cookie: %s' % cookie)
   > def extsetup(ui):
   >     common.permhooks.insert(0, perform_authentication)
   > EOF
 
   $ hg serve --config extensions.cookieauth=cookieauth.py -R test -p $HGPORT -d --pid-file=pid
   $ cat pid > $DAEMON_PIDS
 
 Request without cookie sent should fail due to lack of cookie
 
   $ hg id http://localhost:$HGPORT
   abort: HTTP Error 500: no-cookie
   [100]
 
 Populate a cookies file
 
   $ cat > cookies.txt << EOF
   > # HTTP Cookie File
   > # Expiration is 2030-01-01 at midnight
   > .example.com	TRUE	/	FALSE	1893456000	hgkey	examplevalue
   > EOF
 
 Should not send a cookie for another domain
 
   $ hg --config auth.cookiefile=cookies.txt id http://localhost:$HGPORT/
   abort: HTTP Error 500: no-cookie
   [100]
 
 Add a cookie entry for our test server and verify it is sent
 
   $ cat >> cookies.txt << EOF
   > localhost.local	FALSE	/	FALSE	1893456000	hgkey	localhostvalue
   > EOF
 
   $ hg --config auth.cookiefile=cookies.txt id http://localhost:$HGPORT/
   abort: HTTP Error 500: Cookie: hgkey=localhostvalue
   [100]

tests/test-https.t

@@ -1,562 +1,557
 #require serve ssl
 
 Proper https client requires the built-in ssl from Python 2.6.
 
 Disable the system configuration which may set stricter TLS requirements.
 This test expects that legacy TLS versions are supported.
 
   $ OPENSSL_CONF=
   $ export OPENSSL_CONF
 
 Make server certificates:
 
   $ CERTSDIR="$TESTDIR/sslcerts"
   $ cat "$CERTSDIR/priv.pem" "$CERTSDIR/pub.pem" >> server.pem
   $ PRIV=`pwd`/server.pem
   $ cat "$CERTSDIR/priv.pem" "$CERTSDIR/pub-not-yet.pem" > server-not-yet.pem
   $ cat "$CERTSDIR/priv.pem" "$CERTSDIR/pub-expired.pem" > server-expired.pem
 
   $ hg init test
   $ cd test
   $ echo foo>foo
   $ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
   $ echo foo>foo.d/foo
   $ echo bar>foo.d/bAr.hg.d/BaR
   $ echo bar>foo.d/baR.d.hg/bAR
   $ hg commit -A -m 1
   adding foo
   adding foo.d/bAr.hg.d/BaR
   adding foo.d/baR.d.hg/bAR
   adding foo.d/foo
   $ hg serve -p $HGPORT -d --pid-file=../hg0.pid --certificate=$PRIV
   $ cat ../hg0.pid >> $DAEMON_PIDS
 
 cacert not found
 
   $ hg in --config web.cacerts=no-such.pem https://localhost:$HGPORT/
   abort: could not find web.cacerts: no-such.pem
   [255]
 
 Test server address cannot be reused
 
   $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
   abort: cannot start server at 'localhost:$HGPORT': $EADDRINUSE$
   [255]
 
   $ cd ..
 
 Our test cert is not signed by a trusted CA. It should fail to verify if
 we are able to load CA certs.
 
 #if no-defaultcacertsloaded
   $ hg clone https://localhost:$HGPORT/ copy-pull
   (an attempt was made to load CA certificates but none were loaded; see https://mercurial-scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this error)
   abort: error: *certificate verify failed* (glob)
   [100]
 #endif
 
 #if defaultcacertsloaded
   $ hg clone https://localhost:$HGPORT/ copy-pull
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
 #endif
 
 Specifying a per-host certificate file that doesn't exist will abort.  The full
 C:/path/to/msysroot will print on Windows.
 
   $ hg --config hostsecurity.localhost:verifycertsfile=/does/not/exist clone https://localhost:$HGPORT/
   abort: path specified by hostsecurity.localhost:verifycertsfile does not exist: */does/not/exist (glob)
   [255]
 
 A malformed per-host certificate file will raise an error
 
   $ echo baddata > badca.pem
   $ hg --config hostsecurity.localhost:verifycertsfile=badca.pem clone https://localhost:$HGPORT/
   abort: error loading CA file badca.pem: * (glob)
   (file is empty or malformed?)
   [255]
 
 A per-host certificate mismatching the server will fail verification
 
 (modern ssl is able to discern whether the loaded cert is a CA cert)
   $ hg --config hostsecurity.localhost:verifycertsfile="$CERTSDIR/client-cert.pem" clone https://localhost:$HGPORT/
   (an attempt was made to load CA certificates but none were loaded; see https://mercurial-scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this error)
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
 
 A per-host certificate matching the server's cert will be accepted
 
   $ hg --config hostsecurity.localhost:verifycertsfile="$CERTSDIR/pub.pem" clone -U https://localhost:$HGPORT/ perhostgood1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
 
 A per-host certificate with multiple certs and one matching will be accepted
 
   $ cat "$CERTSDIR/client-cert.pem" "$CERTSDIR/pub.pem" > perhost.pem
   $ hg --config hostsecurity.localhost:verifycertsfile=perhost.pem clone -U https://localhost:$HGPORT/ perhostgood2
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
 
 Defining both per-host certificate and a fingerprint will print a warning
 
   $ hg --config hostsecurity.localhost:verifycertsfile="$CERTSDIR/pub.pem" --config hostsecurity.localhost:fingerprints=sha1:ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03 clone -U https://localhost:$HGPORT/ caandfingerwarning
   (hostsecurity.localhost:verifycertsfile ignored when host fingerprints defined; using host fingerprints for verification)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   new changesets 8b6053c928fe
 
   $ DISABLECACERTS="--config devel.disableloaddefaultcerts=true"
 
 Inability to verify peer certificate will result in abort
 
   $ hg clone https://localhost:$HGPORT/ copy-pull $DISABLECACERTS
   abort: unable to verify security of localhost (no loaded CA certificates); refusing to connect
   (see https://mercurial-scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this error or set hostsecurity.localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e to trust this server)
   [150]
 
   $ hg clone --insecure https://localhost:$HGPORT/ copy-pull
   warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 4 changes to 4 files
   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
   adding bar
   $ cd ..
 
 pull without cacert
 
   $ cd copy-pull
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup"
   > EOF
   $ hg pull $DISABLECACERTS
   pulling from https://localhost:$HGPORT/
   abort: unable to verify security of localhost (no loaded CA certificates); refusing to connect
   (see https://mercurial-scm.org/wiki/SecureConnections for how to configure Mercurial to avoid this error or set hostsecurity.localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e to trust this server)
   [150]
 
   $ hg pull --insecure
   pulling from https://localhost:$HGPORT/
   warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 5fed3813f7f5
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
   HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   https://localhost:$HGPORT/
   HG_URL=https://localhost:$HGPORT/
   
   (run 'hg update' to get a working copy)
   $ cd ..
 
 cacert configured in local repo
 
   $ cp copy-pull/.hg/hgrc copy-pull/.hg/hgrc.bu
   $ echo "[web]" >> copy-pull/.hg/hgrc
   $ echo "cacerts=$CERTSDIR/pub.pem" >> copy-pull/.hg/hgrc
   $ hg -R copy-pull pull
   pulling from https://localhost:$HGPORT/
   searching for changes
   no changes found
   $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc
 
 cacert configured globally, also testing expansion of environment
 variables in the filename
 
   $ echo "[web]" >> $HGRCPATH
   $ echo 'cacerts=$P/pub.pem' >> $HGRCPATH
   $ P="$CERTSDIR" hg -R copy-pull pull
   pulling from https://localhost:$HGPORT/
   searching for changes
   no changes found
   $ P="$CERTSDIR" hg -R copy-pull pull --insecure
   pulling from https://localhost:$HGPORT/
   warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering
   searching for changes
   no changes found
 
 empty cacert file
 
   $ touch emptycafile
 
   $ hg --config web.cacerts=emptycafile -R copy-pull pull
   pulling from https://localhost:$HGPORT/
   abort: error loading CA file emptycafile: * (glob)
   (file is empty or malformed?)
   [255]
 
 cacert mismatch
 
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub.pem" \
   > https://$LOCALIP:$HGPORT/
   pulling from https://*:$HGPORT/ (glob)
   abort: $LOCALIP certificate error: certificate is for localhost (glob)
   (set hostsecurity.$LOCALIP:certfingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e config setting or use --insecure to connect insecurely)
   [150]
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub.pem" \
   > https://$LOCALIP:$HGPORT/ --insecure
   pulling from https://*:$HGPORT/ (glob)
   warning: connection security to $LOCALIP is disabled per current settings; communication is susceptible to eavesdropping and tampering (glob)
   searching for changes
   no changes found
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub-other.pem"
   pulling from https://localhost:$HGPORT/
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub-other.pem" \
   > --insecure
   pulling from https://localhost:$HGPORT/
   warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering
   searching for changes
   no changes found
 
 Test server cert which isn't valid yet
 
   $ hg serve -R test -p $HGPORT1 -d --pid-file=hg1.pid --certificate=server-not-yet.pem
   $ cat hg1.pid >> $DAEMON_PIDS
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub-not-yet.pem" \
   > https://localhost:$HGPORT1/
   pulling from https://localhost:$HGPORT1/
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
 
 Test server cert which no longer is valid
 
   $ hg serve -R test -p $HGPORT2 -d --pid-file=hg2.pid --certificate=server-expired.pem
   $ cat hg2.pid >> $DAEMON_PIDS
   $ hg -R copy-pull pull --config web.cacerts="$CERTSDIR/pub-expired.pem" \
   > https://localhost:$HGPORT2/
   pulling from https://localhost:$HGPORT2/
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
 
 Setting ciphers to an invalid value aborts
   $ P="$CERTSDIR" hg --config hostsecurity.ciphers=invalid -R copy-pull id https://localhost:$HGPORT/
   abort: could not set ciphers: No cipher can be selected.
   (change cipher string (invalid) in config)
   [255]
 
   $ P="$CERTSDIR" hg --config hostsecurity.localhost:ciphers=invalid -R copy-pull id https://localhost:$HGPORT/
   abort: could not set ciphers: No cipher can be selected.
   (change cipher string (invalid) in config)
   [255]
 
 Changing the cipher string works
 
   $ P="$CERTSDIR" hg --config hostsecurity.ciphers=HIGH -R copy-pull id https://localhost:$HGPORT/
   5fed3813f7f5
 
 Fingerprints
 
 - works without cacerts (hostfingerprints)
   $ hg -R copy-pull id https://localhost:$HGPORT/ --insecure --config hostfingerprints.localhost=ec:d8:7c:d6:b3:86:d0:4f:c1:b8:b4:1c:9d:8f:5e:16:8e:ef:1c:03
   (SHA-1 fingerprint for localhost found in legacy [hostfingerprints] section; if you trust this fingerprint, remove the old SHA-1 fingerprint from [hostfingerprints] and add the following entry to the new [hostsecurity] section: localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e)
   5fed3813f7f5
 
 - works without cacerts (hostsecurity)
   $ hg -R copy-pull id https://localhost:$HGPORT/ --config hostsecurity.localhost:fingerprints=sha1:ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03
   5fed3813f7f5
 
   $ hg -R copy-pull id https://localhost:$HGPORT/ --config hostsecurity.localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e
   5fed3813f7f5
 
 - multiple fingerprints specified and first matches
   $ hg --config 'hostfingerprints.localhost=ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03, deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' -R copy-pull id https://localhost:$HGPORT/ --insecure
   (SHA-1 fingerprint for localhost found in legacy [hostfingerprints] section; if you trust this fingerprint, remove the old SHA-1 fingerprint from [hostfingerprints] and add the following entry to the new [hostsecurity] section: localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e)
   5fed3813f7f5
 
   $ hg --config 'hostsecurity.localhost:fingerprints=sha1:ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03, sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' -R copy-pull id https://localhost:$HGPORT/
   5fed3813f7f5
 
 - multiple fingerprints specified and last matches
   $ hg --config 'hostfingerprints.localhost=deadbeefdeadbeefdeadbeefdeadbeefdeadbeef, ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03' -R copy-pull id https://localhost:$HGPORT/ --insecure
   (SHA-1 fingerprint for localhost found in legacy [hostfingerprints] section; if you trust this fingerprint, remove the old SHA-1 fingerprint from [hostfingerprints] and add the following entry to the new [hostsecurity] section: localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e)
   5fed3813f7f5
 
   $ hg --config 'hostsecurity.localhost:fingerprints=sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbeef, sha1:ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03' -R copy-pull id https://localhost:$HGPORT/
   5fed3813f7f5
 
 - multiple fingerprints specified and none match
 
   $ hg --config 'hostfingerprints.localhost=deadbeefdeadbeefdeadbeefdeadbeefdeadbeef, aeadbeefdeadbeefdeadbeefdeadbeefdeadbeef' -R copy-pull id https://localhost:$HGPORT/ --insecure
   abort: certificate for localhost has unexpected fingerprint ec:d8:7c:d6:b3:86:d0:4f:c1:b8:b4:1c:9d:8f:5e:16:8e:ef:1c:03
   (check hostfingerprint configuration)
   [150]
 
   $ hg --config 'hostsecurity.localhost:fingerprints=sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbeef, sha1:aeadbeefdeadbeefdeadbeefdeadbeefdeadbeef' -R copy-pull id https://localhost:$HGPORT/
   abort: certificate for localhost has unexpected fingerprint sha1:ec:d8:7c:d6:b3:86:d0:4f:c1:b8:b4:1c:9d:8f:5e:16:8e:ef:1c:03
   (check hostsecurity configuration)
   [150]
 
 - fails when cert doesn't match hostname (port is ignored)
   $ hg -R copy-pull id https://localhost:$HGPORT1/ --config hostfingerprints.localhost=ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03
   abort: certificate for localhost has unexpected fingerprint f4:2f:5a:0c:3e:52:5b:db:e7:24:a8:32:1d:18:97:6d:69:b5:87:84
   (check hostfingerprint configuration)
   [150]
 
 
 - ignores that certificate doesn't match hostname
   $ hg -R copy-pull id https://$LOCALIP:$HGPORT/ --config hostfingerprints.$LOCALIP=ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03
   (SHA-1 fingerprint for $LOCALIP found in legacy [hostfingerprints] section; if you trust this fingerprint, remove the old SHA-1 fingerprint from [hostfingerprints] and add the following entry to the new [hostsecurity] section: $LOCALIP:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e)
   5fed3813f7f5
 
 Ports used by next test. Kill servers.
 
   $ killdaemons.py hg0.pid
   $ killdaemons.py hg1.pid
   $ killdaemons.py hg2.pid
 
 #if tls1.2
 Start servers running supported TLS versions
 
   $ cd test
   $ hg serve -p $HGPORT -d --pid-file=../hg0.pid --certificate=$PRIV \
   > --config devel.serverexactprotocol=tls1.0
   $ cat ../hg0.pid >> $DAEMON_PIDS
   $ hg serve -p $HGPORT1 -d --pid-file=../hg1.pid --certificate=$PRIV \
   > --config devel.serverexactprotocol=tls1.1
   $ cat ../hg1.pid >> $DAEMON_PIDS
   $ hg serve -p $HGPORT2 -d --pid-file=../hg2.pid --certificate=$PRIV \
   > --config devel.serverexactprotocol=tls1.2
   $ cat ../hg2.pid >> $DAEMON_PIDS
   $ cd ..
 
 Clients talking same TLS versions work
 
   $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.0 --config hostsecurity.ciphers=DEFAULT id https://localhost:$HGPORT/
   5fed3813f7f5
   $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.1 --config hostsecurity.ciphers=DEFAULT id https://localhost:$HGPORT1/
   5fed3813f7f5
   $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.2 id https://localhost:$HGPORT2/
   5fed3813f7f5
 
 Clients requiring newer TLS version than what server supports fail
 
   $ P="$CERTSDIR" hg id https://localhost:$HGPORT/
   (could not negotiate a common security protocol (tls1.1+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support)
   (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server)
   (see https://mercurial-scm.org/wiki/SecureConnections for more info)
   abort: error: .*(unsupported protocol|wrong ssl version|alert protocol version).* (re)
   [100]
 
   $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.1 id https://localhost:$HGPORT/
   (could not negotiate a common security protocol (tls1.1+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support)
   (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server)
   (see https://mercurial-scm.org/wiki/SecureConnections for more info)
   abort: error: .*(unsupported protocol|wrong ssl version|alert protocol version).* (re)
   [100]
   $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.2 id https://localhost:$HGPORT/
   (could not negotiate a common security protocol (tls1.2+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support)
   (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server)
   (see https://mercurial-scm.org/wiki/SecureConnections for more info)
   abort: error: .*(unsupported protocol|wrong ssl version|alert protocol version).* (re)
   [100]
   $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.2 id https://localhost:$HGPORT1/
   (could not negotiate a common security protocol (tls1.2+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support)
   (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server)
   (see https://mercurial-scm.org/wiki/SecureConnections for more info)
   abort: error: .*(unsupported protocol|wrong ssl version|alert protocol version).* (re)
   [100]
 
 --insecure will allow TLS 1.0 connections and override configs
 
   $ hg --config hostsecurity.minimumprotocol=tls1.2 id --insecure https://localhost:$HGPORT1/
   warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering
   5fed3813f7f5
 
 The per-host config option overrides the default
 
   $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ \
   > --config hostsecurity.ciphers=DEFAULT \
   > --config hostsecurity.minimumprotocol=tls1.2 \
   > --config hostsecurity.localhost:minimumprotocol=tls1.0
   5fed3813f7f5
 
 The per-host config option by itself works
 
   $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ \
   > --config hostsecurity.localhost:minimumprotocol=tls1.2
   (could not negotiate a common security protocol (tls1.2+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support)
   (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server)
   (see https://mercurial-scm.org/wiki/SecureConnections for more info)
   abort: error: .*(unsupported protocol|wrong ssl version|alert protocol version).* (re)
   [100]
 
 .hg/hgrc file [hostsecurity] settings are applied to remote ui instances (issue5305)
 
   $ cat >> copy-pull/.hg/hgrc << EOF
   > [hostsecurity]
   > localhost:minimumprotocol=tls1.2
   > EOF
   $ P="$CERTSDIR" hg -R copy-pull id https://localhost:$HGPORT/
   (could not negotiate a common security protocol (tls1.2+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support)
   (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server)
   (see https://mercurial-scm.org/wiki/SecureConnections for more info)
   abort: error: .*(unsupported protocol|wrong ssl version|alert protocol version).* (re)
   [100]
 
   $ killdaemons.py hg0.pid
   $ killdaemons.py hg1.pid
   $ killdaemons.py hg2.pid
 #endif
 
 Prepare for connecting through proxy
 
   $ hg serve -R test -p $HGPORT -d --pid-file=hg0.pid --certificate=$PRIV
   $ cat hg0.pid >> $DAEMON_PIDS
   $ hg serve -R test -p $HGPORT2 -d --pid-file=hg2.pid --certificate=server-expired.pem
   $ cat hg2.pid >> $DAEMON_PIDS
 tinyproxy.py doesn't fully detach, so killing it may result in extra output
 from the shell. So don't kill it.
   $ tinyproxy.py $HGPORT1 localhost >proxy.log </dev/null 2>&1 &
   $ while [ ! -f proxy.pid ]; do sleep 0; done
   $ cat proxy.pid >> $DAEMON_PIDS
 
   $ echo "[http_proxy]" >> copy-pull/.hg/hgrc
   $ echo "always=True" >> copy-pull/.hg/hgrc
   $ echo "[hostfingerprints]" >> copy-pull/.hg/hgrc
   $ echo "localhost =" >> copy-pull/.hg/hgrc
 
 Test unvalidated https through proxy
 
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull --insecure
   pulling from https://localhost:$HGPORT/
   warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering
   searching for changes
   no changes found
 
 Test https with cacert and fingerprint through proxy
 
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull \
   > --config web.cacerts="$CERTSDIR/pub.pem"
   pulling from https://localhost:$HGPORT/
   searching for changes
   no changes found
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://localhost:$HGPORT/ --config hostfingerprints.localhost=ecd87cd6b386d04fc1b8b41c9d8f5e168eef1c03 --trace
   pulling from https://*:$HGPORT/ (glob)
   (SHA-1 fingerprint for localhost found in legacy [hostfingerprints] section; if you trust this fingerprint, remove the old SHA-1 fingerprint from [hostfingerprints] and add the following entry to the new [hostsecurity] section: localhost:fingerprints=sha256:20:de:b3:ad:b4:cd:a5:42:f0:74:41:1c:a2:70:1e:da:6e:c0:5c:16:9e:e7:22:0f:f1:b7:e5:6e:e4:92:af:7e)
   searching for changes
   no changes found
 
 Test https with cert problems through proxy
 
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull \
   > --config web.cacerts="$CERTSDIR/pub-other.pem"
   pulling from https://localhost:$HGPORT/
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull \
   > --config web.cacerts="$CERTSDIR/pub-expired.pem" https://localhost:$HGPORT2/
   pulling from https://localhost:$HGPORT2/
   (the full certificate chain may not be available locally; see "hg help debugssl") (windows !)
   abort: error: *certificate verify failed* (glob)
   [100]
 
 Test when proxy can't connect to server
 
   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull --insecure https://localhost:0/
   pulling from https://localhost:0/
   abort: error: Tunnel connection failed: 404 (Connection refused|\$EADDRNOTAVAIL\$) (re)
   [100]
 
 
   $ killdaemons.py hg0.pid
 
   $ cd test
 
 Missing certificate file(s) are detected
 
   $ hg serve -p $HGPORT --certificate=/missing/certificate \
   > --config devel.servercafile=$PRIV --config devel.serverrequirecert=true
   abort: referenced certificate file (*/missing/certificate) does not exist (glob)
   [255]
 
   $ hg serve -p $HGPORT --certificate=$PRIV \
   > --config devel.servercafile=/missing/cafile --config devel.serverrequirecert=true
   abort: referenced certificate file (*/missing/cafile) does not exist (glob)
   [255]
 
 Start hgweb that requires client certificates:
 
   $ hg serve -p $HGPORT -d --pid-file=../hg0.pid --certificate=$PRIV \
   > --config devel.servercafile=$PRIV --config devel.serverrequirecert=true
   $ cat ../hg0.pid >> $DAEMON_PIDS
   $ cd ..
 
 without client certificate:
 
   $ P="$CERTSDIR" hg id https://localhost:$HGPORT/
   abort: error: .*(\$ECONNRESET\$|certificate required|handshake failure|EOF occurred).* (re)
   [100]
 
 with client certificate:
 
   $ cat << EOT >> $HGRCPATH
   > [auth]
   > l.prefix = localhost
   > l.cert = $CERTSDIR/client-cert.pem
   > l.key = $CERTSDIR/client-key.pem
   > EOT
 
   $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ \
   > --config auth.l.key="$CERTSDIR/client-key-decrypted.pem"
   5fed3813f7f5
 
   $ printf '1234\n' | env P="$CERTSDIR" hg id https://localhost:$HGPORT/ \
   > --config ui.interactive=True --config ui.nontty=True
   passphrase for */client-key.pem: 5fed3813f7f5 (glob)
 
   $ env P="$CERTSDIR" hg id https://localhost:$HGPORT/
   abort: error: * (glob)
   [100]
 
 Missing certficate and key files result in error
 
   $ hg id https://localhost:$HGPORT/ --config auth.l.cert=/missing/cert
   abort: certificate file (*/missing/cert) does not exist; cannot connect to localhost (glob)
   (restore missing file or fix references in Mercurial config)
   [255]
 
   $ hg id https://localhost:$HGPORT/ --config auth.l.key=/missing/key
   abort: certificate file (*/missing/key) does not exist; cannot connect to localhost (glob)
   (restore missing file or fix references in Mercurial config)
   [255]

tests/test-import-merge.t

@@ -1,167 +1,162
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ tipparents() {
   > hg parents --template "{rev}:{node|short} {desc|firstline}\n" -r tip
   > }
 
 Test import and merge diffs
 
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ echo a >> a
   $ hg ci -m changea
   $ echo c > c
   $ hg ci -Am addc
   adding c
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > b
   $ hg ci -Am addb
   adding b
   created new head
   $ hg up 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ hg export . > ../merge.diff
   $ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff
   $ cd ..
   $ hg clone -r2 repo repo2
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
   new changesets 07f494440405:890ecaa90481
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo2
   $ hg pull -r3 ../repo
   pulling from ../repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 102a90ea7b4a
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Test without --exact and diff.p1 == workingdir.p1
 
   $ hg up 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat > $TESTTMP/editor.sh <<EOF
   > env | grep HGEDITFORM
   > echo merge > \$1
   > EOF
   $ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff
   applying ../merge.nomsg.diff
   HGEDITFORM=import.normal.merge
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test without --exact and diff.p1 != workingdir.p1
 
   $ hg up 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import ../merge.diff
   applying ../merge.diff
   warning: import the patch as a normal revision
   (use --exact to import the patch as a merge)
   $ tipparents
   2:890ecaa90481 addc
   $ hg strip --no-backup tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test with --exact
 
   $ hg import --exact ../merge.diff
   applying ../merge.diff
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Test with --bypass and diff.p1 == workingdir.p1
 
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import --bypass ../merge.diff
   applying ../merge.diff
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
 
 Test with --bypass and diff.p1 != workingdir.p1
 
   $ hg up 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg import --bypass ../merge.diff
   applying ../merge.diff
   warning: import the patch as a normal revision
   (use --exact to import the patch as a merge)
   $ tipparents
   2:890ecaa90481 addc
   $ hg strip --no-backup tip
 
 Test with --bypass and --exact
 
   $ hg import --bypass --exact ../merge.diff
   applying ../merge.diff
   $ tipparents
   1:540395c44225 changea
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
 
   $ cd ..
 
 Test that --exact on a bad header doesn't corrupt the repo (issue3616)
 
   $ hg init repo3
   $ cd repo3
   $ echo a>a
   $ hg ci -Aqm0
   $ echo a>>a
   $ hg ci -m1
   $ echo a>>a
   $ hg ci -m2
   $ echo a>a
   $ echo b>>a
   $ echo a>>a
   $ hg ci -m3
   $ hg export 2 | head -7 > ../a.patch
   $ hg export tip > out
   >>> apatch = open("../a.patch", "ab")
   >>> apatch.write(b"".join(open("out", 'rb').readlines()[7:])) and None
 
   $ cd ..
   $ hg clone -qr0 repo3 repo3-clone
   $ cd repo3-clone
   $ hg pull -qr1 ../repo3
 
   $ hg import --exact ../a.patch
   applying ../a.patch
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   patching file a
   Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
   transaction abort!
   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

tests/test-incoming-outgoing.t

@@ -1,553 +1,543
 #require serve
 
   $ hg init test
   $ cd test
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >     echo $i >> foo
   >     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 ..
 
   $ hg init new
 
 http incoming
 
   $ hg -R new incoming http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming -r 4 http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 local incoming
 
   $ hg -R new incoming test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming -r 4 test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 limit to 2 changesets
 
   $ hg -R new incoming -l 2 test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
 
 limit to 2 changesets, test with -p --git
 
   $ hg -R new incoming -l 2 -p --git test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,1 @@
   +0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -1,1 +1,2 @@
    0
   +1
   
 
 test with --bundle
 
   $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming --bundle test2.hg test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
 
 
 test the resulting bundles
 
   $ hg init temp
   $ hg init temp2
   $ hg -R temp unbundle test.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 1 files
   new changesets 00a43fa82f62:e4feb4ac9035 (9 drafts)
   (run 'hg update' to get a working copy)
   $ hg -R temp2 unbundle test2.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 1 files
   new changesets 00a43fa82f62:e4feb4ac9035 (9 drafts)
   (run 'hg update' to get a working copy)
   $ hg -R temp tip
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R temp2 tip
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
 
   $ rm -r temp temp2 new
 
 test outgoing
 
   $ hg clone test test-dev
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-dev
   $ for i in 9 10 11 12 13; do
   >     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
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   changeset:   12:e576b1bed305
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     12
   
   changeset:   13:96bbff09a7cc
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     13
   
 test outgoing with secret changesets
 
   $ hg -R test-dev phase --force --secret 9
   $ hg -R test-dev outgoing test
   comparing with test
   searching for changes
   no changes found (ignored 5 secret changesets)
   [1]
   $ hg -R test-dev phase --draft -r 'head()'
 
 limit to 3 changesets
 
   $ hg -R test-dev outgoing -l 3 test
   comparing with test
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   $ hg -R test-dev outgoing http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   changeset:   12:e576b1bed305
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     12
   
   changeset:   13:96bbff09a7cc
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     13
   
   $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
 
 incoming from empty remote repository
 
   $ hg init r1
   $ hg init r2
   $ echo a > r1/foo
   $ hg -R r1 ci -Ama
   adding foo
   $ hg -R r1 incoming r2 --bundle x.hg
   comparing with r2
   searching for changes
   no changes found
   [1]
 
 Create a "split" repo that pulls from r1 and pushes to r2, using default-push
 
   $ hg clone r1 split
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat > split/.hg/hgrc << EOF
   > [paths]
   > default = $TESTTMP/r3
   > default-push = $TESTTMP/r2
   > EOF
   $ hg -R split outgoing
   comparing with $TESTTMP/r2
   searching for changes
   changeset:   0:3e92d79f743a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 
 Use default:pushurl instead of default-push
 
 Windows needs a leading slash to make a URL that passes all of the checks
   $ WD=`pwd`
 #if windows
   $ WD="/$WD"
 #endif
   $ cat > split/.hg/hgrc << EOF
   > [paths]
   > default = $WD/r3
   > default:pushurl = file://$WD/r2
   > EOF
   $ hg -R split outgoing
   comparing with file:/*/$TESTTMP/r2 (glob)
   searching for changes
   changeset:   0:3e92d79f743a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 
 Push and then double-check outgoing
 
   $ echo a >> split/foo
   $ hg -R split commit -Ama
   $ hg -R split push
   pushing to file:/*/$TESTTMP/r2 (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   $ hg -R split outgoing
   comparing with file:/*/$TESTTMP/r2 (glob)
   searching for changes
   no changes found
   [1]
 

tests/test-issue1175.t

@@ -1,97 +1,92
 https://bz.mercurial-scm.org/1175
 
   $ hg init repo
   $ cd repo
   $ touch a
   $ hg ci -Am0
   adding a
 
   $ hg mv a a1
   $ hg ci -m1
 
   $ hg co 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg mv a a2
   $ hg up
   note: possible conflict - a was renamed multiple times to:
    a1
    a2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg ci -m2
 
   $ touch a
   $ hg ci -Am3
   adding a
 
   $ hg mv a b
   $ hg ci -Am4 a
 
   $ hg ci --debug --traceback -Am5 b
   committing files:
   b
   warning: can't find ancestor for 'b' copied from 'a'!
   committing manifest
   committing changelog
   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
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
   # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f
   5
   
   diff --git a/b b/b
   new file mode 100644
 
 https://bz.mercurial-scm.org/show_bug.cgi?id=4476
 
   $ hg init foo
   $ cd foo
   $ touch a && hg ci -Aqm a
   $ hg mv a b
   $ echo b1 >> b
   $ hg ci -Aqm b1
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv a b
   $ echo b2 >> b
   $ hg ci -Aqm b2
   $ hg graft 1
   grafting 1:5974126fad84 "b1"
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [1]
   $ echo a > b
   $ echo b3 >> b
   $ hg resolve --mark b
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft --continue
   grafting 1:5974126fad84 "b1"
   $ hg log -f b -T 'changeset:   {rev}:{node|short}\nsummary:     {desc}\n\n'
   changeset:   3:376d30ccffc0
   summary:     b1
   
   changeset:   2:416baaa2e5e4
   summary:     b2
   
   changeset:   0:3903775176ed
   summary:     a
   
 
 

tests/test-journal-exists.t

@@ -1,61 +1,55
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ hg ci -Am0
   adding a
 
   $ hg -q clone . foo
 
   $ touch .hg/store/journal
 
   $ echo foo > a
   $ hg ci -Am0
   abort: abandoned transaction found
   (run 'hg recover' to clean up transaction)
   [255]
 
   $ hg recover
   rolling back interrupted transaction
   (verify step skipped, run `hg verify` to check your repository content)
 
 recover, explicit verify
 
   $ touch .hg/store/journal
   $ hg ci -Am0
   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
 
   $ touch .hg/store/journal
   $ hg ci -Am0
   abort: abandoned transaction found
   (run 'hg recover' to clean up transaction)
   [255]
   $ hg recover --no-verify
   rolling back interrupted transaction
   (verify step skipped, run `hg verify` to check your repository content)
 
 
 Check that zero-size journals are correctly aborted:
 
 #if unix-permissions no-root
   $ hg bundle -qa repo.hg
   $ chmod -w foo/.hg/store/00changelog.i
 
   $ hg -R foo unbundle repo.hg
   adding changesets
   abort: Permission denied: '$TESTTMP/repo/foo/.hg/store/.00changelog.i-*' (glob)
   [255]
 
   $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
 #endif
 

tests/test-keyword.t

@@ -1,1475 +1,1470
 #require no-reposimplestore
 
 Run kwdemo outside a repo
   $ hg -q --config extensions.keyword= --config keywordmaps.Foo="{author|user}" kwdemo
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Foo = {author|user}
   $Foo: test $
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > keyword =
   > mq =
   > notify =
   > record =
   > transplant =
   > [ui]
   > interactive = true
   > EOF
 
 hide outer repo
   $ hg init
 
 Run kwdemo before [keyword] files are set up
 as it would succeed without uisetup otherwise
 
   $ hg --quiet kwdemo
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Author = {author|user}
   Date = {date|utcdate}
   Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
   Id = {file|basename},v {node|short} {date|utcdate} {author|user}
   RCSFile = {file|basename},v
   RCSfile = {file|basename},v
   Revision = {node|short}
   Source = {root}/{file},v
   $Author: test $
   $Date: ????/??/?? ??:??:?? $ (glob)
   $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
   $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
   $RCSFile: demo.txt,v $
   $RCSfile: demo.txt,v $
   $Revision: ???????????? $ (glob)
   $Source: */demo.txt,v $ (glob)
 
   $ hg --quiet kwdemo "Branch = {branches}"
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Branch = {branches}
   $Branch: demobranch $
 
 (test template filter svnisodate and svnutcdate)
 
   $ hg --quiet kwdemo --config keywordset.svn=True
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = True
   [keywordmaps]
   Author = {author|user}
   Date = {date|svnisodate}
   Id = {file|basename},v {node|short} {date|svnutcdate} {author|user}
   LastChangedBy = {author|user}
   LastChangedDate = {date|svnisodate}
   LastChangedRevision = {node|short}
   Revision = {node|short}
   $Author: test $
   $Date: ????-??-?? ??:??:?? ????? (???, ?? ??? ????) $ (glob)
   $Id: demo.txt,v ???????????? ????-??-?? ??:??:??Z test $ (glob)
   $LastChangedBy: test $
   $LastChangedDate: ????-??-?? ??:??:?? ????? (???, ?? ??? ????) $ (glob)
   $LastChangedRevision: ???????????? $ (glob)
   $Revision: ???????????? $ (glob)
 
   $ cat <<EOF >> $HGRCPATH
   > [keyword]
   > ** =
   > b = ignore
   > i = ignore
   > [hooks]
   > EOF
   $ cp $HGRCPATH $HGRCPATH.nohooks
   > cat <<EOF >> $HGRCPATH
   > commit=
   > commit.test=cp a hooktest
   > EOF
 
   $ hg init Test-bndl
   $ cd Test-bndl
 
 kwshrink should exit silently in empty/invalid repo
 
   $ hg kwshrink
 
 Symlinks cannot be created on Windows.
 A bundle to test this was made with:
  hg init t
  cd t
  echo a > a
  ln -s a sym
  hg add sym
  hg ci -m addsym -u mercurial
  hg bundle --base null ../test-keyword.hg
 
   $ hg unbundle "$TESTDIR"/bundles/test-keyword.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets a2392c293916 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up a2392c293916
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo 'expand $Id$' > a
   $ echo 'do not process $Id:' >> a
   $ echo 'xxx $' >> a
   $ echo 'ignore $Id$' > b
 
 Output files as they were created
 
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   ignore $Id$
 
 no kwfiles
 
   $ hg kwfiles
 
 untracked candidates
 
   $ hg -v kwfiles --unknown
   k a
 
 Add files and check status
 
   $ hg addremove
   adding a
   adding b
   $ hg status
   A a
   A b
 
 
 Default keyword expansion including commit hook
 Interrupted commit should not change state or run commit hook
 
   $ hg --debug commit
   abort: empty commit message
   [10]
   $ hg status
   A a
   A b
 
 Commit with several checks
 
   $ hg --debug commit -mabsym -u 'User Name <[e-mail]>'
   committing files:
   a
   b
   committing manifest
   committing changelog
   overwriting a expanding keywords
   updating the branch cache
   committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
   running hook commit.test: cp a hooktest
   $ hg status
   ? hooktest
   $ hg debugrebuildstate
   $ hg --quiet identify
   ef63ca68695b
 
 cat files in working directory with keywords expanded
 
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
 
 hg cat files and symlink, no expansion
 
   $ hg cat sym a b && echo
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
   a
 
   $ diff a hooktest
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
   $ rm hooktest
 
 hg status of kw-ignored binary file starting with '\1\n'
 
   >>> open("i", "wb").write(b"\1\nfoo") and None
   $ hg -q commit -Am metasep i
   $ hg status
   >>> open("i", "wb").write(b"\1\nbar") and None
   $ hg status
   M i
   $ hg -q commit -m "modify metasep" i
   $ hg status --rev 2:3
   M i
   $ touch empty
   $ hg -q commit -A -m "another file"
   $ hg status -A --rev 3:4 i
   C i
 
   $ hg -q strip --no-backup 2
 
 Test hook execution
 
 bundle
 
   $ hg bundle --base null ../kw.hg
   2 changesets found
   $ cd ..
   $ hg init Test
   $ cd Test
 
 Notify on pull to check whether keywords stay as is in email
 ie. if patch.diff wrapper acts as it should
 
   $ cat <<EOF >> $HGRCPATH
   > [hooks]
   > incoming.notify = python:hgext.notify.hook
   > [notify]
   > sources = pull
   > diffstat = False
   > maxsubject = 15
   > [reposubs]
   > * = Test
   > EOF
 
 Pull from bundle and trigger notify
 
   $ hg pull -u ../kw.hg | \
   >  "$PYTHON" $TESTDIR/unwrap-message-id.py
   pulling from ../kw.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets a2392c293916:ef63ca68695b (2 drafts)
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   MIME-Version: 1.0
   Content-Type: text/plain; charset="us-ascii"
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
   Subject: changeset in...
   From: mercurial
   X-Hg-Notification: changeset a2392c293916
   Message-Id: <hg.a2392c293916*> (glob)
   To: Test
   
   changeset a2392c293916 in $TESTTMP/Test
   details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
   description:
   	addsym
   
   diffs (6 lines):
   
   diff -r 000000000000 -r a2392c293916 sym
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
   @@ -0,0 +1,1 @@
   +a
   \ No newline at end of file
   MIME-Version: 1.0
   Content-Type: text/plain; charset="us-ascii"
   Content-Transfer-Encoding: 7bit
   Date:* (glob)
   Subject: changeset in...
   From: User Name <[e-mail]>
   X-Hg-Notification: changeset ef63ca68695b
   Message-Id: <hg.ef63ca68695b*> (glob)
   To: Test
   
   changeset ef63ca68695b in $TESTTMP/Test
   details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
   description:
   	absym
   
   diffs (12 lines):
   
   diff -r a2392c293916 -r ef63ca68695b a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
   diff -r a2392c293916 -r ef63ca68695b b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ignore $Id$
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
 
 Touch files and check with status
 
   $ touch a b
   $ hg status
 
 Update and expand
 
   $ rm sym a b
   $ hg update -C
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
 
 Check whether expansion is filewise and file mode is preserved
 
   $ echo '$Id$' > c
   $ echo 'tests for different changenodes' >> c
 #if unix-permissions
   $ chmod 600 c
   $ ls -l c | cut -b 1-10
   -rw-------
 #endif
 
 commit file c
 
   $ hg commit -A -mcndiff -d '1 0' -u 'User Name <[e-mail]>'
   adding c
 #if unix-permissions
   $ ls -l c | cut -b 1-10
   -rw-------
 #endif
 
 force expansion
 
   $ hg -v kwexpand
   overwriting a expanding keywords
   overwriting c expanding keywords
 
 compare changenodes in a and c
 
   $ cat a c
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
 
 record
 
   $ echo '$Id$' > r
   $ hg add r
 
 record chunk
 
   >>> lines = open('a', 'rb').readlines()
   >>> lines.insert(1, b'foo\n')
   >>> lines.append(b'bar\n')
   >>> open('a', 'wb').writelines(lines)
   $ hg record -d '10 1' -m rectest a<<EOF
   > y
   > n
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
   @@ -1,3 +1,4 @@
    expand $Id$
   +foo
    do not process $Id:
    xxx $
   record change 1/2 to 'a'?
   (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
   record change 2/2 to 'a'?
   (enter ? for help) [Ynesfdaq?] n
   
 
   $ hg identify
   5f5eb23505c3+ tip
   $ hg status
   M a
   A r
 
 Cat modified file a
 
   $ cat a
   expand $Id: a,v 5f5eb23505c3 1970/01/01 00:00:10 test $
   foo
   do not process $Id:
   xxx $
   bar
 
 Diff remaining chunk
 
   $ hg diff a
   diff -r 5f5eb23505c3 a
   --- a/a	Thu Jan 01 00:00:09 1970 -0000
   +++ b/a	* (glob)
   @@ -2,3 +2,4 @@
    foo
    do not process $Id:
    xxx $
   +bar
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
 
 Record all chunks in file a
 
   $ echo foo > msg
 
  - do not use "hg record -m" here!
 
   $ hg record -l msg -d '11 1' a<<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
   @@ -1,3 +1,4 @@
    expand $Id$
   +foo
    do not process $Id:
    xxx $
   record change 1/2 to 'a'?
   (enter ? for help) [Ynesfdaq?] y
   
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
   record change 2/2 to 'a'?
   (enter ? for help) [Ynesfdaq?] y
   
 
 File a should be clean
 
   $ hg status -A a
   C a
 
 rollback and revert expansion
 
   $ cat a
   expand $Id: a,v 78e0a02d76aa 1970/01/01 00:00:11 test $
   foo
   do not process $Id:
   xxx $
   bar
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting a expanding keywords
   $ hg status a
   M a
   $ cat a
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   foo
   do not process $Id:
   xxx $
   bar
   $ echo '$Id$' > y
   $ echo '$Id$' > z
   $ hg add y
   $ hg commit -Am "rollback only" z
   $ cat z
   $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting z shrinking keywords
 
 Only z should be overwritten
 
   $ hg status a y z
   M a
   A y
   A z
   $ cat z
   $Id$
   $ hg forget y z
   $ rm y z
 
 record added file alone
 
   $ hg -v record -l msg -d '12 2' r<<EOF
   > y
   > y
   > EOF
   diff --git a/r b/r
   new file mode 100644
   @@ -0,0 +1,1 @@
   +$Id$
   record this change to 'r'?
   (enter ? for help) [Ynesfdaq?] y
   
   resolving manifests
   patching file r
   committing files:
   r
   committing manifest
   committing changelog
   committed changeset 3:82a2f715724d
   overwriting r expanding keywords
   $ hg status r
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting r shrinking keywords
   $ hg forget r
   $ rm msg r
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 record added keyword ignored file
 
   $ echo '$Id$' > i
   $ hg add i
   $ hg --verbose record -d '13 1' -m recignored<<EOF
   > y
   > y
   > EOF
   diff --git a/i b/i
   new file mode 100644
   examine changes to 'i'?
   (enter ? for help) [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +$Id$
   record this change to 'i'?
   (enter ? for help) [Ynesfdaq?] y
   
   resolving manifests
   patching file i
   committing files:
   i
   committing manifest
   committing changelog
   committed changeset 3:9f40ceb5a072
   $ cat i
   $Id$
   $ hg -q rollback
   $ hg forget i
   $ rm i
 
 amend
 
   $ echo amend >> a
   $ echo amend >> b
   $ hg -q commit -d '14 1' -m 'prepare amend'
 
   $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords
   overwriting a expanding keywords
   $ hg -q id
   67d8c481a6be
   $ head -1 a
   expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $
 
   $ hg -q strip --no-backup tip
 
 Test patch queue repo
 
   $ hg init --mq
   $ hg qimport -r tip -n mqtest.diff
   $ hg commit --mq -m mqtest
 
 Keywords should not be expanded in patch
 
   $ cat .hg/patches/mqtest.diff
   # HG changeset patch
   # User User Name <[e-mail]>
   # Date 1 0
   #      Thu Jan 01 00:00:01 1970 +0000
   # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
   # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
   cndiff
   
   diff -r ef63ca68695b -r 40a904bbbe4c c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,2 @@
   +$Id$
   +tests for different changenodes
 
   $ hg qpop
   popping mqtest.diff
   patch queue now empty
 
 qgoto, implying qpush, should expand
 
   $ hg qgoto mqtest.diff
   applying mqtest.diff
   now at: mqtest.diff
   $ cat c
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
   $ hg cat c
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
 
 Keywords should not be expanded in filelog
 
   $ hg --config 'extensions.keyword=!' cat c
   $Id$
   tests for different changenodes
 
 qpop and move on
 
   $ hg qpop
   popping mqtest.diff
   patch queue now empty
 
 Copy and show added kwfiles
 
   $ hg cp a c
   $ hg kwfiles
   a
   c
 
 Commit and show expansion in original and copy
 
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <[e-mail]>'
   committing files:
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
   committing manifest
   committing changelog
   overwriting c expanding keywords
   updating the branch cache
   committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
   $ cat a c
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
   do not process $Id:
   xxx $
 
 Touch copied c and check its status
 
   $ touch c
   $ hg status
 
 Copy kwfile to keyword ignored file unexpanding keywords
 
   $ hg --verbose copy a i
   copying a to i
   overwriting i shrinking keywords
   $ head -n 1 i
   expand $Id$
   $ hg forget i
   $ rm i
 
 Copy ignored file to ignored file: no overwriting
 
   $ hg --verbose copy b i
   copying b to i
   $ hg forget i
   $ rm i
 
 cp symlink file; hg cp -A symlink file (part1)
 - copied symlink points to kwfile: overwrite
 
 #if symlink
   $ cp sym i
   $ ls -l i
   -rw-r--r--* (glob)
   $ head -1 i
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg copy --after --verbose sym i
   copying sym to i
   overwriting i shrinking keywords
   $ head -1 i
   expand $Id$
   $ hg forget i
   $ rm i
 #endif
 
 Test different options of hg kwfiles
 
   $ hg kwfiles
   a
   c
   $ hg -v kwfiles --ignore
   I b
   I sym
   $ hg kwfiles --all
   K a
   K c
   I b
   I sym
 
 Diff specific revision
 
   $ hg diff --rev 1
   diff -r ef63ca68695b c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	* (glob)
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
 
 Status after rollback:
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1
   $ hg status
   A c
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 #if symlink
 
 cp symlink file; hg cp -A symlink file (part2)
 - copied symlink points to kw ignored file: do not overwrite
 
   $ cat a > i
   $ ln -s i symignored
   $ hg commit -Am 'fake expansion in ignored and symlink' i symignored
   $ cp symignored x
   $ hg copy --after --verbose symignored x
   copying symignored to x
   $ head -n 1 x
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg forget x
   $ rm x
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm i symignored
 
 #endif
 
 Custom keywordmaps as argument to kwdemo
 
   $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
   [extensions]
   keyword =
   [keyword]
   ** = 
   b = ignore
   demo.txt = 
   i = ignore
   [keywordset]
   svn = False
   [keywordmaps]
   Xinfo = {author}: {desc}
   $Xinfo: test: hg keyword configuration and expansion example $
 
 Configure custom keywordmaps
 
   $ cat <<EOF >>$HGRCPATH
   > [keywordmaps]
   > Id = {file} {node|short} {date|rfc822date} {author|user}
   > Xinfo = {author}: {desc}
   > EOF
 
 Cat and hg cat files before custom expansion
 
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
   do not process $Id:
   xxx $
   ignore $Id$
   a
 
 Write custom keyword and prepare multi-line commit message
 
   $ echo '$Xinfo$' >> a
   $ cat <<EOF >> log
   > firstline
   > secondline
   > EOF
 
 Interrupted commit should not change state
 
   $ hg commit
   abort: empty commit message
   [10]
   $ hg status
   M a
   ? c
   ? log
 
 Commit with multi-line message and custom expansion
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <[e-mail]>'
   committing files:
   a
   committing manifest
   committing changelog
   overwriting a expanding keywords
   updating the branch cache
   committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
   $ rm log
 
 Stat, verify and show custom expansion (firstline)
 
   $ 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:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   a
 
 annotate
 
   $ hg annotate a
   1: expand $Id$
   1: do not process $Id:
   1: xxx $
   2: $Xinfo$
 
 remove with status checks
 
   $ hg debugrebuildstate
   $ hg remove a
   $ hg --debug commit -m rma
   committing files:
   committing manifest
   committing changelog
   updating the branch cache
   committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
   $ hg status
   ? c
 
 Rollback, revert, and check expansion
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   $ hg status
   R a
   ? c
   $ hg revert --no-backup --rev tip a
   $ cat a
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
 Clone to test global and local configurations
 
   $ cd ..
 
 Expansion in destination with global configuration
 
   $ hg --quiet clone Test globalconf
   $ cat globalconf/a
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
 No expansion in destination with local configuration in origin only
 
   $ hg --quiet --config 'keyword.**=ignore' clone Test localconf
   $ cat localconf/a
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
 
 Clone to test incoming
 
   $ hg clone -r1 Test Test-a
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets a2392c293916:ef63ca68695b
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd Test-a
   $ cat <<EOF >> .hg/hgrc
   > [paths]
   > default = ../Test
   > EOF
   $ hg incoming
   comparing with $TESTTMP/Test
   searching for changes
   changeset:   2:bb948857c743
   tag:         tip
   user:        User Name <[e-mail]>
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     firstline
   
 Imported patch should not be rejected
 
   >>> import re
   >>> text = re.sub(br'(Id.*)', br'\1 rejecttest', open('a', 'rb').read())
   >>> open('a', 'wb').write(text) and None
   $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <[e-mail]>'
   committing files:
   a
   committing manifest
   committing changelog
   overwriting a expanding keywords
   updating the branch cache
   committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
   $ hg export -o ../rejecttest.diff tip
   $ cd ../Test
   $ hg import ../rejecttest.diff
   applying ../rejecttest.diff
   $ cat a b
   expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
   do not process $Id: rejecttest
   xxx $
   $Xinfo: User Name <[e-mail]>: rejects? $
   ignore $Id$
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo import)
   working directory now based on revision 2
   $ hg update --clean
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 kwexpand/kwshrink on selected files
 
   $ mkdir x
   $ hg copy a x/a
   $ hg --verbose kwshrink a
   overwriting a shrinking keywords
  - sleep required for dirstate.normal() check
   $ sleep 1
   $ hg status a
   $ hg --verbose kwexpand a
   overwriting a expanding keywords
   $ hg status a
 
 kwexpand x/a should abort
 
   $ hg --verbose kwexpand x/a
   abort: outstanding uncommitted changes
   [255]
   $ cd x
   $ hg --debug commit -m xa -d '3 0' -u 'User Name <[e-mail]>'
   committing files:
   x/a
    x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
   committing manifest
   committing changelog
   overwriting x/a expanding keywords
   updating the branch cache
   committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
   $ cat a
   expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: xa $
 
 kwshrink a inside directory x
 
   $ hg --verbose kwshrink a
   overwriting x/a shrinking keywords
   $ cat a
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   $ cd ..
 
 kwexpand nonexistent
 
   $ hg kwexpand nonexistent
   nonexistent:* (glob)
 
 
 #if serve
 hg serve
  - expand with hgweb file
  - no expansion with hgweb annotate/changeset/filediff/comparison
  - expand with hgweb file, again
  - check errors
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ get-with-headers.py localhost:$HGPORT 'file/tip/a/?style=raw'
   200 Script output follows
   
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   $ get-with-headers.py localhost:$HGPORT 'annotate/tip/a/?style=raw'
   200 Script output follows
   
   
   user@1: expand $Id$
   user@1: do not process $Id:
   user@1: xxx $
   user@2: $Xinfo$
   
   
   
   
   $ get-with-headers.py localhost:$HGPORT 'rev/tip/?style=raw'
   200 Script output follows
   
   
   # HG changeset patch
   # User User Name <[e-mail]>
   # Date 3 0
   # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
   # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
   xa
   
   diff -r bb948857c743 -r b4560182a3f9 x/a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,4 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
   +$Xinfo$
   
   $ get-with-headers.py localhost:$HGPORT 'diff/bb948857c743/a?style=raw'
   200 Script output follows
   
   
   diff -r ef63ca68695b -r bb948857c743 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:02 1970 +0000
   @@ -1,3 +1,4 @@
    expand $Id$
    do not process $Id:
    xxx $
   +$Xinfo$
   
   
   
   
   $ get-with-headers.py localhost:$HGPORT 'comparison/bb948857c743/a' | grep '\$[a-zA-Z]'
   <td class="source equal"><a href="#l1r1">     1</a> expand $Id$</td>
   <td class="source equal"><a href="#l1r1">     1</a> expand $Id$</td>
   <td class="source equal"><a href="#l2r2">     2</a> do not process $Id:</td>
   <td class="source equal"><a href="#l2r2">     2</a> do not process $Id:</td>
   <td class="source insert"><a href="#r4">     4</a> $Xinfo$</td>
 
 (check "kwweb_skip"-ed webcommand doesn't suppress expanding keywords
 at subsequent webcommands)
 
   $ get-with-headers.py localhost:$HGPORT 'file/tip/a/?style=raw'
   200 Script output follows
   
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
   $ killdaemons.py
   $ cat errors.log
 #endif
 
 Prepare merge and resolve tests
 
   $ echo '$Id$' > m
   $ hg add m
   $ hg commit -m 4kw
   $ echo foo >> m
   $ hg commit -m 5foo
 
 simplemerge
 
   $ hg update 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo >> m
   $ hg commit -m 6foo
   created new head
   $ hg merge
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m simplemerge
   $ cat m
   $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
   foo
 
 conflict: keyword should stay outside conflict zone
 
   $ hg update 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar >> m
   $ hg commit -m 8bar
   created new head
   $ hg merge
   merging m
   warning: conflicts while merging m! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ cat m
   $Id$
   <<<<<<< working copy: 88a80c8d172e - test: 8bar
   bar
   =======
   foo
   >>>>>>> merge rev:    85d2d2d732a5 - test: simplemerge
 
 resolve to local, m must contain hash of last change (local parent)
 
   $ hg resolve -t internal:local -a
   (no more unresolved files)
   $ hg commit -m localresolve
   $ cat m
   $Id: m 88a80c8d172e Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
 
 Test restricted mode with transplant -b
 
   $ hg update 6
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ mv a a.bak
   $ echo foobranch > a
   $ cat a.bak >> a
   $ rm a.bak
   $ hg commit -m 9foobranch
   $ hg update default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -y transplant -b foo tip
   applying 4aa30d025d50
   4aa30d025d50 transplanted to e00abbf63521
 
 Expansion in changeset but not in file
 
   $ hg tip -p
   changeset:   11:e00abbf63521
   tag:         tip
   parent:      9:800511b3a22d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9foobranch
   
   diff -r 800511b3a22d -r e00abbf63521 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
   
   $ head -n 2 a
   foobranch
   expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $
 
 Turn off expansion
 
   $ hg -q rollback
   $ hg -q update -C
 
 kwshrink with unknown file u
 
   $ cp a u
   $ hg --verbose kwshrink
   overwriting a shrinking keywords
   overwriting m shrinking keywords
   overwriting x/a shrinking keywords
 
 Keywords shrunk in working directory, but not yet disabled
  - cat shows unexpanded keywords
  - hg cat shows expanded keywords
 
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   a
 
 Now disable keyword expansion
 
   $ cp $HGRCPATH $HGRCPATH.backup
   $ rm "$HGRCPATH"
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   a
 
 enable keyword expansion again
 
   $ cat $HGRCPATH.backup >> $HGRCPATH
 
 Test restricted mode with unshelve
 
   $ echo xxxx >> a
   $ hg diff
   diff -r 800511b3a22d a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* (glob)
   @@ -2,3 +2,4 @@
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
   $ hg shelve -q --name tmp
   $ hg shelve --list --patch
   tmp             (*)* changes to: localresolve (glob)
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -2,3 +2,4 @@
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
 
   $ hg update -q -C 10
   $ hg unshelve -q tmp
   $ hg diff
   diff -r 4aa30d025d50 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* (glob)
   @@ -3,3 +3,4 @@
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
 
 Test restricted mode with rebase
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > rebase =
   > EOF
 
   $ hg update -q -C 9
 
   $ echo xxxx >> a
   $ hg commit -m '#11'
   $ hg diff -c 11
   diff -r 800511b3a22d -r b07670694489 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -2,3 +2,4 @@
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
 
   $ hg diff -c 10
   diff -r 27d48ee14f67 -r 4aa30d025d50 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
 
   $ hg rebase -q -s 10 -d 11 --keep
   $ hg diff -r 9 -r 12 a
   diff -r 800511b3a22d -r 1939b927726c a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +1,6 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
 
 Test restricted mode with graft
 
   $ hg graft -q 10
   $ hg diff -r 9 -r 13 a
   diff -r 800511b3a22d -r 01a68de1003a a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +1,6 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
 
 Test restricted mode with backout
 
   $ hg backout -q 11 --no-commit
   $ hg diff a
   diff -r 01a68de1003a a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* (glob)
   @@ -3,4 +3,3 @@
    do not process $Id:
    xxx $
    $Xinfo$
   -xxxx
 
 Test restricted mode with histedit
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > histedit =
   > EOF
 
   $ hg commit -m 'backout #11'
   $ hg histedit -q --command - 13 <<EOF
   > pick 49f5f2d940c3 14 backout #11
   > pick 01a68de1003a 13 9foobranch
   > EOF
 
 Test restricted mode with fetch (with merge)
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > fetch =
   > EOF
 
   $ hg clone -q -r 9 . ../fetch-merge
   $ cd ../fetch-merge
   $ hg -R ../Test export 10 | hg import -q -
   $ hg fetch -q -r 11
   $ hg diff -r 9 a
   diff -r 800511b3a22d a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* (glob)
   @@ -1,4 +1,6 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
    $Xinfo$
   +xxxx
 
 Test that patch.diff(), which is implied by "hg diff" or so, doesn't
 suppress expanding keywords at subsequent commands
 
 #if windows
   $ PYTHONPATH="$TESTDIR/../contrib;$PYTHONPATH"
 #else
   $ PYTHONPATH="$TESTDIR/../contrib:$PYTHONPATH"
 #endif
   $ export PYTHONPATH
 
   $ grep -v '^promptecho ' < $HGRCPATH >> $HGRCPATH.new
   $ mv $HGRCPATH.new $HGRCPATH
 
   >>> from hgclient import check, readchannel, runcommand
   >>> @check
   ... def check(server):
   ...     # hello block
   ...     readchannel(server)
   ... 
   ...     runcommand(server, [b'cat', b'm'])
   ...     runcommand(server, [b'diff', b'-c', b'.', b'm'])
   ...     runcommand(server, [b'cat', b'm'])
   *** runcommand cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
   *** runcommand diff -c . m
   *** runcommand cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
 
   $ cd ..
 
 #if serve
 
 Test that keywords are expanded only in repositories, which enable
 keyword extension, even if multiple repositories are served in a
 process
 
   $ cat >> fetch-merge/.hg/hgrc <<EOF
   > [extensions]
   > keyword = !
   > EOF
 
   $ cat > paths.conf <<EOF
   > [paths]
   > enabled=Test
   > disabled=fetch-merge
   > EOF
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log --webdir-conf paths.conf
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ get-with-headers.py localhost:$HGPORT 'enabled/file/tip/m/?style=raw'
   200 Script output follows
   
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
 
   $ get-with-headers.py localhost:$HGPORT 'disabled/file/tip/m/?style=raw'
   200 Script output follows
   
   $Id$
   bar
 
 (check expansion again, for safety)
 
   $ get-with-headers.py localhost:$HGPORT 'enabled/file/tip/m/?style=raw'
   200 Script output follows
   
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
 
   $ killdaemons.py
 #endif

tests/test-largefiles-wireproto.t

@@ -1,442 +1,414
 This file contains testcases that tend to be related to the wire protocol part
 of largefiles.
 
   $ USERCACHE="$TESTTMP/cache"; export USERCACHE
   $ mkdir "${USERCACHE}"
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > largefiles=
   > purge=
   > rebase=
   > transplant=
   > [phases]
   > publish=False
   > [largefiles]
   > minsize=2
   > patterns=glob:**.dat
   > usercache=${USERCACHE}
   > [web]
   > allow-archive = zip
   > [hooks]
   > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
   > EOF
 
 
 #if serve
 vanilla clients not locked out from largefiles servers on vanilla repos
   $ mkdir r1
   $ cd r1
   $ hg init
   $ echo c1 > f1
   $ hg add f1
   $ hg commit -m "m1"
   Invoking status precommit hook
   A f1
   $ cd ..
   $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets b6eb3a2e2efe (1 drafts)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 largefiles clients still work with vanilla servers
   $ hg serve --config extensions.largefiles=! -R r1 -d -p $HGPORT1 --pid-file hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT1 r3
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets b6eb3a2e2efe (1 drafts)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #endif
 
 vanilla clients locked out from largefiles http repos
   $ mkdir r4
   $ cd r4
   $ hg init
   $ echo c1 > f1
   $ hg add --large f1
   $ hg commit -m "m1"
   Invoking status precommit hook
   A f1
   $ cd ..
 
 largefiles can be pushed locally (issue3583)
   $ hg init dest
   $ cd r4
   $ hg outgoing ../dest
   comparing with ../dest
   searching for changes
   changeset:   0:639881c12b4c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     m1
   
   $ hg push ../dest
   pushing to ../dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 exit code with nothing outgoing (issue3611)
   $ hg outgoing ../dest
   comparing with ../dest
   searching for changes
   no changes found
   [1]
   $ cd ..
 
 #if serve
   $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
   abort: remote error:
   
   This repository uses the largefiles extension.
   
   Please enable it in your Mercurial config file.
   [100]
 
 used all HGPORTs, kill all daemons
   $ killdaemons.py
 #endif
 
 vanilla clients locked out from largefiles ssh repos
   $ hg --config extensions.largefiles=! clone ssh://user@dummy/r4 r5
   remote: 
   remote: This repository uses the largefiles extension.
   remote: 
   remote: Please enable it in your Mercurial config file.
   remote: 
   remote: -
   abort: remote error
   (check previous remote output)
   [100]
 
 #if serve
 
 largefiles clients refuse to push largefiles repos to vanilla servers
   $ mkdir r6
   $ cd r6
   $ hg init
   $ echo c1 > f1
   $ hg add f1
   $ hg commit -m "m1"
   Invoking status precommit hook
   A f1
   $ cat >> .hg/hgrc <<!
   > [web]
   > push_ssl = false
   > allow_push = *
   > !
   $ cd ..
   $ hg clone r6 r7
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd r7
   $ echo c2 > f2
   $ hg add --large f2
   $ 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
   pushing to http://localhost:$HGPORT/
   searching for changes
   abort: http://localhost:$HGPORT/ does not appear to be a largefile store
   [255]
   $ cd ..
 
 putlfile errors are shown (issue3123)
 Corrupt the cached largefile in r7 and move it out of the servers usercache
   $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 .
   $ echo 'client side corruption' > r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
   $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
   $ hg init empty
   $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
   >   --config 'web.allow_push=*' --config web.push_ssl=False
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg push -R r7 http://localhost:$HGPORT1
   pushing to http://localhost:$HGPORT1/
   searching for changes
   remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
   abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/
   [255]
   $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
 Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
   $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
   $ hg push -R r7 http://localhost:$HGPORT1
   pushing to http://localhost:$HGPORT1/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
   $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
   server side corruption
   $ rm -rf empty
 
 Push a largefiles repository to a served empty repository
   $ hg init r8
   $ echo c3 > r8/f1
   $ hg add --large r8/f1 -R r8
   $ hg commit -m "m1" -R r8
   Invoking status precommit hook
   A f1
   $ hg init empty
   $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
   >   --config 'web.allow_push=*' --config web.push_ssl=False
   $ cat hg.pid >> $DAEMON_PIDS
   $ rm "${USERCACHE}"/*
   $ hg push -R r8 http://localhost:$HGPORT2/#default
   pushing to http://localhost:$HGPORT2/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
   $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
 
 Clone over http, no largefiles pulled on clone.
 
   $ hg clone http://localhost:$HGPORT2/#default http-clone -U
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets cf03e5bb9936 (1 drafts)
 
 Archive contains largefiles
   >>> import os
   >>> from mercurial import urllibcompat
   >>> u = 'http://localhost:%s/archive/default.zip' % os.environ['HGPORT2']
   >>> with open('archive.zip', 'wb') as f:
   ...     f.write(urllibcompat.urlreq.urlopen(u).read()) and None
   $ unzip -t archive.zip
   Archive:  archive.zip
       testing: empty-default/.hg_archival.txt*OK (glob)
       testing: empty-default/f1*OK (glob)
   No errors detected in compressed data of archive.zip.
 
 test 'verify' with remotestore:
 
   $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90
   $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
   $ hg -R http-clone verify --large --lfa
   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
   changeset 0:cf03e5bb9936: f1 missing
   verified existence of 1 revisions of 1 largefiles
   [1]
   $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
   $ hg -R http-clone -q verify --large --lfa
 
 largefiles pulled on update - a largefile missing on the server:
   $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
   $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
   getting changed largefiles
   f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R http-clone st
   ! f1
   $ hg -R http-clone up -Cqr null
 
 largefiles pulled on update - a largefile corrupted on the server:
   $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90
   $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
   getting changed largefiles
   f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R http-clone st
   ! f1
   $ [ ! -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:
   $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
   $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache --config progress.debug=true
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
    .hglf/f1: remote created -> g
   getting .hglf/f1
   updating: .hglf/f1 1/1 files (100.00%)
   getting changed largefiles
   using http://localhost:$HGPORT2/
   sending capabilities command
   sending statlfile command
   getting largefiles: 0/1 files (0.00%)
   getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90
   sending getlfile command
   found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store
   1 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ ls http-clone-usercache/*
   http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90
 
   $ rm -rf empty http-clone*
 
 used all HGPORTs, kill all daemons
   $ killdaemons.py
 
 largefiles should batch verify remote calls
 
   $ hg init batchverifymain
   $ cd batchverifymain
   $ echo "aaa" >> a
   $ hg add --large a
   $ hg commit -m "a"
   Invoking status precommit hook
   A a
   $ echo "bbb" >> b
   $ hg add --large b
   $ hg commit -m "b"
   Invoking status precommit hook
   A b
   $ cd ..
   $ hg serve -R batchverifymain -d -p $HGPORT --pid-file hg.pid \
   > -A access.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ hg clone --noupdate http://localhost:$HGPORT batchverifyclone
   requesting all changes
   adding changesets
   adding manifests
   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
   getting changed largefiles
   2 largefiles updated, 0 removed
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Clear log file before next test
 
   $ printf "" > access.log
 
 Verify should check file on remote server only when file is not
 available locally.
 
   $ echo "ccc" >> batchverifymain/c
   $ hg -R batchverifymain status
   ? c
   $ hg -R batchverifymain add --large batchverifymain/c
   $ hg -R batchverifymain commit -m "c"
   Invoking status precommit hook
   A c
   $ hg -R batchverifyclone pull
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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)
 
   $ killdaemons.py
 
 largefiles should not ask for password again after successful authorization
 
   $ hg init credentialmain
   $ cd credentialmain
   $ echo "aaa" >> a
   $ hg add --large a
   $ hg commit -m "a"
   Invoking status precommit hook
   A a
 
 Before running server clear the user cache to force clone to download
 a large file from the server rather than to get it from the cache
 
   $ rm "${USERCACHE}"/*
 
   $ cd ..
 
   $ hg serve --config extensions.x=$TESTDIR/httpserverauth.py -R credentialmain \
   >          -d -p $HGPORT --pid-file hg.pid -A access.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cat << EOF > get_pass.py
   > from mercurial import util
   > def newgetpass():
   >   return "pass"
   > util.get_password = newgetpass
   > EOF
   $ hg clone --config ui.interactive=true --config extensions.getpass=get_pass.py \
   >          http://user@localhost:$HGPORT credentialclone
   http authorization required for http://localhost:$HGPORT/
   realm: mercurial
   user: user
   password: requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 567253b0f523 (1 drafts)
   updating to branch default
   getting changed largefiles
   1 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ killdaemons.py
   $ rm hg.pid access.log
 
 #endif

tests/test-largefiles.t

@@ -1,1892 +1,1878
 This file used to contains all largefile tests.
 Do not add any new tests in this file as it his already far too long to run.
 
 It contains all the testing of the basic concepts of large file in a single block.
 
   $ USERCACHE="$TESTTMP/cache"; export USERCACHE
   $ mkdir "${USERCACHE}"
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > largefiles=
   > purge=
   > rebase=
   > transplant=
   > [phases]
   > publish=False
   > [largefiles]
   > minsize=2
   > patterns=glob:**.dat
   > usercache=${USERCACHE}
   > [hooks]
   > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
   > EOF
 
 Create the repo with a couple of revisions of both large and normal
 files.
 Test status and dirstate of largefiles and that summary output is correct.
 
   $ hg init a
   $ cd a
   $ mkdir sub
   $ echo normal1 > normal1
   $ echo normal2 > sub/normal2
   $ echo large1 > large1
   $ echo large2 > sub/large2
   $ hg add normal1 sub/normal2
   $ hg add --large large1 sub/large2
   $ hg commit -m "add files"
   Invoking status precommit hook
   A large1
   A normal1
   A sub/large2
   A sub/normal2
   $ touch large1 sub/large2
   $ sleep 1
   $ hg st
   $ hg debugstate --no-dates
   n 644         41 set                 .hglf/large1
   n 644         41 set                 .hglf/sub/large2
   n 644          8 set                 normal1
   n 644          8 set                 sub/normal2
   $ hg debugstate --large --no-dates
   n 644          7 set                 large1
   n 644          7 set                 sub/large2
   $ echo normal11 > normal1
   $ echo normal22 > sub/normal2
   $ echo large11 > large1
   $ echo large22 > sub/large2
   $ hg commit -m "edit files"
   Invoking status precommit hook
   M large1
   M normal1
   M sub/large2
   M sub/normal2
   $ hg sum --large
   parent: 1:ce8896473775 tip
    edit files
   branch: default
   commit: (clean)
   update: (current)
   phases: 2 draft
   largefiles: (no remote repo)
 
 Commit preserved largefile contents.
 
   $ cat normal1
   normal11
   $ cat large1
   large11
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
 
 Test status, subdir and unknown files
 
   $ echo unknown > sub/unknown
   $ hg st --all
   ? sub/unknown
   C large1
   C normal1
   C sub/large2
   C sub/normal2
   $ hg st --all sub
   ? sub/unknown
   C sub/large2
   C sub/normal2
   $ rm sub/unknown
 
 Test messages and exit codes for remove warning cases
 
   $ hg remove -A large1
   not removing large1: file still exists
   [1]
   $ echo 'modified' > large1
   $ hg remove large1
   not removing large1: file is modified (use -f to force removal)
   [1]
   $ echo 'new' > normalnew
   $ hg add normalnew
   $ echo 'new' > largenew
   $ hg add --large normalnew
   normalnew already tracked!
   $ hg remove normalnew largenew
   not removing largenew: file is untracked
   not removing normalnew: file has been marked for add (use 'hg forget' to undo add)
   [1]
   $ rm normalnew largenew
   $ hg up -Cq
 
 Remove both largefiles and normal files.
 
   $ hg remove normal1 large1
   $ hg status large1
   R large1
   $ hg commit -m "remove files"
   Invoking status precommit hook
   R large1
   R normal1
   $ ls -A
   .hg
   .hglf
   sub
   $ echo "testlargefile" > large1-test
   $ hg add --large large1-test
   $ hg st
   A large1-test
   $ hg rm large1-test
   not removing large1-test: file has been marked for add (use forget to undo)
   [1]
   $ hg st
   A large1-test
   $ hg forget large1-test
   $ hg st
   ? large1-test
   $ hg remove large1-test
   not removing large1-test: file is untracked
   [1]
   $ hg forget large1-test
   not removing large1-test: file is already untracked
   [1]
   $ rm large1-test
 
 Copy both largefiles and normal files (testing that status output is correct).
 
   $ hg cp sub/normal2 normal1
   $ hg cp sub/large2 large1
   $ hg commit -m "copy files"
   Invoking status precommit hook
   A large1
   A normal1
   $ cat normal1
   normal22
   $ cat large1
   large22
 
 Test moving largefiles and verify that normal files are also unaffected.
 
   $ hg mv normal1 normal3
   $ hg mv large1 large3
   $ hg mv sub/normal2 sub/normal4
   $ hg mv sub/large2 sub/large4
   $ hg commit -m "move files"
   Invoking status precommit hook
   A large3
   A normal3
   A sub/large4
   A sub/normal4
   R large1
   R normal1
   R sub/large2
   R sub/normal2
   $ cat normal3
   normal22
   $ cat large3
   large22
   $ cat sub/normal4
   normal22
   $ cat sub/large4
   large22
 
 
 #if serve
 Test display of largefiles in hgweb
 
   $ hg serve -d -p $HGPORT --pid-file ../hg.pid
   $ cat ../hg.pid >> $DAEMON_PIDS
   $ get-with-headers.py $LOCALIP:$HGPORT 'file/tip/?style=raw'
   200 Script output follows
   
   
   drwxr-xr-x sub
   -rw-r--r-- 41 large3
   -rw-r--r-- 9 normal3
   
   
   $ get-with-headers.py $LOCALIP:$HGPORT 'file/tip/sub/?style=raw'
   200 Script output follows
   
   
   -rw-r--r-- 41 large4
   -rw-r--r-- 9 normal4
   
   
   $ killdaemons.py
 #endif
 
 Test largefiles can be loaded in hgweb (wrapcommand() shouldn't fail)
 
   $ cat <<EOF > "$TESTTMP/hgweb.cgi"
   > #!$PYTHON
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
   > application = hgweb(b'.', b'test repo')
   > wsgicgi.launch(application)
   > EOF
   $ . "$TESTDIR/cgienv"
 
   $ SCRIPT_NAME='' \
   > "$PYTHON" "$TESTTMP/hgweb.cgi" > /dev/null
 
 Test archiving the various revisions.  These hit corner cases known with
 archiving.
 
   $ hg archive -r 0 ../archive0
   $ hg archive -r 1 ../archive1
   $ hg archive -r 2 ../archive2
   $ hg archive -r 3 ../archive3
   $ hg archive -r 4 ../archive4
   $ cd ../archive0
   $ cat normal1
   normal1
   $ cat large1
   large1
   $ cat sub/normal2
   normal2
   $ cat sub/large2
   large2
   $ cd ../archive1
   $ cat normal1
   normal11
   $ cat large1
   large11
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
   $ cd ../archive2
   $ ls -A
   .hg_archival.txt
   sub
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
   $ cd ../archive3
   $ cat normal1
   normal22
   $ cat large1
   large22
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
   $ cd ../archive4
   $ cat normal3
   normal22
   $ cat large3
   large22
   $ cat sub/normal4
   normal22
   $ cat sub/large4
   large22
 
 Commit corner case: specify files to commit.
 
   $ cd ../a
   $ echo normal3 > normal3
   $ echo large3 > large3
   $ echo normal4 > sub/normal4
   $ echo large4 > sub/large4
   $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
   Invoking status precommit hook
   M large3
   M normal3
   M sub/large4
   M sub/normal4
   $ cat normal3
   normal3
   $ cat large3
   large3
   $ cat sub/normal4
   normal4
   $ cat sub/large4
   large4
 
 One more commit corner case: commit from a subdirectory.
 
   $ cd ../a
   $ echo normal33 > normal3
   $ echo large33 > large3
   $ echo normal44 > sub/normal4
   $ echo large44 > sub/large4
   $ cd sub
   $ hg commit -m "edit files yet again"
   Invoking status precommit hook
   M large3
   M normal3
   M sub/large4
   M sub/normal4
   $ cat ../normal3
   normal33
   $ cat ../large3
   large33
   $ cat normal4
   normal44
   $ cat large4
   large44
 
 Committing standins is not allowed.
 
   $ cd ..
   $ echo large3 > large3
   $ hg commit .hglf/large3 -m "try to commit standin"
   abort: file ".hglf/large3" is a largefile standin
   (commit the largefile itself instead)
   [255]
 
 Corner cases for adding largefiles.
 
   $ echo large5 > large5
   $ hg add --large large5
   $ hg add --large large5
   large5 already a largefile
   $ mkdir sub2
   $ echo large6 > sub2/large6
   $ echo large7 > sub2/large7
   $ hg add --large sub2
   adding sub2/large6 as a largefile
   adding sub2/large7 as a largefile
   $ hg st
   M large3
   A large5
   A sub2/large6
   A sub2/large7
 
 Committing directories containing only largefiles.
 
   $ mkdir -p z/y/x/m
   $ touch z/y/x/m/large1
   $ touch z/y/x/large2
   $ hg add --large z/y/x/m/large1 z/y/x/large2
   $ hg commit -m "Subdir with directory only containing largefiles" z
   Invoking status precommit hook
   M large3
   A large5
   A sub2/large6
   A sub2/large7
   A z/y/x/large2
   A z/y/x/m/large1
 
 (and a bit of log testing)
 
   $ hg log -T '{rev}\n' z/y/x/m/large1
   7
   $ hg log -T '{rev}\n' z/y/x/m  # with only a largefile
   7
 
   $ hg rollback --quiet
   $ touch z/y/x/m/normal
   $ hg add z/y/x/m/normal
   $ hg commit -m "Subdir with mixed contents" z
   Invoking status precommit hook
   M large3
   A large5
   A sub2/large6
   A sub2/large7
   A z/y/x/large2
   A z/y/x/m/large1
   A z/y/x/m/normal
   $ hg st
   M large3
   A large5
   A sub2/large6
   A sub2/large7
   $ hg rollback --quiet
   $ hg revert z/y/x/large2 z/y/x/m/large1
   $ rm z/y/x/large2 z/y/x/m/large1
   $ hg commit -m "Subdir with normal contents" z
   Invoking status precommit hook
   M large3
   A large5
   A sub2/large6
   A sub2/large7
   A z/y/x/m/normal
   $ hg st
   M large3
   A large5
   A sub2/large6
   A sub2/large7
   $ hg rollback --quiet
   $ hg revert --quiet z
   $ hg commit -m "Empty subdir" z
   abort: z: no match under directory!
   [10]
   $ rm -rf z
   $ hg ci -m "standin" .hglf
   abort: file ".hglf" is a largefile standin
   (commit the largefile itself instead)
   [255]
 
 Test "hg status" with combination of 'file pattern' and 'directory
 pattern' for largefiles:
 
   $ hg status sub2/large6 sub2
   A sub2/large6
   A sub2/large7
 
 Config settings (pattern **.dat, minsize 2 MB) are respected.
 
   $ echo testdata > test.dat
   $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
   $ hg add
   adding reallylarge as a largefile
   adding test.dat as a largefile
 
 Test that minsize and --lfsize handle float values;
 also tests that --lfsize overrides largefiles.minsize.
 (0.250 MB = 256 kB = 262144 B)
 
   $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
   $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
   $ hg --config largefiles.minsize=.25 add
   adding ratherlarge as a largefile
   adding medium
   $ hg forget medium
   $ hg --config largefiles.minsize=.25 add --lfsize=.125
   adding medium as a largefile
   $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
   $ hg --config largefiles.minsize=.25 add --lfsize=.125
   adding notlarge
   $ hg forget notlarge
 
 Test forget on largefiles.
 
   $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
   $ hg commit -m "add/edit more largefiles"
   Invoking status precommit hook
   A sub2/large6
   A sub2/large7
   R large3
   ? large5
   ? medium
   ? notlarge
   ? ratherlarge
   ? reallylarge
   ? test.dat
   $ hg st
   ? large3
   ? large5
   ? medium
   ? notlarge
   ? ratherlarge
   ? reallylarge
   ? test.dat
 
 Purge with largefiles: verify that largefiles are still in the working
 dir after a purge.
 
   $ hg purge --all
   $ cat sub/large4
   large44
   $ cat sub2/large6
   large6
   $ cat sub2/large7
   large7
 
 Test addremove: verify that files that should be added as largefiles are added as
 such and that already-existing largefiles are not added as normal files by
 accident.
 
   $ rm normal3
   $ rm sub/large4
   $ echo "testing addremove with patterns" > testaddremove.dat
   $ echo "normaladdremove" > normaladdremove
   $ hg addremove
   removing sub/large4
   adding testaddremove.dat as a largefile
   removing normal3
   adding normaladdremove
 
 Test addremove with -R
 
   $ hg up -C
   getting changed largefiles
   1 largefiles updated, 0 removed
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm normal3
   $ rm sub/large4
   $ echo "testing addremove with patterns" > testaddremove.dat
   $ echo "normaladdremove" > normaladdremove
   $ cd ..
   $ hg -R a -v addremove
   removing sub/large4
   adding testaddremove.dat as a largefile
   removing normal3
   adding normaladdremove
   $ cd a
 
 Test 3364
   $ hg clone . ../addrm
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../addrm
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
   > EOF
   $ touch foo
   $ hg add --large foo
   $ hg ci -m "add foo"
   Invoking status precommit hook
   A foo
   Invoking status postcommit hook
   C foo
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   $ rm foo
   $ hg st
   ! foo
 hmm.. no precommit invoked, but there is a postcommit??
   $ hg ci -m "will not checkin"
   nothing changed (1 missing files, see 'hg status')
   Invoking status postcommit hook
   ! foo
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   [1]
   $ hg addremove
   removing foo
   $ hg st
   R foo
   $ hg ci -m "used to say nothing changed"
   Invoking status precommit hook
   R foo
   Invoking status postcommit hook
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   $ hg st
 
 Test 3507 (both normal files and largefiles were a problem)
 
   $ touch normal
   $ touch large
   $ hg add normal
   $ hg add --large large
   $ hg ci -m "added"
   Invoking status precommit hook
   A large
   A normal
   Invoking status postcommit hook
   C large
   C normal
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   $ hg remove normal
   $ hg addremove --traceback
   $ hg ci -m "addremoved normal"
   Invoking status precommit hook
   R normal
   Invoking status postcommit hook
   C large
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   $ hg up -C '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg remove large
   $ hg addremove --traceback
   $ hg ci -m "removed large"
   Invoking status precommit hook
   R large
   created new head
   Invoking status postcommit hook
   C normal
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
 
 Test commit -A (issue3542)
   $ echo large8 > large8
   $ hg add --large large8
   $ hg ci -Am 'this used to add large8 as normal and commit both'
   Invoking status precommit hook
   A large8
   Invoking status postcommit hook
   C large8
   C normal
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   $ rm large8
   $ hg ci -Am 'this used to not notice the rm'
   removing large8
   Invoking status precommit hook
   R large8
   Invoking status postcommit hook
   C normal
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
 
 Test that a standin can't be added as a large file
 
   $ touch large
   $ hg add --large large
   $ hg ci -m "add"
   Invoking status precommit hook
   A large
   Invoking status postcommit hook
   C large
   C normal
   C normal3
   C sub/large4
   C sub/normal4
   C sub2/large6
   C sub2/large7
   $ hg remove large
   $ touch large
   $ hg addremove --config largefiles.patterns=**large --traceback
   adding large as a largefile
 
 Test that outgoing --large works (with revsets too)
   $ hg outgoing --rev '.^' --large
   comparing with $TESTTMP/a
   searching for changes
   changeset:   8:c02fd3b77ec4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   changeset:   9:289dd08c9bbb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     used to say nothing changed
   
   changeset:   10:34f23ac6ac12
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added
   
   changeset:   12:710c1b2f523c
   parent:      10:34f23ac6ac12
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     removed large
   
   changeset:   13:0a3e75774479
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     this used to add large8 as normal and commit both
   
   changeset:   14:84f3d378175c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     this used to not notice the rm
   
   largefiles to upload (1 entities):
   large8
   
   $ cd ../a
 
 Clone a largefiles repo.
 
   $ hg clone . ../b
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../b
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal3
   normal33
 
 Test graph log
 
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n'
   @  7:daea875e9014  add/edit more largefiles
   |
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   |
   o  3:9e8fbc4bce62  copy files
   |
   o  2:51a0ae4d5864  remove files
   |
   o  1:ce8896473775  edit files
   |
   o  0:30d30fe6a5be  add files
   
 
 Test log with --patch
 
   $ hg log --patch -r 6::7
   changeset:   6:4355d653f84f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files yet again
   
   diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3
   --- a/.hglf/large3	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/large3	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -baaf12afde9d8d67f25dab6dced0d2bf77dba47c
   +7838695e10da2bb75ac1156565f40a2595fa2fa0
   diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
   --- a/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -aeb2210d19f02886dde00dac279729a48471e2f9
   +971fb41e78fea4f8e0ba5244784239371cb00591
   diff -r 9d5af5072dbd -r 4355d653f84f normal3
   --- a/normal3	Thu Jan 01 00:00:00 1970 +0000
   +++ b/normal3	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -normal3
   +normal33
   diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
   --- a/sub/normal4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/sub/normal4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -normal4
   +normal44
   
   changeset:   7:daea875e9014
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add/edit more largefiles
   
   diff -r 4355d653f84f -r daea875e9014 .hglf/large3
   --- a/.hglf/large3	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -7838695e10da2bb75ac1156565f40a2595fa2fa0
   diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub2/large6	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30
   diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub2/large7	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +bb3151689acb10f0c3125c560d5e63df914bc1af
   
 
   $ hg log --patch -r 6::7 sub/
   changeset:   6:4355d653f84f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files yet again
   
   diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
   --- a/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -aeb2210d19f02886dde00dac279729a48471e2f9
   +971fb41e78fea4f8e0ba5244784239371cb00591
   diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
   --- a/sub/normal4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/sub/normal4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -normal4
   +normal44
   
 
 log with both --follow and --patch
 
   $ hg log --follow --patch --limit 2
   changeset:   7:daea875e9014
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add/edit more largefiles
   
   diff -r 4355d653f84f -r daea875e9014 .hglf/large3
   --- a/.hglf/large3	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -7838695e10da2bb75ac1156565f40a2595fa2fa0
   diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub2/large6	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30
   diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub2/large7	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +bb3151689acb10f0c3125c560d5e63df914bc1af
   
   changeset:   6:4355d653f84f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files yet again
   
   diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3
   --- a/.hglf/large3	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/large3	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -baaf12afde9d8d67f25dab6dced0d2bf77dba47c
   +7838695e10da2bb75ac1156565f40a2595fa2fa0
   diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
   --- a/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -aeb2210d19f02886dde00dac279729a48471e2f9
   +971fb41e78fea4f8e0ba5244784239371cb00591
   diff -r 9d5af5072dbd -r 4355d653f84f normal3
   --- a/normal3	Thu Jan 01 00:00:00 1970 +0000
   +++ b/normal3	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -normal3
   +normal33
   diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
   --- a/sub/normal4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/sub/normal4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -normal4
   +normal44
   
   $ hg log --follow --patch sub/large4
   changeset:   6:4355d653f84f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files yet again
   
   diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
   --- a/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -aeb2210d19f02886dde00dac279729a48471e2f9
   +971fb41e78fea4f8e0ba5244784239371cb00591
   
   changeset:   5:9d5af5072dbd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files again
   
   diff -r 74c02385b94c -r 9d5af5072dbd .hglf/sub/large4
   --- a/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   +aeb2210d19f02886dde00dac279729a48471e2f9
   
   changeset:   4:74c02385b94c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     move files
   
   diff -r 9e8fbc4bce62 -r 74c02385b94c .hglf/sub/large4
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large4	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   
   changeset:   1:ce8896473775
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     edit files
   
   diff -r 30d30fe6a5be -r ce8896473775 .hglf/sub/large2
   --- a/.hglf/sub/large2	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large2	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -1deebade43c8c498a3c8daddac0244dc55d1331d
   +eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   
   changeset:   0:30d30fe6a5be
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add files
   
   diff -r 000000000000 -r 30d30fe6a5be .hglf/sub/large2
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hglf/sub/large2	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +1deebade43c8c498a3c8daddac0244dc55d1331d
   
   $ cat sub/normal4
   normal44
   $ cat sub/large4
   large44
   $ cat sub2/large6
   large6
   $ cat sub2/large7
   large7
   $ hg log -qf sub2/large7
   7:daea875e9014
   $ hg log -Gqf sub2/large7
   @  7:daea875e9014
   |
   ~
   $ cd ..
 
 Test log from outside repo
 
   $ hg log  b/sub -T '{rev}:{node|short}  {desc|firstline}\n'
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
 
 Test clone at revision
 
   $ hg clone a -r 3 c
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 10 changes to 4 files
   new changesets 30d30fe6a5be:9e8fbc4bce62 (4 drafts)
   updating to branch default
   getting changed largefiles
   2 largefiles updated, 0 removed
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd c
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal1
   normal22
   $ cat large1
   large22
   $ cat sub/normal2
   normal22
   $ cat sub/large2
   large22
 
 Old revisions of a clone have correct largefiles content (this also
 tests update).
 
   $ hg update -r 1
   getting changed largefiles
   1 largefiles updated, 0 removed
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat large1
   large11
   $ cat sub/large2
   large22
   $ cd ..
 
 Test cloning with --all-largefiles flag
 
   $ rm "${USERCACHE}"/*
   $ hg clone --all-largefiles a a-backup
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   7 additional largefiles cached
 
   $ rm "${USERCACHE}"/*
   $ hg clone --all-largefiles -u 0 a a-clone0
   updating to branch default
   getting changed largefiles
   2 largefiles updated, 0 removed
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   8 additional largefiles cached
   $ hg -R a-clone0 sum
   parent: 0:30d30fe6a5be 
    add files
   branch: default
   commit: (clean)
   update: 7 new changesets (update)
   phases: 8 draft
 
   $ rm "${USERCACHE}"/*
   $ hg clone --all-largefiles -u 1 a a-clone1
   updating to branch default
   getting changed largefiles
   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
   branch: default
   commit: (clean)
   update: 6 new changesets (update)
   phases: 8 draft
 
   $ rm "${USERCACHE}"/*
   $ hg clone --all-largefiles -U a a-clone-u
   10 additional largefiles cached
   $ hg -R a-clone-u sum
   parent: -1:000000000000  (no revision checked out)
   branch: default
   commit: (clean)
   update: 8 new changesets (update)
   phases: 8 draft
 
 Show computed destination directory:
 
   $ mkdir xyz
   $ cd xyz
   $ hg clone ../a
   destination directory: a
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 Clone URL without path:
 
   $ hg clone file://
   abort: repository / not found
   [255]
 
 Ensure base clone command argument validation
 
   $ hg clone -U -u 0 a a-clone-failure
   abort: cannot specify both --noupdate and --updaterev
   [10]
 
   $ hg clone --all-largefiles a ssh://localhost/a
   abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
   [255]
 
 Test pulling with --all-largefiles flag.  Also test that the largefiles are
 downloaded from 'default' instead of 'default-push' when no source is specified
 (issue3584)
 
   $ rm -Rf a-backup
   $ hg clone -r 1 a a-backup
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 8 changes to 4 files
   new changesets 30d30fe6a5be:ce8896473775 (2 drafts)
   updating to branch default
   getting changed largefiles
   2 largefiles updated, 0 removed
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm "${USERCACHE}"/*
   $ cd a-backup
   $ hg pull --all-largefiles --config paths.default-push=bogus/path
   pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 16 changes to 8 files
   new changesets 51a0ae4d5864:daea875e9014 (6 drafts)
   (run 'hg update' to get a working copy)
   6 largefiles cached
 
 redo pull with --lfrev and check it pulls largefiles for the right revs
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo pull)
   $ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
   pulling from $TESTTMP/a
   searching for changes
   all local changesets known remotely
   6 changesets found
   uncompressed size of bundle content:
       1389 (changelog)
       1698 (manifests)
        254  .hglf/large1
        564  .hglf/large3
        572  .hglf/sub/large4
        182  .hglf/sub2/large6
        182  .hglf/sub2/large7
        212  normal1
        457  normal3
        465  sub/normal4
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 16 changes to 8 files
   new changesets 51a0ae4d5864:daea875e9014 (6 drafts)
   calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
   (run 'hg update' to get a working copy)
   pulling largefiles for revision 7
   found 971fb41e78fea4f8e0ba5244784239371cb00591 in store
   found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store
   found bb3151689acb10f0c3125c560d5e63df914bc1af in store
   pulling largefiles for revision 2
   found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
   0 largefiles cached
 
 lfpull
 
   $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull
   2 largefiles cached
   $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull
   pulling largefiles for revision 4
   found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
   found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
   pulling largefiles for revision 2
   found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
   0 largefiles cached
 
   $ ls usercache-lfpull/* | sort
   usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d
   usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64
 
   $ cd ..
 
 Rebasing between two repositories does not revert largefiles to old
 revisions (this was a very bad bug that took a lot of work to fix).
 
   $ hg clone a d
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd b
   $ echo large4-modified > sub/large4
   $ echo normal3-modified > normal3
   $ hg commit -m "modify normal file and largefile in repo b"
   Invoking status precommit hook
   M normal3
   M sub/large4
   $ cd ../d
   $ echo large6-modified > sub2/large6
   $ echo normal4-modified > sub/normal4
   $ hg commit -m "modify normal file largefile in repo d"
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6
   $ cd ..
   $ hg clone d e
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd d
 
 More rebase testing, but also test that the largefiles are downloaded from
 'default-push' when no source is specified (issue3584). (The largefile from the
 pulled revision is however not downloaded but found in the local cache.)
 Largefiles are fetched for the new pulled revision, not for existing revisions,
 rebased or not.
 
   $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
   $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
   pulling from $TESTTMP/b
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   new changesets a381d2c8c80e (1 drafts)
   0 largefiles cached
   rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6
   saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg
   $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n'
   @  9:598410d3eb9a  modify normal file largefile in repo d
   |
   o  8:a381d2c8c80e  modify normal file and largefile in repo b
   |
   o  7:daea875e9014  add/edit more largefiles
   |
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   |
   o  3:9e8fbc4bce62  copy files
   |
   o  2:51a0ae4d5864  remove files
   |
   o  1:ce8896473775  edit files
   |
   o  0:30d30fe6a5be  add files
   
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
   $ cd ../e
   $ hg pull ../b
   pulling from ../b
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   new changesets a381d2c8c80e (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg rebase
   rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6
   saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-rebase.hg
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
 
 Log on largefiles
 
 - same output
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n' .hglf/sub/large4
   8:a381d2c8c80e  modify normal file and largefile in repo b
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n' .hglf/sub/large4
   o  8:a381d2c8c80e  modify normal file and largefile in repo b
   :
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   |
   ~
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n' sub/large4
   8:a381d2c8c80e  modify normal file and largefile in repo b
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n' .hglf/sub/large4
   o  8:a381d2c8c80e  modify normal file and largefile in repo b
   :
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   |
   ~
 
 - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n' .hglf/sub
   8:a381d2c8c80e  modify normal file and largefile in repo b
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n' .hglf/sub
   o  8:a381d2c8c80e  modify normal file and largefile in repo b
   :
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   :
   o  1:ce8896473775  edit files
   |
   o  0:30d30fe6a5be  add files
   
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n' sub
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n' sub
   @  9:598410d3eb9a  modify normal file largefile in repo d
   |
   o  8:a381d2c8c80e  modify normal file and largefile in repo b
   :
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   :
   o  1:ce8896473775  edit files
   |
   o  0:30d30fe6a5be  add files
   
 - globbing gives same result
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n' 'glob:sub/*'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ hg log -G --template '{rev}:{node|short}  {desc|firstline}\n' 'glob:sub/*'
   @  9:598410d3eb9a  modify normal file largefile in repo d
   |
   o  8:a381d2c8c80e  modify normal file and largefile in repo b
   :
   o  6:4355d653f84f  edit files yet again
   |
   o  5:9d5af5072dbd  edit files again
   |
   o  4:74c02385b94c  move files
   :
   o  1:ce8896473775  edit files
   |
   o  0:30d30fe6a5be  add files
   
 Rollback on largefiles.
 
   $ echo large4-modified-again > sub/large4
   $ hg commit -m "Modify large4 again"
   Invoking status precommit hook
   M sub/large4
   $ hg rollback
   repository tip rolled back to revision 9 (undo commit)
   working directory now based on revision 9
   $ hg st
   M sub/large4
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat sub/large4
   large4-modified-again
 
 "update --check" refuses to update with uncommitted changes.
   $ hg update --check 8
   abort: uncommitted changes
   [255]
 
 "update --clean" leaves correct largefiles in working copy, even when there is
 .orig files from revert in .hglf.
 
   $ echo mistake > sub2/large7
   $ hg revert sub2/large7
   $ cat sub2/large7
   large7
   $ cat sub2/large7.orig
   mistake
   $ test ! -f .hglf/sub2/large7.orig
 
   $ hg -q update --clean -r null
   $ hg update --clean
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
   $ cat sub2/large7.orig
   mistake
   $ test ! -f .hglf/sub2/large7.orig
 
 verify that largefile .orig file no longer is overwritten on every update -C:
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat sub2/large7.orig
   mistake
   $ rm sub2/large7.orig
 
 Now "update check" is happy.
   $ hg update --check 8
   getting changed largefiles
   1 largefiles updated, 0 removed
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg update --check
   getting changed largefiles
   1 largefiles updated, 0 removed
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Test removing empty largefiles directories on update
   $ test -d sub2 && echo "sub2 exists"
   sub2 exists
   $ hg update -q null
   $ test -d sub2 && echo "error: sub2 should not exist anymore"
   [1]
   $ hg update -q
 
 Test hg remove removes empty largefiles directories
   $ test -d sub2 && echo "sub2 exists"
   sub2 exists
   $ hg remove sub2/*
   $ test -d sub2 && echo "error: sub2 should not exist anymore"
   [1]
   $ hg revert sub2/large6 sub2/large7
 
 "revert" works on largefiles (and normal files too).
   $ echo hack3 >> normal3
   $ echo hack4 >> sub/normal4
   $ echo hack4 >> sub/large4
   $ rm sub2/large6
   $ hg revert sub2/large6
   $ hg rm sub2/large6
   $ echo new >> sub2/large8
   $ hg add --large sub2/large8
 # XXX we don't really want to report that we're reverting the standin;
 # that's just an implementation detail. But I don't see an obvious fix. ;-(
   $ hg revert sub
   reverting .hglf/sub/large4
   reverting sub/normal4
   $ hg status
   M normal3
   A sub2/large8
   R sub2/large6
   ? sub/large4.orig
   ? sub/normal4.orig
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ hg revert -a --no-backup
   forgetting .hglf/sub2/large8
   reverting normal3
   undeleting .hglf/sub2/large6
   $ hg status
   ? sub/large4.orig
   ? sub/normal4.orig
   ? sub2/large8
   $ cat normal3
   normal3-modified
   $ cat sub2/large6
   large6-modified
   $ rm sub/*.orig sub2/large8
 
 revert some files to an older revision
   $ hg revert --no-backup -r 8 sub2
   reverting .hglf/sub2/large6
   $ cat sub2/large6
   large6
   $ hg revert --no-backup -C -r '.^' sub2
   $ hg revert --no-backup sub2
   reverting .hglf/sub2/large6
   $ hg status
 
 "verify --large" actually verifies largefiles
 
 - Where Do We Come From? What Are We? Where Are We Going?
   $ pwd
   $TESTTMP/e
   $ hg paths
   default = $TESTTMP/d
 
   $ 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
   verified existence of 3 revisions of 3 largefiles
 
 - introduce missing blob in local store repo and remote store
 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:
   $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
   $ hg verify -q --large --lfc
   changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
   [1]
 
 - cleanup
   $ cp e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/
   $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 .hg/largefiles/
 
 - verifying all revisions will fail because we didn't clone all largefiles to d:
   $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   $ hg verify -q --lfa --lfc
   changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64
   changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d
   changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f
   changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c
   changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9
   changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0
   [1]
 
 - cleanup
   $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   $ rm -f .hglf/sub/*.orig
 
 Update to revision with missing largefile - and make sure it really is missing
 
   $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
   $ hg up -r 6
   getting changed largefiles
   large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
   1 largefiles updated, 2 removed
   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ rm normal3
   $ echo >> sub/normal4
   $ hg ci -m 'commit with missing files'
   Invoking status precommit hook
   M sub/normal4
   ! large3
   ! normal3
   created new head
   $ hg st
   ! large3
   ! normal3
   $ hg up -r.
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
   ! large3
   ! normal3
   $ hg up -Cr.
   getting changed largefiles
   large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
   ! large3
   $ hg rollback
   repository tip rolled back to revision 9 (undo commit)
   working directory now based on revision 6
 
 Merge with revision with missing largefile - and make sure it tries to fetch it.
 
   $ hg up -Cqr null
   $ echo f > f
   $ hg ci -Am branch
   adding f
   Invoking status precommit hook
   A f
   created new head
   $ hg merge -r 6
   getting changed largefiles
   large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
   1 largefiles updated, 0 removed
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg rollback -q
   $ hg up -Cq
 
 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
 
   $ hg pull --all-largefiles
   pulling from $TESTTMP/d
   searching for changes
   no changes found
 
 Merging does not revert to old versions of largefiles and also check
 that merging after having pulled from a non-default remote works
 correctly.
 
   $ cd ..
   $ hg clone -r 7 e temp
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 24 changes to 10 files
   new changesets 30d30fe6a5be:daea875e9014 (8 drafts)
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone temp f
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 # Delete the largefiles in the largefiles system cache so that we have an
 # opportunity to test that caching after a pull works.
   $ rm "${USERCACHE}"/*
   $ cd f
   $ echo "large4-merge-test" > sub/large4
   $ hg commit -m "Modify large4 to test merge"
   Invoking status precommit hook
   M sub/large4
 # Test --cache-largefiles flag
   $ hg pull --lfrev 'heads(pulled())' ../e
   pulling from ../e
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 4 changes to 4 files (+1 heads)
   new changesets a381d2c8c80e:598410d3eb9a (2 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   2 largefiles cached
   $ hg merge
   largefile sub/large4 has a merge conflict
   ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
   you can keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928.
   what do you want to do? l
   getting changed largefiles
   1 largefiles updated, 0 removed
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m "Merge repos e and f"
   Invoking status precommit hook
   M normal3
   M sub/normal4
   M sub2/large6
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-merge-test
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
 
 Test status after merging with a branch that introduces a new largefile:
 
   $ echo large > large
   $ hg add --large large
   $ hg commit -m 'add largefile'
   Invoking status precommit hook
   A large
   $ hg update -q ".^"
   $ echo change >> normal3
   $ hg commit -m 'some change'
   Invoking status precommit hook
   M normal3
   created new head
   $ hg merge
   getting changed largefiles
   1 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg status
   M large
 
 - make sure update of merge with removed largefiles fails as expected
   $ hg rm sub2/large6
   $ hg up -r.
   abort: outstanding uncommitted merge
   [20]
 
 - revert should be able to revert files introduced in a pending merge
   $ hg revert --all -r .
   removing .hglf/large
   undeleting .hglf/sub2/large6
 
 Test that a normal file and a largefile with the same name and path cannot
 coexist.
 
   $ rm sub2/large7
   $ echo "largeasnormal" > sub2/large7
   $ hg add sub2/large7
   sub2/large7 already a largefile
 
 Test that transplanting a largefile change works correctly.
 
   $ cd ..
   $ hg clone -r 8 d g
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 26 changes to 10 files
   new changesets 30d30fe6a5be:a381d2c8c80e (9 drafts)
   updating to branch default
   getting changed largefiles
   3 largefiles updated, 0 removed
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd g
   $ hg transplant -s ../d 598410d3eb9a
   searching for changes
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets 598410d3eb9a (1 drafts)
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
   7:daea875e9014  add/edit more largefiles
   6:4355d653f84f  edit files yet again
   5:9d5af5072dbd  edit files again
   4:74c02385b94c  move files
   3:9e8fbc4bce62  copy files
   2:51a0ae4d5864  remove files
   1:ce8896473775  edit files
   0:30d30fe6a5be  add files
   $ cat normal3
   normal3-modified
   $ cat sub/normal4
   normal4-modified
   $ cat sub/large4
   large4-modified
   $ cat sub2/large6
   large6-modified
   $ cat sub2/large7
   large7
 
 Cat a largefile
   $ hg cat normal3
   normal3-modified
   $ hg cat sub/large4
   large4-modified
   $ rm "${USERCACHE}"/*
   $ hg cat -r a381d2c8c80e -o cat.out sub/large4
   $ cat cat.out
   large4-modified
   $ rm cat.out
   $ hg cat -r a381d2c8c80e normal3
   normal3-modified
   $ hg cat -r '.^' normal3
   normal3-modified
   $ hg cat -r '.^' sub/large4 doesntexist
   large4-modified
   doesntexist: no such file in rev a381d2c8c80e
   $ hg --cwd sub cat -r '.^' large4
   large4-modified
   $ hg --cwd sub cat -r '.^' ../normal3
   normal3-modified
 Cat a standin
   $ hg cat .hglf/sub/large4
   e166e74c7303192238d60af5a9c4ce9bef0b7928
   $ hg cat .hglf/normal3
   .hglf/normal3: no such file in rev 598410d3eb9a
   [1]
 
 Test that renaming a largefile results in correct output for status
 
   $ hg rename sub/large4 large4-renamed
   $ hg commit -m "test rename output"
   Invoking status precommit hook
   A large4-renamed
   R sub/large4
   $ cat large4-renamed
   large4-modified
   $ cd sub2
   $ hg rename large6 large6-renamed
   $ hg st
   A sub2/large6-renamed
   R sub2/large6
   $ cd ..
 
 Test --normal flag
 
   $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
   $ hg add --normal --large new-largefile
   abort: --normal cannot be used with --large
   [255]
   $ hg add --normal new-largefile
   new-largefile: up to 69 MB of RAM may be required to manage this file
   (use 'hg revert new-largefile' to cancel the pending addition)
   $ hg revert new-largefile
   $ hg --config ui.large-file-limit=22M add --normal new-largefile
 
 Test explicit commit of switch between normal and largefile - make sure both
 the add and the remove is committed.
 
   $ hg up -qC
   $ hg forget normal3 large4-renamed
   $ hg add --large normal3
   $ hg add large4-renamed
   $ hg commit -m 'swap' normal3 large4-renamed
   Invoking status precommit hook
   A large4-renamed
   A normal3
   ? new-largefile
   ? sub2/large6-renamed
   $ hg mani
   .hglf/normal3
   .hglf/sub2/large6
   .hglf/sub2/large7
   large4-renamed
   sub/normal4
 
   $ cd ..
 
 
 

tests/test-manifest.t

@@ -1,378 +1,368
 Source bundle was generated with the following script:
 
 # hg init
 # echo a > a
 # ln -s a l
 # hg ci -Ama -d'0 0'
 # mkdir b
 # echo a > b/a
 # chmod +x b/a
 # hg ci -Amb -d'1 0'
 
   $ hg init
   $ hg unbundle "$TESTDIR/bundles/test-manifest.hg"
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets b73562a03cfe:5bdc995175ba (2 drafts)
   (run 'hg update' to get a working copy)
 
 The next call is expected to return nothing:
 
   $ hg manifest
 
   $ hg co
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg manifest
   a
   b/a
   l
 
   $ hg files -vr .
            2   a
            2 x b/a
            1 l l
   $ hg files -r . -X b
   a
   l
   $ hg files -T '{path} {size} {flags}\n'
   a 2 
   b/a 2 x
   l 1 l
   $ hg files -T '{path} {node|shortest}\n' -r.
   a 5bdc
   b/a 5bdc
   l 5bdc
 
   $ hg manifest -v
   644   a
   755 * b/a
   644 @ l
   $ hg manifest -T '{path} {rev}\n'
   a 1
   b/a 1
   l 1
 
   $ hg manifest --debug
   b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a
   b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
   047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
 
   $ hg manifest -r 0
   a
   l
 
   $ hg manifest -r 1
   a
   b/a
   l
 
   $ hg manifest -r tip
   a
   b/a
   l
 
   $ hg manifest tip
   a
   b/a
   l
 
   $ hg manifest --all
   a
   b/a
   l
 
 The next two calls are expected to abort:
 
   $ hg manifest -r 2
   abort: unknown revision '2'
   [10]
 
   $ hg manifest -r tip tip
   abort: please specify just one revision
   [10]
 
 Testing the manifest full text cache utility
 --------------------------------------------
 
 Reminder of the manifest log content
 
   $ hg log --debug | grep 'manifest:'
   manifest:    1:1e01206b1d2f72bd55f2a33fa8ccad74144825b7
   manifest:    0:fce2a30dedad1eef4da95ca1dc0004157aa527cf
 
 Showing the content of the caches after the above operations
 
   $ hg debugmanifestfulltextcache
   cache contains 1 manifest entries, in order of most to least recent:
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   total cache data size 157 bytes, on-disk 157 bytes
 
 (Clearing the cache in case of any content)
 
   $ hg debugmanifestfulltextcache --clear
 
 Adding a new persistent entry in the cache
 
   $ hg debugmanifestfulltextcache --add 1e01206b1d2f72bd55f2a33fa8ccad74144825b7
 
   $ hg debugmanifestfulltextcache
   cache contains 1 manifest entries, in order of most to least recent:
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   total cache data size 157 bytes, on-disk 157 bytes
 
 Check we don't duplicated entry (added from the debug command)
 
   $ hg debugmanifestfulltextcache --add 1e01206b1d2f72bd55f2a33fa8ccad74144825b7
   $ hg debugmanifestfulltextcache
   cache contains 1 manifest entries, in order of most to least recent:
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   total cache data size 157 bytes, on-disk 157 bytes
 
 Adding a second entry
 
   $ hg debugmanifestfulltextcache --add fce2a30dedad1eef4da95ca1dc0004157aa527cf
   $ hg debugmanifestfulltextcache
   cache contains 2 manifest entries, in order of most to least recent:
   id: fce2a30dedad1eef4da95ca1dc0004157aa527cf, size 87 bytes
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   total cache data size 268 bytes, on-disk 268 bytes
 
 Accessing the initial entry again, refresh their order
 
   $ hg debugmanifestfulltextcache --add 1e01206b1d2f72bd55f2a33fa8ccad74144825b7
   $ hg debugmanifestfulltextcache
   cache contains 2 manifest entries, in order of most to least recent:
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   id: fce2a30dedad1eef4da95ca1dc0004157aa527cf, size 87 bytes
   total cache data size 268 bytes, on-disk 268 bytes
 
 Check cache clearing
 
   $ hg debugmanifestfulltextcache --clear
   $ hg debugmanifestfulltextcache
   cache empty
 
 Check adding multiple entry in one go:
 
   $ hg debugmanifestfulltextcache --add fce2a30dedad1eef4da95ca1dc0004157aa527cf  --add 1e01206b1d2f72bd55f2a33fa8ccad74144825b7
   $ hg debugmanifestfulltextcache
   cache contains 2 manifest entries, in order of most to least recent:
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   id: fce2a30dedad1eef4da95ca1dc0004157aa527cf, size 87 bytes
   total cache data size 268 bytes, on-disk 268 bytes
   $ hg debugmanifestfulltextcache --clear
 
 Test caching behavior on actual operation
 -----------------------------------------
 
 Make sure we start empty
 
   $ hg debugmanifestfulltextcache
   cache empty
 
 Commit should have the new node cached:
 
   $ echo a >> b/a
   $ hg commit -m 'foo'
   $ hg debugmanifestfulltextcache
   cache contains 2 manifest entries, in order of most to least recent:
   id: 26b8653b67af8c1a0a0317c4ee8dac50a41fdb65, size 133 bytes
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   total cache data size 314 bytes, on-disk 314 bytes
   $ hg log -r 'ancestors(., 1)' --debug | grep 'manifest:'
   manifest:    1:1e01206b1d2f72bd55f2a33fa8ccad74144825b7
   manifest:    2:26b8653b67af8c1a0a0317c4ee8dac50a41fdb65
 
 hg update should warm the cache too
 
 (force dirstate check to avoid flackiness in manifest order)
   $ hg debugrebuilddirstate
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugmanifestfulltextcache
   cache contains 3 manifest entries, in order of most to least recent:
   id: fce2a30dedad1eef4da95ca1dc0004157aa527cf, size 87 bytes
   id: 26b8653b67af8c1a0a0317c4ee8dac50a41fdb65, size 133 bytes
   id: 1e01206b1d2f72bd55f2a33fa8ccad74144825b7, size 133 bytes
   total cache data size 425 bytes, on-disk 425 bytes
   $ hg log -r '0' --debug | grep 'manifest:'
   manifest:    0:fce2a30dedad1eef4da95ca1dc0004157aa527cf
 
 Test file removal (especially with pure).  The tests are crafted such that there
 will be contiguous spans of existing entries to ensure that is handled properly.
 (In this case, a.txt, aa.txt and c.txt, cc.txt, and ccc.txt)
 
   $ cat > $TESTTMP/manifest.py <<EOF
   > from mercurial import (
   >     extensions,
   >     manifest,
   > )
   > def extsetup(ui):
   >     manifest.FASTDELTA_TEXTDIFF_THRESHOLD = 0
   > EOF
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > manifest = $TESTTMP/manifest.py
   > EOF
 
 Pure removes should actually remove all dropped entries
 
   $ hg init repo
   $ cd repo
   $ echo a > a.txt
   $ echo aa > aa.txt
   $ echo b > b.txt
   $ echo c > c.txt
   $ echo c > cc.txt
   $ echo c > ccc.txt
   $ echo b > d.txt
   $ echo c > e.txt
   $ hg ci -Aqm 'a-e'
 
   $ hg rm b.txt d.txt
   $ hg ci -m 'remove b and d'
 
   $ hg debugdata -m 1
   a.txt\x00b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 (esc)
   aa.txt\x00a4bdc161c8fbb523c9a60409603f8710ff49a571 (esc)
   c.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
   cc.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
   ccc.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
   e.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
 
   $ 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
   $ echo bb > bb.txt
 
 A mix of adds and removes should remove all dropped entries.
 
   $ hg ci -Aqm 'remove b and d; add bb'
 
   $ hg debugdata -m 1
   a.txt\x00b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 (esc)
   aa.txt\x00a4bdc161c8fbb523c9a60409603f8710ff49a571 (esc)
   bb.txt\x0004c6faf8a9fdd848a5304dfc1704749a374dff44 (esc)
   c.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
   cc.txt\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
   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
 ============================================
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'share=' >> $HGRCPATH
 
 creating some history
 
   $ hg init share-source
   $ hg debugbuilddag .+10 -n -R share-source
   $ hg log --debug -r . -R share-source | grep 'manifest:'
   manifest:    -1:0000000000000000000000000000000000000000
   $ hg log -r . -R share-source
   changeset:   -1:000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg debugmanifestfulltextcache -R share-source
   cache contains 4 manifest entries, in order of most to least recent:
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   id: c6e7b359cbbb5469e98f35acd73ac4757989c4d8, size 450 bytes
   id: 8de636143b0acc5236cb47ca914bd482d82e6f35, size 405 bytes
   id: 7d32499319983d90f97ca02a6c2057a1030bebbb, size 360 bytes
   total cache data size 1.76 KB, on-disk 1.76 KB
   $ hg -R share-source update 1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugmanifestfulltextcache -R share-source
   cache contains 4 manifest entries, in order of most to least recent:
   id: fffc37b38c401b1ab4f8b99da4b72325e31b985f, size 90 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   id: c6e7b359cbbb5469e98f35acd73ac4757989c4d8, size 450 bytes
   id: 8de636143b0acc5236cb47ca914bd482d82e6f35, size 405 bytes
   total cache data size 1.50 KB, on-disk 1.50 KB
 
 making a share out of it. It should have its manifest cache updated
 
   $ hg share share-source share-dest
   updating working directory
   11 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --debug -r . -R share-dest | grep 'manifest:'
   manifest:    10:b264454d7033405774b9f353b9b37a082c1a8fba
   $ hg debugmanifestfulltextcache -R share-dest
   cache contains 1 manifest entries, in order of most to least recent:
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   total cache data size 520 bytes, on-disk 520 bytes
 
 update on various side should only affect the target share
 
   $ hg update -R share-dest 4
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   $ hg log --debug -r . -R share-dest | grep 'manifest:'
   manifest:    4:d45ead487afec2588272fcec88a25413c0ec7dc8
   $ hg debugmanifestfulltextcache -R share-dest
   cache contains 2 manifest entries, in order of most to least recent:
   id: d45ead487afec2588272fcec88a25413c0ec7dc8, size 225 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   total cache data size 769 bytes, on-disk 769 bytes
   $ hg debugmanifestfulltextcache -R share-source
   cache contains 4 manifest entries, in order of most to least recent:
   id: fffc37b38c401b1ab4f8b99da4b72325e31b985f, size 90 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   id: c6e7b359cbbb5469e98f35acd73ac4757989c4d8, size 450 bytes
   id: 8de636143b0acc5236cb47ca914bd482d82e6f35, size 405 bytes
   total cache data size 1.50 KB, on-disk 1.50 KB
   $ hg update -R share-source 7
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --debug -r . -R share-source | grep 'manifest:'
   manifest:    7:7d32499319983d90f97ca02a6c2057a1030bebbb
   $ hg debugmanifestfulltextcache -R share-dest
   cache contains 2 manifest entries, in order of most to least recent:
   id: d45ead487afec2588272fcec88a25413c0ec7dc8, size 225 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   total cache data size 769 bytes, on-disk 769 bytes
   $ hg debugmanifestfulltextcache -R share-source
   cache contains 4 manifest entries, in order of most to least recent:
   id: 7d32499319983d90f97ca02a6c2057a1030bebbb, size 360 bytes
   id: fffc37b38c401b1ab4f8b99da4b72325e31b985f, size 90 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   id: c6e7b359cbbb5469e98f35acd73ac4757989c4d8, size 450 bytes
   total cache data size 1.46 KB, on-disk 1.46 KB
   $ hg update -R share-dest 8
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --debug -r . -R share-dest | grep 'manifest:'
   manifest:    8:8de636143b0acc5236cb47ca914bd482d82e6f35
   $ hg debugmanifestfulltextcache -R share-dest
   cache contains 3 manifest entries, in order of most to least recent:
   id: 8de636143b0acc5236cb47ca914bd482d82e6f35, size 405 bytes
   id: d45ead487afec2588272fcec88a25413c0ec7dc8, size 225 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   total cache data size 1.17 KB, on-disk 1.17 KB
   $ hg debugmanifestfulltextcache -R share-source
   cache contains 4 manifest entries, in order of most to least recent:
   id: 7d32499319983d90f97ca02a6c2057a1030bebbb, size 360 bytes
   id: fffc37b38c401b1ab4f8b99da4b72325e31b985f, size 90 bytes
   id: b264454d7033405774b9f353b9b37a082c1a8fba, size 496 bytes
   id: c6e7b359cbbb5469e98f35acd73ac4757989c4d8, size 450 bytes
   total cache data size 1.46 KB, on-disk 1.46 KB
 

tests/test-narrow-exchange.t

@@ -1,225 +1,220
 #testcases lfs-on lfs-off
 
 #if lfs-on
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > lfs =
   > EOF
 #endif
 
   $ . "$TESTDIR/narrow-library.sh"
 
 create full repo
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
 
   $ mkdir inside
   $ echo 1 > inside/f
   $ mkdir inside2
   $ echo 1 > inside2/f
   $ mkdir outside
   $ echo 1 > outside/f
   $ hg ci -Aqm 'initial'
 
   $ echo 2 > inside/f
   $ hg ci -qm 'inside 2'
 
   $ echo 2 > inside2/f
   $ hg ci -qm 'inside2 2'
 
   $ echo 2 > outside/f
   $ hg ci -qm 'outside 2'
 
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg clone --narrow ssh://user@dummy/master narrow2 --include inside --include inside2
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 2 files
   new changesets *:* (glob)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Can push to wider repo if change does not affect paths in wider repo that are
 not also in narrower repo
 
   $ cd narrow
   $ echo 3 > inside/f
   $ hg ci -m 'inside 3'
   $ hg push ssh://user@dummy/narrow2
   pushing to ssh://user@dummy/narrow2
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
 
 Can push to narrower repo if change affects only paths within remote's
 narrow spec
 
   $ cd ../narrow2
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
   $ hg co -r 'desc("inside 3")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 4 > inside/f
   $ hg ci -m 'inside 4'
   $ hg push ssh://user@dummy/narrow
   pushing to ssh://user@dummy/narrow
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
 
 Can push to narrow repo if change affects only paths outside remote's
 narrow spec
 
   $ echo 3 > inside2/f
   $ hg ci -m 'inside2 3'
 TODO: this should be successful
   $ hg push ssh://user@dummy/narrow
   pushing to ssh://user@dummy/narrow
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: transaction abort!
   remote: rollback completed
   remote: abort: data/inside2/f@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent (reporevlogstore !)
   remote: abort: data/inside2/f/index@4a1aa07735e6: no node (reposimplestore !)
   abort: stream ended unexpectedly (got 0 bytes, expected 4)
   [255]
 
 Can pull from wider repo if change affects only paths outside remote's
 narrow spec
   $ echo 4 > inside2/f
   $ hg ci -m 'inside2 4'
   $ hg log -G -T '{rev} {node|short} {files}\n'
   @  7 d78a96df731d inside2/f
   |
   o  6 8c26f5218962 inside2/f
   |
   o  5 ba3480e2f9de inside/f
   |
   o  4 4e5edd526618 inside/f
   |
   o  3 81e7e07b7ab0 outside/f
   |
   o  2 f3993b8c0c2b inside2/f
   |
   o  1 8cd66ca966b4 inside/f
   |
   o  0 c8057d6f53ab inside/f inside2/f outside/f
   
   $ cd ../narrow
   $ hg log -G -T '{rev} {node|short} {files}\n'
   o  4 ba3480e2f9de inside/f
   |
   @  3 4e5edd526618 inside/f
   |
   o  2 81e7e07b7ab0 outside/f
   |
   o  1 8cd66ca966b4 inside/f
   |
   o  0 c8057d6f53ab inside/f inside2/f outside/f
   
   $ hg pull ssh://user@dummy/narrow2
   pulling from ssh://user@dummy/narrow2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files
   new changesets d78a96df731d
   (run 'hg update' to get a working copy)
 
 Check that the resulting history is valid in the full repo
 
   $ cd ../narrow2
   $ hg push ssh://user@dummy/master
   pushing to ssh://user@dummy/master
   searching for changes
   remote: adding changesets
   remote: adding manifests
   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
   $ cd ../master
   $ hg co -r 'desc("inside2 4")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 5 > inside2/f
   $ hg ci -m 'inside2 5'
   $ hg log -G -T '{rev} {node|short} {files}\n'
   @  8 5970befb64ba inside2/f
   |
   o  7 d78a96df731d inside2/f
   |
   o  6 8c26f5218962 inside2/f
   |
   o  5 ba3480e2f9de inside/f
   |
   o  4 4e5edd526618 inside/f
   |
   o  3 81e7e07b7ab0 outside/f
   |
   o  2 f3993b8c0c2b inside2/f
   |
   o  1 8cd66ca966b4 inside/f
   |
   o  0 c8057d6f53ab inside/f inside2/f outside/f
   
   $ cd ../narrow
   $ hg pull
   pulling from ssh://user@dummy/master
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files
   new changesets * (glob)
   (run 'hg update' to get a working copy)
 TODO: this should tell the user that their narrow clone does not have the
 necessary content to be able to push to the target
 
 TODO: lfs shouldn't abort like this
   $ hg push ssh://user@dummy/narrow2 || true
   pushing to ssh://user@dummy/narrow2
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 0 changes to 0 files (no-lfs-on !)
   remote: error: pretxnchangegroup.lfs hook raised an exception: inside2/f@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !)
   remote: transaction abort! (lfs-on !)
   remote: rollback completed (lfs-on !)
   remote: abort: inside2/f@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !)
   abort: stream ended unexpectedly (got 0 bytes, expected 4) (lfs-on !)

tests/test-narrow-share.t

@@ -1,198 +1,192
 #testcases flat tree
 #testcases safe normal
 
 #if safe
   $ echo "[format]"         >> $HGRCPATH
   $ echo "exp-share-safe = True" >> $HGRCPATH
 #endif
 
   $ . "$TESTDIR/narrow-library.sh"
 
 #if tree
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > treemanifest = 1
   > EOF
 #endif
 
   $ cat << EOF >> $HGRCPATH
   > [extensions]
   > share =
   > EOF
 
   $ hg init remote
   $ cd remote
   $ for x in `$TESTDIR/seq.py 0 10`
   > do
   >   mkdir d$x
   >   echo $x > d$x/f
   >   hg add d$x/f
   >   hg commit -m "add d$x/f"
   > done
   $ cd ..
 
   $ hg clone --narrow ssh://user@dummy/remote main -q \
   > --include d1 --include d3 --include d5 --include d7
 
 Ignore file called "ignored"
   $ echo ignored > main/.hgignore
 
   $ hg share main share
   updating working directory
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R share tracked
   I path:d1
   I path:d3
   I path:d5
   I path:d7
   $ hg -R share files
   share/d1/f
   share/d3/f
   share/d5/f
   share/d7/f
 
 Narrow the share and check that the main repo's working copy gets updated
 
 # Make sure the files that are supposed to be known-clean get their timestamps set in the dirstate
   $ sleep 2
   $ hg -R main st
   $ hg -R main debugdirstate --no-dates
   n 644          2 set                 d1/f
   n 644          2 set                 d3/f
   n 644          2 set                 d5/f
   n 644          2 set                 d7/f
 # Make d3/f dirty
   $ echo x >> main/d3/f
   $ echo y >> main/d3/g
   $ touch main/d3/ignored
   $ touch main/d3/untracked
   $ hg add main/d3/g
   $ hg -R main st
   M d3/f
   A d3/g
   ? d3/untracked
 # Make d5/f not match the dirstate timestamp even though it's clean
   $ sleep 2
   $ hg -R main st
   M d3/f
   A d3/g
   ? d3/untracked
   $ hg -R main debugdirstate --no-dates
   n 644          2 set                 d1/f
   n 644          2 set                 d3/f
   a   0         -1 unset               d3/g
   n 644          2 set                 d5/f
   n 644          2 set                 d7/f
   $ touch main/d5/f
   $ hg -R share tracked --removeinclude d1 --removeinclude d3 --removeinclude d5
   comparing with ssh://user@dummy/remote
   searching for changes
   looking for local changes to affected paths
   deleting data/d1/f.i
   deleting data/d3/f.i
   deleting data/d5/f.i
   deleting meta/d1/00manifest.i (tree !)
   deleting meta/d3/00manifest.i (tree !)
   deleting meta/d5/00manifest.i (tree !)
   deleting unwanted files from working copy
   $ hg -R main tracked
   I path:d7
   $ hg -R main files
   abort: working copy's narrowspec is stale
   (run 'hg tracked --update-working-copy')
   [20]
   $ hg -R main tracked --update-working-copy
   not deleting possibly dirty file d3/f
   not deleting possibly dirty file d3/g
   not deleting possibly dirty file d5/f
   not deleting unknown file d3/untracked
   not deleting ignored file d3/ignored
 # d1/f, d3/f, d3/g and d5/f should no longer be reported
   $ hg -R main files
   main/d7/f
 # d1/f should no longer be there, d3/f should be since it was dirty, d3/g should be there since
 # it was added, and d5/f should be since we couldn't be sure it was clean
   $ find main/d* -type f | sort
   main/d3/f
   main/d3/g
   main/d3/ignored
   main/d3/untracked
   main/d5/f
   main/d7/f
 
 Widen the share and check that the main repo's working copy gets updated
 
   $ hg -R share tracked --addinclude d1 --addinclude d3 -q
   $ hg -R share tracked
   I path:d1
   I path:d3
   I path:d7
   $ hg -R share files
   share/d1/f
   share/d3/f
   share/d7/f
   $ hg -R main tracked
   I path:d1
   I path:d3
   I path:d7
   $ hg -R main files
   abort: working copy's narrowspec is stale
   (run 'hg tracked --update-working-copy')
   [20]
   $ hg -R main tracked --update-working-copy
 # d1/f, d3/f should be back
   $ hg -R main files
   main/d1/f
   main/d3/f
   main/d7/f
 # d3/f should be modified (not clobbered by the widening), and d3/g should be untracked
   $ hg -R main st --all
   M d3/f
   ? d3/g
   ? d3/untracked
   I d3/ignored
   C d1/f
   C d7/f
 
 We should also be able to unshare without breaking everything:
 
   $ hg share main share-unshare
   updating working directory
   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
 
   $ hg share main share-upgrade
   updating working directory
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd share-upgrade
   $ echo x >> d1/f
   $ echo y >> d3/g
   $ hg add d3/g
   $ hg rm d7/f
   $ hg st
   M d1/f
   A d3/g
   R d7/f
 Make it look like a repo from before narrow+share was supported
   $ rm .hg/narrowspec.dirstate
   $ hg ci -Am test
   abort: working copy's narrowspec is stale
   (run 'hg tracked --update-working-copy')
   [20]
   $ hg tracked --update-working-copy
   $ hg st
   M d1/f
   A d3/g
   R d7/f
   $ cd ..

tests/test-narrow-widen-no-ellipsis.t

@@ -1,426 +1,414
 #testcases tree flat
   $ . "$TESTDIR/narrow-library.sh"
 
 #if tree
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > treemanifest = 1
   > EOF
 #endif
 
   $ hg init master
   $ cd master
 
   $ mkdir inside
   $ echo 'inside' > inside/f
   $ hg add inside/f
   $ hg commit -m 'add inside'
 
   $ mkdir widest
   $ echo 'widest' > widest/f
   $ hg add widest/f
   $ hg commit -m 'add widest'
 
   $ mkdir outside
   $ echo 'outside' > outside/f
   $ hg add outside/f
   $ hg commit -m 'add outside'
 
   $ cd ..
 
 narrow clone the inside file
 
   $ hg clone --narrow ssh://user@dummy/master narrow
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 0 changes to 0 files
   new changesets *:* (glob)
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
   $ hg tracked
   $ hg files
   [1]
 
 widen from an empty clone
 
   $ hg tracked --addinclude inside
   comparing with ssh://user@dummy/master
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 1 changes to 1 files
   $ hg tracked
   I path:inside
   $ ls -A
   .hg
   inside
   $ cat inside/f
   inside
   $ cd ..
 
 add more upstream files which we will include in a wider narrow spec
 
   $ cd master
 
   $ mkdir wider
   $ echo 'wider' > wider/f
   $ hg add wider/f
   $ echo 'widest v2' > widest/f
   $ hg commit -m 'add wider, update widest'
 
   $ echo 'widest v3' > widest/f
   $ hg commit -m 'update widest v3'
 
   $ echo 'inside v2' > inside/f
   $ hg commit -m 'update inside'
 
   $ mkdir outside2
   $ echo 'outside2' > outside2/f
   $ hg add outside2/f
   $ hg commit -m 'add outside2'
 
   $ echo 'widest v4' > widest/f
   $ hg commit -m 'update widest v4'
 
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   7: update widest v4
   6: add outside2
   5: update inside
   4: update widest v3
   3: add wider, update widest
   2: add outside
   1: add widest
   0: add inside
 
   $ cd ..
 
 Widen the narrow spec to see the widest file. This should not get the newly
 added upstream revisions.
 
   $ cd narrow
   $ hg id -n
   2
 
   $ hg tracked --addinclude widest/f --debug
   comparing with ssh://user@dummy/master
   running * "*dummyssh" *user@dummy* *hg -R master serve --stdio* (glob)
   sending hello command
   sending between command
   remote: * (glob)
   remote: capabilities: * (glob)
   remote: 1
   sending protocaps command
   query 1; heads
   sending batch command
   searching for changes
   all local changesets known remotely
   sending narrow_widen command
   bundle2-input-bundle: with-transaction
   bundle2-input-part: "changegroup" (params: * mandatory) supported (glob)
   adding changesets
   adding manifests
   adding widest/ revisions (tree !)
   adding file changes
   adding widest/f revisions
   bundle2-input-part: total payload size * (glob)
   bundle2-input-bundle: 1 parts total
   added 0 changesets with 1 changes to 1 files
    widest/f: narrowspec updated -> g
   getting widest/f
   $ hg tracked
   I path:inside
   I path:widest/f
 
   $ cat widest/f
   widest
 
   $ hg id -n
   2
 
 Test that extending already included files should not call narrow_widen
 wireprotocol command
 
   $ hg tracked --addinclude widest/f
   nothing to widen or narrow
 
 Pull down the newly added upstream revision.
 
   $ hg pull
   pulling from ssh://user@dummy/master
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 4 changes to 2 files
   new changesets *:* (glob)
   (run 'hg update' to get a working copy)
   $ hg update -r 'desc("add wider")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cat widest/f
   widest v2
 
   $ hg update -r 'desc("update inside")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v3
   $ cat inside/f
   inside v2
 
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   7: update widest v4
   6: add outside2
   5: update inside
   4: update widest v3
   3: add wider, update widest
   2: add outside
   1: add widest
   0: add inside
 
 Check that widening with a newline fails
 
   $ hg tracked --addinclude 'widest
   > '
   abort: newlines are not allowed in narrowspec paths
   [255]
 
 widen the narrow spec to include the wider file
 
   $ hg tracked --addinclude wider
   comparing with ssh://user@dummy/master
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 1 changes to 1 files
   $ hg tracked
   I path:inside
   I path:wider
   I path:widest/f
   $ hg update 'desc("add widest")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat widest/f
   widest
   $ hg update 'desc("add wider, update widest")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
   wider
   $ cat widest/f
   widest v2
   $ hg update 'desc("update widest v3")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v3
   $ hg update 'desc("update widest v4")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v4
 
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   7: update widest v4
   6: add outside2
   5: update inside
   4: update widest v3
   3: add wider, update widest
   2: add outside
   1: add widest
   0: add inside
 
 separate suite of tests: files from 0-10 modified in changes 0-10. This allows
 more obvious precise tests tickling particular corner cases.
 
   $ cd ..
   $ hg init upstream
   $ cd upstream
   $ for x in `$TESTDIR/seq.py 0 10`
   > do
   >   mkdir d$x
   >   echo $x > d$x/f
   >   hg add d$x/f
   >   hg commit -m "add d$x/f"
   > done
   $ hg log -T "{rev}: {desc}\n"
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
 
 make narrow clone with every third node.
 
   $ cd ..
   $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 11 changesets with 4 changes to 4 files
   new changesets *:* (glob)
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow2
   $ hg tracked
   I path:d0
   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
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 1 changes to 1 files
   $ hg tracked
   I path:d0
   I path:d1
   I path:d3
   I path:d6
   I path:d9
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
 
 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
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
   $ cd narrow3
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg pull -q -r 3
   $ hg co -q tip
   $ hg pull -q -r 4
   $ echo local > d2/f
   $ hg ci -m local
   created new head
   $ hg tracked -q --addinclude d0 --addinclude d9
 
 Widening preserves bookmarks
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4
   $ cd narrow-bookmarks
   $ echo local > d4/f
   $ hg ci -m local
   $ hg bookmarks bookmark
   $ hg bookmarks
    * bookmark                  11:* (glob)
   $ hg -q tracked --addinclude d2
   $ hg bookmarks
    * bookmark                  11:* (glob)
   $ hg log -r bookmark -T '{desc}\n'
   local
 
 Widening that fails can be recovered from
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0
   $ cd interrupted
   $ echo local > d0/f
   $ hg ci -m local
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   11: local
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg bookmarks bookmark
   $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 1 changes to 1 files
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   11: local
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg bookmarks
    * bookmark                  11:* (glob)
   $ hg unbundle .hg/strip-backup/*-widen.hg
   abort: .hg/strip-backup/*-widen.hg: $ENOTDIR$ (windows !)
   abort: $ENOENT$: '.hg/strip-backup/*-widen.hg' (no-windows !)
   [255]
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   11: local
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
   $ hg bookmarks
    * bookmark                  11:* (glob)

tests/test-narrow-widen.t

@@ -1,453 +1,441
 #testcases flat tree
   $ . "$TESTDIR/narrow-library.sh"
 
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > l = log -G -T "{if(ellipsis, '...')}{rev}: {desc}\n"
   > EOF
 
 #if tree
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > treemanifest = 1
   > EOF
 #endif
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
 
   $ mkdir inside
   $ echo 'inside' > inside/f
   $ hg add inside/f
   $ hg commit -m 'add inside'
 
   $ mkdir widest
   $ echo 'widest' > widest/f
   $ hg add widest/f
   $ hg commit -m 'add widest'
 
   $ mkdir outside
   $ echo 'outside' > outside/f
   $ hg add outside/f
   $ hg commit -m 'add outside'
 
   $ cd ..
 
 narrow clone the inside file
 
   $ hg clone --narrow ssh://user@dummy/master narrow --include inside
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow
   $ hg tracked
   I path:inside
   $ ls -A
   .hg
   inside
   $ cat inside/f
   inside
   $ cd ..
 
 add more upstream files which we will include in a wider narrow spec
 
   $ cd master
 
   $ mkdir wider
   $ echo 'wider' > wider/f
   $ hg add wider/f
   $ echo 'widest v2' > widest/f
   $ hg commit -m 'add wider, update widest'
 
   $ echo 'widest v3' > widest/f
   $ hg commit -m 'update widest v3'
 
   $ echo 'inside v2' > inside/f
   $ hg commit -m 'update inside'
 
   $ mkdir outside2
   $ echo 'outside2' > outside2/f
   $ hg add outside2/f
   $ hg commit -m 'add outside2'
 
   $ echo 'widest v4' > widest/f
   $ hg commit -m 'update widest v4'
 
   $ hg l
   @  7: update widest v4
   |
   o  6: add outside2
   |
   o  5: update inside
   |
   o  4: update widest v3
   |
   o  3: add wider, update widest
   |
   o  2: add outside
   |
   o  1: add widest
   |
   o  0: add inside
   
 
   $ cd ..
 
 Widen the narrow spec to see the widest file. This should not get the newly
 added upstream revisions.
 
   $ cd narrow
   $ hg l
   @  ...1: add outside
   |
   o  0: add inside
   
   $ hg tracked --addinclude widest/f
   comparing with ssh://user@dummy/master
   searching for changes
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 3 files
   $ hg l
   @  ...2: add outside
   |
   o  1: add widest
   |
   o  0: add inside
   
   $ hg tracked
   I path:inside
   I path:widest/f
 
   $ cat widest/f
   widest
 
 Pull down the newly added upstream revision.
 
   $ hg pull
   pulling from ssh://user@dummy/master
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 4 changes to 2 files
   new changesets *:* (glob)
   (run 'hg update' to get a working copy)
   $ hg update -r 'desc("add wider")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v2
 
   $ hg update -r 'desc("update inside")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v3
   $ cat inside/f
   inside v2
 
   $ hg l
   o  7: update widest v4
   |
   o  ...6: add outside2
   |
   @  5: update inside
   |
   o  4: update widest v3
   |
   o  3: add wider, update widest
   |
   o  ...2: add outside
   |
   o  1: add widest
   |
   o  0: add inside
   
 
 Check that widening with a newline fails
 
   $ hg tracked --addinclude 'widest
   > '
   abort: newlines are not allowed in narrowspec paths
   [255]
 
 widen the narrow spec to include the wider file
 
   $ hg tracked --addinclude wider
   comparing with ssh://user@dummy/master
   searching for changes
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 7 changes to 5 files
   $ hg tracked
   I path:inside
   I path:wider
   I path:widest/f
   $ hg update 'desc("add widest")'
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat widest/f
   widest
   $ hg update 'desc("add wider, update widest")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
   wider
   $ cat widest/f
   widest v2
   $ hg update 'desc("update widest v3")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v3
   $ hg update 'desc("update widest v4")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
   widest v4
 
   $ hg l
   @  7: update widest v4
   |
   o  ...6: add outside2
   |
   o  5: update inside
   |
   o  4: update widest v3
   |
   o  3: add wider, update widest
   |
   o  ...2: add outside
   |
   o  1: add widest
   |
   o  0: add inside
   
 
 separate suite of tests: files from 0-10 modified in changes 0-10. This allows
 more obvious precise tests tickling particular corner cases.
 
   $ cd ..
   $ hg init upstream
   $ cd upstream
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
   $ for x in `$TESTDIR/seq.py 0 10`
   > do
   >   mkdir d$x
   >   echo $x > d$x/f
   >   hg add d$x/f
   >   hg commit -m "add d$x/f"
   > done
   $ hg log -T "{rev}: {desc}\n"
   10: add d10/f
   9: add d9/f
   8: add d8/f
   7: add d7/f
   6: add d6/f
   5: add d5/f
   4: add d4/f
   3: add d3/f
   2: add d2/f
   1: add d1/f
   0: add d0/f
 
 make narrow clone with every third node.
 
   $ cd ..
   $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 4 changes to 4 files
   new changesets *:* (glob)
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd narrow2
   $ hg tracked
   I path:d0
   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
   |
   o  6: add d9/f
   |
   o  ...5: add d8/f
   |
   o  4: add d6/f
   |
   o  ...3: add d5/f
   |
   o  2: add d3/f
   |
   o  ...1: add d2/f
   |
   o  0: add d0/f
   
   $ hg tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 5 changes to 9 files
   $ hg tracked
   I path:d0
   I path:d1
   I path:d3
   I path:d6
   I path:d9
   $ hg l
   @  ...8: add d10/f
   |
   o  7: add d9/f
   |
   o  ...6: add d8/f
   |
   o  5: add d6/f
   |
   o  ...4: add d5/f
   |
   o  3: add d3/f
   |
   o  ...2: add d2/f
   |
   o  1: add d1/f
   |
   o  0: add d0/f
   
 
 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
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
   $ cd narrow3
   $ hg l
   @  1: add d2/f
   |
   o  ...0: add d1/f
   
   $ hg pull -q -r 3
   $ hg co -q tip
   $ hg pull -q -r 4
   $ echo local > d2/f
   $ hg ci -m local
   created new head
   $ hg l
   @  4: local
   |
   | o  ...3: add d4/f
   |/
   o  ...2: add d3/f
   |
   o  1: add d2/f
   |
   o  ...0: add d1/f
   
   $ hg tracked -q --addinclude d0 --addinclude d9
   $ hg l
   @  5: local
   |
   | o  ...4: add d4/f
   |/
   o  ...3: add d3/f
   |
   o  2: add d2/f
   |
   o  ...1: add d1/f
   |
   o  0: add d0/f
   
 
 Widening preserves bookmarks
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4
   $ cd narrow-bookmarks
   $ echo local > d4/f
   $ hg ci -m local
   $ hg bookmarks bookmark
   $ hg bookmarks
    * bookmark                  3:* (glob)
   $ hg -q tracked --addinclude d2
   $ hg bookmarks
    * bookmark                  5:* (glob)
   $ hg log -r bookmark -T '{desc}\n'
   local
 
 Widening that fails can be recovered from
 
   $ cd ..
   $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0
   $ cd interrupted
   $ echo local > d0/f
   $ hg ci -m local
   $ hg l
   @  2: local
   |
   o  ...1: add d10/f
   |
   o  0: add d0/f
   
   $ hg bookmarks bookmark
   $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob)
   adding changesets
   adding manifests
   adding file changes
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.bad hook exited with status 1
   [40]
   $ hg l
   $ hg bookmarks
   no bookmarks set
   $ hg unbundle .hg/strip-backup/*-widen.hg
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files
   new changesets *:* (glob)
   (run 'hg update' to get a working copy)
   $ hg l
   o  2: local
   |
   o  ...1: add d10/f
   |
   o  0: add d0/f
   
   $ hg bookmarks
    * bookmark                  2:* (glob)

tests/test-obsolete-changeset-exchange.t

@@ -1,181 +1,176
 Test changesets filtering during exchanges (some tests are still in
 test-obsolete.t)
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
 Push does not corrupt remote
 ----------------------------
 
 Create a DAG where a changeset reuses a revision from a file first used in an
 extinct changeset.
 
   $ hg init local
   $ cd local
   $ echo 'base' > base
   $ hg commit -Am base
   adding base
   $ echo 'A' > A
   $ hg commit -Am A
   adding A
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg revert -ar 1
   adding A
   $ hg commit -Am "A'"
   created new head
   $ hg log -G --template='{desc} {node}'
   @  A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
   |
   | o  A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a
   |/
   o  base d20a80d4def38df63a4b330b7fb688f3d4cae1e3
   
   $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
   1 new obsolescence markers
   obsoleted 1 changesets
 
 Push it. The bundle should not refer to the extinct changeset.
 
   $ hg init ../other
   $ hg push ../other
   pushing to ../other
   searching for changes
   adding changesets
   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
 ------------------------------------------
 
 Pull a changeset that will immediatly goes extinct (because you already have a
 marker to obsolete him)
 (test resolution of issue3788)
 
   $ hg phase --draft --force f89bcc95eba5
   $ hg phase -R ../other --draft --force f89bcc95eba5
   $ hg commit --amend -m "A''"
   $ hg --hidden --config extensions.mq= strip  --no-backup f89bcc95eba5
   $ hg pull ../other
   pulling from ../other
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   1 new phase-divergent changesets
   new changesets f89bcc95eba5
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 check that bundle is not affected
 
   $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg
   1 changesets found
   $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5
   $ hg unbundle ../f89bcc95eba5.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   (1 other changesets obsolete on arrival)
   (run 'hg heads' to see heads)
 
 check-that bundle can contain markers:
 
   $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1
   1 changesets found
   $ hg debugbundle ../f89bcc95eba5.hg
   Stream params: {Compression: BZ}
   changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
       f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
   cache:rev-branch-cache -- {} (mandatory: False)
   $ hg debugbundle ../f89bcc95eba5-obs.hg
   Stream params: {Compression: BZ}
   changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
       f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
   cache:rev-branch-cache -- {} (mandatory: False)
   obsmarkers -- {} (mandatory: True)
       version: 1 (70 bytes)
       9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   $ cd ..
 
 pull does not fetch excessive changesets when common node is hidden (issue4982)
 -------------------------------------------------------------------------------
 
 initial repo with server and client matching
 
   $ hg init pull-hidden-common
   $ cd pull-hidden-common
   $ touch foo
   $ hg -q commit -A -m initial
   $ echo 1 > foo
   $ hg commit -m 1
   $ echo 2a > foo
   $ hg commit -m 2a
   $ cd ..
   $ hg clone --pull pull-hidden-common pull-hidden-common-client
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets 96ee1d7354c4:6a29ed9c68de
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 server obsoletes the old head
 
   $ cd pull-hidden-common
   $ hg -q up -r 1
   $ echo 2b > foo
   $ hg -q commit -m 2b
   $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129
   1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ..
 
 client only pulls down 1 changeset
 
   $ cd pull-hidden-common-client
   $ hg pull --debug
   pulling from $TESTTMP/pull-hidden-common
   query 1; heads
   searching for changes
   taking quick initial sample
   query 2; still undecided: 2, sample size is: 2
   2 total queries in *.????s (glob)
   1 changesets found
   list of changesets:
   bec0734cd68e84477ba7fc1d13e6cff53ab70129
   listing keys for "bookmarks"
   bundle2-output-bundle: "HG20", 3 parts total
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
   bundle2-output-part: "phase-heads" 24 bytes payload
   bundle2-input-bundle: with-transaction
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
   add changeset bec0734cd68e
   adding manifests
   adding file changes
   adding foo revisions
   bundle2-input-part: total payload size 476
   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size 24
   bundle2-input-bundle: 3 parts total
   checking for updated bookmarks
   updating the branch cache
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets bec0734cd68e
   (run 'hg heads' to see heads, 'hg merge' to merge)

tests/test-permissions.t

@@ -1,90 +1,76
 #require unix-permissions no-root reporevlogstore
 
 #testcases dirstate-v1 dirstate-v2
 
 #if dirstate-v2
   $ cat >> $HGRCPATH << EOF
   > [format]
   > use-dirstate-v2=1
   > [storage]
   > dirstate-v2.slow-path=allow
   > EOF
 #endif
 
   $ hg init t
   $ cd t
 
   $ echo foo > a
   $ hg add a
 
   $ 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
 
   $ echo barber > a
   $ hg commit -m "2"
   trouble committing a!
   abort: Permission denied: '$TESTTMP/t/.hg/store/data/a.i'
   [255]
 
   $ chmod -w .
 
   $ hg diff --nodates
   diff -r 2a18120dc1c9 a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -foo
   +barber
 
   $ chmod +w .
 
   $ chmod +w .hg/store/data/a.i
   $ mkdir dir
   $ touch dir/a
   $ hg status
   M a
   ? dir/a
   $ chmod -rx dir
 
 #if no-fsmonitor
 
 (fsmonitor makes "hg status" avoid accessing to "dir")
 
   $ hg status
   dir: Permission denied* (glob)
   M a
 
 #endif
 
 Reenable perm to allow deletion:
 
   $ chmod +rx dir
 
   $ cd ..

tests/test-phases.t

@@ -1,1146 +1,1141
   $ cat > $TESTTMP/hook.sh << 'EOF'
   > echo "test-hook-close-phase: $HG_NODE:  $HG_OLDPHASE -> $HG_PHASE"
   > EOF
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > phasereport=$TESTDIR/testlib/ext-phase-report.py
   > [hooks]
   > txnclose-phase.test = sh $TESTTMP/hook.sh
   > EOF
 
   $ hglog() { hg log -G --template "{rev} {phaseidx} {desc}\n" $*; }
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    message="$1"
   >    shift
   >    hg ci -m "$message" $*
   > }
 
   $ hg init initialrepo
   $ cd initialrepo
 
 Cannot change null revision phase
 
   $ hg phase --force --secret null
   abort: cannot change null revision phase
   [255]
   $ hg phase null
   -1: public
 
   $ mkcommit A
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
 
 New commit are draft by default
 
   $ hglog
   @  0 1 A
   
 
 Following commit are draft too
 
   $ mkcommit B
   test-debug-phase: new rev 1:  x -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> draft
 
   $ hglog
   @  1 1 B
   |
   o  0 1 A
   
 
 Working directory phase is secret when its parent is secret.
 
   $ hg phase --force --secret .
   test-debug-phase: move rev 0: 1 -> 2
   test-debug-phase: move rev 1: 1 -> 2
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:  draft -> secret
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> secret
   $ hg log -r 'wdir()' -T '{phase}\n'
   secret
   $ hg log -r 'wdir() and public()' -T '{phase}\n'
   $ hg log -r 'wdir() and draft()' -T '{phase}\n'
   $ hg log -r 'wdir() and secret()' -T '{phase}\n'
   secret
 
 Working directory phase is draft when its parent is draft.
 
   $ hg phase --draft .
   test-debug-phase: move rev 1: 2 -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  secret -> draft
   $ hg log -r 'wdir()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and public()' -T '{phase}\n'
   $ hg log -r 'wdir() and draft()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and secret()' -T '{phase}\n'
 
 Working directory phase is secret when a new commit will be created as secret,
 even if the parent is draft.
 
   $ hg log -r 'wdir() and secret()' -T '{phase}\n' \
   > --config phases.new-commit='secret'
   secret
 
 Working directory phase is draft when its parent is public.
 
   $ hg phase --public .
   test-debug-phase: move rev 0: 1 -> 0
   test-debug-phase: move rev 1: 1 -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:  draft -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> public
   $ hg log -r 'wdir()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and public()' -T '{phase}\n'
   $ hg log -r 'wdir() and draft()' -T '{phase}\n'
   draft
   $ hg log -r 'wdir() and secret()' -T '{phase}\n'
   $ hg log -r 'wdir() and secret()' -T '{phase}\n' \
   > --config phases.new-commit='secret'
   secret
 
 Draft commit are properly created over public one:
 
   $ hg phase
   1: public
   $ hglog
   @  1 0 B
   |
   o  0 0 A
   
 
   $ mkcommit C
   test-debug-phase: new rev 2:  x -> 1
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> draft
   $ mkcommit D
   test-debug-phase: new rev 3:  x -> 1
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> draft
 
   $ hglog
   @  3 1 D
   |
   o  2 1 C
   |
   o  1 0 B
   |
   o  0 0 A
   
 
 Test creating changeset as secret
 
   $ mkcommit E --config phases.new-commit='secret'
   test-debug-phase: new rev 4:  x -> 2
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:   -> secret
   $ hglog
   @  4 2 E
   |
   o  3 1 D
   |
   o  2 1 C
   |
   o  1 0 B
   |
   o  0 0 A
   
 
 Test the secret property is inherited
 
   $ mkcommit H
   test-debug-phase: new rev 5:  x -> 2
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:   -> secret
   $ hglog
   @  5 2 H
   |
   o  4 2 E
   |
   o  3 1 D
   |
   o  2 1 C
   |
   o  1 0 B
   |
   o  0 0 A
   
 
 Even on merge
 
   $ hg up -q 1
   $ mkcommit "B'"
   test-debug-phase: new rev 6:  x -> 1
   created new head
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> draft
   $ hglog
   @  6 1 B'
   |
   | o  5 2 H
   | |
   | o  4 2 E
   | |
   | o  3 1 D
   | |
   | o  2 1 C
   |/
   o  1 0 B
   |
   o  0 0 A
   
   $ hg merge 4 # E
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg phase
   6: draft
   4: secret
   $ hg ci -m "merge B' and E"
   test-debug-phase: new rev 7:  x -> 2
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:   -> secret
 
   $ hglog
   @    7 2 merge B' and E
   |\
   | o  6 1 B'
   | |
   +---o  5 2 H
   | |
   o |  4 2 E
   | |
   o |  3 1 D
   | |
   o |  2 1 C
   |/
   o  1 0 B
   |
   o  0 0 A
   
 
 Test secret changeset are not pushed
 
   $ hg init ../push-dest
   $ cat > ../push-dest/.hg/hgrc << EOF
   > [phases]
   > publish=False
   > EOF
   $ hg outgoing ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
   $ hg outgoing -r 'branch(default)' ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
 
   $ hg push ../push-dest -f # force because we push multiple heads
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 1
   test-debug-phase: new rev 3:  x -> 1
   test-debug-phase: new rev 4:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> draft
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> draft
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> draft
   $ hglog
   @    7 2 merge B' and E
   |\
   | o  6 1 B'
   | |
   +---o  5 2 H
   | |
   o |  4 2 E
   | |
   o |  3 1 D
   | |
   o |  2 1 C
   |/
   o  1 0 B
   |
   o  0 0 A
   
   $ cd ../push-dest
   $ hglog
   o  4 1 B'
   |
   | o  3 1 D
   | |
   | o  2 1 C
   |/
   o  1 0 B
   |
   o  0 0 A
   
 
 (Issue3303)
 Check that remote secret changeset are ignore when checking creation of remote heads
 
 We add a secret head into the push destination. This secret head shadows a
 visible shared between the initial repo and the push destination.
 
   $ hg up -q 4 # B'
   $ mkcommit Z --config phases.new-commit=secret
   test-debug-phase: new rev 5:  x -> 2
   test-hook-close-phase: 2713879da13d6eea1ff22b442a5a87cb31a7ce6a:   -> secret
   $ hg phase .
   5: secret
 
 We now try to push a new public changeset that descend from the common public
 head shadowed by the remote secret head.
 
   $ cd ../initialrepo
   $ hg up -q 6 #B'
   $ mkcommit I
   test-debug-phase: new rev 8:  x -> 1
   created new head
   test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061:   -> draft
   $ hg push ../push-dest
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   test-debug-phase: new rev 6:  x -> 1
   test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061:   -> draft
 
 :note: The "(+1 heads)" is wrong as we do not had any visible head
 
 check that branch cache with "served" filter are properly computed and stored
 
   $ ls ../push-dest/.hg/cache/branch2*
   ../push-dest/.hg/cache/branch2-base
   ../push-dest/.hg/cache/branch2-served
   $ cat ../push-dest/.hg/cache/branch2-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
   $ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n'  #update visible cache too
   6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft
   5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret
   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft
   $ ls ../push-dest/.hg/cache/branch2*
   ../push-dest/.hg/cache/branch2-base
   ../push-dest/.hg/cache/branch2-served
   ../push-dest/.hg/cache/branch2-visible
   $ cat ../push-dest/.hg/cache/branch2-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
   $ cat ../push-dest/.hg/cache/branch2-visible
   6d6770faffce199f1fddd1cf87f6f026138cf061 6
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
 
 
 Restore condition prior extra insertion.
   $ hg -q --config extensions.mq= strip .
   $ hg up -q 7
   $ cd ..
 
 Test secret changeset are not pull
 
   $ hg init pull-dest
   $ cd pull-dest
   $ hg pull ../initialrepo
   pulling from ../initialrepo
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   new changesets 4a2df7238c3b:cf9fe039dfd6
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hglog
   o  4 0 B'
   |
   | o  3 0 D
   | |
   | o  2 0 C
   |/
   o  1 0 B
   |
   o  0 0 A
   
   $ cd ..
 
 But secret can still be bundled explicitly
 
   $ cd initialrepo
   $ hg bundle --base '4^' -r 'children(4)' ../secret-bundle.hg
   4 changesets found
   $ cd ..
 
 Test secret changeset are not cloned
 (during local clone)
 
   $ hg clone -qU initialrepo clone-dest
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   $ hglog -R clone-dest
   o  4 0 B'
   |
   | o  3 0 D
   | |
   | o  2 0 C
   |/
   o  1 0 B
   |
   o  0 0 A
   
 
 Test summary
 
   $ hg summary -R clone-dest --verbose
   parent: -1:000000000000  (no revision checked out)
   branch: default
   commit: (clean)
   update: 5 new changesets (update)
   $ hg summary -R initialrepo
   parent: 7:17a481b3bccb tip
    merge B' and E
   branch: default
   commit: (clean) (secret)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 3 draft, 3 secret
   $ hg summary -R initialrepo --quiet
   parent: 7:17a481b3bccb tip
   update: 1 new changesets, 2 branch heads (merge)
 
 Test revset
 
   $ cd initialrepo
   $ hglog -r 'public()'
   o  1 0 B
   |
   o  0 0 A
   
   $ hglog -r 'draft()'
   o  6 1 B'
   |
   ~
   o  3 1 D
   |
   o  2 1 C
   |
   ~
   $ hglog -r 'secret()'
   @    7 2 merge B' and E
   |\
   | ~
   | o  5 2 H
   |/
   o  4 2 E
   |
   ~
 
 test that phase are displayed in log at debug level
 
   $ hg log --debug
   changeset:   7:17a481b3bccb796c0521ae97903d81c52bfee4af
   tag:         tip
   phase:       secret
   parent:      6:cf9fe039dfd67e829edf6522a45de057b5c86519
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   manifest:    7:5e724ffacba267b2ab726c91fc8b650710deaaa8
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   extra:       branch=default
   description:
   merge B' and E
   
   
   changeset:   6:cf9fe039dfd67e829edf6522a45de057b5c86519
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B'
   extra:       branch=default
   description:
   B'
   
   
   changeset:   5:a030c6be5127abc010fcbff1851536552e6951a8
   phase:       secret
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      H
   extra:       branch=default
   description:
   H
   
   
   changeset:   4:a603bfb5a83e312131cebcd05353c217d4d21dde
   phase:       secret
   parent:      3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    4:7173fd1c27119750b959e3a0f47ed78abe75d6dc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      E
   extra:       branch=default
   description:
   E
   
   
   changeset:   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   phase:       draft
   parent:      2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      D
   extra:       branch=default
   description:
   D
   
   
   changeset:   2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    2:66a5a01817fdf5239c273802b5b7618d051c89e4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C
   extra:       branch=default
   description:
   C
   
   
   changeset:   1:27547f69f25460a52fff66ad004e58da7ad3fb56
   phase:       public
   parent:      0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B
   extra:       branch=default
   description:
   B
   
   
   changeset:   0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   phase:       public
   parent:      -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      A
   extra:       branch=default
   description:
   A
   
   
 
 
 (Issue3707)
 test invalid phase name
 
   $ mkcommit I --config phases.new-commit='babar'
   transaction abort!
   rollback completed
   config error: phases.new-commit: not a valid phase name ('babar')
   [30]
 Test phase command
 ===================
 
 initial picture
 
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 display changesets phase
 
 (mixing -r and plain rev specification)
 
   $ hg phase 1::4 -r 7
   1: public
   2: draft
   3: draft
   4: secret
   7: secret
 
 
 move changeset forward
 
 (with -r option)
 
   $ hg phase --public -r 2
   test-debug-phase: move rev 2: 1 -> 0
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  draft -> public
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset backward
 
 (without -r option)
 
   $ hg phase --draft --force 2
   test-debug-phase: move rev 2: 0 -> 1
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  public -> draft
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset forward and backward
 
   $ hg phase --draft --force 1::4
   test-debug-phase: move rev 1: 0 -> 1
   test-debug-phase: move rev 4: 2 -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  public -> draft
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  secret -> draft
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 draft E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 draft B
   |
   o  0 public A
   
 test partial failure
 
   $ hg phase --public 7
   test-debug-phase: move rev 1: 1 -> 0
   test-debug-phase: move rev 2: 1 -> 0
   test-debug-phase: move rev 3: 1 -> 0
   test-debug-phase: move rev 4: 1 -> 0
   test-debug-phase: move rev 6: 1 -> 0
   test-debug-phase: move rev 7: 2 -> 0
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  draft -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  draft -> public
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  draft -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:  draft -> public
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  secret -> public
   $ hg phase --draft '5 or 7'
   test-debug-phase: move rev 5: 2 -> 1
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:  secret -> draft
   cannot move 1 changesets to a higher phase, use --force
   phase changed for 1 changesets
   [1]
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 public merge B' and E
   |\
   | o  6 public B'
   | |
   +---o  5 draft H
   | |
   o |  4 public E
   | |
   o |  3 public D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 test complete failure
 
   $ hg phase --draft 7
   cannot move 1 changesets to a higher phase, use --force
   no phases changed
   [1]
 
   $ cd ..
 
 test hidden changeset are not cloned as public (issue3935)
 
   $ cd initialrepo
 
 (enabling evolution)
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
 (making a changeset hidden; H in that case)
   $ hg debugobsolete `hg id --debug -r 5`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ cd ..
   $ hg clone initialrepo clonewithobs
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 7 changesets with 6 changes to 6 files
   new changesets 4a2df7238c3b:17a481b3bccb
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-debug-phase: new rev 5:  x -> 0
   test-debug-phase: new rev 6:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:   -> public
   updating to branch default
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd clonewithobs
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    6 public merge B' and E
   |\
   | o  5 public B'
   | |
   o |  4 public E
   | |
   o |  3 public D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 test verify repo containing hidden changesets, which should not abort just
 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 ..
 
 check whether HG_PENDING makes pending changes only in related
 repositories visible to an external hook.
 
 (emulate a transaction running concurrently by copied
 .hg/phaseroots.pending in subsequent test)
 
   $ cat > $TESTTMP/savepending.sh <<EOF
   > cp .hg/store/phaseroots.pending  .hg/store/phaseroots.pending.saved
   > exit 1 # to avoid changing phase for subsequent tests
   > EOF
   $ cd push-dest
   $ hg phase 6
   6: draft
   $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" phase -f -s 6
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [40]
   $ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending
 
 (check (in)visibility of phaseroot while transaction running in repo)
 
   $ cat > $TESTTMP/checkpending.sh <<EOF
   > echo '@initialrepo'
   > hg -R "$TESTTMP/initialrepo" phase 7
   > echo '@push-dest'
   > hg -R "$TESTTMP/push-dest" phase 6
   > exit 1 # to avoid changing phase for subsequent tests
   > EOF
   $ cd ../initialrepo
   $ hg phase 7
   7: public
   $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" phase -f -s 7
   @initialrepo
   7: secret
   @push-dest
   6: draft
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [40]
 
 Check that pretxnclose-phase hook can control phase movement
 
   $ hg phase --force b3325c91a4d9 --secret
   test-debug-phase: move rev 3: 0 -> 2
   test-debug-phase: move rev 4: 0 -> 2
   test-debug-phase: move rev 5: 1 -> 2
   test-debug-phase: move rev 7: 0 -> 2
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  public -> secret
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  public -> secret
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:  draft -> secret
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  public -> secret
   $ hg log -G -T phases
   @    changeset:   7:17a481b3bccb
   |\   tag:         tip
   | |  phase:       secret
   | |  parent:      6:cf9fe039dfd6
   | |  parent:      4:a603bfb5a83e
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     merge B' and E
   | |
   | o  changeset:   6:cf9fe039dfd6
   | |  phase:       public
   | |  parent:      1:27547f69f254
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     B'
   | |
   o |  changeset:   4:a603bfb5a83e
   | |  phase:       secret
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     E
   | |
   o |  changeset:   3:b3325c91a4d9
   | |  phase:       secret
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     D
   | |
   o |  changeset:   2:f838bfaca5c7
   |/   phase:       public
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     C
   |
   o  changeset:   1:27547f69f254
   |  phase:       public
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     B
   |
   o  changeset:   0:4a2df7238c3b
      phase:       public
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Install a hook that prevent b3325c91a4d9 to become public
 
   $ cat >> .hg/hgrc << EOF
   > [hooks]
   > pretxnclose-phase.nopublish_D = sh -c "(echo \$HG_NODE| grep -v b3325c91a4d9>/dev/null) || [ 'public' != \$HG_PHASE ]"
   > EOF
 
 Try various actions. only the draft move should succeed
 
   $ hg phase --public b3325c91a4d9
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [40]
   $ hg phase --public a603bfb5a83e
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [40]
   $ hg phase --draft 17a481b3bccb
   test-debug-phase: move rev 3: 2 -> 1
   test-debug-phase: move rev 4: 2 -> 1
   test-debug-phase: move rev 7: 2 -> 1
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  secret -> draft
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  secret -> draft
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  secret -> draft
   $ hg phase --public 17a481b3bccb
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [40]
 
   $ cd ..
 
 Test for the "internal" phase
 =============================
 
 Check we deny its usage on older repository
 
   $ hg init no-internal-phase --config format.use-internal-phase=no
   $ cd no-internal-phase
   $ hg debugrequires | grep internal-phase
   [1]
   $ echo X > X
   $ hg add X
   $ hg status
   A X
   $ hg --config "phases.new-commit=internal" commit -m "my test internal commit" 2>&1 | grep ProgrammingError
   ** ProgrammingError: this repository does not support the internal phase
       raise error.ProgrammingError(msg) (no-pyoxidizer !)
   *ProgrammingError: this repository does not support the internal phase (glob)
   $ hg --config "phases.new-commit=archived" commit -m "my test archived commit" 2>&1 | grep ProgrammingError
   ** ProgrammingError: this repository does not support the archived phase
       raise error.ProgrammingError(msg) (no-pyoxidizer !)
   *ProgrammingError: this repository does not support the archived phase (glob)
 
   $ cd ..
 
 Check it works fine with repository that supports it.
 
   $ hg init internal-phase --config format.use-internal-phase=yes
   $ cd internal-phase
   $ hg debugrequires | grep internal-phase
   internal-phase-2
   $ mkcommit A
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
 
 Commit an internal changesets
 
   $ echo B > B
   $ hg add B
   $ hg status
   A B
   $ hg --config "phases.new-commit=internal" commit -m "my test internal commit"
   test-debug-phase: new rev 1:  x -> 96
   test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea:   -> internal
 
 The changeset is a working parent descendant.
 Per the usual visibility rules, it is made visible.
 
   $ hg log -G -l 3
   @  changeset:   1:c01c42dffc7f
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     my test internal commit
   |
   o  changeset:   0:4a2df7238c3b
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Commit is hidden as expected
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   @  changeset:   0:4a2df7238c3b
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Test for archived phase
 -----------------------
 
 Commit an archived changesets
 
   $ cd ..
   $ hg clone --quiet --pull internal-phase archived-phase \
   > --config format.exp-archived-phase=yes \
   > --config extensions.phasereport='!' \
   > --config hooks.txnclose-phase.test=
 
   $ cd archived-phase
 
   $ echo B > B
   $ hg add B
   $ hg status
   A B
   $ hg --config "phases.new-commit=archived" commit -m "my test archived commit"
   test-debug-phase: new rev 1:  x -> 32
   test-hook-close-phase: 8df5997c3361518f733d1ae67cd3adb9b0eaf125:   -> archived
 
 The changeset is a working parent descendant.
 Per the usual visibility rules, it is made visible.
 
   $ hg log -G -l 3
   @  changeset:   1:8df5997c3361
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     my test archived commit
   |
   o  changeset:   0:4a2df7238c3b
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Commit is hidden as expected
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   @  changeset:   0:4a2df7238c3b
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
   $ cd ..
 
 Recommitting an exact match of a public commit shouldn't change it to
 draft:
 
   $ cd initialrepo
   $ hg phase -r 2
   2: public
   $ hg up -C 1
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ mkcommit C
   warning: commit already existed in the repository!
   $ hg phase -r 2
   2: public
 
 Same, but for secret:
 
   $ hg up 7
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit F -s
   test-debug-phase: new rev 8:  x -> 2
   test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a:   -> secret
   $ hg up 7
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg phase
   7: draft
   $ mkcommit F
   test-debug-phase: new rev 8:  x -> 2
   warning: commit already existed in the repository!
   test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a:   -> secret
   $ hg phase -r tip
   8: secret
 
 But what about obsoleted changesets?
 
   $ hg up 4
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit H
   test-debug-phase: new rev 5:  x -> 2
   warning: commit already existed in the repository!
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:   -> secret
   $ hg phase -r 5
   5: secret
   $ hg par
   changeset:   5:a030c6be5127
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   obsolete:    pruned
   summary:     H
   
   $ hg up tip
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cd ..
 
 Testing that command line flags override configuration
 
   $ hg init commit-overrides
   $ cd commit-overrides
 
 `hg commit --draft` overrides new-commit=secret
 
   $ mkcommit A --config phases.new-commit='secret' --draft
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
   $ hglog
   @  0 1 A
   
 
 `hg commit --secret` overrides new-commit=draft
 
   $ mkcommit B --config phases.new-commit='draft' --secret
   test-debug-phase: new rev 1:  x -> 2
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> secret
   $ hglog
   @  1 2 B
   |
   o  0 1 A
   
 
   $ cd ..

tests/test-pull-network.t

@@ -1,127 +1,117
 #require serve
 
   $ hg init test
   $ cd test
 
   $ echo foo>foo
   $ hg addremove
   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
   $ cd ..
 
   $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 340e38bdcde4
   updating to branch default
   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
   $ cat foo
   foo
 
   $ hg manifest --debug
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
 
   $ hg pull
   pulling from http://foo@localhost:$HGPORT/
   searching for changes
   no changes found
 
   $ hg rollback --dry-run --verbose
   repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
 
 Test pull of non-existing 20 character revision specification, making sure plain ascii identifiers
 not are encoded like a node:
 
   $ hg pull -r 'xxxxxxxxxxxxxxxxxxxy'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'
   [255]
   $ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'
   [255]
 
 Test pull of working copy revision
   $ hg pull -r 'ffffffffffff'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'ffffffffffff'
   [255]
 
 Test 'file:' uri handling:
 
   $ hg pull -q file://../test-does-not-exist
   abort: file:// URLs can only refer to localhost
   [255]
 
   $ hg pull -q file://../test
   abort: file:// URLs can only refer to localhost
   [255]
 
 MSYS changes 'file:' into 'file;'
 
 #if no-msys
   $ hg pull -q file:../test  # no-msys
 #endif
 
 It's tricky to make file:// URLs working on every platform with
 regular shell commands.
 
   $ URL=`"$PYTHON" -c "import os; print('file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
   $ hg pull -q "$URL"
   abort: file:// URLs can only refer to localhost
   [255]
 
   $ URL=`"$PYTHON" -c "import os; print('file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
   $ hg pull -q "$URL"
 
 SEC: check for unsafe ssh url
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > ssh = sh -c "read l; read l; read l"
   > EOF
 
   $ hg pull 'ssh://-oProxyCommand=touch${IFS}owned/path'
   pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg pull 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
   pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg pull 'ssh://fakehost|touch${IFS}owned/path'
   pulling from ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path
   abort: no suitable response from remote hg
   [255]
   $ hg --config ui.timestamp-output=true pull 'ssh://fakehost%7Ctouch%20owned/path'
   \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] pulling from ssh://fakehost%7Ctouch%20owned/path (re)
   \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] abort: no suitable response from remote hg (re)
   [255]
 
   $ [ ! -f owned ] || echo 'you got owned'
 
   $ cd ..

tests/test-pull-permission.t

@@ -1,33 +1,28
 #require unix-permissions no-root
 
   $ hg init a
   $ cd a
   $ echo foo > b
   $ hg add b
   $ hg ci -m "b"
 
   $ chmod -w .hg/store
 
   $ cd ..
 
   $ hg clone a b
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 97310831fa1a
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ 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 ..

tests/test-pull-pull-corruption.t

@@ -1,75 +1,70
 Corrupt an hg repo with two pulls.
 create one repo with a long history
 
   $ hg init source1
   $ cd source1
   $ touch foo
   $ hg add foo
   $ for i in 1 2 3 4 5 6 7 8 9 10; do
   >     echo $i >> foo
   >     hg ci -m $i
   > done
   $ cd ..
 
 create one repo with a shorter history
 
   $ hg clone -r 0 source1 source2
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 495a0ec48aaf
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd source2
   $ echo a >> foo
   $ hg ci -m a
   $ cd ..
 
 create a third repo to pull both other repos into it
 
   $ hg init corrupted
   $ cd corrupted
 
 use a hook to make the second pull start while the first one is still running
 
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'prechangegroup = sleep 5' >> .hg/hgrc
 
 start a pull...
 
   $ hg pull ../source1 > pull.out 2>&1 &
 
 ... and start another pull before the first one has finished
 
   $ sleep 1
   $ hg pull ../source2 2>/dev/null
   pulling from ../source2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets ca3c05af513e
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ cat pull.out
   pulling from ../source1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 10 changesets with 10 changes to 1 files
   new changesets 495a0ec48aaf:1e7b6c812ca8
   (run 'hg update' to get a working copy)
 
 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 ..

tests/test-push.t

@@ -1,402 +1,342
 ==================================
 Basic testing for the push command
 ==================================
 
 Testing of the '--rev' flag
 ===========================
 
   $ hg init test-revflag
   $ hg -R test-revflag unbundle "$TESTDIR/bundles/remote.hg"
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >    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
   searching for changes
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
   adding changesets
   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
 
   $ hg pull ../test-revflag-7
   pulling from ../test-revflag-7
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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 ..
 
 Test server side validation during push
 =======================================
 
   $ hg init test-validation
   $ cd test-validation
 
   $ cat > .hg/hgrc <<EOF
   > [server]
   > validate=1
   > EOF
 
   $ echo alpha > alpha
   $ echo beta > beta
   $ hg addr
   adding alpha
   adding beta
   $ hg ci -m 1
 
   $ cd ..
   $ hg clone test-validation test-validation-clone
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 #if reporevlogstore
 
 Test spurious filelog entries:
 
   $ cd test-validation-clone
   $ echo blah >> beta
   $ cp .hg/store/data/beta.i tmp1
   $ hg ci -m 2
   $ cp .hg/store/data/beta.i tmp2
   $ hg -q rollback
   $ mv tmp2 .hg/store/data/beta.i
   $ echo blah >> beta
   $ hg ci -m '2 (corrupt)'
 
 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]
 
   $ hg push
   pushing to $TESTTMP/test-validation
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   transaction abort!
   rollback completed
   abort: received spurious file revlog entry
   [255]
 
   $ hg -q rollback
   $ mv tmp1 .hg/store/data/beta.i
   $ echo beta > beta
 
 Test missing filelog entries:
 
   $ cp .hg/store/data/beta.i tmp
   $ echo blah >> beta
   $ hg ci -m '2 (corrupt)'
   $ mv tmp .hg/store/data/beta.i
 
 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]
 
   $ hg push
   pushing to $TESTTMP/test-validation
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   transaction abort!
   rollback completed
   abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
   [255]
 
   $ cd ..
 
 #endif
 
 Test push hook locking
 =====================
 
   $ hg init 1
 
   $ echo '[ui]' >> 1/.hg/hgrc
   $ echo 'timeout = 10' >> 1/.hg/hgrc
 
   $ echo foo > 1/foo
   $ hg --cwd 1 ci -A -m foo
   adding foo
 
   $ hg clone 1 2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg clone 2 3
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh
   > hg debuglocks
   > true
   > EOF
   $ echo '[hooks]' >> 2/.hg/hgrc
   $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc
   $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc
 
   $ echo bar >> 3/foo
   $ hg --cwd 3 ci -m bar
 
   $ hg --cwd 3 push ../2 --config devel.legacy.exchange=bundle1
   pushing to ../2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   lock:  user *, process * (*s) (glob)
   wlock: free
   added 1 changesets with 1 changes to 1 files
 
   $ hg --cwd 1 --config extensions.strip= strip tip -q
   $ hg --cwd 2 --config extensions.strip= strip tip -q
   $ hg --cwd 3 push ../2 # bundle2+
   pushing to ../2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   lock:  user *, process * (*s) (glob)
   wlock: user *, process * (*s) (glob)
   added 1 changesets with 1 changes to 1 files
 
 Test bare push with multiple race checking options
 --------------------------------------------------
 
   $ hg init test-bare-push-no-concurrency
   $ hg init test-bare-push-unrelated-concurrency
   $ hg -R test-revflag push -r 0 test-bare-push-no-concurrency --config server.concurrent-push-mode=strict
   pushing to test-bare-push-no-concurrency
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   $ hg -R test-revflag push -r 0 test-bare-push-unrelated-concurrency --config server.concurrent-push-mode=check-related
   pushing to test-bare-push-unrelated-concurrency
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 SEC: check for unsafe ssh url
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > ssh = sh -c "read l; read l; read l"
   > EOF
 
   $ hg -R test-revflag push 'ssh://-oProxyCommand=touch${IFS}owned/path'
   pushing to ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg -R test-revflag push 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
   pushing to ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg -R test-revflag push 'ssh://fakehost|touch${IFS}owned/path'
   pushing to ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path
   abort: no suitable response from remote hg
   [255]
   $ hg -R test-revflag push 'ssh://fakehost%7Ctouch%20owned/path'
   pushing to ssh://fakehost%7Ctouch%20owned/path
   abort: no suitable response from remote hg
   [255]
 
   $ [ ! -f owned ] || echo 'you got owned'
 
 Test `commands.push.require-revs`
 ---------------------------------
 
   $ hg clone -q test-revflag test-require-revs-source
   $ hg init test-require-revs-dest
   $ cd test-require-revs-source
   $ cat >> .hg/hgrc << EOF
   > [paths]
   > default = ../test-require-revs-dest
   > [commands]
   > push.require-revs=1
   > EOF
   $ hg push
   pushing to $TESTTMP/test-require-revs-dest
   abort: no revisions specified to push
   (did you mean "hg push -r ."?)
   [10]
   $ hg push -r 0
   pushing to $TESTTMP/test-require-revs-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   $ hg bookmark -r 0 push-this-bookmark
 (test that -B (bookmark) works for specifying "revs")
   $ hg push -B push-this-bookmark
   pushing to $TESTTMP/test-require-revs-dest
   searching for changes
   no changes found
   exporting bookmark push-this-bookmark
   [1]
 (test that -b (branch)  works for specifying "revs")
   $ hg push -b default
   pushing to $TESTTMP/test-require-revs-dest
   searching for changes
   abort: push creates new remote head [0-9a-f]+ (re)
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
 (demonstrate that even though we don't have anything to exchange, we're still
 showing the error)
   $ hg push
   pushing to $TESTTMP/test-require-revs-dest
   abort: no revisions specified to push
   (did you mean "hg push -r ."?)
   [10]
   $ hg push --config paths.default:pushrev=0
   pushing to $TESTTMP/test-require-revs-dest
   searching for changes
   no changes found
   [1]

tests/test-revlog-v2.t

@@ -1,132 +1,122
 #require reporevlogstore
 
 A repo with unknown revlogv2 requirement string cannot be opened
 
   $ hg init invalidreq
   $ cd invalidreq
   $ echo exp-revlogv2.unknown >> .hg/requires
   $ hg log
   abort: repository requires features unknown to this Mercurial: exp-revlogv2.unknown
   (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
   [255]
   $ cd ..
 
 Can create and open repo with revlog v2 requirement
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > revlogv2 = enable-unstable-format-and-corrupt-my-data
   > EOF
 
   $ hg init new-repo
   $ cd new-repo
   $ hg debugrequires | grep revlogv2
   exp-revlogv2.2
   dirstate-v2 (dirstate-v2 !)
 
   $ hg log
 
 Unknown flags to revlog are rejected
 
   >>> with open('.hg/store/00changelog.i', 'wb') as fh:
   ...     fh.write(b'\xff\x00\xde\xad') and None
 
   $ hg log
   abort: unknown flags (0xff00) in version 57005 revlog 00changelog
   [50]
 
   $ cd ..
 
 Writing a simple revlog v2 works
 
   $ hg init simple
   $ cd simple
   $ touch foo
   $ hg -q commit -A -m initial
 
   $ hg log
   changeset:   0:96ee1d7354c4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial
   
 
 Header written as expected
 
   $ f --hexdump --bytes 4 .hg/store/00changelog.i
   .hg/store/00changelog.i:
   0000: 00 00 de ad                                     |....|
 
   $ f --hexdump --bytes 4 .hg/store/data/foo.i
   .hg/store/data/foo.i:
   0000: 00 00 de ad                                     |....|
 
 Bundle use a compatible changegroup format
 ------------------------------------------
 
   $ hg bundle --all ../basic.hg
   1 changesets found
   $ hg debugbundle --spec ../basic.hg
   bzip2-v2
 
 The expected files are generated
 --------------------------------
 
 We should have have:
 - a docket
 - a index file with a unique name
 - a data file
 
   $ ls .hg/store/00changelog* .hg/store/00manifest*
   .hg/store/00changelog-1335303a.sda
   .hg/store/00changelog-6b8ab34b.idx
   .hg/store/00changelog-b875dfc5.dat
   .hg/store/00changelog.i
   .hg/store/00manifest-05a21d65.idx
   .hg/store/00manifest-43c37dde.dat
   .hg/store/00manifest-e2c9362a.sda
   .hg/store/00manifest.i
 
 Local clone works
 -----------------
 
   $ hg clone . ../cloned-repo
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tip | tee ../tip-new
   changeset:   0:96ee1d7354c4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial
   
   $ hg tip -R ../cloned-repo | tee ../tip-cloned
   changeset:   0:96ee1d7354c4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial
   
 
 The two repository should be identical, this diff MUST be empty
 
   $ cmp ../tip-new ../tip-cloned || diff -U8 ../tip-new ../tip-cloned
 
 
 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

tests/test-rhg-sparse-narrow.t

@@ -1,117 +1,112
 #require rhg
 
   $ NO_FALLBACK="env RHG_ON_UNSUPPORTED=abort"
 
 Rhg works well when sparse working copy is enabled.
 
   $ cd "$TESTTMP"
   $ hg init repo-sparse
   $ cd repo-sparse
   $ cat > .hg/hgrc <<EOF
   > [extensions]
   > sparse=
   > EOF
 
   $ echo a > show
   $ echo x > hide
   $ mkdir dir1 dir2
   $ echo x > dir1/x
   $ echo y > dir1/y
   $ echo z > dir2/z
 
   $ hg ci -Aqm 'initial'
   $ hg debugsparse --include 'show'
   $ ls -A
   .hg
   show
 
   $ tip=$(hg log -r . --template '{node}')
   $ $NO_FALLBACK rhg files -r "$tip"
   dir1/x
   dir1/y
   dir2/z
   hide
   show
   $ $NO_FALLBACK rhg files
   show
 
   $ $NO_FALLBACK rhg cat -r "$tip" hide
   x
 
   $ cd ..
 
 We support most things when narrow is enabled, too, with a couple of caveats.
 
   $ . "$TESTDIR/narrow-library.sh"
   $ real_hg=$RHG_FALLBACK_EXECUTABLE
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > narrow=
   > EOF
 
   $ hg clone --narrow  ./repo-sparse repo-narrow --include dir1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets 6d714a4a2998
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd repo-narrow
 
   $ $NO_FALLBACK rhg cat -r "$tip" dir1/x
   x
   $ "$real_hg" cat -r "$tip" dir1/x
   x
 
 TODO: bad error message
 
   $ $NO_FALLBACK rhg cat -r "$tip" hide
   abort: invalid revision identifier: 6d714a4a2998cbfd0620db44da58b749f6565d63
   [255]
   $ "$real_hg" cat -r "$tip" hide
   [1]
 
 A naive implementation of [rhg files] leaks the paths that are supposed to be
 hidden by narrow, so we just fall back to hg.
 
   $ $NO_FALLBACK rhg files -r "$tip"
   unsupported feature: rhg files -r <rev> is not supported in narrow clones
   [252]
   $ "$real_hg" files -r "$tip"
   dir1/x
   dir1/y
 
 Hg status needs to do some filtering based on narrow spec
 
   $ mkdir dir2
   $ touch dir2/q
   $ "$real_hg" status
   $ $NO_FALLBACK rhg --config rhg.status=true status
 
 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
   dir1/y
 
 # TODO: even though [hg files] hides the orphaned dir2/z, [hg cat] still shows it.
 # rhg has the same issue, but at least it's not specific to rhg.
 # This is despite [hg verify] succeeding above.
 
   $ $NO_FALLBACK rhg cat -r "$tip" dir2/z
   z
   $ "$real_hg" cat -r "$tip" dir2/z
   z

tests/test-rollback.t

@@ -1,468 +1,442
 setup repo
   $ hg init t
   $ cd t
   $ 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
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
 
 rollback to null revision
   $ hg status
   $ 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
 
 Two changesets this time so we rollback to a real changeset
   $ hg commit -m'add a again'
   $ echo a >> a
   $ hg commit -m'modify a'
 
 Test issue 902 (current branch is preserved)
   $ hg branch test
   marked working directory as branch test
   (branches are permanent and global, did you want a bookmark?)
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   working directory now based on revision 0
   $ hg branch
   default
 
 Test issue 1635 (commit message saved)
   $ cat .hg/last-message.txt ; echo
   modify a
 
 Test rollback of hg before issue 902 was fixed
 
   $ hg commit -m "test3"
   $ hg branch test
   marked working directory as branch test
   (branches are permanent and global, did you want a bookmark?)
   $ rm .hg/undo.branch
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   named branch could not be reset: current branch is still 'test'
   working directory now based on revision 0
   $ hg branch
   test
 
 working dir unaffected by rollback: do not restore dirstate et. al.
   $ hg log --template '{rev}  {branch}  {desc|firstline}\n'
   0  default  add a again
   $ hg status
   M a
   $ hg bookmark foo
   $ hg commit -m'modify a again'
   $ echo b > b
   $ hg bookmark bar -r default #making bar active, before the transaction
   $ hg commit -Am'add b'
   adding b
   $ hg log --template '{rev}  {branch}  {desc|firstline}\n'
   2  test  add b
   1  test  modify a again
   0  default  add a again
   $ hg update bar
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (activating bookmark bar)
   $ cat .hg/undo.branch ; echo
   test
   $ hg rollback -f
   repository tip rolled back to revision 1 (undo commit)
   $ hg id -n
   0
   $ hg branch
   default
   $ cat .hg/bookmarks.current ; echo
   bar
   $ hg bookmark --delete foo bar
 
 rollback by pretxncommit saves commit message (issue1635)
 
   $ echo a >> a
   $ hg --config hooks.pretxncommit=false commit -m"precious commit message"
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status * (glob)
   [40]
   $ cat .hg/last-message.txt ; echo
   precious commit message
 
 same thing, but run $EDITOR
 
   $ cat > editor.sh << '__EOF__'
   > echo "another precious commit message" > "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
   transaction abort!
   rollback completed
   note: commit message saved in .hg/last-message.txt
   note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
   abort: pretxncommit hook exited with status * (glob)
   [40]
   $ cat .hg/last-message.txt
   another precious commit message
 
 test rollback on served repository
 
 #if serve
   $ hg commit -m "precious commit message"
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone http://localhost:$HGPORT u
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files (+1 heads)
   new changesets 23b0221f3370:068774709090
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd u
   $ hg id default
   068774709090
 
 now rollback and observe that 'hg serve' reloads the repository and
 presents the correct tip changeset:
 
   $ hg -R ../t rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 0
   $ hg id default
   791dd2169706
 
   $ killdaemons.py
 #endif
 
 update to older changeset and then refuse rollback, because
 that would lose data (issue2998)
   $ cd ../t
   $ hg -q update
   $ rm `hg status -un`
   $ template='{rev}:{node|short}  [{branch}]  {desc|firstline}\n'
   $ echo 'valuable new file' > b
   $ echo 'valuable modification' >> a
   $ hg commit -A -m'a valuable change'
   adding b
   $ hg update 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rollback
   abort: rollback of last commit while not checked out may lose data
   (use -f to force)
   [255]
   $ hg tip -q
   2:4d9cd3795eea
   $ hg rollback -f
   repository tip rolled back to revision 1 (undo commit)
   $ hg status
   $ hg log --removed b   # yep, it's gone
 
 same again, but emulate an old client that doesn't write undo.desc
   $ hg -q update
   $ echo 'valuable modification redux' >> a
   $ hg commit -m'a valuable change redux'
   $ rm .hg/undo.desc
   $ hg update 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rollback
   rolling back unknown transaction
   $ cat a
   a
 
 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 <<EOF
   > [ui]
   > rollback = false
   > EOF
   $ echo narf >> pinky-sayings.txt
   $ hg add pinky-sayings.txt
   $ hg ci -m 'First one.'
   $ hg rollback
   abort: rollback is disabled because it is unsafe
   (see `hg help -v rollback` for information)
   [255]
 
   $ cd ..
 
 I/O errors on stdio are handled properly (issue5658)
 
   $ cat > badui.py << EOF
   > import errno
   > from mercurial.i18n import _
   > from mercurial import (
   >     error,
   >     registrar,
   >     ui as uimod,
   > )
   > 
   > configtable = {}
   > configitem = registrar.configitem(configtable)
   > 
   > configitem(b'ui', b'ioerrors',
   >     default=list,
   > )
   > 
   > def pretxncommit(ui, repo, **kwargs):
   >     ui.warn(b'warn during pretxncommit\n')
   > 
   > def pretxnclose(ui, repo, **kwargs):
   >     ui.warn(b'warn during pretxnclose\n')
   > 
   > def txnclose(ui, repo, **kwargs):
   >     ui.warn(b'warn during txnclose\n')
   > 
   > def txnabort(ui, repo, **kwargs):
   >     ui.warn(b'warn during abort\n')
   > 
   > class fdproxy(object):
   >     def __init__(self, ui, o):
   >         self._ui = ui
   >         self._o = o
   > 
   >     def __getattr__(self, attr):
   >         return getattr(self._o, attr)
   > 
   >     def write(self, msg):
   >         errors = set(self._ui.configlist(b'ui', b'ioerrors'))
   >         pretxncommit = msg == b'warn during pretxncommit\n'
   >         pretxnclose = msg == b'warn during pretxnclose\n'
   >         txnclose = msg == b'warn during txnclose\n'
   >         txnabort = msg == b'warn during abort\n'
   >         msgabort = msg == _(b'transaction abort!\n')
   >         msgrollback = msg == _(b'rollback completed\n')
   > 
   >         if pretxncommit and b'pretxncommit' in errors:
   >             raise IOError(errno.EPIPE, 'simulated epipe')
   >         if pretxnclose and b'pretxnclose' in errors:
   >             raise IOError(errno.EIO, 'simulated eio')
   >         if txnclose and b'txnclose' in errors:
   >             raise IOError(errno.EBADF, 'simulated badf')
   >         if txnabort and b'txnabort' in errors:
   >             raise IOError(errno.EPIPE, 'simulated epipe')
   >         if msgabort and b'msgabort' in errors:
   >             raise IOError(errno.EBADF, 'simulated ebadf')
   >         if msgrollback and b'msgrollback' in errors:
   >             raise IOError(errno.EIO, 'simulated eio')
   > 
   >         return self._o.write(msg)
   > 
   > def uisetup(ui):
   >     class badui(ui.__class__):
   >         def _write(self, dest, *args, **kwargs):
   >             olderr = self.ferr
   >             try:
   >                 if dest is self.ferr:
   >                     self.ferr = dest = fdproxy(self, olderr)
   >                 return super(badui, self)._write(dest, *args, **kwargs)
   >             finally:
   >                 self.ferr = olderr
   > 
   >     ui.__class__ = badui
   > 
   > def reposetup(ui, repo):
   >     ui.setconfig(b'hooks', b'pretxnclose.badui', pretxnclose, b'badui')
   >     ui.setconfig(b'hooks', b'txnclose.badui', txnclose, b'badui')
   >     ui.setconfig(b'hooks', b'pretxncommit.badui', pretxncommit, b'badui')
   >     ui.setconfig(b'hooks', b'txnabort.badui', txnabort, b'badui')
   > EOF
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > badui = $TESTTMP/badui.py
   > EOF
 
 An I/O error during pretxncommit is handled
 
   $ hg init ioerror-pretxncommit
   $ cd ioerror-pretxncommit
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
   $ echo 1 > foo
   $ hg --config ui.ioerrors=pretxncommit commit -m 'error during pretxncommit'
   warn during pretxnclose
   warn during txnclose
 
   $ hg commit -m 'commit 1'
   nothing changed
   [1]
 
   $ cd ..
 
 An I/O error during pretxnclose is handled
 
   $ hg init ioerror-pretxnclose
   $ cd ioerror-pretxnclose
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=pretxnclose commit -m 'error during pretxnclose'
   warn during pretxncommit
   warn during txnclose
 
   $ hg commit -m 'commit 1'
   nothing changed
   [1]
 
   $ cd ..
 
 An I/O error during txnclose is handled
 
   $ hg init ioerror-txnclose
   $ cd ioerror-txnclose
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=txnclose commit -m 'error during txnclose'
   warn during pretxncommit
   warn during pretxnclose
 
   $ hg commit -m 'commit 1'
   nothing changed
   [1]
 
   $ cd ..
 
 An I/O error writing "transaction abort" is handled
 
   $ hg init ioerror-msgabort
   $ cd ioerror-msgabort
 
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=msgabort --config hooks.pretxncommit=false commit -m 'error during abort message'
   warn during abort
   rollback completed
   abort: pretxncommit hook exited with status 1
   [40]
 
   $ hg commit -m 'commit 1'
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ cd ..
 
 An I/O error during txnabort should still result in rollback
 
   $ hg init ioerror-txnabort
   $ cd ioerror-txnabort
 
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=txnabort --config hooks.pretxncommit=false commit -m 'error during abort'
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status 1
   [40]
 
   $ hg commit -m 'commit 1'
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ cd ..
 
 An I/O error writing "rollback completed" is handled
 
   $ hg init ioerror-msgrollback
   $ cd ioerror-msgrollback
 
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
 
   $ hg --config ui.ioerrors=msgrollback --config hooks.pretxncommit=false commit -m 'error during rollback message'
   transaction abort!
   warn during abort
   abort: pretxncommit hook exited with status 1
   [40]
 
-  $ 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 ..
 
 Multiple I/O errors after transaction open are handled.
 This is effectively what happens if a peer disconnects in the middle
 of a transaction.
 
   $ hg init ioerror-multiple
   $ cd ioerror-multiple
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
 
   $ hg --config ui.ioerrors=pretxncommit,pretxnclose,txnclose,txnabort,msgabort,msgrollback commit -m 'multiple errors'
 
-  $ 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 ..

tests/test-simple-update.t

@@ -1,138 +1,128
   $ hg init test
   $ cd test
   $ echo foo>foo
   $ hg addremove
   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 clone . ../branch
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../branch
   $ hg co
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar>>foo
   $ hg commit -m "2" -d '1 0'
 
   $ cd ../test
 
   $ hg pull ../branch
   pulling from ../branch
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 84b9316f7b31
   1 local changesets published
   (run 'hg update' to get a working copy)
 
-  $ 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
 
   $ hg co
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cat foo
   foo
   bar
 
   $ hg manifest --debug
   6f4310b00b9a147241b071a60c28a650827fb03d 644   foo
 
 update to rev 0 with a date
 
   $ hg upd -d foo 0
   abort: you can't specify a revision and a date
   [10]
 
 update by date
 
   $ hg update -d '<1970-01-01 00:00:02 +0000'
   found revision 1 from Thu Jan 01 00:00:01 1970 +0000
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg update -d '<1970-01-01 00:00:01 +0000'
   found revision 1 from Thu Jan 01 00:00:01 1970 +0000
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg update -d '<1970-01-01 00:00:00 +0000'
   found revision 0 from Thu Jan 01 00:00:00 1970 +0000
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg update -d '>1970-01-01 00:00:02 +0000'
   abort: revision matching date not found
   [10]
   $ hg update -d '>1970-01-01 00:00:01 +0000'
   found revision 1 from Thu Jan 01 00:00:01 1970 +0000
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg update -d '>1970-01-01 00:00:00 +0000'
   found revision 1 from Thu Jan 01 00:00:01 1970 +0000
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 update to default destination (with empty revspec)
 
   $ hg update -q null
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   84b9316f7b31 tip
 
   $ hg update -q null
   $ hg update -r ''
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   84b9316f7b31 tip
 
   $ hg update -q null
   $ hg update ''
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   84b9316f7b31 tip
 
   $ cd ..
 
 update with worker processes
 
 #if no-windows
 
   $ cat <<EOF > forceworker.py
   > from mercurial import extensions, worker
   > def nocost(orig, ui, costperop, nops, threadsafe=True):
   >     return worker._numworkers(ui) > 1
   > def uisetup(ui):
   >     extensions.wrapfunction(worker, 'worthwhile', nocost)
   > EOF
 
   $ hg init worker
   $ cd worker
   $ cat <<EOF >> .hg/hgrc
   > [extensions]
   > forceworker = $TESTTMP/forceworker.py
   > [worker]
   > numcpus = 4
   > EOF
   $ for i in `"$PYTHON" $TESTDIR/seq.py 1 100`; do
   >   echo $i > $i
   > done
   $ hg ci -qAm 'add 100 files'
 
   $ hg update null
   0 files updated, 0 files merged, 100 files removed, 0 files unresolved
   $ hg update -v | grep 100
   getting 100
   100 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
 
   $ cd ..
 
 #endif

tests/test-ssh-bundle1.t

@@ -1,596 +1,581
 This test is a duplicate of 'test-http.t' feel free to factor out
 parts that are not bundle1/bundle2 specific.
 
   $ cat << EOF >> $HGRCPATH
   > [devel]
   > # This test is dedicated to interaction through old bundle
   > legacy.exchange = bundle1
   > EOF
 
 
 This test tries to exercise the ssh functionality with a dummy script
 
 creating 'remote' repo
 
   $ hg init remote
   $ cd remote
   $ echo this > foo
   $ echo this > fooO
   $ hg ci -A -m "init" foo fooO
 
 insert a closed branch (issue4428)
 
   $ hg up null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg branch closed
   marked working directory as branch closed
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -mc0
   $ hg ci --close-branch -mc1
   $ hg up -q default
 
 configure for serving
 
   $ cat <<EOF > .hg/hgrc
   > [server]
   > uncompressed = True
   > 
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup-in-remote 0 ../dummylog"
   > EOF
   $ cd $TESTTMP
 
 repo not found error
 
   $ hg clone ssh://user@dummy/nonexistent local
   remote: abort: repository nonexistent not found
   abort: no suitable response from remote hg
   [255]
 
 non-existent absolute path
 
 #if no-msys
   $ hg clone ssh://user@dummy//`pwd`/nonexistent local
   remote: abort: repository /$TESTTMP/nonexistent not found
   abort: no suitable response from remote hg
   [255]
 #endif
 
 clone remote via stream
 
 #if no-reposimplestore
 
   $ hg clone --stream ssh://user@dummy/remote local-stream
   streaming all changes
   4 files to transfer, 602 bytes of data (no-zstd !)
   transferred 602 bytes in * seconds (*) (glob) (no-zstd !)
   4 files to transfer, 621 bytes of data (zstd !)
   transferred 621 bytes in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
   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
 
 clone bookmarks via stream
 
   $ hg -R local-stream book mybook
   $ hg clone --stream ssh://user@dummy/local-stream stream2
   streaming all changes
   4 files to transfer, 602 bytes of data (no-zstd !)
   transferred 602 bytes in * seconds (*) (glob) (no-zstd !)
   4 files to transfer, 621 bytes of data (zstd !)
   transferred 621 bytes in * seconds (* */sec) (glob) (zstd !)
   searching for changes
   no changes found
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd stream2
   $ hg book
      mybook                    0:1160648e36ce
   $ cd $TESTTMP
   $ rm -rf local-stream stream2
 
 #endif
 
 clone remote via pull
 
   $ hg clone ssh://user@dummy/remote local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 2 files
   new changesets 1160648e36ce:ad076bfb429d
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 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 <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup-in-local 0 ../dummylog"
   > EOF
 
 empty default pull
 
   $ hg paths
   default = ssh://user@dummy/remote
   $ hg pull
   pulling from ssh://user@dummy/remote
   searching for changes
   no changes found
 
 pull from wrong ssh URL
 
   $ hg pull ssh://user@dummy/doesnotexist
   pulling from ssh://user@dummy/doesnotexist
   remote: abort: repository doesnotexist not found
   abort: no suitable response from remote hg
   [255]
 
 local change
 
   $ echo bleah > foo
   $ hg ci -m "add"
 
 updating rc
 
   $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
 
 find outgoing
 
   $ hg out ssh://user@dummy/remote
   comparing with ssh://user@dummy/remote
   searching for changes
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 find incoming on the remote side
 
   $ hg incoming -R ../remote ssh://user@dummy/local
   comparing with ssh://user@dummy/local
   searching for changes
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 find incoming on the remote side (using absolute path)
 
   $ hg incoming -R ../remote "ssh://user@dummy/`pwd`"
   comparing with ssh://user@dummy/$TESTTMP/local
   searching for changes
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 push
 
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ cd $TESTTMP/remote
 
 check remote tip
 
   $ hg tip
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   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
   $ hg ci -A -m z z
   created new head
 
 test pushkeys and bookmarks
 
   $ cd $TESTTMP/local
   $ hg debugpushkey ssh://user@dummy/remote namespaces
   bookmarks	
   namespaces	
   phases	
   $ hg book foo -r 0
   $ hg out -B
   comparing with ssh://user@dummy/remote
   searching for changed bookmarks
      foo                       1160648e36ce
   $ hg push -B foo
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   exporting bookmark foo
   [1]
   $ hg debugpushkey ssh://user@dummy/remote bookmarks
   foo	1160648e36cec0054048a7edc4110c6f84fde594
   $ hg book -f foo
   $ hg push --traceback
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   updating bookmark foo
   [1]
   $ hg book -d foo
   $ hg in -B
   comparing with ssh://user@dummy/remote
   searching for changed bookmarks
      foo                       a28a9d1a809c
   $ hg book -f -r 0 foo
   $ hg pull -B foo
   pulling from ssh://user@dummy/remote
   no changes found
   updating bookmark foo
   $ hg book -d foo
   $ hg push -B foo
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   deleting remote bookmark foo
   [1]
 
 a bad, evil hook that prints to stdout
 
   $ cat <<EOF > $TESTTMP/badhook
   > import sys
   > sys.stdout.write("KABOOM\n")
   > EOF
 
   $ echo '[hooks]' >> ../remote/.hg/hgrc
   $ echo "changegroup.stdout = \"$PYTHON\" $TESTTMP/badhook" >> ../remote/.hg/hgrc
   $ echo r > r
   $ hg ci -A -m z r
 
 push should succeed even though it has an unexpected response
 
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote has heads on branch 'default' that are not known locally: 6c0482d977a3
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (py3 !)
   remote: KABOOM
   $ hg -R ../remote heads
   changeset:   5:1383141674ec
   tag:         tip
   parent:      3:a28a9d1a809c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     z
   
   changeset:   4:6c0482d977a3
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     z
   
 
 clone bookmarks
 
   $ hg -R ../remote bookmark test
   $ hg -R ../remote bookmarks
    * test                      4:6c0482d977a3
   $ hg clone ssh://user@dummy/remote local-bookmarks
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 4 files (+1 heads)
   new changesets 1160648e36ce:1383141674ec
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R local-bookmarks bookmarks
      test                      4:6c0482d977a3
 
 passwords in ssh urls are not supported
 (we use a glob here because different Python versions give different
 results here)
 
   $ hg push ssh://user:erroneouspwd@dummy/remote
   pushing to ssh://user:*@dummy/remote (glob)
   abort: password in URL not supported
   [255]
 
   $ cd $TESTTMP
 
 hide outer repo
   $ hg init
 
 Test remote paths with spaces (issue2983):
 
   $ hg init "ssh://user@dummy/a repo"
   $ touch "$TESTTMP/a repo/test"
   $ hg -R 'a repo' commit -A -m "test"
   adding test
   $ hg -R 'a repo' tag tag
   $ hg id "ssh://user@dummy/a repo"
   73649e48688a
 
   $ hg id "ssh://user@dummy/a repo#noNoNO"
   abort: unknown revision 'noNoNO'
   [255]
 
 Test (non-)escaping of remote paths with spaces when cloning (issue3145):
 
   $ hg clone "ssh://user@dummy/a repo"
   destination directory: a repo
   abort: destination 'a repo' is not empty
   [10]
 
 Test hg-ssh using a helper script that will restore PYTHONPATH (which might
 have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
 parameters:
 
   $ cat > ssh.sh << EOF
   > userhost="\$1"
   > SSH_ORIGINAL_COMMAND="\$2"
   > export SSH_ORIGINAL_COMMAND
   > PYTHONPATH="$PYTHONPATH"
   > export PYTHONPATH
   > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
   > EOF
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo"
   73649e48688a
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
   remote: Illegal repository "$TESTTMP/a'repo"
   abort: no suitable response from remote hg
   [255]
 
   $ hg id --ssh "sh ssh.sh" --remotecmd hacking "ssh://user@dummy/a'repo"
   remote: Illegal command "hacking -R 'a'\''repo' serve --stdio"
   abort: no suitable response from remote hg
   [255]
 
   $ SSH_ORIGINAL_COMMAND="'hg' serve -R 'a'repo' --stdio" "$PYTHON" "$TESTDIR/../contrib/hg-ssh"
   Illegal command "'hg' serve -R 'a'repo' --stdio": No closing quotation
   [255]
 
 Test hg-ssh in read-only mode:
 
   $ cat > ssh.sh << EOF
   > userhost="\$1"
   > SSH_ORIGINAL_COMMAND="\$2"
   > export SSH_ORIGINAL_COMMAND
   > PYTHONPATH="$PYTHONPATH"
   > export PYTHONPATH
   > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
   > EOF
 
   $ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote" read-only-local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 4 files (+1 heads)
   new changesets 1160648e36ce:1383141674ec
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd read-only-local
   $ echo "baz" > bar
   $ hg ci -A -m "unpushable commit" bar
   $ hg push --ssh "sh ../ssh.sh"
   pushing to ssh://user@dummy/*/remote (glob)
   searching for changes
   remote: Permission denied
   remote: abort: pretxnopen.hg-ssh hook failed
   remote: Permission denied
   remote: pushkey-abort: prepushkey.hg-ssh hook failed
   updating 6c0482d977a3 to public failed!
   [1]
 
   $ cd $TESTTMP
 
 stderr from remote commands should be printed before stdout from local code (issue4336)
 
   $ hg clone remote stderr-ordering
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd stderr-ordering
   $ cat >> localwrite.py << EOF
   > from mercurial import exchange, extensions
   > 
   > def wrappedpush(orig, repo, *args, **kwargs):
   >     res = orig(repo, *args, **kwargs)
   >     repo.ui.write(b'local stdout\n')
   >     return res
   > 
   > def extsetup(ui):
   >     extensions.wrapfunction(exchange, b'push', wrappedpush)
   > EOF
 
   $ cat >> .hg/hgrc << EOF
   > [paths]
   > default-push = ssh://user@dummy/remote
   > [extensions]
   > localwrite = localwrite.py
   > EOF
 
   $ echo localwrite > foo
   $ hg commit -m 'testing localwrite'
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (py3 !)
   remote: KABOOM
   local stdout
 
 debug output
 
   $ hg pull --debug ssh://user@dummy/remote
   pulling from ssh://user@dummy/remote
   running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re)
   sending hello command
   sending between command
   remote: \d+ (re)
   remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
   remote: 1
   sending protocaps command
   preparing listkeys for "bookmarks"
   sending listkeys command
   received listkey for "bookmarks": 45 bytes
   query 1; heads
   sending batch command
   searching for changes
   all remote heads known locally
   no changes found
   preparing listkeys for "phases"
   sending listkeys command
   received listkey for "phases": 15 bytes
   checking for updated bookmarks
 
   $ cd $TESTTMP
 
   $ cat dummylog
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio (no-msys !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60
   HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60
   HG_SOURCE=serve
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=serve
   remote:ssh:$LOCALIP
   HG_URL=remote:ssh:$LOCALIP
   
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6
   HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6
   HG_SOURCE=serve
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=serve
   remote:ssh:$LOCALIP
   HG_URL=remote:ssh:$LOCALIP
   
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg init 'a repo'
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8
   HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8
   HG_SOURCE=serve
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=serve
   remote:ssh:$LOCALIP
   HG_URL=remote:ssh:$LOCALIP
   
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
 
 remote hook failure is attributed to remote
 
   $ cat > $TESTTMP/failhook << EOF
   > def hook(ui, repo, **kwargs):
   >     ui.write(b'hook failure!\n')
   >     ui.flush()
   >     return 1
   > EOF
 
   $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc
 
   $ hg -q clone ssh://user@dummy/remote hookout
   $ cd hookout
   $ touch hookfailure
   $ hg -q commit -A -m 'remote hook failure'
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: hook failure!
   remote: transaction abort!
   remote: rollback completed
   remote: abort: pretxnchangegroup.fail hook failed
   [1]
 
 abort during pull is properly reported as such
 
   $ echo morefoo >> ../remote/foo
   $ hg -R ../remote commit --message "more foo to be pulled"
   $ cat >> ../remote/.hg/hgrc << EOF
   > [extensions]
   > crash = ${TESTDIR}/crashgetbundler.py
   > EOF
   $ hg pull
   pulling from ssh://user@dummy/remote
   searching for changes
   adding changesets
   remote: abort: this is an exercise
   transaction abort!
   rollback completed
   abort: stream ended unexpectedly (got 0 bytes, expected 4)
   [255]

tests/test-ssh-clone-r.t

@@ -1,210 +1,145
 This test tries to exercise the ssh functionality with a dummy script
 
 creating 'remote' repo
 
   $ hg init remote
   $ cd remote
   $ hg unbundle "$TESTDIR/bundles/remote.hg"
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 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
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   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
   added 2 changesets with 2 changes to 1 files
   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
   added 3 changesets with 3 changes to 1 files
   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
   added 4 changesets with 4 changes to 1 files
   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
   added 2 changesets with 2 changes to 1 files
   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
   added 3 changesets with 3 changes to 1 files
   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
   added 4 changesets with 5 changes to 2 files
   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
   added 5 changesets with 6 changes to 3 files
   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
   added 5 changesets with 5 changes to 2 files
   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
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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
   pulling from ssh://user@dummy/remote
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 4 files
   new changesets 4ce51a113780:916f1afdef90
   (run 'hg update' to get a working copy)
   $ cd ..
   $ cd test-2
   $ hg pull -r 5 ssh://user@dummy/remote
   pulling from ssh://user@dummy/remote
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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
   adding changesets
   adding manifests
   adding file changes
   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 ..

tests/test-ssh.t

@@ -1,714 +1,699
 This test tries to exercise the ssh functionality with a dummy script
 
 creating 'remote' repo
 
   $ hg init remote
   $ cd remote
   $ echo this > foo
   $ echo this > fooO
   $ hg ci -A -m "init" foo fooO
 
 insert a closed branch (issue4428)
 
   $ hg up null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg branch closed
   marked working directory as branch closed
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -mc0
   $ hg ci --close-branch -mc1
   $ hg up -q default
 
 configure for serving
 
   $ cat <<EOF > .hg/hgrc
   > [server]
   > uncompressed = True
   > 
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup-in-remote 0 ../dummylog"
   > EOF
   $ cd $TESTTMP
 
 repo not found error
 
   $ hg clone ssh://user@dummy/nonexistent local
   remote: abort: repository nonexistent not found
   abort: no suitable response from remote hg
   [255]
   $ hg clone -q ssh://user@dummy/nonexistent local
   remote: abort: repository nonexistent not found
   abort: no suitable response from remote hg
   [255]
 
 non-existent absolute path
 
   $ hg clone ssh://user@dummy/`pwd`/nonexistent local
   remote: abort: repository $TESTTMP/nonexistent not found
   abort: no suitable response from remote hg
   [255]
 
 clone remote via stream
 
 #if no-reposimplestore
 
   $ hg clone --stream ssh://user@dummy/remote local-stream
   streaming all changes
   8 files to transfer, 827 bytes of data (no-zstd !)
   transferred 827 bytes in * seconds (*) (glob) (no-zstd !)
   8 files to transfer, 846 bytes of data (zstd !)
   transferred * bytes in * seconds (* */sec) (glob) (zstd !)
   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
 
 clone bookmarks via stream
 
   $ hg -R local-stream book mybook
   $ hg clone --stream ssh://user@dummy/local-stream stream2
   streaming all changes
   15 files to transfer, * of data (glob)
   transferred * in * seconds (*) (glob)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd stream2
   $ hg book
      mybook                    0:1160648e36ce
   $ cd $TESTTMP
   $ rm -rf local-stream stream2
 
 #endif
 
 clone remote via pull
 
   $ hg clone ssh://user@dummy/remote local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 2 files
   new changesets 1160648e36ce:ad076bfb429d
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 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 <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py changegroup-in-local 0 ../dummylog"
   > EOF
 
 empty default pull
 
   $ hg paths
   default = ssh://user@dummy/remote
   $ hg pull
   pulling from ssh://user@dummy/remote
   searching for changes
   no changes found
 
 pull from wrong ssh URL
 
   $ hg pull ssh://user@dummy/doesnotexist
   pulling from ssh://user@dummy/doesnotexist
   remote: abort: repository doesnotexist not found
   abort: no suitable response from remote hg
   [255]
 
 local change
 
   $ echo bleah > foo
   $ hg ci -m "add"
 
 updating rc
 
   $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
 
 find outgoing
 
   $ hg out ssh://user@dummy/remote
   comparing with ssh://user@dummy/remote
   searching for changes
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 find incoming on the remote side
 
   $ hg incoming -R ../remote ssh://user@dummy/local
   comparing with ssh://user@dummy/local
   searching for changes
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 find incoming on the remote side (using absolute path)
 
   $ hg incoming -R ../remote "ssh://user@dummy/`pwd`"
   comparing with ssh://user@dummy/$TESTTMP/local
   searching for changes
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 push
 
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ cd $TESTTMP/remote
 
 check remote tip
 
   $ hg tip
   changeset:   3:a28a9d1a809c
   tag:         tip
   parent:      0:1160648e36ce
   user:        test
   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
   $ hg ci -A -m z z
   created new head
 
 test pushkeys and bookmarks
 
   $ cd $TESTTMP/local
   $ hg debugpushkey ssh://user@dummy/remote namespaces
   bookmarks	
   namespaces	
   phases	
   $ hg book foo -r 0
   $ hg out -B --config paths.default=bogus://invalid --config paths.default:pushurl=`hg paths default`
   comparing with ssh://user@dummy/remote
   searching for changed bookmarks
      foo                       1160648e36ce
   $ hg push -B foo
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   exporting bookmark foo
   [1]
   $ hg debugpushkey ssh://user@dummy/remote bookmarks
   foo	1160648e36cec0054048a7edc4110c6f84fde594
   $ hg book -f foo
   $ hg push --traceback
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   updating bookmark foo
   [1]
   $ hg book -d foo
   $ hg in -B
   comparing with ssh://user@dummy/remote
   searching for changed bookmarks
      foo                       a28a9d1a809c
   $ hg book -f -r 0 foo
   $ hg pull -B foo
   pulling from ssh://user@dummy/remote
   no changes found
   updating bookmark foo
   $ hg book -d foo
   $ hg push -B foo
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   deleting remote bookmark foo
   [1]
 
 a bad, evil hook that prints to stdout
 
   $ cat <<EOF > $TESTTMP/badhook
   > import sys
   > sys.stdout.write("KABOOM\n")
   > sys.stdout.flush()
   > EOF
 
   $ cat <<EOF > $TESTTMP/badpyhook.py
   > import sys
   > def hook(ui, repo, hooktype, **kwargs):
   >     sys.stdout.write("KABOOM IN PROCESS\n")
   >     sys.stdout.flush()
   > EOF
 
   $ cat <<EOF >> ../remote/.hg/hgrc
   > [hooks]
   > changegroup.stdout = "$PYTHON" $TESTTMP/badhook
   > changegroup.pystdout = python:$TESTTMP/badpyhook.py:hook
   > EOF
   $ echo r > r
   $ hg ci -A -m z r
 
 push should succeed even though it has an unexpected response
 
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote has heads on branch 'default' that are not known locally: 6c0482d977a3
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (py3 !)
   remote: KABOOM
   remote: KABOOM IN PROCESS
   $ hg -R ../remote heads
   changeset:   5:1383141674ec
   tag:         tip
   parent:      3:a28a9d1a809c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     z
   
   changeset:   4:6c0482d977a3
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     z
   
 
 #if chg
 
 try again with remote chg, which should succeed as well
 
   $ hg rollback -R ../remote
   repository tip rolled back to revision 4 (undo serve)
 
   $ hg push --config ui.remotecmd=chg
   pushing to ssh://user@dummy/remote
   searching for changes
   remote has heads on branch 'default' that are not known locally: 6c0482d977a3
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (py3 !)
   remote: KABOOM
   remote: KABOOM IN PROCESS
 
 #endif
 
 clone bookmarks
 
   $ hg -R ../remote bookmark test
   $ hg -R ../remote bookmarks
    * test                      4:6c0482d977a3
   $ hg clone ssh://user@dummy/remote local-bookmarks
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 4 files (+1 heads)
   new changesets 1160648e36ce:1383141674ec
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R local-bookmarks bookmarks
      test                      4:6c0482d977a3
 
 passwords in ssh urls are not supported
 (we use a glob here because different Python versions give different
 results here)
 
   $ hg push ssh://user:erroneouspwd@dummy/remote
   pushing to ssh://user:*@dummy/remote (glob)
   abort: password in URL not supported
   [255]
 
   $ cd $TESTTMP
 
 hide outer repo
   $ hg init
 
 Test remote paths with spaces (issue2983):
 
   $ hg init "ssh://user@dummy/a repo"
   $ touch "$TESTTMP/a repo/test"
   $ hg -R 'a repo' commit -A -m "test"
   adding test
   $ hg -R 'a repo' tag tag
   $ hg id "ssh://user@dummy/a repo"
   73649e48688a
 
   $ hg id "ssh://user@dummy/a repo#noNoNO"
   abort: unknown revision 'noNoNO'
   [255]
 
 Test (non-)escaping of remote paths with spaces when cloning (issue3145):
 
   $ hg clone "ssh://user@dummy/a repo"
   destination directory: a repo
   abort: destination 'a repo' is not empty
   [10]
 
 #if no-rhg
 Make sure hg is really paranoid in serve --stdio mode. It used to be
 possible to get a debugger REPL by specifying a repo named --debugger.
   $ hg -R --debugger serve --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio']
   [255]
   $ hg -R --config=ui.debugger=yes serve --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio']
   [255]
 Abbreviations of 'serve' also don't work, to avoid shenanigans.
   $ hg -R narf serv --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']
   [255]
 #else
 rhg aborts early on -R without a repository at that path
   $ hg -R --debugger serve --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio'] (missing-correct-output !)
   abort: repository --debugger not found (known-bad-output !)
   [255]
   $ hg -R --config=ui.debugger=yes serve --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio'] (missing-correct-output !)
   abort: repository --config=ui.debugger=yes not found (known-bad-output !)
   [255]
   $ hg -R narf serv --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio'] (missing-correct-output !)
   abort: repository narf not found (known-bad-output !)
   [255]
 If the repo does exist, rhg finds an unsupported command and falls back to Python
 which still does the right thing
   $ hg init narf
   $ hg -R narf serv --stdio
   abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']
   [255]
 #endif
 
 Test hg-ssh using a helper script that will restore PYTHONPATH (which might
 have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
 parameters:
 
   $ cat > ssh.sh << EOF
   > userhost="\$1"
   > SSH_ORIGINAL_COMMAND="\$2"
   > export SSH_ORIGINAL_COMMAND
   > PYTHONPATH="$PYTHONPATH"
   > export PYTHONPATH
   > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
   > EOF
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo"
   73649e48688a
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
   remote: Illegal repository "$TESTTMP/a'repo"
   abort: no suitable response from remote hg
   [255]
 
   $ hg id --ssh "sh ssh.sh" --remotecmd hacking "ssh://user@dummy/a'repo"
   remote: Illegal command "hacking -R 'a'\''repo' serve --stdio"
   abort: no suitable response from remote hg
   [255]
 
   $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" "$PYTHON" "$TESTDIR/../contrib/hg-ssh"
   Illegal command "'hg' -R 'a'repo' serve --stdio": No closing quotation
   [255]
 
 Test hg-ssh in read-only mode:
 
   $ cat > ssh.sh << EOF
   > userhost="\$1"
   > SSH_ORIGINAL_COMMAND="\$2"
   > export SSH_ORIGINAL_COMMAND
   > PYTHONPATH="$PYTHONPATH"
   > export PYTHONPATH
   > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
   > EOF
 
   $ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote" read-only-local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 5 changes to 4 files (+1 heads)
   new changesets 1160648e36ce:1383141674ec
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd read-only-local
   $ echo "baz" > bar
   $ hg ci -A -m "unpushable commit" bar
   $ hg push --ssh "sh ../ssh.sh"
   pushing to ssh://user@dummy/*/remote (glob)
   searching for changes
   remote: Permission denied
   remote: pretxnopen.hg-ssh hook failed
   abort: push failed on remote
   [100]
 
   $ cd $TESTTMP
 
 stderr from remote commands should be printed before stdout from local code (issue4336)
 
   $ hg clone remote stderr-ordering
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd stderr-ordering
   $ cat >> localwrite.py << EOF
   > from mercurial import exchange, extensions
   > 
   > def wrappedpush(orig, repo, *args, **kwargs):
   >     res = orig(repo, *args, **kwargs)
   >     repo.ui.write(b'local stdout\n')
   >     repo.ui.flush()
   >     return res
   > 
   > def extsetup(ui):
   >     extensions.wrapfunction(exchange, b'push', wrappedpush)
   > EOF
 
   $ cat >> .hg/hgrc << EOF
   > [paths]
   > default-push = ssh://user@dummy/remote
   > [extensions]
   > localwrite = localwrite.py
   > EOF
 
   $ echo localwrite > foo
   $ hg commit -m 'testing localwrite'
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (py3 !)
   remote: KABOOM
   remote: KABOOM IN PROCESS
   local stdout
 
 debug output
 
   $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
   pulling from ssh://user@dummy/remote
   running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re)
   devel-peer-request: hello+between
   devel-peer-request:   pairs: 81 bytes
   sending hello command
   sending between command
   remote: \d+ (re)
   remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re)
   remote: 1
   devel-peer-request: protocaps
   devel-peer-request:   caps: * bytes (glob)
   sending protocaps command
   query 1; heads
   devel-peer-request: batched-content
   devel-peer-request:    - heads (0 arguments)
   devel-peer-request:    - known (1 arguments)
   devel-peer-request: batch
   devel-peer-request:   cmds: 141 bytes
   sending batch command
   searching for changes
   all remote heads known locally
   no changes found
   devel-peer-request: getbundle
   devel-peer-request:   bookmarks: 1 bytes
   devel-peer-request:   bundlecaps: 270 bytes
   devel-peer-request:   cg: 1 bytes
   devel-peer-request:   common: 122 bytes
   devel-peer-request:   heads: 122 bytes
   devel-peer-request:   listkeys: 9 bytes
   devel-peer-request:   phases: 1 bytes
   sending getbundle command
   bundle2-input-bundle: with-transaction
   bundle2-input-part: "bookmarks" supported
   bundle2-input-part: total payload size 26
   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
   bundle2-input-part: total payload size 45
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size 72
   bundle2-input-bundle: 3 parts total
   checking for updated bookmarks
 
   $ cd $TESTTMP
 
   $ cat dummylog
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_BUNDLE2=1
   HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60
   HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60
   HG_SOURCE=serve
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=serve
   HG_URL=remote:ssh:$LOCALIP
   
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_BUNDLE2=1
   HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6
   HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6
   HG_SOURCE=serve
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=serve
   HG_URL=remote:ssh:$LOCALIP
   
   Got arguments 1:user@dummy 2:chg -R remote serve --stdio (chg !)
   changegroup-in-remote hook: HG_BUNDLE2=1 (chg !)
   HG_HOOKNAME=changegroup (chg !)
   HG_HOOKTYPE=changegroup (chg !)
   HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 (chg !)
   HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6 (chg !)
   HG_SOURCE=serve (chg !)
   HG_TXNID=TXN:$ID$ (chg !)
   HG_TXNNAME=serve (chg !)
   HG_URL=remote:ssh:$LOCALIP (chg !)
    (chg !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg init 'a repo'
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_BUNDLE2=1
   HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8
   HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8
   HG_SOURCE=serve
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=serve
   HG_URL=remote:ssh:$LOCALIP
   
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
 
 
 remote hook failure is attributed to remote
 
   $ cat > $TESTTMP/failhook << EOF
   > def hook(ui, repo, **kwargs):
   >     ui.write(b'hook failure!\n')
   >     ui.flush()
   >     return 1
   > EOF
 
   $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc
 
   $ hg -q clone ssh://user@dummy/remote hookout
   $ cd hookout
   $ touch hookfailure
   $ hg -q commit -A -m 'remote hook failure'
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: hook failure!
   remote: transaction abort!
   remote: rollback completed
   remote: pretxnchangegroup.fail hook failed
   abort: push failed on remote
   [100]
 
 abort during pull is properly reported as such
 
   $ echo morefoo >> ../remote/foo
   $ hg -R ../remote commit --message "more foo to be pulled"
   $ cat >> ../remote/.hg/hgrc << EOF
   > [extensions]
   > crash = ${TESTDIR}/crashgetbundler.py
   > EOF
   $ hg pull
   pulling from ssh://user@dummy/remote
   searching for changes
   remote: abort: this is an exercise
   abort: pull failed on remote
   [100]
 
 abort with no error hint when there is a ssh problem when pulling
 
   $ hg pull ssh://brokenrepository
   pulling from ssh://brokenrepository/
   abort: no suitable response from remote hg
   [255]
 
 abort with configured error hint when there is a ssh problem when pulling
 
   $ hg pull ssh://brokenrepository \
   > --config ui.ssherrorhint="Please see http://company/internalwiki/ssh.html"
   pulling from ssh://brokenrepository/
   abort: no suitable response from remote hg
   (Please see http://company/internalwiki/ssh.html)
   [255]
 
 test that custom environment is passed down to ssh executable
   $ cat >>dumpenv <<EOF
   > #! /bin/sh
   > echo \$VAR >&2
   > EOF
   $ chmod +x dumpenv
   $ hg pull ssh://something --config ui.ssh="sh dumpenv"
   pulling from ssh://something/
   remote: 
   abort: no suitable response from remote hg
   [255]
   $ hg pull ssh://something --config ui.ssh="sh dumpenv" --config sshenv.VAR=17
   pulling from ssh://something/
   remote: 17
   abort: no suitable response from remote hg
   [255]
 

tests/test-static-http.t

@@ -1,299 +1,283
 #require no-reposimplestore
 
   $ hg clone http://localhost:$HGPORT/ copy
   abort: * (glob)
   [100]
   $ test -d copy
   [1]
 
 This server doesn't do range requests so it's basically only good for
 one pull
 
   $ "$PYTHON" "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid \
   > --logfile server.log
   $ cat dumb.pid >> $DAEMON_PIDS
   $ hg init remote
   $ cd remote
   $ echo foo > bar
   $ echo c2 > '.dotfile with spaces'
   $ hg add
   adding .dotfile with spaces
   adding bar
   $ hg commit -m"test"
   $ hg tip
   changeset:   0:02770d679fb8
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ cd ..
   $ hg clone static-http://localhost:$HGPORT/remote local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets 02770d679fb8
   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
   $ echo baz > quux
   $ hg commit -A -mtest2
   adding quux
 
 check for HTTP opener failures when cachefile does not exist
 
   $ rm .hg/cache/*
   $ cd ../local
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > changegroup = sh -c "printenv.py --line changegroup"
   > EOF
   $ hg pull
   pulling from static-http://localhost:$HGPORT/remote
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 4ac2e3648604
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432
   HG_NODE_LAST=4ac2e3648604439c580c69b09ec9d93a88d93432
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   http://localhost:$HGPORT/remote
   HG_URL=http://localhost:$HGPORT/remote
   
   (run 'hg update' to get a working copy)
 
 trying to push
 
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo more foo >> bar
   $ hg commit -m"test"
   $ hg push
   pushing to static-http://localhost:$HGPORT/remote
   abort: destination does not support push
   [255]
 
 trying clone -r
 
   $ cd ..
   $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0
   abort: unknown revision 'doesnotexist'
   [10]
   $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets 02770d679fb8
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 test with "/" URI (issue747) and subrepo
 
   $ hg init
   $ hg init sub
   $ touch sub/test
   $ hg -R sub commit -A -m "test"
   adding test
   $ hg -R sub tag not-empty
   $ echo sub=sub > .hgsub
   $ echo a > a
   $ hg add a .hgsub
   $ hg -q ci -ma
   $ hg clone static-http://localhost:$HGPORT/ local2
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   new changesets a9ebfbe8e587
   updating to branch default
   cloning subrepo sub from static-http://localhost:$HGPORT/sub
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   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
   default = static-http://localhost:$HGPORT/
 
 test with empty repo (issue965)
 
   $ cd ..
   $ hg init remotempty
   $ hg clone static-http://localhost:$HGPORT/remotempty local3
   no changes found
   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
 
 test with non-repo
 
   $ cd ..
   $ mkdir notarepo
   $ hg clone static-http://localhost:$HGPORT/notarepo local3
   abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository
   [255]
 
 Clone with tags and branches works
 
   $ hg init remote-with-names
   $ cd remote-with-names
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   $ echo 1 > foo
   $ hg commit -m 'commit 1'
   $ hg -q up 0
   $ hg branch mybranch
   marked working directory as branch mybranch
   (branches are permanent and global, did you want a bookmark?)
   $ echo 2 > foo
   $ hg commit -m 'commit 2 (mybranch)'
   $ hg tag -r 1 'default-tag'
   $ hg tag -r 2 'branch-tag'
 
   $ cd ..
 
   $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 2 files (+1 heads)
   new changesets 68986213bd44:0c325bd2b5a7
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Clone a specific branch works
 
   $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 2 files
   new changesets 68986213bd44:0c325bd2b5a7
   updating to branch mybranch
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Clone a specific tag works
 
   $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
   new changesets 68986213bd44:4ee3fcef1c80
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ killdaemons.py
 
 List of files accessed over HTTP:
 
   $ cat server.log | sed -n -e 's|.*GET \(/[^ ]*\).*|\1|p' | sort -u
   /.hg/bookmarks
   /.hg/bookmarks.current
   /.hg/cache/hgtagsfnodes1
   /.hg/dirstate
   /.hg/requires
   /.hg/store/00changelog.i
   /.hg/store/00manifest.i
   /.hg/store/data/%7E2ehgsub.i (no-py37 !)
   /.hg/store/data/%7E2ehgsubstate.i (no-py37 !)
   /.hg/store/data/a.i
   /.hg/store/data/~2ehgsub.i (py37 !)
   /.hg/store/data/~2ehgsubstate.i (py37 !)
   /.hg/store/requires
   /notarepo/.hg/00changelog.i
   /notarepo/.hg/requires
   /remote-with-names/.hg/bookmarks
   /remote-with-names/.hg/bookmarks.current
   /remote-with-names/.hg/cache/branch2-served
   /remote-with-names/.hg/cache/hgtagsfnodes1
   /remote-with-names/.hg/cache/tags2-served
   /remote-with-names/.hg/dirstate
   /remote-with-names/.hg/localtags
   /remote-with-names/.hg/requires
   /remote-with-names/.hg/store/00changelog.i
   /remote-with-names/.hg/store/00manifest.i
   /remote-with-names/.hg/store/data/%7E2ehgtags.i (no-py37 !)
   /remote-with-names/.hg/store/data/foo.i
   /remote-with-names/.hg/store/data/~2ehgtags.i (py37 !)
   /remote-with-names/.hg/store/obsstore
   /remote-with-names/.hg/store/requires
   /remote/.hg/bookmarks
   /remote/.hg/bookmarks.current
   /remote/.hg/cache/branch2-base
   /remote/.hg/cache/branch2-immutable
   /remote/.hg/cache/branch2-served
   /remote/.hg/cache/hgtagsfnodes1
   /remote/.hg/cache/rbc-names-v1
   /remote/.hg/cache/tags2-served
   /remote/.hg/dirstate
   /remote/.hg/localtags
   /remote/.hg/requires
   /remote/.hg/store/00changelog.i
   /remote/.hg/store/00manifest.i
   /remote/.hg/store/data/%7E2edotfile%20with%20spaces.i (no-py37 !)
   /remote/.hg/store/data/%7E2ehgtags.i (no-py37 !)
   /remote/.hg/store/data/bar.i
   /remote/.hg/store/data/quux.i
   /remote/.hg/store/data/~2edotfile%20with%20spaces.i (py37 !)
   /remote/.hg/store/data/~2ehgtags.i (py37 !)
   /remote/.hg/store/obsstore
   /remote/.hg/store/requires
   /remotempty/.hg/bookmarks
   /remotempty/.hg/bookmarks.current
   /remotempty/.hg/dirstate
   /remotempty/.hg/requires
   /remotempty/.hg/store/00changelog.i
   /remotempty/.hg/store/00manifest.i
   /remotempty/.hg/store/requires
   /sub/.hg/bookmarks
   /sub/.hg/bookmarks.current
   /sub/.hg/cache/hgtagsfnodes1
   /sub/.hg/dirstate
   /sub/.hg/requires
   /sub/.hg/store/00changelog.i
   /sub/.hg/store/00manifest.i
   /sub/.hg/store/data/%7E2ehgtags.i (no-py37 !)
   /sub/.hg/store/data/test.i
   /sub/.hg/store/data/~2ehgtags.i (py37 !)
   /sub/.hg/store/requires

tests/test-strip-cross.t

@@ -1,220 +1,184
 test stripping of filelogs where the linkrev doesn't always increase
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'strip =' >> $HGRCPATH
   $ commit()
   > {
   >     hg up -qC null
   >     count=1
   >     for i in "$@"; do
   >         for f in $i; do
   >             mkdir -p `dirname $f`
   >             echo $count > $f
   >         done
   >         count=`expr $count + 1`
   >     done
   >     hg commit -qAm "$*"
   > }
 
 2 1 0 2 0 1 2
 
   $ mkdir files
   $ cd files
   $ hg init orig
   $ cd orig
   $ commit '201 210'
   $ commit '102 120' '210'
   $ commit '021'
   $ commit '201' '021 120'
   $ commit '012 021' '102 201' '120 210'
   $ commit '102 120' '012 210' '021 201'
   $ commit '201 210' '021 120' '012 102'
   $ cd ..
   $ hg clone -q -U -r 4 -r 5 -r 6 orig crossed
   $ cd crossed
 
   $ for i in 012 021 102 120 201 210; do
   >     echo $i
   >     hg debugindex $i
   >     echo
   > done
   012
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 5d9299349fc0 000000000000 000000000000
        2       2 2661d26c6496 000000000000 000000000000
   
   021
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       2 5d9299349fc0 000000000000 000000000000
        2       1 2661d26c6496 000000000000 000000000000
   
   102
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b8e02f643373 000000000000 000000000000
        1       0 5d9299349fc0 000000000000 000000000000
        2       2 2661d26c6496 000000000000 000000000000
   
   120
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 b8e02f643373 000000000000 000000000000
        1       2 5d9299349fc0 000000000000 000000000000
        2       0 2661d26c6496 000000000000 000000000000
   
   201
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 b8e02f643373 000000000000 000000000000
        1       0 5d9299349fc0 000000000000 000000000000
        2       1 2661d26c6496 000000000000 000000000000
   
   210
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 b8e02f643373 000000000000 000000000000
        1       1 5d9299349fc0 000000000000 000000000000
        2       0 2661d26c6496 000000000000 000000000000
   
   $ cd ..
   $ for i in 0 1 2; do
   >     hg clone -q -U --pull crossed $i
   >     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 ..
 
 Do a similar test where the manifest revlog has unordered linkrevs
   $ mkdir manifests
   $ cd manifests
   $ hg init orig
   $ cd orig
   $ commit 'file'
   $ commit 'other'
   $ commit '' 'other'
   $ HGUSER=another-user; export HGUSER
   $ commit 'file'
   $ commit 'other' 'file'
   $ cd ..
   $ hg clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
   $ cd crossed
   $ hg debugindex --manifest
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 6bbc6fee55c2 000000000000 000000000000
        1       0 1c556153fe54 000000000000 000000000000
        2       1 1f76dba919fd 000000000000 000000000000
        3       3 bbee06ad59d5 000000000000 000000000000
 
   $ cd ..
   $ for i in 2 3; do
   >     hg clone -q -U --pull crossed $i
   >     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 ..
 
 Now a similar test for a non-root manifest revlog
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > treemanifests = yes
   > EOF
   $ mkdir treemanifests
   $ cd treemanifests
   $ 
   $ hg --config experimental.treemanifest=True init orig
   $ cd orig
   $ commit 'dir/file'
   $ commit 'dir/other'
   $ commit '' 'dir/other'
   $ HGUSER=yet-another-user; export HGUSER
   $ commit 'otherdir dir/file'
   $ commit 'otherdir dir/other' 'otherdir dir/file'
   $ cd ..
   $ hg --config experimental.treemanifest=True clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
   $ cd crossed
   $ hg debugindex --dir dir
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       2 6bbc6fee55c2 000000000000 000000000000
        1       0 1c556153fe54 000000000000 000000000000
        2       1 1f76dba919fd 000000000000 000000000000
        3       3 bbee06ad59d5 000000000000 000000000000
 
   $ cd ..
   $ for i in 2 3; do
   >     hg --config experimental.treemanifest=True clone -q -U --pull crossed $i
   >     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 ..

tests/test-subrepo-missing.t

@@ -1,146 +1,134
   $ hg init repo
   $ cd repo
   $ hg init subrepo
   $ echo a > subrepo/a
   $ hg -R subrepo ci -Am adda
   adding a
   $ echo 'subrepo = subrepo' > .hgsub
   $ hg ci -Am addsubrepo
   adding .hgsub
   $ echo b > subrepo/b
   $ hg -R subrepo ci -Am addb
   adding b
   $ hg ci -m updatedsub
 
 ignore blanklines in .hgsubstate
 
   >>> open('.hgsubstate', 'wb').write(b'\n\n   \t \n   \n') and None
   $ hg st --subrepos
   M .hgsubstate
   $ hg revert -qC .hgsubstate
 
 abort more gracefully on .hgsubstate parsing error
 
   $ cp .hgsubstate .hgsubstate.old
   >>> open('.hgsubstate', 'wb').write(b'\ninvalid') and None
   $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo
   abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2
   [255]
   $ mv .hgsubstate.old .hgsubstate
 
 delete .hgsub and revert it
 
   $ rm .hgsub
   $ hg revert .hgsub
   warning: subrepo spec file '.hgsub' not found
   warning: subrepo spec file '.hgsub' not found
 
 delete .hgsubstate and revert it
 
   $ rm .hgsubstate
   $ hg revert .hgsubstate
 
 delete .hgsub and update
 
   $ rm .hgsub
   $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
   warning: subrepo spec file 'repo/.hgsub' not found
   warning: subrepo spec file 'repo/.hgsub' not found
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
   warning: subrepo spec file '.hgsub' not found
   ! .hgsub
   $ ls -A subrepo
   .hg
   a
 
 delete .hgsubstate and update
 
   $ hg up -C
   warning: subrepo spec file '.hgsub' not found
   warning: subrepo spec file '.hgsub' not found
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm .hgsubstate
   $ hg up 0
   other [destination] changed .hgsubstate which local [working copy] deleted
   use (c)hanged version or leave (d)eleted? c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
   $ ls -A subrepo
   .hg
   a
 
 Enable obsolete
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > logtemplate= {rev}:{node|short} {desc|firstline}
   > [phases]
   > publish=False
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
 check that we can update parent repo with missing (amended) subrepo revision
 
   $ hg up --repository subrepo -r tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci -m "updated subrepo to tip"
   created new head
   $ cd subrepo
   $ hg update -r tip
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo > a
   $ hg commit --amend -m "addb (amended)"
   $ cd ..
   $ hg update --clean .
   revision 102a90ea7b4a in subrepository "subrepo" is hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 check that --hidden is propagated to the subrepo
 
   $ hg -R subrepo up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci -m 'commit with amended subrepo'
   $ echo bar > subrepo/a
   $ hg -R subrepo ci --amend -m "amend a (again)"
   $ hg --hidden cat subrepo/a
   foo
 
 verify will warn if locked-in subrepo revisions are hidden or missing
 
   $ 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
 
 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
   4: repository $TESTTMP/repo/subrepo not found
   $ ls -A
   .hg
   .hgsub
   .hgsubstate
   b
   $ mv b subrepo
 
   $ cd ..

tests/test-treemanifest.t

@@ -1,896 +1,842
 Set up repo
 
   $ hg --config experimental.treemanifest=True init repo
   $ cd repo
 
 Requirements get set on init
 
   $ hg debugrequires | grep treemanifest
   treemanifest
 
 Without directories, looks like any other repo
 
   $ echo 0 > a
   $ echo 0 > b
   $ hg ci -Aqm initial
   $ hg debugdata -m 0
   a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
   b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
 
 Submanifest is stored in separate revlog
 
   $ mkdir dir1
   $ echo 1 > dir1/a
   $ echo 1 > dir1/b
   $ echo 1 > e
   $ hg ci -Aqm 'add dir1'
   $ hg debugdata -m 1
   a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
   b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)
   dir1\x008b3ffd73f901e83304c83d33132c8e774ceac44et (esc)
   e\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
   $ hg debugdata --dir dir1 0
   a\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
   b\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)
 
 Can add nested directories
 
   $ mkdir dir1/dir1
   $ echo 2 > dir1/dir1/a
   $ echo 2 > dir1/dir1/b
   $ mkdir dir1/dir2
   $ echo 2 > dir1/dir2/a
   $ echo 2 > dir1/dir2/b
   $ hg ci -Aqm 'add dir1/dir1'
   $ hg files -r .
   a
   b
   dir1/a
   dir1/b
   dir1/dir1/a
   dir1/dir1/b
   dir1/dir2/a
   dir1/dir2/b
   e
 
 The manifest command works
 
   $ hg manifest
   a
   b
   dir1/a
   dir1/b
   dir1/dir1/a
   dir1/dir1/b
   dir1/dir2/a
   dir1/dir2/b
   e
 
 Revision is not created for unchanged directory
 
   $ mkdir dir2
   $ echo 3 > dir2/a
   $ hg add dir2
   adding dir2/a
   $ hg debugindex --dir dir1 > before
   $ hg ci -qm 'add dir2'
   $ hg debugindex --dir dir1 > after
   $ diff before after
   $ rm before after
 
 Removing directory does not create an revlog entry
 
   $ hg rm dir1/dir1
   removing dir1/dir1/a
   removing dir1/dir1/b
   $ hg debugindex --dir dir1/dir1 > before
   $ hg ci -qm 'remove dir1/dir1'
   $ hg debugindex --dir dir1/dir1 > after
   $ diff before after
   $ rm before after
 
 Check that hg files (calls treemanifest.walk()) works
 without loading all directory revlogs
 
   $ hg co 'desc("add dir2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mv .hg/store/meta/dir2 .hg/store/meta/dir2-backup
   $ hg files -r . dir1
   dir1/a
   dir1/b
   dir1/dir1/a
   dir1/dir1/b
   dir1/dir2/a
   dir1/dir2/b
 
 Check that status between revisions works (calls treemanifest.matches())
 without loading all directory revlogs
 
   $ hg status --rev 'desc("add dir1")' --rev . dir1
   A dir1/dir1/a
   A dir1/dir1/b
   A dir1/dir2/a
   A dir1/dir2/b
   $ mv .hg/store/meta/dir2-backup .hg/store/meta/dir2
 
 Merge creates 2-parent revision of directory revlog
 
   $ echo 5 > dir1/a
   $ hg ci -Aqm 'modify dir1/a'
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 6 > dir1/b
   $ hg ci -Aqm 'modify dir1/b'
   $ hg merge 'desc("modify dir1/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'conflict-free merge involving dir1/'
   $ cat dir1/a
   5
   $ cat dir1/b
   6
   $ hg debugindex --dir dir1
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       1 8b3ffd73f901 000000000000 000000000000
        1       2 68e9d057c5a8 8b3ffd73f901 000000000000
        2       4 4698198d2624 68e9d057c5a8 000000000000
        3       5 44844058ccce 68e9d057c5a8 000000000000
        4       6 bf3d9b744927 68e9d057c5a8 000000000000
        5       7 dde7c0af2a03 bf3d9b744927 44844058ccce
 
 Merge keeping directory from parent 1 does not create revlog entry. (Note that
 dir1's manifest does change, but only because dir1/a's filelog changes.)
 
   $ hg co 'desc("add dir2")'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 8 > dir2/a
   $ hg ci -m 'modify dir2/a'
   created new head
 
   $ hg debugindex --dir dir2 > before
   $ hg merge 'desc("modify dir1/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert -r 'desc("modify dir2/a")' .
   reverting dir1/a
   $ hg ci -m 'merge, keeping parent 1'
   $ hg debugindex --dir dir2 > after
   $ diff before after
   $ rm before after
 
 Merge keeping directory from parent 2 does not create revlog entry. (Note that
 dir2's manifest does change, but only because dir2/a's filelog changes.)
 
   $ hg co 'desc("modify dir2/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugindex --dir dir1 > before
   $ hg merge 'desc("modify dir1/a")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg revert -r 'desc("modify dir1/a")' .
   reverting dir2/a
   $ hg ci -m 'merge, keeping parent 2'
   created new head
   $ hg debugindex --dir dir1 > after
   $ diff before after
   $ rm before after
 
 Create flat source repo for tests with mixed flat/tree manifests
 
   $ cd ..
   $ hg init repo-flat
   $ cd repo-flat
 
 Create a few commits with flat manifest
 
   $ echo 0 > a
   $ echo 0 > b
   $ echo 0 > e
   $ for d in dir1 dir1/dir1 dir1/dir2 dir2
   > do
   >   mkdir $d
   >   echo 0 > $d/a
   >   echo 0 > $d/b
   > done
   $ hg ci -Aqm initial
 
   $ echo 1 > a
   $ echo 1 > dir1/a
   $ echo 1 > dir1/dir1/a
   $ hg ci -Aqm 'modify on branch 1'
 
   $ hg co 0
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 2 > b
   $ echo 2 > dir1/b
   $ echo 2 > dir1/dir1/b
   $ hg ci -Aqm 'modify on branch 2'
 
   $ hg merge 1
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge of flat manifests to new flat manifest'
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 Create clone with tree manifests enabled
 
   $ cd ..
   $ hg clone --config experimental.treemanifest=1 \
   >   http://localhost:$HGPORT repo-mixed -r 1
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 14 changes to 11 files
   new changesets 5b02a3e8db7e:581ef6037d8b
   updating to branch default
   11 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo-mixed
   $ test -d .hg/store/meta
   [1]
   $ hg debugrequires | grep treemanifest
   treemanifest
 
 Should be possible to push updates from flat to tree manifest repo
 
   $ hg -R ../repo-flat push ssh://user@dummy/repo-mixed
   pushing to ssh://user@dummy/repo-mixed
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 3 changes to 3 files
 
 Commit should store revlog per directory
 
   $ hg co 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 3 > a
   $ echo 3 > dir1/a
   $ echo 3 > dir1/dir1/a
   $ hg ci -m 'first tree'
   created new head
   $ find .hg/store/meta | sort
   .hg/store/meta
   .hg/store/meta/dir1
   .hg/store/meta/dir1/00manifest.i
   .hg/store/meta/dir1/dir1
   .hg/store/meta/dir1/dir1/00manifest.i
   .hg/store/meta/dir1/dir2
   .hg/store/meta/dir1/dir2/00manifest.i
   .hg/store/meta/dir2
   .hg/store/meta/dir2/00manifest.i
 
 Merge of two trees
 
   $ hg co 2
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 1
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge of flat manifests to new tree manifest'
   created new head
   $ hg diff -r 3
 
 Parent of tree root manifest should be flat manifest, and two for merge
 
   $ hg debugindex -m
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 40536115ed9e 000000000000 000000000000
        1       1 f3376063c255 40536115ed9e 000000000000
        2       2 5d9b9da231a2 40536115ed9e 000000000000
        3       3 d17d663cbd8a 5d9b9da231a2 f3376063c255
        4       4 51e32a8c60ee f3376063c255 000000000000
        5       5 cc5baa78b230 5d9b9da231a2 f3376063c255
 
 
 Status across flat/tree boundary should work
 
   $ hg status --rev '.^' --rev .
   M a
   M dir1/a
   M dir1/dir1/a
 
 
 Turning off treemanifest config has no effect
 
   $ hg debugindex --dir dir1
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
   $ echo 2 > dir1/a
   $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
   $ hg debugindex --dir dir1
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
        2       6 5b16163a30c6 25ecb8cb8618 000000000000
 
 Stripping and recovering changes should work
 
   $ hg st --change tip
   M dir1/a
   $ hg --config extensions.strip= strip tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
   $ hg debugindex --dir dir1
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
 
 #if repobundlerepo
   $ hg incoming .hg/strip-backup/*
   comparing with .hg/strip-backup/*-backup.hg (glob)
   searching for changes
   changeset:   6:51cfd7b1e13b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     modify dir1/a
   
 #endif
 
   $ hg unbundle .hg/strip-backup/*
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 51cfd7b1e13b (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg --config extensions.strip= strip tip
   saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle -q .hg/strip-backup/*
   $ hg debugindex --dir dir1
      rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       4 064927a0648a 000000000000 000000000000
        1       5 25ecb8cb8618 000000000000 000000000000
        2       6 5b16163a30c6 25ecb8cb8618 000000000000
   $ hg st --change tip
   M dir1/a
 
 Shelving and unshelving should work
 
   $ echo foo >> dir1/a
   $ hg shelve
   shelved as default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg unshelve
   unshelving change 'default'
   $ hg diff --nodates
   diff -r 708a273da119 dir1/a
   --- a/dir1/a
   +++ b/dir1/a
   @@ -1,1 +1,2 @@
    1
   +foo
 
 Pushing from treemanifest repo to an empty repo makes that a treemanifest repo
 
   $ cd ..
   $ hg init empty-repo
   $ cat << EOF >> empty-repo/.hg/hgrc
   > [experimental]
   > changegroup3=yes
   > EOF
   $ hg debugrequires -R empty-repo | grep treemanifest
   [1]
   $ hg push -R repo -r 0 empty-repo
   pushing to empty-repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   $ hg debugrequires -R empty-repo | grep treemanifest
   treemanifest
 
 Pushing to an empty repo works
 
   $ hg --config experimental.treemanifest=1 init clone
   $ hg debugrequires -R clone | grep treemanifest
   treemanifest
   $ hg push -R repo clone
   pushing to clone
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   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.
 
   $ hg --config experimental.treemanifest=True init deeprepo
   $ cd deeprepo
 
   $ mkdir .A
   $ mkdir b
   $ mkdir b/bar
   $ mkdir b/bar/orange
   $ mkdir b/bar/orange/fly
   $ mkdir b/foo
   $ mkdir b/foo/apple
   $ mkdir b/foo/apple/bees
 
   $ touch .A/one.txt
   $ touch .A/two.txt
   $ touch b/bar/fruits.txt
   $ touch b/bar/orange/fly/gnat.py
   $ touch b/bar/orange/fly/housefly.txt
   $ touch b/foo/apple/bees/flower.py
   $ touch c.txt
   $ touch d.py
 
   $ hg ci -Aqm 'initial'
 
   $ echo >> .A/one.txt
   $ echo >> .A/two.txt
   $ echo >> b/bar/fruits.txt
   $ echo >> b/bar/orange/fly/gnat.py
   $ echo >> b/bar/orange/fly/housefly.txt
   $ echo >> b/foo/apple/bees/flower.py
   $ echo >> c.txt
   $ echo >> d.py
   $ hg ci -Aqm 'second'
 
 We'll see that visitdir works by removing some treemanifest revlogs and running
 the files command with various parameters.
 
 Test files from the root.
 
   $ hg files -r .
   .A/one.txt
   .A/two.txt
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   b/foo/apple/bees/flower.py
   c.txt
   d.py
 
 Excludes with a glob should not exclude everything from the glob's root
 
   $ hg files -r . -X 'b/fo?' b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   $ cp -R .hg/store .hg/store-copy
 
 Test files for a subdirectory.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ hg files -r . b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   b/foo/apple/bees/flower.py
   $ hg diff -r '.^' -r . --stat b
    b/bar/fruits.txt              |  1 +
    b/bar/orange/fly/gnat.py      |  1 +
    b/bar/orange/fly/housefly.txt |  1 +
    b/foo/apple/bees/flower.py    |  1 +
    4 files changed, 4 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files with just includes and excludes.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/bar/orange/fly
   $ rm -r .hg/store/meta/b/foo/apple/bees
   $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
   b/bar/fruits.txt
   $ hg diff -r '.^' -r . --stat -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
    b/bar/fruits.txt |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files for a subdirectory, excluding a directory within it.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/foo
   $ hg files -r . -X path:b/foo b
   b/bar/fruits.txt
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   $ hg diff -r '.^' -r . --stat -X path:b/foo b
    b/bar/fruits.txt              |  1 +
    b/bar/orange/fly/gnat.py      |  1 +
    b/bar/orange/fly/housefly.txt |  1 +
    3 files changed, 3 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files for a sub directory, including only a directory within it, and
 including an unrelated directory.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/foo
   $ hg files -r . -I path:b/bar/orange -I path:a b
   b/bar/orange/fly/gnat.py
   b/bar/orange/fly/housefly.txt
   $ hg diff -r '.^' -r . --stat -I path:b/bar/orange -I path:a b
    b/bar/orange/fly/gnat.py      |  1 +
    b/bar/orange/fly/housefly.txt |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Test files for a pattern, including a directory, and excluding a directory
 within that.
 
 #if reporevlogstore
   $ rm -r .hg/store/meta/~2e_a
 #endif
 #if reposimplestore
   $ rm -r .hg/store/meta/._a
 #endif
   $ rm -r .hg/store/meta/b/foo
   $ rm -r .hg/store/meta/b/bar/orange
   $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
   b/bar/fruits.txt
   $ hg diff -r '.^' -r . --stat glob:**.txt -I path:b/bar -X path:b/bar/orange
    b/bar/fruits.txt |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   $ cp -R .hg/store-copy/. .hg/store
 
 Add some more changes to the deep repo
   $ echo narf >> b/bar/fruits.txt
   $ hg ci -m narf
   $ echo troz >> b/bar/orange/fly/gnat.py
   $ 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
   $ grep meta/.A/00manifest.i .hg/store/fncache
   meta/.A/00manifest.i
 
 Rebuilt fncache includes dirlogs
   $ rm .hg/store/fncache
   $ hg debugrebuildfncache
   adding data/.A/one.txt.i
   adding data/.A/two.txt.i
   adding data/b/bar/fruits.txt.i
   adding data/b/bar/orange/fly/gnat.py.i
   adding data/b/bar/orange/fly/housefly.txt.i
   adding data/b/foo/apple/bees/flower.py.i
   adding data/c.txt.i
   adding data/d.py.i
   adding meta/.A/00manifest.i
   adding meta/b/00manifest.i
   adding meta/b/bar/00manifest.i
   adding meta/b/bar/orange/00manifest.i
   adding meta/b/bar/orange/fly/00manifest.i
   adding meta/b/foo/00manifest.i
   adding meta/b/foo/apple/00manifest.i
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache
 #endif
 
 Finish first server
   $ killdaemons.py
 
 Back up the recently added revlogs
   $ cp -R .hg/store .hg/store-newcopy
 
 Verify reports missing dirlog
   $ rm .hg/store/meta/b/00manifest.*
   $ hg verify
   checking changesets
   checking manifests
   checking directory manifests
    0: empty or missing b/
    b/@0: parent-directory manifest refers to unknown revision 67688a370455
    b/@1: parent-directory manifest refers to unknown revision f065da70369e
    b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
    b/@3: parent-directory manifest refers to unknown revision 367152e6af28
   warning: orphan data file 'meta/b/bar/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/bar/orange/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/foo/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/foo/apple/00manifest.i' (reporevlogstore !)
   warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i' (reporevlogstore !)
   crosschecking files in changesets and manifests
    b/bar/fruits.txt@0: in changeset but not in manifest
    b/bar/orange/fly/gnat.py@0: in changeset but not in manifest
    b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest
    b/foo/apple/bees/flower.py@0: in changeset but not in manifest
   checking files
   checked 4 changesets with 18 changes to 8 files
   6 warnings encountered! (reporevlogstore !)
   9 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-newcopy/. .hg/store
 
 Verify reports missing dirlog entry
   $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/
   $ hg verify
   checking changesets
   checking manifests
   checking directory manifests
    b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
    b/@3: parent-directory manifest refers to unknown revision 367152e6af28
    b/bar/@?: rev 2 points to unexpected changeset 2
    b/bar/@?: 44d7e1146e0d not in parent-directory manifest
    b/bar/@?: rev 3 points to unexpected changeset 3
    b/bar/@?: 70b10c6b17b7 not in parent-directory manifest
    b/bar/orange/@?: rev 2 points to unexpected changeset 3
    (expected None)
    b/bar/orange/fly/@?: rev 2 points to unexpected changeset 3
    (expected None)
   crosschecking files in changesets and manifests
   checking files
   checked 4 changesets with 18 changes to 8 files
   2 warnings encountered!
   8 integrity errors encountered!
   (first damaged changeset appears to be 2)
   [1]
   $ cp -R .hg/store-newcopy/. .hg/store
 
 Test cloning a treemanifest repo over http.
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 We can clone even with the knob turned off and we'll get a treemanifest repo.
   $ hg clone --config experimental.treemanifest=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deepclone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 18 changes to 8 files
   new changesets 775704be6f52:523e5c631710
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
 No server errors.
   $ cat deeprepo/errors.log
 requires got updated to include treemanifest
   $ hg debugrequires -R deepclone | grep treemanifest
   treemanifest
 Tree manifest revlogs exist.
   $ find deepclone/.hg/store/meta | sort
   deepclone/.hg/store/meta
   deepclone/.hg/store/meta/._a (reposimplestore !)
   deepclone/.hg/store/meta/._a/00manifest.i (reposimplestore !)
   deepclone/.hg/store/meta/b
   deepclone/.hg/store/meta/b/00manifest.i
   deepclone/.hg/store/meta/b/bar
   deepclone/.hg/store/meta/b/bar/00manifest.i
   deepclone/.hg/store/meta/b/bar/orange
   deepclone/.hg/store/meta/b/bar/orange/00manifest.i
   deepclone/.hg/store/meta/b/bar/orange/fly
   deepclone/.hg/store/meta/b/bar/orange/fly/00manifest.i
   deepclone/.hg/store/meta/b/foo
   deepclone/.hg/store/meta/b/foo/00manifest.i
   deepclone/.hg/store/meta/b/foo/apple
   deepclone/.hg/store/meta/b/foo/apple/00manifest.i
   deepclone/.hg/store/meta/b/foo/apple/bees
   deepclone/.hg/store/meta/b/foo/apple/bees/00manifest.i
   deepclone/.hg/store/meta/~2e_a (reporevlogstore !)
   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
 Create clones using old repo formats to use in later tests
   $ hg clone --config format.usestore=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deeprepo-basicstore
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 18 changes to 8 files
   new changesets 775704be6f52:523e5c631710
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd deeprepo-basicstore
   $ hg debugrequires | grep store
   [1]
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone --config format.usefncache=False \
   >   --config experimental.changegroup3=True \
   >   http://localhost:$HGPORT deeprepo-encodedstore
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 18 changes to 8 files
   new changesets 775704be6f52:523e5c631710
   updating to branch default
   8 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd deeprepo-encodedstore
   $ hg debugrequires | grep fncache
   [1]
   $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
 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 \
   >   http://localhost:$HGPORT1 stream-clone-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 \
   >   http://localhost:$HGPORT2 stream-clone-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 \
   >   http://localhost:$HGPORT stream-clone-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
   writing 5330 bytes for 18 files (no-zstd !)
   writing 5400 bytes for 18 files (zstd !)
   bundle requirements:.* treemanifest(,.*)? (re)
   $ hg debugbundle --spec repo-packed.hg
   none-packed1;requirements%3D(.*%2C)?treemanifest(%2C.*)? (re)
 
 #endif
 
 Bundle with changegroup2 is not supported
 
   $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle
   abort: repository does not support bundle version 02
   [255]
 
 Pull does not include changegroup for manifest the client already has from
 other branch
 
   $ mkdir grafted-dir-repo
   $ cd grafted-dir-repo
   $ hg --config experimental.treemanifest=1 init
   $ mkdir dir
   $ echo a > dir/file
   $ echo a > file
   $ hg ci -Am initial
   adding dir/file
   adding file
   $ echo b > dir/file
   $ hg ci -m updated
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert -r tip dir/
   reverting dir/file
   $ echo b > file # to make sure root manifest is sent
   $ hg ci -m grafted
   created new head
   $ cd ..
 
   $ hg --config experimental.treemanifest=1 clone --pull -r 1 \
   >   grafted-dir-repo grafted-dir-repo-clone
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 2 files
   new changesets d84f4c419457:09ab742f3b0f
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd grafted-dir-repo-clone
   $ hg pull -r 2
   pulling from $TESTTMP/grafted-dir-repo
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 73699489fb7c
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Committing a empty commit does not duplicate root treemanifest
   $ echo z >> z
   $ hg commit -Aqm 'pre-empty commit'
   $ hg rm z
   $ hg commit --amend -m 'empty commit'
   saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg
   $ hg log -r 'tip + tip^' -T '{manifest}\n'
   1:678d3574b88c
   1:678d3574b88c
   $ hg --config extensions.strip= strip -r . -q

tests/test-unamend.t

@@ -1,462 +1,456
 Test for command `hg unamend` which lives in uncommit extension
 ===============================================================
 
   $ cat >> $HGRCPATH << EOF
   > [alias]
   > glog = log -G -T '{rev}:{node|short}  {desc}'
   > [experimental]
   > evolution = createmarkers, allowunstable
   > evolution.allowdivergence = true
   > [extensions]
   > rebase =
   > amend =
   > uncommit =
   > EOF
 
 Repo Setup
 
   $ hg init repo
   $ cd repo
   $ for ch in a b c d e f g h; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done
 
   $ hg glog
   @  7:ec2426147f0e  Added h
   |
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
 Trying to unamend when there was no amend done
 
   $ hg unamend
   abort: working copy parent was not created by 'hg amend' or 'hg unamend'
   [10]
   $ echo "bar" >> h
 
 Trying to unamend when the obsmarker is missing
 
   $ hg amend
   $ hg debugobsolete --delete 0
   deleted 1 obsolescence markers
   $ hg unamend
   abort: changeset must have one predecessor, found 0 predecessors
   [10]
   $ hg strip tip --config extensions.strip=
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c9fa1a715c1b-06e5c233-backup.hg
   $ hg up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Unamend on clean wdir and tip
 
   $ echo "bar" >> h
   $ hg amend
 
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
   diff -r 87d6d6676308 -r c9fa1a715c1b h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +foo
   +bar
 
   $ hg glog --hidden
   @  8:c9fa1a715c1b  Added h
   |
   | x  7:ec2426147f0e  Added h
   |/
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
   $ hg unamend
   $ hg glog --hidden
   @  9:46d02d47eec6  Added h
   |
   | x  8:c9fa1a715c1b  Added h
   |/
   | x  7:ec2426147f0e  Added h
   |/
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
   $ hg diff
   diff -r 46d02d47eec6 h
   --- a/h	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    foo
   +bar
 
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 46d02d47eec6ca096b8dcab3f8f5579c40c3dd9a
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
   diff -r 87d6d6676308 -r 46d02d47eec6 h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +foo
 
   $ hg status
   M h
 
   $ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log
   branch=default
   unamend_source=c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
 
 Using unamend to undo an unamed (intentional)
 
   $ hg unamend
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 850ddfc1bc662997ec6094ada958f01f0cc8070a
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
   diff -r 87d6d6676308 -r 850ddfc1bc66 h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +foo
   +bar
   $ hg diff
 
 Unamend on a dirty working directory
 
   $ echo "bar" >> a
   $ hg amend
   $ echo "foobar" >> a
   $ echo "bar" >> b
   $ hg status
   M a
   M b
 
   $ hg unamend
 
   $ hg status
   M a
   M b
 
   $ hg diff
   diff -r ec338db45d51 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    foo
   +bar
   +foobar
   diff -r ec338db45d51 b
   --- a/b	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    foo
   +bar
 
 Unamending an added file
 
   $ hg ci -m "Added things to a and b"
   $ echo foo > bar
   $ hg add bar
   $ hg amend
 
   $ hg unamend
   $ hg status
   A bar
 
   $ hg revert --all
   forgetting bar
 
 Unamending a removed file
 
   $ hg remove a
   $ hg amend
 
   $ hg unamend
   $ hg status
   R a
   ? bar
 
   $ hg revert --all
   undeleting a
 
 Unamending an added file with dirty wdir status
 
   $ hg add bar
   $ hg amend
   $ echo bar >> bar
   $ hg status
   M bar
 
   $ hg unamend
   $ hg status
   A bar
   $ hg diff
   diff -r 7f79409af972 bar
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +foo
   +bar
 
   $ hg revert --all
   forgetting bar
   $ rm bar
 
 Unamending in middle of a stack
 
   $ hg glog
   @  19:7f79409af972  Added things to a and b
   |
   o  12:ec338db45d51  Added h
   |
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
   $ hg up 5
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo bar >> f
   $ hg amend
   3 new orphan changesets
   $ hg rebase -s 6 -d . -q
 
   $ hg glog
   o  23:03ddd6fc5af1  Added things to a and b
   |
   o  22:3e7b64ee157b  Added h
   |
   o  21:49635b68477e  Added g
   |
   @  20:93f0e8ffab32  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
 
   $ hg --config experimental.evolution=createmarkers unamend
   abort: cannot unamend changeset, as that will orphan 3 descendants
   (see 'hg help evolution.instability')
   [10]
 
   $ hg unamend
   3 new orphan changesets
 
 Trying to unamend a public changeset
 
   $ hg up -C 23
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg phase -r . -p
   1 new phase-divergent changesets
   $ hg unamend
   abort: cannot unamend public changesets: 03ddd6fc5af1
   (see 'hg help phases' for details)
   [10]
 
 Testing whether unamend retains copies or not
 
   $ hg status
 
   $ hg mv a foo
 
   $ hg ci -m "Moved a to foo"
   $ hg exp --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID cfef290346fbee5126313d7e1aab51d877679b09
   # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
   rename from a
   rename to foo
 
   $ hg mv b foobar
   $ hg diff --git
   diff --git a/b b/foobar
   rename from b
   rename to foobar
   $ hg amend
 
   $ hg exp --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID eca050985275bb271ce3092b54e56ea5c85d29a3
   # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
   rename from a
   rename to foo
   diff --git a/b b/foobar
   rename from b
   rename to foobar
 
   $ 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
 
   $ hg exp --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 552e3af4f01f620f88ca27be1f898316235b736a
   # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
   rename from a
   rename to foo
 
 Retained copies in working directoy
 
   $ hg diff --git
   diff --git a/b b/foobar
   rename from b
   rename to foobar
   diff --git a/c b/wat
   rename from c
   rename to wat
   $ hg revert -qa
   $ rm foobar wat
 
 Rename a->b, then amend b->c. After unamend, should look like b->c.
 
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'move to a b'
   $ hg mv b c
   $ hg amend
   $ hg unamend
   $ hg st --copies --change .
   A b
     a
   R a
   $ hg st --copies
   A c
     b
   R b
   $ hg revert -qa
   $ rm c
 
 Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d
 
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'move to a b'
   warning: commit already existed in the repository!
   $ hg mv b c
   $ hg amend
   warning: commit already existed in the repository!
   $ hg mv c d
   $ hg unamend
   $ hg st --copies --change .
   A b
     a
   R a
   $ hg st --copies
   A d
     b
   R b
 
 Try to unamend a merge
 
   $ cd ..
   $ hg init merge
   $ cd merge
   $ echo initial > initial
   $ hg ci -Aqm initial
   $ echo left > left
   $ hg ci -Aqm left
   $ hg co -q 0
   $ echo right > right
   $ hg ci -Aqm right
   $ hg merge -q 1
   $ hg ci -m merge
   $ echo accidental > initial
   $ hg st --rev 1 --rev .
   A right
   $ hg st --rev 2 --rev .
   A left
   $ hg amend
   $ hg unamend
   abort: cannot unamend merge changeset
   [10]

tests/test-unionrepo.t

@@ -1,172 +1,167
 #require no-reposimplestore
 
 Test unionrepo functionality
 
 Create one repository
 
   $ hg init repo1
   $ cd repo1
   $ touch repo1-0
   $ echo repo1-0 > f
   $ hg ci -Aqmrepo1-0
   $ touch repo1-1
   $ echo repo1-1 >> f
   $ hg ci -Aqmrepo1-1
   $ touch repo1-2
   $ echo repo1-2 >> f
   $ hg ci -Aqmrepo1-2
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   2:68c0685446a3  repo1-2
   1:8a58db72e69d  repo1-1
   0:f093fec0529b  repo1-0
   $ tip1=`hg id -q`
   $ cd ..
 
 - and a clone with a not-completely-trivial history
 
   $ hg clone -q repo1 --rev 0 repo2
   $ cd repo2
   $ touch repo2-1
   $ sed '1i\
   > repo2-1 at top
   > ' f > f.tmp
   $ mv f.tmp f
   $ hg ci -Aqmrepo2-1
   $ touch repo2-2
   $ hg pull -q ../repo1 -r 1
   $ hg merge -q
   $ hg ci -Aqmrepo2-2-merge
   $ touch repo2-3
   $ echo repo2-3 >> f
   $ hg ci -mrepo2-3
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   4:2f0d178c469c  repo2-3
   3:9e6fb3e0b9da  repo2-2-merge
   2:8a58db72e69d  repo1-1
   1:c337dba826e7  repo2-1
   0:f093fec0529b  repo1-0
   $ cd ..
 
 revisions from repo2 appear as appended / pulled to repo1
 
   $ hg -R union:repo1+repo2 log --template '{rev}:{node|short}  {desc|firstline}\n'
   5:2f0d178c469c  repo2-3
   4:9e6fb3e0b9da  repo2-2-merge
   3:c337dba826e7  repo2-1
   2:68c0685446a3  repo1-2
   1:8a58db72e69d  repo1-1
   0:f093fec0529b  repo1-0
 
 manifest can be retrieved for revisions in both repos
 
   $ hg -R union:repo1+repo2 mani -r $tip1
   f
   repo1-0
   repo1-1
   repo1-2
   $ hg -R union:repo1+repo2 mani -r 4
   f
   repo1-0
   repo1-1
   repo2-1
   repo2-2
 
 files can be retrieved form both repos
 
   $ hg -R repo1 cat repo1/f -r2
   repo1-0
   repo1-1
   repo1-2
 
   $ hg -R union:repo1+repo2 cat -r$tip1 repo1/f
   repo1-0
   repo1-1
   repo1-2
 
   $ hg -R union:repo1+repo2 cat -r4 $TESTTMP/repo1/f
   repo2-1 at top
   repo1-0
   repo1-1
 
 files can be compared across repos
 
   $ hg -R union:repo1+repo2 diff -r$tip1 -rtip
   diff -r 68c0685446a3 -r 2f0d178c469c f
   --- a/f	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@
   +repo2-1 at top
    repo1-0
    repo1-1
   -repo1-2
   +repo2-3
 
 heads from both repos are found correctly
 
   $ hg -R union:repo1+repo2 heads --template '{rev}:{node|short}  {desc|firstline}\n'
   5:2f0d178c469c  repo2-3
   2:68c0685446a3  repo1-2
 
 revsets works across repos
 
   $ hg -R union:repo1+repo2 id -r "ancestor($tip1, 5)"
   8a58db72e69d
 
 annotate works - an indication that linkrevs works
 
   $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
   3: repo2-1 at top
   0: repo1-0
   1: repo1-1
   5: repo2-3
 
 union repos can be cloned ... and clones works correctly
 
   $ hg clone -U union:repo1+repo2 repo3
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 11 changes to 6 files (+1 heads)
   new changesets f093fec0529b:2f0d178c469c (6 drafts)
 
   $ 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
   2:68c0685446a3  repo1-2
 
   $ hg -R repo3 log --template '{rev}:{node|short}  {desc|firstline}\n'
   5:2f0d178c469c  repo2-3
   4:9e6fb3e0b9da  repo2-2-merge
   3:c337dba826e7  repo2-1
   2:68c0685446a3  repo1-2
   1:8a58db72e69d  repo1-1
   0:f093fec0529b  repo1-0
 
 union repos should use the correct rev number (issue5024)
 
   $ hg init a
   $ cd a
   $ echo a0 >> f
   $ hg ci -Aqm a0
   $ cd ..
   $ hg init b
   $ cd b
   $ echo b0 >> f
   $ hg ci -Aqm b0
   $ echo b1 >> f
   $ hg ci -qm b1
   $ cd ..
 
 "hg files -v" to call fctx.size() -> fctx.iscensored()
   $ hg files -R union:b+a -r2 -v
            3   b/f

tests/test-upgrade-repo.t

@@ -1,2143 +1,2103
 #require no-reposimplestore
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > share =
   > [format]
   > # stabilize test accross variant
   > revlog-compression=zlib
   > [storage]
   > dirstate-v2.slow-path=allow
   > EOF
 
 store and revlogv1 are required in source
 
   $ hg --config format.usestore=false init no-store
   $ hg -R no-store debugupgraderepo
   abort: cannot upgrade repository; requirement missing: store
   [255]
 
   $ hg init no-revlogv1
   $ cat > no-revlogv1/.hg/requires << EOF
   > dotencode
   > fncache
   > generaldelta
   > store
   > EOF
 
   $ hg -R no-revlogv1 debugupgraderepo
   abort: cannot upgrade repository; missing a revlog version
   [255]
 
 Cannot upgrade shared repositories
 
   $ hg init share-parent
   $ hg -R share-parent debugbuilddag -n .+9
   $ hg -R share-parent up tip
   10 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -q share share-parent share-child
 
   $ hg -R share-child debugupgraderepo --config format.sparse-revlog=no
   abort: cannot use these actions on a share repository: sparserevlog
   (upgrade the main repository directly)
   [255]
 
 Unless the action is compatible with share
 
   $ hg -R share-child debugupgraderepo --config format.use-dirstate-v2=yes --quiet
   requirements
      preserved: * (glob)
      added: dirstate-v2
   
   no revlogs to process
   
 
   $ hg -R share-child debugupgraderepo --config format.use-dirstate-v2=yes --quiet --run
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      added: dirstate-v2
   
   no revlogs to process
   
   $ hg debugformat -R share-child | grep dirstate-v2
   dirstate-v2:        yes
   $ hg debugformat -R share-parent | grep dirstate-v2
   dirstate-v2:         no
   $ hg status --all -R share-child
   C nf0
   C nf1
   C nf2
   C nf3
   C nf4
   C nf5
   C nf6
   C nf7
   C nf8
   C nf9
   $ hg log -l 3 -R share-child
   changeset:   9:0059eb38e4a4
   tag:         tip
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:09 1970 +0000
   summary:     r9
   
   changeset:   8:4d5be70c8130
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:08 1970 +0000
   summary:     r8
   
   changeset:   7:e60bfe72517e
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:07 1970 +0000
   summary:     r7
   
   $ hg status --all -R share-parent
   C nf0
   C nf1
   C nf2
   C nf3
   C nf4
   C nf5
   C nf6
   C nf7
   C nf8
   C nf9
   $ hg log -l 3 -R share-parent
   changeset:   9:0059eb38e4a4
   tag:         tip
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:09 1970 +0000
   summary:     r9
   
   changeset:   8:4d5be70c8130
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:08 1970 +0000
   summary:     r8
   
   changeset:   7:e60bfe72517e
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:07 1970 +0000
   summary:     r7
   
 
   $ hg -R share-child debugupgraderepo --config format.use-dirstate-v2=no --quiet --run
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      removed: dirstate-v2
   
   no revlogs to process
   
   $ hg debugformat -R share-child | grep dirstate-v2
   dirstate-v2:         no
   $ hg debugformat -R share-parent | grep dirstate-v2
   dirstate-v2:         no
   $ hg status --all -R share-child
   C nf0
   C nf1
   C nf2
   C nf3
   C nf4
   C nf5
   C nf6
   C nf7
   C nf8
   C nf9
   $ hg log -l 3 -R share-child
   changeset:   9:0059eb38e4a4
   tag:         tip
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:09 1970 +0000
   summary:     r9
   
   changeset:   8:4d5be70c8130
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:08 1970 +0000
   summary:     r8
   
   changeset:   7:e60bfe72517e
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:07 1970 +0000
   summary:     r7
   
   $ hg status --all -R share-parent
   C nf0
   C nf1
   C nf2
   C nf3
   C nf4
   C nf5
   C nf6
   C nf7
   C nf8
   C nf9
   $ hg log -l 3 -R share-parent
   changeset:   9:0059eb38e4a4
   tag:         tip
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:09 1970 +0000
   summary:     r9
   
   changeset:   8:4d5be70c8130
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:08 1970 +0000
   summary:     r8
   
   changeset:   7:e60bfe72517e
   user:        debugbuilddag
   date:        Thu Jan 01 00:00:07 1970 +0000
   summary:     r7
   
 
 Do not yet support upgrading treemanifest repos
 
   $ hg --config experimental.treemanifest=true init treemanifest
   $ hg -R treemanifest debugupgraderepo
   abort: cannot upgrade repository; unsupported source requirement: treemanifest
   [255]
 
 Cannot add treemanifest requirement during upgrade
 
   $ hg init disallowaddedreq
   $ hg -R disallowaddedreq --config experimental.treemanifest=true debugupgraderepo
   abort: cannot upgrade repository; do not support adding requirement: treemanifest
   [255]
 
 An upgrade of a repository created with recommended settings only suggests optimizations
 
   $ hg init empty
   $ cd empty
   $ hg debugformat
   format-variant     repo
   fncache:            yes
   dirstate-v2:         no
   tracked-hint:        no
   dotencode:          yes
   generaldelta:       yes
   share-safe:         yes
   sparserevlog:       yes
   persistent-nodemap:  no (no-rust !)
   persistent-nodemap: yes (rust !)
   copies-sdc:          no
   revlog-v2:           no
   changelog-v2:        no
   plain-cl-delta:     yes
   compression:        zlib
   compression-level:  default
   $ hg debugformat --verbose
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zlib   zlib    zstd (zstd !)
   compression-level:  default default default
   $ hg debugformat --verbose --config format.usefncache=no
   format-variant     repo config default
   fncache:            yes     no     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes     no     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zlib   zlib    zstd (zstd !)
   compression-level:  default default default
   $ hg debugformat --verbose --config format.usefncache=no --color=debug
   format-variant     repo config default
   [formatvariant.name.mismatchconfig|fncache:           ][formatvariant.repo.mismatchconfig| yes][formatvariant.config.special|     no][formatvariant.default|     yes]
   [formatvariant.name.uptodate|dirstate-v2:       ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|tracked-hint:      ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.mismatchconfig|dotencode:         ][formatvariant.repo.mismatchconfig| yes][formatvariant.config.special|     no][formatvariant.default|     yes]
   [formatvariant.name.uptodate|generaldelta:      ][formatvariant.repo.uptodate| yes][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.uptodate|share-safe:        ][formatvariant.repo.uptodate| yes][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.uptodate|sparserevlog:      ][formatvariant.repo.uptodate| yes][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.uptodate|persistent-nodemap:][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no] (no-rust !)
   [formatvariant.name.mismatchdefault|persistent-nodemap:][formatvariant.repo.mismatchdefault| yes][formatvariant.config.special|    yes][formatvariant.default|      no] (rust !)
   [formatvariant.name.uptodate|copies-sdc:        ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|revlog-v2:         ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|changelog-v2:      ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|plain-cl-delta:    ][formatvariant.repo.uptodate| yes][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.uptodate|compression:       ][formatvariant.repo.uptodate| zlib][formatvariant.config.default|   zlib][formatvariant.default|    zlib] (no-zstd !)
   [formatvariant.name.mismatchdefault|compression:       ][formatvariant.repo.mismatchdefault| zlib][formatvariant.config.special|   zlib][formatvariant.default|    zstd] (zstd !)
   [formatvariant.name.uptodate|compression-level: ][formatvariant.repo.uptodate| default][formatvariant.config.default| default][formatvariant.default| default]
   $ hg debugformat -Tjson
   [
    {
     "config": true,
     "default": true,
     "name": "fncache",
     "repo": true
    },
    {
     "config": false,
     "default": false,
     "name": "dirstate-v2",
     "repo": false
    },
    {
     "config": false,
     "default": false,
     "name": "tracked-hint",
     "repo": false
    },
    {
     "config": true,
     "default": true,
     "name": "dotencode",
     "repo": true
    },
    {
     "config": true,
     "default": true,
     "name": "generaldelta",
     "repo": true
    },
    {
     "config": true,
     "default": true,
     "name": "share-safe",
     "repo": true
    },
    {
     "config": true,
     "default": true,
     "name": "sparserevlog",
     "repo": true
    },
    {
     "config": false, (no-rust !)
     "config": true, (rust !)
     "default": false,
     "name": "persistent-nodemap",
     "repo": false (no-rust !)
     "repo": true (rust !)
    },
    {
     "config": false,
     "default": false,
     "name": "copies-sdc",
     "repo": false
    },
    {
     "config": false,
     "default": false,
     "name": "revlog-v2",
     "repo": false
    },
    {
     "config": false,
     "default": false,
     "name": "changelog-v2",
     "repo": false
    },
    {
     "config": true,
     "default": true,
     "name": "plain-cl-delta",
     "repo": true
    },
    {
     "config": "zlib",
     "default": "zlib", (no-zstd !)
     "default": "zstd", (zstd !)
     "name": "compression",
     "repo": "zlib"
    },
    {
     "config": "default",
     "default": "default",
     "name": "compression-level",
     "repo": "default"
    }
   ]
   $ hg debugupgraderepo
   (no format upgrades found in existing repository)
   performing an upgrade with "--run" will make the following changes:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   no revlogs to process
   
   additional optimizations are available by specifying "--optimize <name>":
   
   re-delta-parent
      deltas within internal storage will be recalculated to choose an optimal base revision where this was not already done; the size of the repository may shrink and various operations may become faster; the first time this optimization is performed could slow down upgrade execution considerably; subsequent invocations should not run noticeably slower
   
   re-delta-multibase
      deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges
   
   re-delta-all
      deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed
   
   re-delta-fulladd
      every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
   
 
   $ hg debugupgraderepo --quiet
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   no revlogs to process
   
 
 --optimize can be used to add optimizations
 
   $ hg debugupgrade --optimize 're-delta-parent'
   (no format upgrades found in existing repository)
   performing an upgrade with "--run" will make the following changes:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   additional optimizations are available by specifying "--optimize <name>":
   
   re-delta-multibase
      deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges
   
   re-delta-all
      deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed
   
   re-delta-fulladd
      every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
   
 
 modern form of the option
 
   $ hg debugupgrade --optimize re-delta-parent
   (no format upgrades found in existing repository)
   performing an upgrade with "--run" will make the following changes:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   additional optimizations are available by specifying "--optimize <name>":
   
   re-delta-multibase
      deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges
   
   re-delta-all
      deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed
   
   re-delta-fulladd
      every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
   
 
   $ hg debugupgrade --optimize re-delta-parent --quiet
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
 
 passing multiple optimization:
 
   $ hg debugupgrade --optimize re-delta-parent --optimize re-delta-multibase --quiet
   requirements
      preserved: * (glob)
   
   optimisations: re-delta-multibase, re-delta-parent
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
 
 unknown optimization:
 
   $ hg debugupgrade --optimize foobar
   abort: unknown optimization action requested: foobar
   (run without arguments to see valid optimizations)
   [255]
 
 Various sub-optimal detections work
 
   $ cat > .hg/requires << EOF
   > revlogv1
   > store
   > EOF
 
   $ hg debugformat
   format-variant     repo
   fncache:             no
   dirstate-v2:         no
   tracked-hint:        no
   dotencode:           no
   generaldelta:        no
   share-safe:          no
   sparserevlog:        no
   persistent-nodemap:  no
   copies-sdc:          no
   revlog-v2:           no
   changelog-v2:        no
   plain-cl-delta:     yes
   compression:        zlib
   compression-level:  default
   $ hg debugformat --verbose
   format-variant     repo config default
   fncache:             no    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:           no    yes     yes
   generaldelta:        no    yes     yes
   share-safe:          no    yes     yes
   sparserevlog:        no    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap:  no    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zlib   zlib    zstd (zstd !)
   compression-level:  default default default
   $ hg debugformat --verbose --config format.usegeneraldelta=no
   format-variant     repo config default
   fncache:             no    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:           no    yes     yes
   generaldelta:        no     no     yes
   share-safe:          no    yes     yes
   sparserevlog:        no     no     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap:  no    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zlib   zlib    zstd (zstd !)
   compression-level:  default default default
   $ hg debugformat --verbose --config format.usegeneraldelta=no --color=debug
   format-variant     repo config default
   [formatvariant.name.mismatchconfig|fncache:           ][formatvariant.repo.mismatchconfig|  no][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.uptodate|dirstate-v2:       ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|tracked-hint:      ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.mismatchconfig|dotencode:         ][formatvariant.repo.mismatchconfig|  no][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.mismatchdefault|generaldelta:      ][formatvariant.repo.mismatchdefault|  no][formatvariant.config.special|     no][formatvariant.default|     yes]
   [formatvariant.name.mismatchconfig|share-safe:        ][formatvariant.repo.mismatchconfig|  no][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.mismatchdefault|sparserevlog:      ][formatvariant.repo.mismatchdefault|  no][formatvariant.config.special|     no][formatvariant.default|     yes]
   [formatvariant.name.uptodate|persistent-nodemap:][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no] (no-rust !)
   [formatvariant.name.mismatchconfig|persistent-nodemap:][formatvariant.repo.mismatchconfig|  no][formatvariant.config.special|    yes][formatvariant.default|      no] (rust !)
   [formatvariant.name.uptodate|copies-sdc:        ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|revlog-v2:         ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|changelog-v2:      ][formatvariant.repo.uptodate|  no][formatvariant.config.default|     no][formatvariant.default|      no]
   [formatvariant.name.uptodate|plain-cl-delta:    ][formatvariant.repo.uptodate| yes][formatvariant.config.default|    yes][formatvariant.default|     yes]
   [formatvariant.name.uptodate|compression:       ][formatvariant.repo.uptodate| zlib][formatvariant.config.default|   zlib][formatvariant.default|    zlib] (no-zstd !)
   [formatvariant.name.mismatchdefault|compression:       ][formatvariant.repo.mismatchdefault| zlib][formatvariant.config.special|   zlib][formatvariant.default|    zstd] (zstd !)
   [formatvariant.name.uptodate|compression-level: ][formatvariant.repo.uptodate| default][formatvariant.config.default| default][formatvariant.default| default]
   $ hg debugupgraderepo
   note:    selecting all-filelogs for processing to change: dotencode
   note:    selecting all-manifestlogs for processing to change: dotencode
   note:    selecting changelog for processing to change: dotencode
   
   repository lacks features recommended by current config options:
   
   fncache
      long and reserved filenames may not work correctly; repository performance is sub-optimal
   
   dotencode
      storage of filenames beginning with a period or space may not work correctly
   
   generaldelta
      deltas within internal storage are unable to choose optimal revisions; repository is larger and slower than it could be; interaction with other repositories may require extra network and CPU resources, making "hg push" and "hg pull" slower
   
   share-safe
      old shared repositories do not share source repository requirements and config. This leads to various problems when the source repository format is upgraded or some new extensions are enabled.
   
   sparserevlog
      in order to limit disk reading and memory usage on older version, the span of a delta chain from its root to its end is limited, whatever the relevant data in this span. This can severly limit Mercurial ability to build good chain of delta resulting is much more storage space being taken and limit reusability of on disk delta during exchange.
   
   persistent-nodemap (rust !)
      persist the node -> rev mapping on disk to speedup lookup (rust !)
    (rust !)
   
   performing an upgrade with "--run" will make the following changes:
   
   requirements
      preserved: revlogv1, store
      added: dotencode, fncache, generaldelta, share-safe, sparserevlog (no-rust !)
      added: dotencode, fncache, generaldelta, persistent-nodemap, share-safe, sparserevlog (rust !)
   
   fncache
      repository will be more resilient to storing certain paths and performance of certain operations should be improved
   
   dotencode
      repository will be better able to store files beginning with a space or period
   
   generaldelta
      repository storage will be able to create optimal deltas; new repository data will be smaller and read times should decrease; interacting with other repositories using this storage model should require less network and CPU resources, making "hg push" and "hg pull" faster
   
   share-safe
      Upgrades a repository to share-safe format so that future shares of this repository share its requirements and configs.
   
   sparserevlog
      Revlog supports delta chain with more unused data between payload. These gaps will be skipped at read time. This allows for better delta chains, making a better compression and faster exchange with server.
   
   persistent-nodemap (rust !)
      Speedup revision lookup by node id. (rust !)
    (rust !)
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   additional optimizations are available by specifying "--optimize <name>":
   
   re-delta-parent
      deltas within internal storage will be recalculated to choose an optimal base revision where this was not already done; the size of the repository may shrink and various operations may become faster; the first time this optimization is performed could slow down upgrade execution considerably; subsequent invocations should not run noticeably slower
   
   re-delta-multibase
      deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges
   
   re-delta-all
      deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed
   
   re-delta-fulladd
      every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
   
   $ hg debugupgraderepo --quiet
   requirements
      preserved: revlogv1, store
      added: dotencode, fncache, generaldelta, share-safe, sparserevlog (no-rust !)
      added: dotencode, fncache, generaldelta, persistent-nodemap, share-safe, sparserevlog (rust !)
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
 
   $ hg --config format.dotencode=false debugupgraderepo
   note:    selecting all-filelogs for processing to change: fncache
   note:    selecting all-manifestlogs for processing to change: fncache
   note:    selecting changelog for processing to change: fncache
   
   repository lacks features recommended by current config options:
   
   fncache
      long and reserved filenames may not work correctly; repository performance is sub-optimal
   
   generaldelta
      deltas within internal storage are unable to choose optimal revisions; repository is larger and slower than it could be; interaction with other repositories may require extra network and CPU resources, making "hg push" and "hg pull" slower
   
   share-safe
      old shared repositories do not share source repository requirements and config. This leads to various problems when the source repository format is upgraded or some new extensions are enabled.
   
   sparserevlog
      in order to limit disk reading and memory usage on older version, the span of a delta chain from its root to its end is limited, whatever the relevant data in this span. This can severly limit Mercurial ability to build good chain of delta resulting is much more storage space being taken and limit reusability of on disk delta during exchange.
   
   persistent-nodemap (rust !)
      persist the node -> rev mapping on disk to speedup lookup (rust !)
    (rust !)
   repository lacks features used by the default config options:
   
   dotencode
      storage of filenames beginning with a period or space may not work correctly
   
   
   performing an upgrade with "--run" will make the following changes:
   
   requirements
      preserved: revlogv1, store
      added: fncache, generaldelta, share-safe, sparserevlog (no-rust !)
      added: fncache, generaldelta, persistent-nodemap, share-safe, sparserevlog (rust !)
   
   fncache
      repository will be more resilient to storing certain paths and performance of certain operations should be improved
   
   generaldelta
      repository storage will be able to create optimal deltas; new repository data will be smaller and read times should decrease; interacting with other repositories using this storage model should require less network and CPU resources, making "hg push" and "hg pull" faster
   
   share-safe
      Upgrades a repository to share-safe format so that future shares of this repository share its requirements and configs.
   
   sparserevlog
      Revlog supports delta chain with more unused data between payload. These gaps will be skipped at read time. This allows for better delta chains, making a better compression and faster exchange with server.
   
   persistent-nodemap (rust !)
      Speedup revision lookup by node id. (rust !)
    (rust !)
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   additional optimizations are available by specifying "--optimize <name>":
   
   re-delta-parent
      deltas within internal storage will be recalculated to choose an optimal base revision where this was not already done; the size of the repository may shrink and various operations may become faster; the first time this optimization is performed could slow down upgrade execution considerably; subsequent invocations should not run noticeably slower
   
   re-delta-multibase
      deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges
   
   re-delta-all
      deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed
   
   re-delta-fulladd
      every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
   
 
   $ cd ..
 
 Upgrading a repository that is already modern essentially no-ops
 
   $ hg init modern
   $ hg -R modern debugupgraderepo --run
   nothing to do
 
 Upgrading a repository to generaldelta works
 
   $ hg --config format.usegeneraldelta=false init upgradegd
   $ cd upgradegd
   $ touch f0
   $ hg -q commit -A -m initial
   $ mkdir FooBarDirectory.d
   $ touch FooBarDirectory.d/f1
   $ hg -q commit -A -m 'add f1'
   $ hg -q up -r 0
   >>> import random
   >>> random.seed(0) # have a reproducible content
   >>> with open("f2", "wb") as f:
   ...     for i in range(100000):
   ...         f.write(b"%d\n" % random.randint(1000000000, 9999999999)) and None
   $ hg -q commit -A -m 'add f2'
 
 make sure we have a .d file
 
   $ ls -d .hg/store/data/*
   .hg/store/data/_foo_bar_directory.d.hg
   .hg/store/data/f0.i
   .hg/store/data/f2.d
   .hg/store/data/f2.i
 
   $ hg debugupgraderepo --run --config format.sparse-revlog=false
   note:    selecting all-filelogs for processing to change: generaldelta
   note:    selecting all-manifestlogs for processing to change: generaldelta
   note:    selecting changelog for processing to change: generaldelta
   
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, persistent-nodemap, revlogv1, share-safe, store (rust !)
      added: generaldelta
   
   generaldelta
      repository storage will be able to create optimal deltas; new repository data will be smaller and read times should decrease; interacting with other repositories using this storage model should require less network and CPU resources, making "hg push" and "hg pull" faster
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (384 bytes in store; 238 bytes tracked data)
   finished migrating 3 manifest revisions across 1 manifests; change in size: -17 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: -17 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
   replacing store...
   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)
   copy of old repository backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
   the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
 
 Original requirements backed up
 
   $ cat .hg/upgradebackup.*/requires
   share-safe
   $ cat .hg/upgradebackup.*/store/requires
   dotencode
   fncache
   persistent-nodemap (rust !)
   revlogv1
   store
   upgradeinprogress
 
 generaldelta added to original requirements files
 
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   store
 
 store directory has files we expect
 
   $ ls .hg/store
   00changelog.i
   00manifest.i
   data
   fncache
   phaseroots
   requires
   undo
   undo.backupfiles
   undo.phaseroots
 
 manifest should be generaldelta
 
   $ hg debugrevlog -m | grep flags
   flags  : inline, 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
 
   $ ls -d .hg/upgradebackup.*/
   .hg/upgradebackup.*/ (glob)
   $ ls .hg/upgradebackup.*/store
   00changelog.i
   00manifest.i
   data
   fncache
   phaseroots
   requires
   undo
   undo.backup.fncache
   undo.backupfiles
   undo.phaseroots
 
 unless --no-backup is passed
 
   $ rm -rf .hg/upgradebackup.*/
   $ hg debugupgraderepo --run --no-backup
   note:    selecting all-filelogs for processing to change: sparserevlog
   note:    selecting all-manifestlogs for processing to change: sparserevlog
   note:    selecting changelog for processing to change: sparserevlog
   
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      added: sparserevlog
   
   sparserevlog
      Revlog supports delta chain with more unused data between payload. These gaps will be skipped at read time. This allows for better delta chains, making a better compression and faster exchange with server.
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   store replacement complete; repository was inconsistent for * (glob)
   finalizing requirements file and making repository readable again
   removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   $ ls -1 .hg/ | grep upgradebackup
   [1]
 
 We can restrict optimization to some revlog:
 
   $ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   blindly copying data/FooBarDirectory.d/f1.i containing 1 revisions
   blindly copying data/f0.i containing 1 revisions
   blindly copying data/f2.i containing 1 revisions
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   cloning 3 revisions from 00manifest.i
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   blindly copying 00changelog.i containing 3 revisions
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   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)
 
 Check that the repo still works fine
 
   $ hg log -G --stat
   @  changeset:   2:fca376863211 (py3 !)
   |  tag:         tip
   |  parent:      0:ba592bf28da2
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add f2
   |
   |   f2 |  100000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   |   1 files changed, 100000 insertions(+), 0 deletions(-)
   |
   | o  changeset:   1:2029ce2354e2
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     add f1
   |
   |
   o  changeset:   0:ba592bf28da2
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial
   
   
 
-  $ 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
 
   $ hg debugupgrade --optimize re-delta-parent --run --no-manifest --no-backup --debug --traceback
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - all-filelogs
     - changelog
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   cloning 1 revisions from data/FooBarDirectory.d/f1.i
   cloning 1 revisions from data/f0.i
   cloning 1 revisions from data/f2.i
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   blindly copying 00manifest.i containing 3 revisions
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   cloning 3 revisions from 00changelog.i
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   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
 
   $ hg debugupgrade --optimize re-delta-parent --run --changelog --no-backup --debug --traceback
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - changelog
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   blindly copying data/FooBarDirectory.d/f1.i containing 1 revisions
   blindly copying data/f0.i containing 1 revisions
   blindly copying data/f2.i containing 1 revisions
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   blindly copying 00manifest.i containing 3 revisions
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   cloning 3 revisions from 00changelog.i
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   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
 
   $ hg debugupgrade --optimize re-delta-parent --run --no-changelog --no-manifest --no-backup --debug --traceback
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - all-filelogs
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   cloning 1 revisions from data/FooBarDirectory.d/f1.i
   cloning 1 revisions from data/f0.i
   cloning 1 revisions from data/f2.i
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   blindly copying 00manifest.i containing 3 revisions
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   blindly copying 00changelog.i containing 3 revisions
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   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
 
   $ echo "[format]" > .hg/hgrc
   $ echo "sparse-revlog=no" >> .hg/hgrc
   $ hg debugupgrade --optimize re-delta-parent --no-manifest --no-backup --quiet
   warning: ignoring  --no-manifest, as upgrade is changing: sparserevlog
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      removed: sparserevlog
   
   optimisations: re-delta-parent
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
   note:    selecting all-filelogs for processing to change: sparserevlog
   note:    selecting changelog for processing to change: sparserevlog
   
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      removed: sparserevlog
   
   optimisations: re-delta-parent
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   cloning 1 revisions from data/FooBarDirectory.d/f1.i
   cloning 1 revisions from data/f0.i
   cloning 1 revisions from data/f2.i
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   cloning 3 revisions from 00manifest.i
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   cloning 3 revisions from 00changelog.i
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   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
 
   $ echo "sparse-revlog=yes" >> .hg/hgrc
   $ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
   note:    selecting all-filelogs for processing to change: sparserevlog
   note:    selecting changelog for processing to change: sparserevlog
   
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      added: sparserevlog
   
   optimisations: re-delta-parent
   
   sparserevlog
      Revlog supports delta chain with more unused data between payload. These gaps will be skipped at read time. This allows for better delta chains, making a better compression and faster exchange with server.
   
   re-delta-parent
      deltas within internal storage will choose a new base revision if needed
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 519 KB in store; 1.05 MB tracked data
   migrating 3 filelogs containing 3 revisions (518 KB in store; 1.05 MB tracked data)
   cloning 1 revisions from data/FooBarDirectory.d/f1.i
   cloning 1 revisions from data/f0.i
   cloning 1 revisions from data/f2.i
   finished migrating 3 filelog revisions across 3 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 3 revisions (367 bytes in store; 238 bytes tracked data)
   cloning 3 revisions from 00manifest.i
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (394 bytes in store; 199 bytes tracked data)
   cloning 3 revisions from 00changelog.i
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: 0 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replacing store...
   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 ..
 
 store files with special filenames aren't encoded during copy
 
   $ hg init store-filenames
   $ cd store-filenames
   $ touch foo
   $ hg -q commit -A -m initial
   $ touch .hg/store/.XX_special_filename
 
   $ hg debugupgraderepo --run
   nothing to do
   $ hg debugupgraderepo --run --optimize 're-delta-fulladd'
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-fulladd
   
   re-delta-fulladd
      each revision will be added as new content to the internal storage; this will likely drastically slow down execution time, but some extensions might need it
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/store-filenames/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 3 total revisions (1 in filelogs, 1 in manifests, 1 in changelog)
   migrating 301 bytes in store; 107 bytes tracked data
   migrating 1 filelogs containing 1 revisions (64 bytes in store; 0 bytes tracked data)
   finished migrating 1 filelog revisions across 1 filelogs; change in size: 0 bytes
   migrating 1 manifests containing 1 revisions (110 bytes in store; 45 bytes tracked data)
   finished migrating 1 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 1 revisions (127 bytes in store; 62 bytes tracked data)
   finished migrating 1 changelog revisions; change in size: 0 bytes
   finished migrating 3 total revisions; total change in store size: 0 bytes
   copying .XX_special_filename
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replaced files will be backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob)
   replacing store...
   store replacement complete; repository was inconsistent for *s (glob)
   finalizing requirements file and making repository readable again
   removing temporary repository $TESTTMP/store-filenames/.hg/upgrade.* (glob)
   copy of old repository backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob)
   the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
 
 fncache is valid after upgrade
 
   $ hg debugrebuildfncache
   fncache already up to date
 
   $ cd ..
 
 Check upgrading a large file repository
 ---------------------------------------
 
   $ hg init largefilesrepo
   $ cat << EOF >> largefilesrepo/.hg/hgrc
   > [extensions]
   > largefiles =
   > EOF
 
   $ cd largefilesrepo
   $ touch foo
   $ hg add --large foo
   $ hg -q commit -m initial
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   largefiles
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   sparserevlog
   store
 
   $ hg debugupgraderepo --run
   nothing to do
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   largefiles
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   sparserevlog
   store
 
   $ cat << EOF >> .hg/hgrc
   > [extensions]
   > lfs =
   > [lfs]
   > threshold = 10
   > EOF
   $ echo '123456789012345' > lfs.bin
   $ hg ci -Am 'lfs.bin'
   adding lfs.bin
   $ hg debugrequires | grep lfs
   lfs
   $ find .hg/store/lfs -type f
   .hg/store/lfs/objects/d0/beab232adff5ba365880366ad30b1edb85c4c5372442b5d2fe27adc96d653f
 
   $ hg debugupgraderepo --run
   nothing to do
 
   $ hg debugrequires | grep lfs
   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
   size 16
   x-is-binary 0
 
   $ cd ..
 
 repository config is taken in account
 -------------------------------------
 
   $ cat << EOF >> $HGRCPATH
   > [format]
   > maxchainlen = 1
   > EOF
 
   $ hg init localconfig
   $ cd localconfig
   $ cat << EOF > file
   > some content
   > with some length
   > to make sure we get a delta
   > after changes
   > very long
   > very long
   > very long
   > very long
   > very long
   > very long
   > very long
   > very long
   > very long
   > very long
   > very long
   > EOF
   $ hg -q commit -A -m A
   $ echo "new line" >> file
   $ hg -q commit -m B
   $ echo "new line" >> file
   $ hg -q commit -m C
 
   $ cat << EOF >> .hg/hgrc
   > [format]
   > maxchainlen = 9001
   > EOF
   $ hg config format
   format.revlog-compression=$BUNDLE2_COMPRESSIONS$
   format.maxchainlen=9001
   $ hg debugdeltachain file
       rev      p1      p2  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio   readsize largestblk rddensity srchunks
         0      -1      -1       1        1       -1    base         77        182         77   0.42308        77         0    0.00000         77         77   1.00000        1
         1       0      -1       1        2        0      p1         21        191         98   0.51309        98         0    0.00000         98         98   1.00000        1
         2       1      -1       1        2        0    snap         30        200        107   0.53500       128        21    0.19626        128        128   0.83594        1
 
   $ hg debugupgraderepo --run --optimize 're-delta-all'
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
   
   optimisations: re-delta-all
   
   re-delta-all
      deltas within internal storage will be fully recomputed; this will likely drastically slow down execution time
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/localconfig/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
   migrating 1019 bytes in store; 882 bytes tracked data
   migrating 1 filelogs containing 3 revisions (320 bytes in store; 573 bytes tracked data)
   finished migrating 3 filelog revisions across 1 filelogs; change in size: -9 bytes
   migrating 1 manifests containing 3 revisions (333 bytes in store; 138 bytes tracked data)
   finished migrating 3 manifest revisions across 1 manifests; change in size: 0 bytes
   migrating changelog containing 3 revisions (366 bytes in store; 171 bytes tracked data)
   finished migrating 3 changelog revisions; change in size: 0 bytes
   finished migrating 9 total revisions; total change in store size: -9 bytes
   copying phaseroots
   copying requires
   data fully upgraded in a temporary repository
   marking source repository as being upgraded; clients will be unable to read from repository
   starting in-place swap of repository data
   replaced files will be backed up at $TESTTMP/localconfig/.hg/upgradebackup.* (glob)
   replacing store...
   store replacement complete; repository was inconsistent for *s (glob)
   finalizing requirements file and making repository readable again
   removing temporary repository $TESTTMP/localconfig/.hg/upgrade.* (glob)
   copy of old repository backed up at $TESTTMP/localconfig/.hg/upgradebackup.* (glob)
   the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
   $ hg debugdeltachain file
       rev      p1      p2  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio   readsize largestblk rddensity srchunks
         0      -1      -1       1        1       -1    base         77        182         77   0.42308        77         0    0.00000         77         77   1.00000        1
         1       0      -1       1        2        0      p1         21        191         98   0.51309        98         0    0.00000         98         98   1.00000        1
         2       1      -1       1        3        1      p1         21        200        119   0.59500       119         0    0.00000        119        119   1.00000        1
   $ cd ..
 
   $ cat << EOF >> $HGRCPATH
   > [format]
   > maxchainlen = 9001
   > EOF
 
 Check upgrading a sparse-revlog repository
 ---------------------------------------
 
   $ hg init sparserevlogrepo --config format.sparse-revlog=no
   $ cd sparserevlogrepo
   $ touch foo
   $ hg add foo
   $ hg -q commit -m "foo"
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   store
 
 Check that we can add the sparse-revlog format requirement
   $ hg --config format.sparse-revlog=yes debugupgraderepo --run --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      added: sparserevlog
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   sparserevlog
   store
 
 Check that we can remove the sparse-revlog format requirement
   $ hg --config format.sparse-revlog=no debugupgraderepo --run --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      removed: sparserevlog
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   store
 
 #if zstd
 
 Check upgrading to a zstd revlog
 --------------------------------
 
 upgrade
 
   $ hg --config format.revlog-compression=zstd debugupgraderepo --run  --no-backup --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, store (rust !)
      added: revlog-compression-zstd, sparserevlog
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugformat -v
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zlib    zstd (zstd !)
   compression-level:  default default default
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd
   revlogv1
   share-safe
   sparserevlog
   store
 
 downgrade
 
   $ hg debugupgraderepo --run --no-backup --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
      removed: revlog-compression-zstd
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugformat -v
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zlib   zlib    zstd (zstd !)
   compression-level:  default default default
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlogv1
   share-safe
   sparserevlog
   store
 
 upgrade from hgrc
 
   $ cat >> .hg/hgrc << EOF
   > [format]
   > revlog-compression=zstd
   > EOF
   $ hg debugupgraderepo --run --no-backup --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (rust !)
      added: revlog-compression-zstd
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugformat -v
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)
   compression-level:  default default default
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd
   revlogv1
   share-safe
   sparserevlog
   store
 
 #endif
 
 Check upgrading to a revlog format supporting sidedata
 ------------------------------------------------------
 
 upgrade
 
   $ hg debugsidedata -c 0
   $ hg --config experimental.revlogv2=enable-unstable-format-and-corrupt-my-data debugupgraderepo --run  --no-backup --config "extensions.sidedata=$TESTDIR/testlib/ext-sidedata.py" --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, share-safe, store (no-zstd !)
      preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, share-safe, sparserevlog, store (zstd no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, share-safe, sparserevlog, store (rust !)
      removed: revlogv1
      added: exp-revlogv2.2 (zstd !)
      added: exp-revlogv2.2, sparserevlog (no-zstd !)
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugformat -v
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:          yes     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)
   compression-level:  default default default
   $ hg debugrequires
   dotencode
   exp-revlogv2.2
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
   share-safe
   sparserevlog
   store
   $ hg debugsidedata -c 0
   2 sidedata entries
    entry-0001 size 4
    entry-0002 size 32
 
 downgrade
 
   $ hg debugupgraderepo --config experimental.revlogv2=no --run --no-backup --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, share-safe, sparserevlog, store (no-zstd !)
      preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, share-safe, sparserevlog, store (zstd no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, share-safe, sparserevlog, store (rust !)
      removed: exp-revlogv2.2
      added: revlogv1
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugformat -v
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)
   compression-level:  default default default
   $ hg debugrequires
   dotencode
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
   revlogv1
   share-safe
   sparserevlog
   store
   $ hg debugsidedata -c 0
 
 upgrade from hgrc
 
   $ cat >> .hg/hgrc << EOF
   > [experimental]
   > revlogv2=enable-unstable-format-and-corrupt-my-data
   > EOF
   $ hg debugupgraderepo --run --no-backup --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: dotencode, fncache, generaldelta, share-safe, sparserevlog, store (no-zstd !)
      preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, share-safe, sparserevlog, store (zstd no-rust !)
      preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, share-safe, sparserevlog, store (rust !)
      removed: revlogv1
      added: exp-revlogv2.2
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
   $ hg debugformat -v
   format-variant     repo config default
   fncache:            yes    yes     yes
   dirstate-v2:         no     no      no
   tracked-hint:        no     no      no
   dotencode:          yes    yes     yes
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no     no      no
   revlog-v2:          yes    yes      no
   changelog-v2:        no     no      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)
   compression-level:  default default default
   $ hg debugrequires
   dotencode
   exp-revlogv2.2
   fncache
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
   share-safe
   sparserevlog
   store
   $ hg debugsidedata -c 0
 
 Demonstrate that nothing to perform upgrade will still run all the way through
 
   $ hg debugupgraderepo --run
   nothing to do
 
 #if no-rust
 
   $ cat << EOF >> $HGRCPATH
   > [storage]
   > dirstate-v2.slow-path = allow
   > EOF
 
 #endif
 
 Upgrade to dirstate-v2
 
   $ hg debugformat -v --config format.use-dirstate-v2=1 | grep dirstate-v2
   dirstate-v2:         no    yes      no
   $ hg debugupgraderepo --config format.use-dirstate-v2=1 --run
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      added: dirstate-v2
   
   dirstate-v2
      "hg status" will be faster
   
   no revlogs to process
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   upgrading to dirstate-v2 from v1
   replaced files will be backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob)
   removing temporary repository $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob)
   $ ls .hg/upgradebackup.*/dirstate
   .hg/upgradebackup.*/dirstate (glob)
   $ hg debugformat -v | grep dirstate-v2
   dirstate-v2:        yes     no      no
   $ hg status
   $ dd bs=12 count=1 if=.hg/dirstate 2> /dev/null
   dirstate-v2
 
 Downgrade from dirstate-v2
 
   $ hg debugupgraderepo --run
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      removed: dirstate-v2
   
   no revlogs to process
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   downgrading from dirstate-v2 to v1
   replaced files will be backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob)
   removing temporary repository $TESTTMP/sparserevlogrepo/.hg/upgrade.* (glob)
   $ hg debugformat -v | grep dirstate-v2
   dirstate-v2:         no     no      no
   $ hg status
 
   $ cd ..
 
 dirstate-v2: upgrade and downgrade from and empty repository:
 -------------------------------------------------------------
 
   $ hg init --config format.use-dirstate-v2=no dirstate-v2-empty
   $ cd dirstate-v2-empty
   $ hg debugformat | grep dirstate-v2
   dirstate-v2:         no
 
 upgrade
 
   $ hg debugupgraderepo --run --config format.use-dirstate-v2=yes
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      added: dirstate-v2
   
   dirstate-v2
      "hg status" will be faster
   
   no revlogs to process
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   upgrading to dirstate-v2 from v1
   replaced files will be backed up at $TESTTMP/dirstate-v2-empty/.hg/upgradebackup.* (glob)
   removing temporary repository $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
   $ hg debugformat | grep dirstate-v2
   dirstate-v2:        yes
 
 downgrade
 
   $ hg debugupgraderepo --run --config format.use-dirstate-v2=no
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
      removed: dirstate-v2
   
   no revlogs to process
   
   beginning upgrade...
   repository locked and read-only
   creating temporary repository to stage upgraded data: $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
   (it is safe to interrupt this process any time before data migration completes)
   downgrading from dirstate-v2 to v1
   replaced files will be backed up at $TESTTMP/dirstate-v2-empty/.hg/upgradebackup.* (glob)
   removing temporary repository $TESTTMP/dirstate-v2-empty/.hg/upgrade.* (glob)
   $ hg debugformat | grep dirstate-v2
   dirstate-v2:         no
 
   $ cd ..
 
 Test automatic upgrade/downgrade
 ================================
 
 
 For dirstate v2
 ---------------
 
 create an initial repository
 
   $ hg init auto-upgrade \
   >     --config format.use-dirstate-v2=no \
   >     --config format.use-dirstate-tracked-hint=yes \
   >     --config format.use-share-safe=no
   $ hg debugbuilddag -R auto-upgrade --new-file .+5
   $ hg -R auto-upgrade update
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugformat -R auto-upgrade | grep dirstate-v2
   dirstate-v2:         no
 
 upgrade it to dirstate-v2 automatically
 
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2=yes
   automatically upgrading repository to the `dirstate-v2` feature
   (see `hg help config.format.use-dirstate-v2` for details)
   $ hg debugformat -R auto-upgrade | grep dirstate-v2
   dirstate-v2:        yes
 
 downgrade it from dirstate-v2 automatically
 
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2=no
   automatically downgrading repository from the `dirstate-v2` feature
   (see `hg help config.format.use-dirstate-v2` for details)
   $ hg debugformat -R auto-upgrade | grep dirstate-v2
   dirstate-v2:         no
 
 
 For multiple change at the same time
 ------------------------------------
 
   $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
   dirstate-v2:         no
   tracked-hint:       yes
   share-safe:          no
 
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2=yes \
   >     --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-tracked-hint=no\
   >     --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-share-safe=yes
   automatically upgrading repository to the `dirstate-v2` feature
   (see `hg help config.format.use-dirstate-v2` for details)
   automatically upgrading repository to the `share-safe` feature
   (see `hg help config.format.use-share-safe` for details)
   automatically downgrading repository from the `tracked-hint` feature
   (see `hg help config.format.use-dirstate-tracked-hint` for details)
   $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
   dirstate-v2:        yes
   tracked-hint:        no
   share-safe:         yes
 
 Quiet upgrade and downgrade
 ---------------------------
 
 
   $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
   dirstate-v2:        yes
   tracked-hint:        no
   share-safe:         yes
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet=yes \
   >     --config format.use-dirstate-v2=no \
   >     --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet=yes \
   >     --config format.use-dirstate-tracked-hint=yes \
   >     --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet=yes \
   >     --config format.use-share-safe=no
 
   $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
   dirstate-v2:         no
   tracked-hint:       yes
   share-safe:          no
 
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet=yes \
   >     --config format.use-dirstate-v2=yes \
   >     --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet=yes \
   >     --config format.use-dirstate-tracked-hint=no\
   >     --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet=yes \
   >     --config format.use-share-safe=yes
   $ hg debugformat -R auto-upgrade | egrep '(dirstate-v2|tracked|share-safe)'
   dirstate-v2:        yes
   tracked-hint:        no
   share-safe:         yes
 
 Attempting Auto-upgrade on a read-only repository
 -------------------------------------------------
 
   $ chmod -R a-w auto-upgrade
 
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2=no
   $ hg debugformat -R auto-upgrade | grep dirstate-v2
   dirstate-v2:        yes
 
   $ chmod -R u+w auto-upgrade
 
 Attempting Auto-upgrade on a locked repository
 ----------------------------------------------
 
   $ hg -R auto-upgrade debuglock --set-lock --quiet &
   $ echo $! >> $DAEMON_PIDS
   $ $RUNTESTDIR/testlib/wait-on-file 10 auto-upgrade/.hg/store/lock
   $ hg status -R auto-upgrade \
   >     --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
   >     --config format.use-dirstate-v2=no
   $ hg debugformat -R auto-upgrade | grep dirstate-v2
   dirstate-v2:        yes
 
   $ killdaemons.py

tests/test-verify.t

@@ -1,364 +1,339
 #require reporevlogstore
 
 prepare repo
 
   $ hg init a
   $ cd a
   $ echo "some text" > FOO.txt
   $ echo "another text" > bar.txt
   $ echo "more text" > QUICK.txt
   $ hg add
   adding FOO.txt
   adding QUICK.txt
   adding bar.txt
   $ hg ci -mtest1
 
 verify
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 3 changes to 3 files
 
 verify with journal
 
   $ touch .hg/store/journal
   $ hg verify
   abandoned transaction found - run hg recover
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 3 changes to 3 files
   $ rm .hg/store/journal
 
 introduce some bugs in repo
 
   $ cd .hg/store/data
   $ mv _f_o_o.txt.i X_f_o_o.txt.i
   $ mv bar.txt.i xbar.txt.i
   $ rm _q_u_i_c_k.txt.i
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    warning: revlog 'data/FOO.txt.i' not in fncache!
    0: empty or missing FOO.txt
    FOO.txt@0: manifest refers to unknown revision f62022d3d590
    warning: revlog 'data/QUICK.txt.i' not in fncache!
    0: empty or missing QUICK.txt
    QUICK.txt@0: manifest refers to unknown revision 88b857db8eba
    warning: revlog 'data/bar.txt.i' not in fncache!
    0: empty or missing bar.txt
    bar.txt@0: manifest refers to unknown revision 256559129457
   checked 1 changesets with 0 changes to 3 files
   3 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
   6 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
 
   $ cd ../../..
   $ cd ..
 
 Set up a repo for testing missing revlog entries
 
   $ hg init missing-entries
   $ cd missing-entries
   $ echo 0 > file
   $ hg ci -Aqm0
   $ cp -R .hg/store .hg/store-partial
   $ echo 1 > file
   $ hg ci -Aqm1
   $ cp -R .hg/store .hg/store-full
 
 Entire changelog missing
 
   $ rm .hg/store/00changelog.*
   $ hg verify -q
    0: empty or missing changelog
    manifest@0: d0b6632564d4 not in changesets
    manifest@1: 941fc4534185 not in changesets
   3 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Entire manifest log missing
 
   $ rm .hg/store/00manifest.*
   $ hg verify -q
    0: empty or missing manifest
   1 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Entire filelog missing
 
   $ rm .hg/store/data/file.*
   $ hg verify -q
    warning: revlog 'data/file.i' not in fncache!
    0: empty or missing file
    file@0: manifest refers to unknown revision 362fef284ce2
    file@1: manifest refers to unknown revision c10f2164107d
   1 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
   3 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Entire changelog and manifest log missing
 
   $ rm .hg/store/00changelog.*
   $ rm .hg/store/00manifest.*
   $ hg verify -q
   warning: orphan data file 'data/file.i'
   1 warnings encountered!
   $ cp -R .hg/store-full/. .hg/store
 
 Entire changelog and filelog missing
 
   $ rm .hg/store/00changelog.*
   $ rm .hg/store/data/file.*
   $ hg verify -q
    0: empty or missing changelog
    manifest@0: d0b6632564d4 not in changesets
    manifest@1: 941fc4534185 not in changesets
    warning: revlog 'data/file.i' not in fncache!
    ?: empty or missing file
    file@0: manifest refers to unknown revision 362fef284ce2
    file@1: manifest refers to unknown revision c10f2164107d
   1 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
   6 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Entire manifest log and filelog missing
 
   $ rm .hg/store/00manifest.*
   $ rm .hg/store/data/file.*
   $ hg verify -q
    0: empty or missing manifest
    warning: revlog 'data/file.i' not in fncache!
    0: empty or missing file
   1 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Changelog missing entry
 
   $ cp -f .hg/store-partial/00changelog.* .hg/store
   $ hg verify -q
    manifest@?: rev 1 points to nonexistent changeset 1
    manifest@?: 941fc4534185 not in changesets
    file@?: rev 1 points to nonexistent changeset 1
    (expected 0)
   1 warnings encountered!
   3 integrity errors encountered!
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Manifest log missing entry
 
   $ cp -f .hg/store-partial/00manifest.* .hg/store
   $ hg verify -q
    manifest@1: changeset refers to unknown revision 941fc4534185
    file@1: c10f2164107d not in manifests
   2 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Filelog missing entry
 
   $ cp -f .hg/store-partial/data/file.* .hg/store/data
   $ hg verify -q
    file@1: manifest refers to unknown revision c10f2164107d
   1 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Changelog and manifest log missing entry
 
   $ cp -f .hg/store-partial/00changelog.* .hg/store
   $ cp -f .hg/store-partial/00manifest.* .hg/store
   $ hg verify -q
    file@?: rev 1 points to nonexistent changeset 1
    (expected 0)
    file@?: c10f2164107d not in manifests
   1 warnings encountered!
   2 integrity errors encountered!
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Changelog and filelog missing entry
 
   $ cp -f .hg/store-partial/00changelog.* .hg/store
   $ cp -f .hg/store-partial/data/file.* .hg/store/data
   $ hg verify -q
    manifest@?: rev 1 points to nonexistent changeset 1
    manifest@?: 941fc4534185 not in changesets
    file@?: manifest refers to unknown revision c10f2164107d
   3 integrity errors encountered!
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Manifest and filelog missing entry
 
   $ cp -f .hg/store-partial/00manifest.* .hg/store
   $ cp -f .hg/store-partial/data/file.* .hg/store/data
   $ hg verify -q
    manifest@1: changeset refers to unknown revision 941fc4534185
   1 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Corrupt changelog base node to cause failure to read revision
 
   $ printf abcd | dd conv=notrunc of=.hg/store/00changelog.i bs=1 seek=16 \
   >   2> /dev/null
   $ hg verify -q
    0: unpacking changeset 08b1860757c2: * (glob)
    manifest@?: rev 0 points to unexpected changeset 0
    manifest@?: d0b6632564d4 not in changesets
    file@?: rev 0 points to unexpected changeset 0
    (expected 1)
   1 warnings encountered!
   4 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Corrupt manifest log base node to cause failure to read revision
 
   $ printf abcd | dd conv=notrunc of=.hg/store/00manifest.i bs=1 seek=16 \
   >   2> /dev/null
   $ hg verify -q
    manifest@0: reading delta d0b6632564d4: * (glob)
    file@0: 362fef284ce2 not in manifests
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
 Corrupt filelog base node to cause failure to read revision
 
   $ printf abcd | dd conv=notrunc of=.hg/store/data/file.i bs=1 seek=16 \
   >   2> /dev/null
   $ hg verify -q
    file@0: unpacking 362fef284ce2: * (glob)
   1 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ cp -R .hg/store-full/. .hg/store
 
   $ cd ..
 
 test changelog without a manifest
 
   $ hg init b
   $ cd b
   $ hg branch foo
   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
 
   $ touch a
   $ hg add a
   $ hg ci -m a
 
   $ echo 'corrupted' > b
   $ 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)
   [1]
 
   $ cd ..
 
 test revlog format 0
 
   $ revlog-formatv0.py
   $ cd formatv0
   $ hg verify
   repository uses revlog format 0
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
   $ cd ..
 
 test flag processor and skipflags
 
   $ hg init skipflags
   $ cd skipflags
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > flagprocessor=$RUNTESTDIR/flagprocessorext.py
   > 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 <<EOF
   > import base64
   > base64.b64decode=lambda x: x
   > EOF
   $ cat >> .hg/hgrc <<EOF
   > 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