comparison tests/test-discovery-obshashrange.t @ 4840:62b60fc1983d

test: change to output around transaction timing CORE-TEST-OUTPUT-UPDATE: d7304434390f
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 12 Sep 2019 12:35:42 +0200
parents 2d85de79ead8
children e804d5a7c193
comparison
equal deleted inserted replaced
4839:485a9f3490c9 4840:62b60fc1983d
64 | 64 |
65 o 0 1ea73414a91b r0 65 o 0 1ea73414a91b r0
66 66
67 67
68 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'` 68 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'`
69 1 new obsolescence markers
69 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'` --config experimental.obshashrange.max-revs=1 70 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'` --config experimental.obshashrange.max-revs=1
71 1 new obsolescence markers
70 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'` 72 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'`
73 1 new obsolescence markers
71 $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0 74 $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0
75 1 new obsolescence markers
72 $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'` 76 $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'`
77 1 new obsolescence markers
73 $ hg debugobsolete 78 $ hg debugobsolete
74 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 79 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
75 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 80 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
76 cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 81 cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
77 dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 82 dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
181 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 186 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
182 $ echo foo > foo 187 $ echo foo > foo
183 $ hg add foo 188 $ hg add foo
184 $ hg commit -m foo 189 $ hg commit -m foo
185 $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` 190 $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'`
191 1 new obsolescence markers
186 $ hg push -f --debug 192 $ hg push -f --debug
187 could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?) 193 could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?)
188 could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?) 194 could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?)
189 pushing to ssh://user@dummy/server 195 pushing to ssh://user@dummy/server
190 running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) 196 running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob)
229 bundle2-output-part: "obsmarkers" streamed payload 235 bundle2-output-part: "obsmarkers" streamed payload
230 remote: adding changesets 236 remote: adding changesets
231 remote: adding manifests 237 remote: adding manifests
232 remote: adding file changes 238 remote: adding file changes
233 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 239 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
240 remote: 1 new obsolescence markers
234 bundle2-input-bundle: no-transaction 241 bundle2-input-bundle: no-transaction
235 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 242 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
236 bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported 243 bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
237 bundle2-input-bundle: 1 parts total 244 bundle2-input-bundle: 1 parts total
238 preparing listkeys for "phases" 245 preparing listkeys for "phases"
239 sending listkeys command 246 sending listkeys command
240 received listkey for "phases": 58 bytes 247 received listkey for "phases": 58 bytes
241 remote: 1 new obsolescence markers
242 $ hg -R ../server blackbox 248 $ hg -R ../server blackbox
243 * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) 249 * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
244 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob) 250 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob)
245 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob) 251 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob)
246 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablesort in *.???? seconds (1r) (glob) 252 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablesort in *.???? seconds (1r) (glob)
270 o 1 66f7d451a68b r1 276 o 1 66f7d451a68b r1
271 | 277 |
272 o 0 1ea73414a91b r0 278 o 0 1ea73414a91b r0
273 279
274 $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` 280 $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'`
281 1 new obsolescence markers
275 $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'` 282 $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'`
283 1 new obsolescence markers
276 $ hg push 284 $ hg push
277 pushing to ssh://user@dummy/server 285 pushing to ssh://user@dummy/server
278 searching for changes 286 searching for changes
279 OBSEXC: computing relevant nodes 287 OBSEXC: computing relevant nodes
280 OBSEXC: looking for common markers in 6 nodes 288 OBSEXC: looking for common markers in 6 nodes
411 o 1 66f7d451a68b r1 419 o 1 66f7d451a68b r1
412 | 420 |
413 o 0 1ea73414a91b r0 421 o 0 1ea73414a91b r0
414 422
415 $ hg -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` 423 $ hg -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'`
424 1 new obsolescence markers
416 $ hg -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r4)'` 425 $ hg -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r4)'`
426 1 new obsolescence markers
417 $ hg pull -r 6 427 $ hg pull -r 6
418 pulling from ssh://user@dummy/server 428 pulling from ssh://user@dummy/server
419 searching for changes 429 searching for changes
420 OBSEXC: looking for common markers in 6 nodes 430 OBSEXC: looking for common markers in 6 nodes
421 OBSEXC: request obsmarkers for 2 common nodes 431 OBSEXC: request obsmarkers for 2 common nodes
505 1 66f7d451a68b 1 1 2 853c77a32154 515 1 66f7d451a68b 1 1 2 853c77a32154
506 4 bebd167eb94d 4 1 5 20a2cc572e4b 516 4 bebd167eb94d 4 1 5 20a2cc572e4b
507 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 517 6 c8d03c1b5e94 5 1 6 446c2dc3bce5
508 7 f69452c5b1af 6 1 7 000000000000 518 7 f69452c5b1af 6 1 7 000000000000
509 $ hg -R ../server debugobsolete aaaa333333333aaaaa333a3a3a3a3a3a3a3a3a3a `getid 'desc(r1)'` 519 $ hg -R ../server debugobsolete aaaa333333333aaaaa333a3a3a3a3a3a3a3a3a3a `getid 'desc(r1)'`
520 1 new obsolescence markers
510 $ hg -R ../server debugobsolete bb4b4b4b4b4b4b4b44b4b4b4b4b4b4b4b4b4b4b4 `getid 'desc(r3)'` 521 $ hg -R ../server debugobsolete bb4b4b4b4b4b4b4b44b4b4b4b4b4b4b4b4b4b4b4 `getid 'desc(r3)'`
522 1 new obsolescence markers
511 $ hg pull -r `getid 'desc(r6)'` 523 $ hg pull -r `getid 'desc(r6)'`
512 pulling from ssh://user@dummy/server 524 pulling from ssh://user@dummy/server
513 no changes found 525 no changes found
514 OBSEXC: looking for common markers in 7 nodes 526 OBSEXC: looking for common markers in 7 nodes
515 OBSEXC: request obsmarkers for 2 common nodes 527 OBSEXC: request obsmarkers for 2 common nodes
586 1 66f7d451a68b 1 1 2 327c7dd73d29 598 1 66f7d451a68b 1 1 2 327c7dd73d29
587 4 bebd167eb94d 4 1 5 20a2cc572e4b 599 4 bebd167eb94d 4 1 5 20a2cc572e4b
588 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 600 5 c8d03c1b5e94 5 1 6 446c2dc3bce5
589 6 f69452c5b1af 6 1 7 000000000000 601 6 f69452c5b1af 6 1 7 000000000000
590 $ hg -R ../server debugobsolete --record-parents `getid 'desc(foo)'` 602 $ hg -R ../server debugobsolete --record-parents `getid 'desc(foo)'`
603 1 new obsolescence markers
591 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' 604 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())'
592 rev node index size depth obshash 605 rev node index size depth obshash
593 7 4de32a90b66c 0 8 8 c7f1f7e9925b 606 7 4de32a90b66c 0 8 8 c7f1f7e9925b
594 8 45f8b879de92 0 6 6 7c49a958a9ac 607 8 45f8b879de92 0 6 6 7c49a958a9ac
595 3 2dc09a01254d 0 4 4 8932bf980bb4 608 3 2dc09a01254d 0 4 4 8932bf980bb4
670 1 66f7d451a68b 1 1 2 327c7dd73d29 683 1 66f7d451a68b 1 1 2 327c7dd73d29
671 4 bebd167eb94d 4 1 5 b21465ecb790 684 4 bebd167eb94d 4 1 5 b21465ecb790
672 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 685 5 c8d03c1b5e94 5 1 6 446c2dc3bce5
673 6 f69452c5b1af 6 1 7 000000000000 686 6 f69452c5b1af 6 1 7 000000000000
674 $ hg -R ../server debugobsolete --record-parents `(cd ../server/; getid 'desc("chain_prune")')` 687 $ hg -R ../server debugobsolete --record-parents `(cd ../server/; getid 'desc("chain_prune")')`
688 1 new obsolescence markers
675 obsoleted 1 changesets 689 obsoleted 1 changesets
676 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' 690 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())'
677 rev node index size depth obshash 691 rev node index size depth obshash
678 7 4de32a90b66c 0 8 8 f966d46c2069 692 7 4de32a90b66c 0 8 8 f966d46c2069
679 8 45f8b879de92 0 6 6 c9ee11811914 693 8 45f8b879de92 0 6 6 c9ee11811914
754 7 f69452c5b1af 6 1 7 000000000000 768 7 f69452c5b1af 6 1 7 000000000000
755 769
756 New marker prefixed to another one 770 New marker prefixed to another one
757 771
758 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa `(cd ../server/; getid 'desc("chain_prune")')` 772 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa `(cd ../server/; getid 'desc("chain_prune")')`
773 1 new obsolescence markers
759 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' 774 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())'
760 rev node index size depth obshash 775 rev node index size depth obshash
761 7 4de32a90b66c 0 8 8 0ffc0013bda0 776 7 4de32a90b66c 0 8 8 0ffc0013bda0
762 8 45f8b879de92 0 6 6 0ffa86a0054f 777 8 45f8b879de92 0 6 6 0ffa86a0054f
763 3 2dc09a01254d 0 4 4 8932bf980bb4 778 3 2dc09a01254d 0 4 4 8932bf980bb4
816 7 f69452c5b1af 6 1 7 000000000000 831 7 f69452c5b1af 6 1 7 000000000000
817 832
818 New prune marker prefixed to another one 833 New prune marker prefixed to another one
819 834
820 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa 835 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa
836 1 new obsolescence markers
821 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' 837 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())'
822 rev node index size depth obshash 838 rev node index size depth obshash
823 7 4de32a90b66c 0 8 8 87b2a11bd884 839 7 4de32a90b66c 0 8 8 87b2a11bd884
824 8 45f8b879de92 0 6 6 fdbbaec33b20 840 8 45f8b879de92 0 6 6 fdbbaec33b20
825 3 2dc09a01254d 0 4 4 8932bf980bb4 841 3 2dc09a01254d 0 4 4 8932bf980bb4