##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

debugdiscovery: display some information about the initial "undecided" set...
marmoute -
r46693:0e5065b6 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1034,6 +1034,14 def debugdiscovery(ui, repo, remoteurl=b
1034 roots_missing = repo.revs(b'roots(%ld)', missing)
1034 roots_missing = repo.revs(b'roots(%ld)', missing)
1035 assert len(common) + len(missing) == len(all)
1035 assert len(common) + len(missing) == len(all)
1036
1036
1037 initial_undecided = repo.revs(
1038 b'not (::%ln or %ln::)', heads_common_remote, heads_common_local
1039 )
1040 heads_initial_undecided = repo.revs(b'heads(%ld)', initial_undecided)
1041 roots_initial_undecided = repo.revs(b'roots(%ld)', initial_undecided)
1042 common_initial_undecided = initial_undecided & common
1043 missing_initial_undecided = initial_undecided & missing
1044
1037 data = {}
1045 data = {}
1038 data[b'elapsed'] = t.elapsed
1046 data[b'elapsed'] = t.elapsed
1039 data[b'nb-common-heads'] = len(heads_common)
1047 data[b'nb-common-heads'] = len(heads_common)
@@ -1052,6 +1060,11 def debugdiscovery(ui, repo, remoteurl=b
1052 data[b'nb-revs-missing'] = len(missing)
1060 data[b'nb-revs-missing'] = len(missing)
1053 data[b'nb-missing-heads'] = len(roots_missing)
1061 data[b'nb-missing-heads'] = len(roots_missing)
1054 data[b'nb-missing-roots'] = len(heads_missing)
1062 data[b'nb-missing-roots'] = len(heads_missing)
1063 data[b'nb-ini_und'] = len(initial_undecided)
1064 data[b'nb-ini_und-heads'] = len(heads_initial_undecided)
1065 data[b'nb-ini_und-roots'] = len(roots_initial_undecided)
1066 data[b'nb-ini_und-common'] = len(common_initial_undecided)
1067 data[b'nb-ini_und-missing'] = len(missing_initial_undecided)
1055
1068
1056 # display discovery summary
1069 # display discovery summary
1057 ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data)
1070 ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data)
@@ -1085,6 +1098,11 def debugdiscovery(ui, repo, remoteurl=b
1085 ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
1098 ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
1086 ui.writenoi18n(b" heads: %(nb-missing-heads)9d\n" % data)
1099 ui.writenoi18n(b" heads: %(nb-missing-heads)9d\n" % data)
1087 ui.writenoi18n(b" roots: %(nb-missing-roots)9d\n" % data)
1100 ui.writenoi18n(b" roots: %(nb-missing-roots)9d\n" % data)
1101 ui.writenoi18n(b" first undecided set: %(nb-ini_und)9d\n" % data)
1102 ui.writenoi18n(b" heads: %(nb-ini_und-heads)9d\n" % data)
1103 ui.writenoi18n(b" roots: %(nb-ini_und-roots)9d\n" % data)
1104 ui.writenoi18n(b" common: %(nb-ini_und-common)9d\n" % data)
1105 ui.writenoi18n(b" missing: %(nb-ini_und-missing)9d\n" % data)
1088
1106
1089 if ui.verbose:
1107 if ui.verbose:
1090 ui.writenoi18n(
1108 ui.writenoi18n(
Show file before | Show file after | Hide comments
@@ -62,6 +62,11 Small superset:
62 missing: 0
62 missing: 0
63 heads: 0
63 heads: 0
64 roots: 0
64 roots: 0
65 first undecided set: 3
66 heads: 1
67 roots: 1
68 common: 3
69 missing: 0
65 common heads: 01241442b3c2 b5714e113bc0
70 common heads: 01241442b3c2 b5714e113bc0
66
71
67 % -- a -> b set
72 % -- a -> b set
@@ -88,6 +93,11 Small superset:
88 missing: 0
93 missing: 0
89 heads: 0
94 heads: 0
90 roots: 0
95 roots: 0
96 first undecided set: 3
97 heads: 1
98 roots: 1
99 common: 3
100 missing: 0
91 common heads: 01241442b3c2 b5714e113bc0
101 common heads: 01241442b3c2 b5714e113bc0
92
102
93 % -- a -> b set (tip only)
103 % -- a -> b set (tip only)
@@ -114,6 +124,11 Small superset:
114 missing: 1
124 missing: 1
115 heads: 1
125 heads: 1
116 roots: 1
126 roots: 1
127 first undecided set: 6
128 heads: 2
129 roots: 1
130 common: 5
131 missing: 1
117 common heads: b5714e113bc0
132 common heads: b5714e113bc0
118
133
119 % -- b -> a tree
134 % -- b -> a tree
@@ -139,6 +154,11 Small superset:
139 missing: 8
154 missing: 8
140 heads: 2
155 heads: 2
141 roots: 2
156 roots: 2
157 first undecided set: 8
158 heads: 2
159 roots: 2
160 common: 0
161 missing: 8
142 common heads: 01241442b3c2 b5714e113bc0
162 common heads: 01241442b3c2 b5714e113bc0
143
163
144 % -- b -> a set
164 % -- b -> a set
@@ -165,6 +185,11 Small superset:
165 missing: 8
185 missing: 8
166 heads: 2
186 heads: 2
167 roots: 2
187 roots: 2
188 first undecided set: 8
189 heads: 2
190 roots: 2
191 common: 0
192 missing: 8
168 common heads: 01241442b3c2 b5714e113bc0
193 common heads: 01241442b3c2 b5714e113bc0
169
194
170 % -- b -> a set (tip only)
195 % -- b -> a set (tip only)
@@ -191,6 +216,11 Small superset:
191 missing: 8
216 missing: 8
192 heads: 2
217 heads: 2
193 roots: 2
218 roots: 2
219 first undecided set: 8
220 heads: 2
221 roots: 2
222 common: 0
223 missing: 8
194 common heads: 01241442b3c2 b5714e113bc0
224 common heads: 01241442b3c2 b5714e113bc0
195
225
196
226
@@ -223,6 +253,11 Many new:
223 missing: 30
253 missing: 30
224 heads: 1
254 heads: 1
225 roots: 1
255 roots: 1
256 first undecided set: 34
257 heads: 2
258 roots: 1
259 common: 4
260 missing: 30
226 common heads: bebd167eb94d
261 common heads: bebd167eb94d
227
262
228 % -- a -> b set
263 % -- a -> b set
@@ -252,6 +287,11 Many new:
252 missing: 30
287 missing: 30
253 heads: 1
288 heads: 1
254 roots: 1
289 roots: 1
290 first undecided set: 34
291 heads: 2
292 roots: 1
293 common: 4
294 missing: 30
255 common heads: bebd167eb94d
295 common heads: bebd167eb94d
256
296
257 % -- a -> b set (tip only)
297 % -- a -> b set (tip only)
@@ -281,6 +321,11 Many new:
281 missing: 33
321 missing: 33
282 heads: 2
322 heads: 2
283 roots: 2
323 roots: 2
324 first undecided set: 35
325 heads: 2
326 roots: 1
327 common: 2
328 missing: 33
284 common heads: 66f7d451a68b
329 common heads: 66f7d451a68b
285
330
286 % -- b -> a tree
331 % -- b -> a tree
@@ -306,6 +351,11 Many new:
306 missing: 3
351 missing: 3
307 heads: 1
352 heads: 1
308 roots: 1
353 roots: 1
354 first undecided set: 3
355 heads: 1
356 roots: 1
357 common: 0
358 missing: 3
309 common heads: bebd167eb94d
359 common heads: bebd167eb94d
310
360
311 % -- b -> a set
361 % -- b -> a set
@@ -335,6 +385,11 Many new:
335 missing: 3
385 missing: 3
336 heads: 1
386 heads: 1
337 roots: 1
387 roots: 1
388 first undecided set: 3
389 heads: 1
390 roots: 1
391 common: 0
392 missing: 3
338 common heads: bebd167eb94d
393 common heads: bebd167eb94d
339
394
340 % -- b -> a set (tip only)
395 % -- b -> a set (tip only)
@@ -364,6 +419,11 Many new:
364 missing: 3
419 missing: 3
365 heads: 1
420 heads: 1
366 roots: 1
421 roots: 1
422 first undecided set: 3
423 heads: 1
424 roots: 1
425 common: 0
426 missing: 3
367 common heads: bebd167eb94d
427 common heads: bebd167eb94d
368
428
369 Both sides many new with stub:
429 Both sides many new with stub:
@@ -395,6 +455,11 Both sides many new with stub:
395 missing: 30
455 missing: 30
396 heads: 1
456 heads: 1
397 roots: 1
457 roots: 1
458 first undecided set: 33
459 heads: 2
460 roots: 1
461 common: 3
462 missing: 30
398 common heads: 2dc09a01254d
463 common heads: 2dc09a01254d
399
464
400 % -- a -> b set
465 % -- a -> b set
@@ -424,6 +489,11 Both sides many new with stub:
424 missing: 30
489 missing: 30
425 heads: 1
490 heads: 1
426 roots: 1
491 roots: 1
492 first undecided set: 33
493 heads: 2
494 roots: 1
495 common: 3
496 missing: 30
427 common heads: 2dc09a01254d
497 common heads: 2dc09a01254d
428
498
429 % -- a -> b set (tip only)
499 % -- a -> b set (tip only)
@@ -453,6 +523,11 Both sides many new with stub:
453 missing: 32
523 missing: 32
454 heads: 2
524 heads: 2
455 roots: 2
525 roots: 2
526 first undecided set: 34
527 heads: 2
528 roots: 1
529 common: 2
530 missing: 32
456 common heads: 66f7d451a68b
531 common heads: 66f7d451a68b
457
532
458 % -- b -> a tree
533 % -- b -> a tree
@@ -478,6 +553,11 Both sides many new with stub:
478 missing: 30
553 missing: 30
479 heads: 1
554 heads: 1
480 roots: 1
555 roots: 1
556 first undecided set: 30
557 heads: 1
558 roots: 1
559 common: 0
560 missing: 30
481 common heads: 2dc09a01254d
561 common heads: 2dc09a01254d
482
562
483 % -- b -> a set
563 % -- b -> a set
@@ -507,6 +587,11 Both sides many new with stub:
507 missing: 30
587 missing: 30
508 heads: 1
588 heads: 1
509 roots: 1
589 roots: 1
590 first undecided set: 30
591 heads: 1
592 roots: 1
593 common: 0
594 missing: 30
510 common heads: 2dc09a01254d
595 common heads: 2dc09a01254d
511
596
512 % -- b -> a set (tip only)
597 % -- b -> a set (tip only)
@@ -536,6 +621,11 Both sides many new with stub:
536 missing: 30
621 missing: 30
537 heads: 1
622 heads: 1
538 roots: 1
623 roots: 1
624 first undecided set: 30
625 heads: 1
626 roots: 1
627 common: 0
628 missing: 30
539 common heads: 2dc09a01254d
629 common heads: 2dc09a01254d
540
630
541
631
@@ -568,6 +658,11 Both many new:
568 missing: 30
658 missing: 30
569 heads: 1
659 heads: 1
570 roots: 1
660 roots: 1
661 first undecided set: 32
662 heads: 1
663 roots: 1
664 common: 2
665 missing: 30
571 common heads: 66f7d451a68b
666 common heads: 66f7d451a68b
572
667
573 % -- a -> b set
668 % -- a -> b set
@@ -597,6 +692,11 Both many new:
597 missing: 30
692 missing: 30
598 heads: 1
693 heads: 1
599 roots: 1
694 roots: 1
695 first undecided set: 32
696 heads: 1
697 roots: 1
698 common: 2
699 missing: 30
600 common heads: 66f7d451a68b
700 common heads: 66f7d451a68b
601
701
602 % -- a -> b set (tip only)
702 % -- a -> b set (tip only)
@@ -626,6 +726,11 Both many new:
626 missing: 30
726 missing: 30
627 heads: 1
727 heads: 1
628 roots: 1
728 roots: 1
729 first undecided set: 32
730 heads: 1
731 roots: 1
732 common: 2
733 missing: 30
629 common heads: 66f7d451a68b
734 common heads: 66f7d451a68b
630
735
631 % -- b -> a tree
736 % -- b -> a tree
@@ -651,6 +756,11 Both many new:
651 missing: 30
756 missing: 30
652 heads: 1
757 heads: 1
653 roots: 1
758 roots: 1
759 first undecided set: 32
760 heads: 1
761 roots: 1
762 common: 2
763 missing: 30
654 common heads: 66f7d451a68b
764 common heads: 66f7d451a68b
655
765
656 % -- b -> a set
766 % -- b -> a set
@@ -680,6 +790,11 Both many new:
680 missing: 30
790 missing: 30
681 heads: 1
791 heads: 1
682 roots: 1
792 roots: 1
793 first undecided set: 32
794 heads: 1
795 roots: 1
796 common: 2
797 missing: 30
683 common heads: 66f7d451a68b
798 common heads: 66f7d451a68b
684
799
685 % -- b -> a set (tip only)
800 % -- b -> a set (tip only)
@@ -709,6 +824,11 Both many new:
709 missing: 30
824 missing: 30
710 heads: 1
825 heads: 1
711 roots: 1
826 roots: 1
827 first undecided set: 32
828 heads: 1
829 roots: 1
830 common: 2
831 missing: 30
712 common heads: 66f7d451a68b
832 common heads: 66f7d451a68b
713
833
714
834
@@ -741,6 +861,11 Both many new skewed:
741 missing: 50
861 missing: 50
742 heads: 1
862 heads: 1
743 roots: 1
863 roots: 1
864 first undecided set: 52
865 heads: 1
866 roots: 1
867 common: 2
868 missing: 50
744 common heads: 66f7d451a68b
869 common heads: 66f7d451a68b
745
870
746 % -- a -> b set
871 % -- a -> b set
@@ -770,6 +895,11 Both many new skewed:
770 missing: 50
895 missing: 50
771 heads: 1
896 heads: 1
772 roots: 1
897 roots: 1
898 first undecided set: 52
899 heads: 1
900 roots: 1
901 common: 2
902 missing: 50
773 common heads: 66f7d451a68b
903 common heads: 66f7d451a68b
774
904
775 % -- a -> b set (tip only)
905 % -- a -> b set (tip only)
@@ -799,6 +929,11 Both many new skewed:
799 missing: 50
929 missing: 50
800 heads: 1
930 heads: 1
801 roots: 1
931 roots: 1
932 first undecided set: 52
933 heads: 1
934 roots: 1
935 common: 2
936 missing: 50
802 common heads: 66f7d451a68b
937 common heads: 66f7d451a68b
803
938
804 % -- b -> a tree
939 % -- b -> a tree
@@ -824,6 +959,11 Both many new skewed:
824 missing: 30
959 missing: 30
825 heads: 1
960 heads: 1
826 roots: 1
961 roots: 1
962 first undecided set: 32
963 heads: 1
964 roots: 1
965 common: 2
966 missing: 30
827 common heads: 66f7d451a68b
967 common heads: 66f7d451a68b
828
968
829 % -- b -> a set
969 % -- b -> a set
@@ -853,6 +993,11 Both many new skewed:
853 missing: 30
993 missing: 30
854 heads: 1
994 heads: 1
855 roots: 1
995 roots: 1
996 first undecided set: 32
997 heads: 1
998 roots: 1
999 common: 2
1000 missing: 30
856 common heads: 66f7d451a68b
1001 common heads: 66f7d451a68b
857
1002
858 % -- b -> a set (tip only)
1003 % -- b -> a set (tip only)
@@ -882,6 +1027,11 Both many new skewed:
882 missing: 30
1027 missing: 30
883 heads: 1
1028 heads: 1
884 roots: 1
1029 roots: 1
1030 first undecided set: 32
1031 heads: 1
1032 roots: 1
1033 common: 2
1034 missing: 30
885 common heads: 66f7d451a68b
1035 common heads: 66f7d451a68b
886
1036
887
1037
@@ -914,6 +1064,11 Both many new on top of long history:
914 missing: 50
1064 missing: 50
915 heads: 1
1065 heads: 1
916 roots: 1
1066 roots: 1
1067 first undecided set: 1050
1068 heads: 1
1069 roots: 1
1070 common: 1000
1071 missing: 50
917 common heads: 7ead0cba2838
1072 common heads: 7ead0cba2838
918
1073
919 % -- a -> b set
1074 % -- a -> b set
@@ -946,6 +1101,11 Both many new on top of long history:
946 missing: 50
1101 missing: 50
947 heads: 1
1102 heads: 1
948 roots: 1
1103 roots: 1
1104 first undecided set: 1050
1105 heads: 1
1106 roots: 1
1107 common: 1000
1108 missing: 50
949 common heads: 7ead0cba2838
1109 common heads: 7ead0cba2838
950
1110
951 % -- a -> b set (tip only)
1111 % -- a -> b set (tip only)
@@ -978,6 +1138,11 Both many new on top of long history:
978 missing: 50
1138 missing: 50
979 heads: 1
1139 heads: 1
980 roots: 1
1140 roots: 1
1141 first undecided set: 1050
1142 heads: 1
1143 roots: 1
1144 common: 1000
1145 missing: 50
981 common heads: 7ead0cba2838
1146 common heads: 7ead0cba2838
982
1147
983 % -- b -> a tree
1148 % -- b -> a tree
@@ -1003,6 +1168,11 Both many new on top of long history:
1003 missing: 30
1168 missing: 30
1004 heads: 1
1169 heads: 1
1005 roots: 1
1170 roots: 1
1171 first undecided set: 1030
1172 heads: 1
1173 roots: 1
1174 common: 1000
1175 missing: 30
1006 common heads: 7ead0cba2838
1176 common heads: 7ead0cba2838
1007
1177
1008 % -- b -> a set
1178 % -- b -> a set
@@ -1035,6 +1205,11 Both many new on top of long history:
1035 missing: 30
1205 missing: 30
1036 heads: 1
1206 heads: 1
1037 roots: 1
1207 roots: 1
1208 first undecided set: 1030
1209 heads: 1
1210 roots: 1
1211 common: 1000
1212 missing: 30
1038 common heads: 7ead0cba2838
1213 common heads: 7ead0cba2838
1039
1214
1040 % -- b -> a set (tip only)
1215 % -- b -> a set (tip only)
@@ -1067,6 +1242,11 Both many new on top of long history:
1067 missing: 30
1242 missing: 30
1068 heads: 1
1243 heads: 1
1069 roots: 1
1244 roots: 1
1245 first undecided set: 1030
1246 heads: 1
1247 roots: 1
1248 common: 1000
1249 missing: 30
1070 common heads: 7ead0cba2838
1250 common heads: 7ead0cba2838
1071
1251
1072
1252
@@ -1151,6 +1331,11 One with >200 heads. We now switch to se
1151 missing: 1040
1331 missing: 1040
1152 heads: 260
1332 heads: 260
1153 roots: 260
1333 roots: 260
1334 first undecided set: 1340
1335 heads: 260
1336 roots: 1
1337 common: 300
1338 missing: 1040
1154 common heads: 3ee37d65064a
1339 common heads: 3ee37d65064a
1155 $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
1340 $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
1156 comparing with b
1341 comparing with b
@@ -1182,6 +1367,11 One with >200 heads. We now switch to se
1182 missing: 1040
1367 missing: 1040
1183 heads: 260
1368 heads: 260
1184 roots: 260
1369 roots: 260
1370 first undecided set: 1340
1371 heads: 260
1372 roots: 1
1373 common: 300
1374 missing: 1040
1185 common heads: 3ee37d65064a
1375 common heads: 3ee37d65064a
1186
1376
1187 Test actual protocol when pulling one new head in addition to common heads
1377 Test actual protocol when pulling one new head in addition to common heads
@@ -1304,4 +1494,9 returned as common heads.
1304 missing: 1
1494 missing: 1
1305 heads: 1
1495 heads: 1
1306 roots: 1
1496 roots: 1
1497 first undecided set: 1
1498 heads: 1
1499 roots: 1
1500 common: 0
1501 missing: 1
1307 common heads: 66f7d451a68b
1502 common heads: 66f7d451a68b
General Comments 0
You need to be logged in to leave comments. Login now