diff -r 6434f3c4f7aa -r 35e769c9604f tests/test-discovery-obshashrange.t --- a/tests/test-discovery-obshashrange.t Wed Apr 08 01:16:51 2020 +0800 +++ b/tests/test-discovery-obshashrange.t Wed Apr 08 01:16:53 2020 +0800 @@ -66,15 +66,10 @@ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'` - 1 new obsolescence markers $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'` --config experimental.obshashrange.max-revs=1 - 1 new obsolescence markers $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'` - 1 new obsolescence markers $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0 - 1 new obsolescence markers $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'` - 1 new obsolescence markers $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -188,7 +183,6 @@ $ hg add foo $ hg commit -m foo $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` - 1 new obsolescence markers $ hg push -f --debug could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?) could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?) @@ -237,14 +231,14 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files (+1 heads) - remote: 1 new obsolescence markers bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported - bundle2-input-bundle: 2 parts total + bundle2-input-bundle: 1 parts total preparing listkeys for "phases" sending listkeys command received listkey for "phases": 58 bytes + remote: 1 new obsolescence markers $ hg -R ../server blackbox * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob) @@ -278,9 +272,7 @@ o 0 1ea73414a91b r0 $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` - 1 new obsolescence markers $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'` - 1 new obsolescence markers $ hg push pushing to ssh://user@dummy/server searching for changes @@ -373,7 +365,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: no-transaction (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 2 parts total (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 1 parts total (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob) @@ -421,9 +413,7 @@ o 0 1ea73414a91b r0 $ hg -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` - 1 new obsolescence markers $ hg -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r4)'` - 1 new obsolescence markers $ hg pull -r 6 pulling from ssh://user@dummy/server searching for changes @@ -517,9 +507,7 @@ 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 7 f69452c5b1af 6 1 7 000000000000 $ hg -R ../server debugobsolete aaaa333333333aaaaa333a3a3a3a3a3a3a3a3a3a `getid 'desc(r1)'` - 1 new obsolescence markers $ hg -R ../server debugobsolete bb4b4b4b4b4b4b4b44b4b4b4b4b4b4b4b4b4b4b4 `getid 'desc(r3)'` - 1 new obsolescence markers $ hg pull -r `getid 'desc(r6)'` pulling from ssh://user@dummy/server no changes found @@ -600,7 +588,6 @@ 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 6 f69452c5b1af 6 1 7 000000000000 $ hg -R ../server debugobsolete --record-parents `getid 'desc(foo)'` - 1 new obsolescence markers $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash 7 4de32a90b66c 0 8 8 c7f1f7e9925b @@ -685,7 +672,6 @@ 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 6 f69452c5b1af 6 1 7 000000000000 $ hg -R ../server debugobsolete --record-parents `(cd ../server/; getid 'desc("chain_prune")')` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash @@ -770,7 +756,6 @@ New marker prefixed to another one $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa `(cd ../server/; getid 'desc("chain_prune")')` - 1 new obsolescence markers $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash 7 4de32a90b66c 0 8 8 0ffc0013bda0 @@ -833,7 +818,6 @@ New prune marker prefixed to another one $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa - 1 new obsolescence markers $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash 7 4de32a90b66c 0 8 8 87b2a11bd884 @@ -1158,6 +1142,7 @@ [1] $ hg debugupdatecache --debug updating the branch cache + invalid branch cache (served): tip differs $ f -s .hg/cache/evoext* .hg/cache/evoext-depthcache-00: size=96 .hg/cache/evoext-firstmerge-00: size=96