##// END OF EJS Templates
debugdiscovery: add some data about the shapes of the sets...
marmoute -
r46692:3ca9d26c default
parent child Browse files
Show More
@@ -1028,7 +1028,10 b' def debugdiscovery(ui, repo, remoteurl=b'
1028
1028
1029 all = repo.revs(b'all()')
1029 all = repo.revs(b'all()')
1030 common = repo.revs(b'::%ln', common)
1030 common = repo.revs(b'::%ln', common)
1031 roots_common = repo.revs(b'roots(::%ld)', common)
1031 missing = repo.revs(b'not ::%ld', common)
1032 missing = repo.revs(b'not ::%ld', common)
1033 heads_missing = repo.revs(b'heads(%ld)', missing)
1034 roots_missing = repo.revs(b'roots(%ld)', missing)
1032 assert len(common) + len(missing) == len(all)
1035 assert len(common) + len(missing) == len(all)
1033
1036
1034 data = {}
1037 data = {}
@@ -1037,6 +1040,7 b' def debugdiscovery(ui, repo, remoteurl=b'
1037 data[b'nb-common-heads-local'] = len(heads_common_local)
1040 data[b'nb-common-heads-local'] = len(heads_common_local)
1038 data[b'nb-common-heads-remote'] = len(heads_common_remote)
1041 data[b'nb-common-heads-remote'] = len(heads_common_remote)
1039 data[b'nb-common-heads-both'] = len(heads_common_both)
1042 data[b'nb-common-heads-both'] = len(heads_common_both)
1043 data[b'nb-common-roots'] = len(roots_common)
1040 data[b'nb-head-local'] = len(heads_local)
1044 data[b'nb-head-local'] = len(heads_local)
1041 data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local)
1045 data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local)
1042 data[b'nb-head-remote'] = len(heads_remote)
1046 data[b'nb-head-remote'] = len(heads_remote)
@@ -1046,6 +1050,8 b' def debugdiscovery(ui, repo, remoteurl=b'
1046 data[b'nb-revs'] = len(all)
1050 data[b'nb-revs'] = len(all)
1047 data[b'nb-revs-common'] = len(common)
1051 data[b'nb-revs-common'] = len(common)
1048 data[b'nb-revs-missing'] = len(missing)
1052 data[b'nb-revs-missing'] = len(missing)
1053 data[b'nb-missing-heads'] = len(roots_missing)
1054 data[b'nb-missing-roots'] = len(heads_missing)
1049
1055
1050 # display discovery summary
1056 # display discovery summary
1051 ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data)
1057 ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data)
@@ -1074,7 +1080,11 b' def debugdiscovery(ui, repo, remoteurl=b'
1074 )
1080 )
1075 ui.writenoi18n(b"local changesets: %(nb-revs)9d\n" % data)
1081 ui.writenoi18n(b"local changesets: %(nb-revs)9d\n" % data)
1076 ui.writenoi18n(b" common: %(nb-revs-common)9d\n" % data)
1082 ui.writenoi18n(b" common: %(nb-revs-common)9d\n" % data)
1083 ui.writenoi18n(b" heads: %(nb-common-heads)9d\n" % data)
1084 ui.writenoi18n(b" roots: %(nb-common-roots)9d\n" % data)
1077 ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
1085 ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
1086 ui.writenoi18n(b" heads: %(nb-missing-heads)9d\n" % data)
1087 ui.writenoi18n(b" roots: %(nb-missing-roots)9d\n" % data)
1078
1088
1079 if ui.verbose:
1089 if ui.verbose:
1080 ui.writenoi18n(
1090 ui.writenoi18n(
@@ -57,7 +57,11 b' Small superset:'
57 unknown: 2
57 unknown: 2
58 local changesets: 7
58 local changesets: 7
59 common: 7
59 common: 7
60 heads: 2
61 roots: 1
60 missing: 0
62 missing: 0
63 heads: 0
64 roots: 0
61 common heads: 01241442b3c2 b5714e113bc0
65 common heads: 01241442b3c2 b5714e113bc0
62
66
63 % -- a -> b set
67 % -- a -> b set
@@ -79,7 +83,11 b' Small superset:'
79 unknown: 2
83 unknown: 2
80 local changesets: 7
84 local changesets: 7
81 common: 7
85 common: 7
86 heads: 2
87 roots: 1
82 missing: 0
88 missing: 0
89 heads: 0
90 roots: 0
83 common heads: 01241442b3c2 b5714e113bc0
91 common heads: 01241442b3c2 b5714e113bc0
84
92
85 % -- a -> b set (tip only)
93 % -- a -> b set (tip only)
@@ -101,7 +109,11 b' Small superset:'
101 unknown: 3
109 unknown: 3
102 local changesets: 7
110 local changesets: 7
103 common: 6
111 common: 6
112 heads: 1
113 roots: 1
104 missing: 1
114 missing: 1
115 heads: 1
116 roots: 1
105 common heads: b5714e113bc0
117 common heads: b5714e113bc0
106
118
107 % -- b -> a tree
119 % -- b -> a tree
@@ -122,7 +134,11 b' Small superset:'
122 unknown: 0
134 unknown: 0
123 local changesets: 15
135 local changesets: 15
124 common: 7
136 common: 7
137 heads: 2
138 roots: 1
125 missing: 8
139 missing: 8
140 heads: 2
141 roots: 2
126 common heads: 01241442b3c2 b5714e113bc0
142 common heads: 01241442b3c2 b5714e113bc0
127
143
128 % -- b -> a set
144 % -- b -> a set
@@ -144,7 +160,11 b' Small superset:'
144 unknown: 0
160 unknown: 0
145 local changesets: 15
161 local changesets: 15
146 common: 7
162 common: 7
163 heads: 2
164 roots: 1
147 missing: 8
165 missing: 8
166 heads: 2
167 roots: 2
148 common heads: 01241442b3c2 b5714e113bc0
168 common heads: 01241442b3c2 b5714e113bc0
149
169
150 % -- b -> a set (tip only)
170 % -- b -> a set (tip only)
@@ -166,7 +186,11 b' Small superset:'
166 unknown: 0
186 unknown: 0
167 local changesets: 15
187 local changesets: 15
168 common: 7
188 common: 7
189 heads: 2
190 roots: 1
169 missing: 8
191 missing: 8
192 heads: 2
193 roots: 2
170 common heads: 01241442b3c2 b5714e113bc0
194 common heads: 01241442b3c2 b5714e113bc0
171
195
172
196
@@ -194,7 +218,11 b' Many new:'
194 unknown: 1
218 unknown: 1
195 local changesets: 35
219 local changesets: 35
196 common: 5
220 common: 5
221 heads: 1
222 roots: 1
197 missing: 30
223 missing: 30
224 heads: 1
225 roots: 1
198 common heads: bebd167eb94d
226 common heads: bebd167eb94d
199
227
200 % -- a -> b set
228 % -- a -> b set
@@ -219,7 +247,11 b' Many new:'
219 unknown: 1
247 unknown: 1
220 local changesets: 35
248 local changesets: 35
221 common: 5
249 common: 5
250 heads: 1
251 roots: 1
222 missing: 30
252 missing: 30
253 heads: 1
254 roots: 1
223 common heads: bebd167eb94d
255 common heads: bebd167eb94d
224
256
225 % -- a -> b set (tip only)
257 % -- a -> b set (tip only)
@@ -244,7 +276,11 b' Many new:'
244 unknown: 1
276 unknown: 1
245 local changesets: 35
277 local changesets: 35
246 common: 2
278 common: 2
279 heads: 1
280 roots: 1
247 missing: 33
281 missing: 33
282 heads: 2
283 roots: 2
248 common heads: 66f7d451a68b
284 common heads: 66f7d451a68b
249
285
250 % -- b -> a tree
286 % -- b -> a tree
@@ -265,7 +301,11 b' Many new:'
265 unknown: 1
301 unknown: 1
266 local changesets: 8
302 local changesets: 8
267 common: 5
303 common: 5
304 heads: 1
305 roots: 1
268 missing: 3
306 missing: 3
307 heads: 1
308 roots: 1
269 common heads: bebd167eb94d
309 common heads: bebd167eb94d
270
310
271 % -- b -> a set
311 % -- b -> a set
@@ -290,7 +330,11 b' Many new:'
290 unknown: 1
330 unknown: 1
291 local changesets: 8
331 local changesets: 8
292 common: 5
332 common: 5
333 heads: 1
334 roots: 1
293 missing: 3
335 missing: 3
336 heads: 1
337 roots: 1
294 common heads: bebd167eb94d
338 common heads: bebd167eb94d
295
339
296 % -- b -> a set (tip only)
340 % -- b -> a set (tip only)
@@ -315,7 +359,11 b' Many new:'
315 unknown: 1
359 unknown: 1
316 local changesets: 8
360 local changesets: 8
317 common: 5
361 common: 5
362 heads: 1
363 roots: 1
318 missing: 3
364 missing: 3
365 heads: 1
366 roots: 1
319 common heads: bebd167eb94d
367 common heads: bebd167eb94d
320
368
321 Both sides many new with stub:
369 Both sides many new with stub:
@@ -342,7 +390,11 b' Both sides many new with stub:'
342 unknown: 1
390 unknown: 1
343 local changesets: 34
391 local changesets: 34
344 common: 4
392 common: 4
393 heads: 1
394 roots: 1
345 missing: 30
395 missing: 30
396 heads: 1
397 roots: 1
346 common heads: 2dc09a01254d
398 common heads: 2dc09a01254d
347
399
348 % -- a -> b set
400 % -- a -> b set
@@ -367,7 +419,11 b' Both sides many new with stub:'
367 unknown: 1
419 unknown: 1
368 local changesets: 34
420 local changesets: 34
369 common: 4
421 common: 4
422 heads: 1
423 roots: 1
370 missing: 30
424 missing: 30
425 heads: 1
426 roots: 1
371 common heads: 2dc09a01254d
427 common heads: 2dc09a01254d
372
428
373 % -- a -> b set (tip only)
429 % -- a -> b set (tip only)
@@ -392,7 +448,11 b' Both sides many new with stub:'
392 unknown: 1
448 unknown: 1
393 local changesets: 34
449 local changesets: 34
394 common: 2
450 common: 2
451 heads: 1
452 roots: 1
395 missing: 32
453 missing: 32
454 heads: 2
455 roots: 2
396 common heads: 66f7d451a68b
456 common heads: 66f7d451a68b
397
457
398 % -- b -> a tree
458 % -- b -> a tree
@@ -413,7 +473,11 b' Both sides many new with stub:'
413 unknown: 1
473 unknown: 1
414 local changesets: 34
474 local changesets: 34
415 common: 4
475 common: 4
476 heads: 1
477 roots: 1
416 missing: 30
478 missing: 30
479 heads: 1
480 roots: 1
417 common heads: 2dc09a01254d
481 common heads: 2dc09a01254d
418
482
419 % -- b -> a set
483 % -- b -> a set
@@ -438,7 +502,11 b' Both sides many new with stub:'
438 unknown: 1
502 unknown: 1
439 local changesets: 34
503 local changesets: 34
440 common: 4
504 common: 4
505 heads: 1
506 roots: 1
441 missing: 30
507 missing: 30
508 heads: 1
509 roots: 1
442 common heads: 2dc09a01254d
510 common heads: 2dc09a01254d
443
511
444 % -- b -> a set (tip only)
512 % -- b -> a set (tip only)
@@ -463,7 +531,11 b' Both sides many new with stub:'
463 unknown: 1
531 unknown: 1
464 local changesets: 34
532 local changesets: 34
465 common: 4
533 common: 4
534 heads: 1
535 roots: 1
466 missing: 30
536 missing: 30
537 heads: 1
538 roots: 1
467 common heads: 2dc09a01254d
539 common heads: 2dc09a01254d
468
540
469
541
@@ -491,7 +563,11 b' Both many new:'
491 unknown: 1
563 unknown: 1
492 local changesets: 32
564 local changesets: 32
493 common: 2
565 common: 2
566 heads: 1
567 roots: 1
494 missing: 30
568 missing: 30
569 heads: 1
570 roots: 1
495 common heads: 66f7d451a68b
571 common heads: 66f7d451a68b
496
572
497 % -- a -> b set
573 % -- a -> b set
@@ -516,7 +592,11 b' Both many new:'
516 unknown: 1
592 unknown: 1
517 local changesets: 32
593 local changesets: 32
518 common: 2
594 common: 2
595 heads: 1
596 roots: 1
519 missing: 30
597 missing: 30
598 heads: 1
599 roots: 1
520 common heads: 66f7d451a68b
600 common heads: 66f7d451a68b
521
601
522 % -- a -> b set (tip only)
602 % -- a -> b set (tip only)
@@ -541,7 +621,11 b' Both many new:'
541 unknown: 1
621 unknown: 1
542 local changesets: 32
622 local changesets: 32
543 common: 2
623 common: 2
624 heads: 1
625 roots: 1
544 missing: 30
626 missing: 30
627 heads: 1
628 roots: 1
545 common heads: 66f7d451a68b
629 common heads: 66f7d451a68b
546
630
547 % -- b -> a tree
631 % -- b -> a tree
@@ -562,7 +646,11 b' Both many new:'
562 unknown: 1
646 unknown: 1
563 local changesets: 32
647 local changesets: 32
564 common: 2
648 common: 2
649 heads: 1
650 roots: 1
565 missing: 30
651 missing: 30
652 heads: 1
653 roots: 1
566 common heads: 66f7d451a68b
654 common heads: 66f7d451a68b
567
655
568 % -- b -> a set
656 % -- b -> a set
@@ -587,7 +675,11 b' Both many new:'
587 unknown: 1
675 unknown: 1
588 local changesets: 32
676 local changesets: 32
589 common: 2
677 common: 2
678 heads: 1
679 roots: 1
590 missing: 30
680 missing: 30
681 heads: 1
682 roots: 1
591 common heads: 66f7d451a68b
683 common heads: 66f7d451a68b
592
684
593 % -- b -> a set (tip only)
685 % -- b -> a set (tip only)
@@ -612,7 +704,11 b' Both many new:'
612 unknown: 1
704 unknown: 1
613 local changesets: 32
705 local changesets: 32
614 common: 2
706 common: 2
707 heads: 1
708 roots: 1
615 missing: 30
709 missing: 30
710 heads: 1
711 roots: 1
616 common heads: 66f7d451a68b
712 common heads: 66f7d451a68b
617
713
618
714
@@ -640,7 +736,11 b' Both many new skewed:'
640 unknown: 1
736 unknown: 1
641 local changesets: 52
737 local changesets: 52
642 common: 2
738 common: 2
739 heads: 1
740 roots: 1
643 missing: 50
741 missing: 50
742 heads: 1
743 roots: 1
644 common heads: 66f7d451a68b
744 common heads: 66f7d451a68b
645
745
646 % -- a -> b set
746 % -- a -> b set
@@ -665,7 +765,11 b' Both many new skewed:'
665 unknown: 1
765 unknown: 1
666 local changesets: 52
766 local changesets: 52
667 common: 2
767 common: 2
768 heads: 1
769 roots: 1
668 missing: 50
770 missing: 50
771 heads: 1
772 roots: 1
669 common heads: 66f7d451a68b
773 common heads: 66f7d451a68b
670
774
671 % -- a -> b set (tip only)
775 % -- a -> b set (tip only)
@@ -690,7 +794,11 b' Both many new skewed:'
690 unknown: 1
794 unknown: 1
691 local changesets: 52
795 local changesets: 52
692 common: 2
796 common: 2
797 heads: 1
798 roots: 1
693 missing: 50
799 missing: 50
800 heads: 1
801 roots: 1
694 common heads: 66f7d451a68b
802 common heads: 66f7d451a68b
695
803
696 % -- b -> a tree
804 % -- b -> a tree
@@ -711,7 +819,11 b' Both many new skewed:'
711 unknown: 1
819 unknown: 1
712 local changesets: 32
820 local changesets: 32
713 common: 2
821 common: 2
822 heads: 1
823 roots: 1
714 missing: 30
824 missing: 30
825 heads: 1
826 roots: 1
715 common heads: 66f7d451a68b
827 common heads: 66f7d451a68b
716
828
717 % -- b -> a set
829 % -- b -> a set
@@ -736,7 +848,11 b' Both many new skewed:'
736 unknown: 1
848 unknown: 1
737 local changesets: 32
849 local changesets: 32
738 common: 2
850 common: 2
851 heads: 1
852 roots: 1
739 missing: 30
853 missing: 30
854 heads: 1
855 roots: 1
740 common heads: 66f7d451a68b
856 common heads: 66f7d451a68b
741
857
742 % -- b -> a set (tip only)
858 % -- b -> a set (tip only)
@@ -761,7 +877,11 b' Both many new skewed:'
761 unknown: 1
877 unknown: 1
762 local changesets: 32
878 local changesets: 32
763 common: 2
879 common: 2
880 heads: 1
881 roots: 1
764 missing: 30
882 missing: 30
883 heads: 1
884 roots: 1
765 common heads: 66f7d451a68b
885 common heads: 66f7d451a68b
766
886
767
887
@@ -789,7 +909,11 b' Both many new on top of long history:'
789 unknown: 1
909 unknown: 1
790 local changesets: 1050
910 local changesets: 1050
791 common: 1000
911 common: 1000
912 heads: 1
913 roots: 1
792 missing: 50
914 missing: 50
915 heads: 1
916 roots: 1
793 common heads: 7ead0cba2838
917 common heads: 7ead0cba2838
794
918
795 % -- a -> b set
919 % -- a -> b set
@@ -817,7 +941,11 b' Both many new on top of long history:'
817 unknown: 1
941 unknown: 1
818 local changesets: 1050
942 local changesets: 1050
819 common: 1000
943 common: 1000
944 heads: 1
945 roots: 1
820 missing: 50
946 missing: 50
947 heads: 1
948 roots: 1
821 common heads: 7ead0cba2838
949 common heads: 7ead0cba2838
822
950
823 % -- a -> b set (tip only)
951 % -- a -> b set (tip only)
@@ -845,7 +973,11 b' Both many new on top of long history:'
845 unknown: 1
973 unknown: 1
846 local changesets: 1050
974 local changesets: 1050
847 common: 1000
975 common: 1000
976 heads: 1
977 roots: 1
848 missing: 50
978 missing: 50
979 heads: 1
980 roots: 1
849 common heads: 7ead0cba2838
981 common heads: 7ead0cba2838
850
982
851 % -- b -> a tree
983 % -- b -> a tree
@@ -866,7 +998,11 b' Both many new on top of long history:'
866 unknown: 1
998 unknown: 1
867 local changesets: 1030
999 local changesets: 1030
868 common: 1000
1000 common: 1000
1001 heads: 1
1002 roots: 1
869 missing: 30
1003 missing: 30
1004 heads: 1
1005 roots: 1
870 common heads: 7ead0cba2838
1006 common heads: 7ead0cba2838
871
1007
872 % -- b -> a set
1008 % -- b -> a set
@@ -894,7 +1030,11 b' Both many new on top of long history:'
894 unknown: 1
1030 unknown: 1
895 local changesets: 1030
1031 local changesets: 1030
896 common: 1000
1032 common: 1000
1033 heads: 1
1034 roots: 1
897 missing: 30
1035 missing: 30
1036 heads: 1
1037 roots: 1
898 common heads: 7ead0cba2838
1038 common heads: 7ead0cba2838
899
1039
900 % -- b -> a set (tip only)
1040 % -- b -> a set (tip only)
@@ -922,7 +1062,11 b' Both many new on top of long history:'
922 unknown: 1
1062 unknown: 1
923 local changesets: 1030
1063 local changesets: 1030
924 common: 1000
1064 common: 1000
1065 heads: 1
1066 roots: 1
925 missing: 30
1067 missing: 30
1068 heads: 1
1069 roots: 1
926 common heads: 7ead0cba2838
1070 common heads: 7ead0cba2838
927
1071
928
1072
@@ -1002,7 +1146,11 b' One with >200 heads. We now switch to se'
1002 unknown: 1
1146 unknown: 1
1003 local changesets: 1340
1147 local changesets: 1340
1004 common: 300
1148 common: 300
1149 heads: 1
1150 roots: 1
1005 missing: 1040
1151 missing: 1040
1152 heads: 260
1153 roots: 260
1006 common heads: 3ee37d65064a
1154 common heads: 3ee37d65064a
1007 $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
1155 $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
1008 comparing with b
1156 comparing with b
@@ -1029,7 +1177,11 b' One with >200 heads. We now switch to se'
1029 unknown: 1
1177 unknown: 1
1030 local changesets: 1340
1178 local changesets: 1340
1031 common: 300
1179 common: 300
1180 heads: 1
1181 roots: 1
1032 missing: 1040
1182 missing: 1040
1183 heads: 260
1184 roots: 260
1033 common heads: 3ee37d65064a
1185 common heads: 3ee37d65064a
1034
1186
1035 Test actual protocol when pulling one new head in addition to common heads
1187 Test actual protocol when pulling one new head in addition to common heads
@@ -1147,5 +1299,9 b' returned as common heads.'
1147 unknown: 0
1299 unknown: 0
1148 local changesets: 3
1300 local changesets: 3
1149 common: 2
1301 common: 2
1302 heads: 1
1303 roots: 1
1150 missing: 1
1304 missing: 1
1305 heads: 1
1306 roots: 1
1151 common heads: 66f7d451a68b
1307 common heads: 66f7d451a68b
General Comments 0
You need to be logged in to leave comments. Login now