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