Show More
@@ -817,9 +817,38 b' def debugdiscovery(ui, repo, remoteurl="' | |||||
817 | localrevs = opts['rev'] |
|
817 | localrevs = opts['rev'] | |
818 | common, hds = doit(localrevs, remoterevs) |
|
818 | common, hds = doit(localrevs, remoterevs) | |
819 |
|
819 | |||
|
820 | # compute all statistics | |||
820 | common = set(common) |
|
821 | common = set(common) | |
821 | rheads = set(hds) |
|
822 | rheads = set(hds) | |
822 | lheads = set(repo.heads()) |
|
823 | lheads = set(repo.heads()) | |
|
824 | ||||
|
825 | data = {} | |||
|
826 | data['nb-common'] = len(common) | |||
|
827 | data['nb-common-local'] = len(common & lheads) | |||
|
828 | data['nb-common-remote'] = len(common & rheads) | |||
|
829 | data['nb-local'] = len(lheads) | |||
|
830 | data['nb-local-missing'] = data['nb-local'] - data['nb-common-local'] | |||
|
831 | data['nb-remote'] = len(rheads) | |||
|
832 | data['nb-remote-unknown'] = data['nb-remote'] - data['nb-common-remote'] | |||
|
833 | data['nb-revs'] = len(repo.revs('all()')) | |||
|
834 | data['nb-revs-common'] = len(repo.revs('::%ln', common)) | |||
|
835 | data['nb-revs-missing'] = data['nb-revs'] - data['nb-revs-common'] | |||
|
836 | ||||
|
837 | # display discovery summary | |||
|
838 | ui.write(("heads summary:\n")) | |||
|
839 | ui.write((" total common heads: %(nb-common)9d\n") % data) | |||
|
840 | ui.write((" also local heads: %(nb-common-local)9d\n") % data) | |||
|
841 | ui.write((" also remote heads: %(nb-common-remote)9d\n") % data) | |||
|
842 | ui.write((" local heads: %(nb-local)9d\n") % data) | |||
|
843 | ui.write((" common: %(nb-common-local)9d\n") % data) | |||
|
844 | ui.write((" missing: %(nb-local-missing)9d\n") % data) | |||
|
845 | ui.write((" remote heads: %(nb-remote)9d\n") % data) | |||
|
846 | ui.write((" common: %(nb-common-remote)9d\n") % data) | |||
|
847 | ui.write((" unknown: %(nb-remote-unknown)9d\n") % data) | |||
|
848 | ui.write(("local changesets: %(nb-revs)9d\n") % data) | |||
|
849 | ui.write((" common: %(nb-revs-common)9d\n") % data) | |||
|
850 | ui.write((" missing: %(nb-revs-missing)9d\n") % data) | |||
|
851 | ||||
823 | ui.write(("common heads: %s\n") % |
|
852 | ui.write(("common heads: %s\n") % | |
824 | " ".join(sorted(short(n) for n in common))) |
|
853 | " ".join(sorted(short(n) for n in common))) | |
825 | if lheads <= common: |
|
854 | if lheads <= common: |
@@ -43,6 +43,19 b' Small superset:' | |||||
43 | comparing with b |
|
43 | comparing with b | |
44 | searching for changes |
|
44 | searching for changes | |
45 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 |
|
45 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 | |
|
46 | heads summary: | |||
|
47 | total common heads: 2 | |||
|
48 | also local heads: 2 | |||
|
49 | also remote heads: 1 | |||
|
50 | local heads: 2 | |||
|
51 | common: 2 | |||
|
52 | missing: 0 | |||
|
53 | remote heads: 3 | |||
|
54 | common: 1 | |||
|
55 | unknown: 2 | |||
|
56 | local changesets: 7 | |||
|
57 | common: 7 | |||
|
58 | missing: 0 | |||
46 | common heads: 01241442b3c2 b5714e113bc0 |
|
59 | common heads: 01241442b3c2 b5714e113bc0 | |
47 | local is subset |
|
60 | local is subset | |
48 |
|
61 | |||
@@ -51,6 +64,19 b' Small superset:' | |||||
51 |
query 1; |
|
64 | query 1; heads | |
52 | searching for changes |
|
65 | searching for changes | |
53 | all local heads known remotely |
|
66 | all local heads known remotely | |
|
67 | heads summary: | |||
|
68 | total common heads: 2 | |||
|
69 | also local heads: 2 | |||
|
70 | also remote heads: 1 | |||
|
71 | local heads: 2 | |||
|
72 | common: 2 | |||
|
73 | missing: 0 | |||
|
74 | remote heads: 3 | |||
|
75 | common: 1 | |||
|
76 | unknown: 2 | |||
|
77 | local changesets: 7 | |||
|
78 | common: 7 | |||
|
79 | missing: 0 | |||
54 | common heads: 01241442b3c2 b5714e113bc0 |
|
80 | common heads: 01241442b3c2 b5714e113bc0 | |
55 | local is subset |
|
81 | local is subset | |
56 |
|
82 | |||
@@ -59,12 +85,38 b' Small superset:' | |||||
59 |
query 1; |
|
85 | query 1; heads | |
60 | searching for changes |
|
86 | searching for changes | |
61 | all local heads known remotely |
|
87 | all local heads known remotely | |
|
88 | heads summary: | |||
|
89 | total common heads: 1 | |||
|
90 | also local heads: 1 | |||
|
91 | also remote heads: 0 | |||
|
92 | local heads: 2 | |||
|
93 | common: 1 | |||
|
94 | missing: 1 | |||
|
95 | remote heads: 3 | |||
|
96 | common: 0 | |||
|
97 | unknown: 3 | |||
|
98 | local changesets: 7 | |||
|
99 | common: 6 | |||
|
100 | missing: 1 | |||
62 | common heads: b5714e113bc0 |
|
101 | common heads: b5714e113bc0 | |
63 |
|
102 | |||
64 | % -- b -> a tree |
|
103 | % -- b -> a tree | |
65 | comparing with a |
|
104 | comparing with a | |
66 | searching for changes |
|
105 | searching for changes | |
67 | unpruned common: 01241442b3c2 b5714e113bc0 |
|
106 | unpruned common: 01241442b3c2 b5714e113bc0 | |
|
107 | heads summary: | |||
|
108 | total common heads: 2 | |||
|
109 | also local heads: 1 | |||
|
110 | also remote heads: 2 | |||
|
111 | local heads: 3 | |||
|
112 | common: 1 | |||
|
113 | missing: 2 | |||
|
114 | remote heads: 2 | |||
|
115 | common: 2 | |||
|
116 | unknown: 0 | |||
|
117 | local changesets: 15 | |||
|
118 | common: 7 | |||
|
119 | missing: 8 | |||
68 | common heads: 01241442b3c2 b5714e113bc0 |
|
120 | common heads: 01241442b3c2 b5714e113bc0 | |
69 | remote is subset |
|
121 | remote is subset | |
70 |
|
122 | |||
@@ -73,6 +125,19 b' Small superset:' | |||||
73 |
query 1; |
|
125 | query 1; heads | |
74 | searching for changes |
|
126 | searching for changes | |
75 | all remote heads known locally |
|
127 | all remote heads known locally | |
|
128 | heads summary: | |||
|
129 | total common heads: 2 | |||
|
130 | also local heads: 1 | |||
|
131 | also remote heads: 2 | |||
|
132 | local heads: 3 | |||
|
133 | common: 1 | |||
|
134 | missing: 2 | |||
|
135 | remote heads: 2 | |||
|
136 | common: 2 | |||
|
137 | unknown: 0 | |||
|
138 | local changesets: 15 | |||
|
139 | common: 7 | |||
|
140 | missing: 8 | |||
76 | common heads: 01241442b3c2 b5714e113bc0 |
|
141 | common heads: 01241442b3c2 b5714e113bc0 | |
77 | remote is subset |
|
142 | remote is subset | |
78 |
|
143 | |||
@@ -81,6 +146,19 b' Small superset:' | |||||
81 | query 1; heads |
|
146 | query 1; heads | |
82 | searching for changes |
|
147 | searching for changes | |
83 | all remote heads known locally |
|
148 | all remote heads known locally | |
|
149 | heads summary: | |||
|
150 | total common heads: 2 | |||
|
151 | also local heads: 1 | |||
|
152 | also remote heads: 2 | |||
|
153 | local heads: 3 | |||
|
154 | common: 1 | |||
|
155 | missing: 2 | |||
|
156 | remote heads: 2 | |||
|
157 | common: 2 | |||
|
158 | unknown: 0 | |||
|
159 | local changesets: 15 | |||
|
160 | common: 7 | |||
|
161 | missing: 8 | |||
84 | common heads: 01241442b3c2 b5714e113bc0 |
|
162 | common heads: 01241442b3c2 b5714e113bc0 | |
85 | remote is subset |
|
163 | remote is subset | |
86 |
|
164 | |||
@@ -95,6 +173,19 b' Many new:' | |||||
95 | comparing with b |
|
173 | comparing with b | |
96 | searching for changes |
|
174 | searching for changes | |
97 | unpruned common: bebd167eb94d |
|
175 | unpruned common: bebd167eb94d | |
|
176 | heads summary: | |||
|
177 | total common heads: 1 | |||
|
178 | also local heads: 1 | |||
|
179 | also remote heads: 0 | |||
|
180 | local heads: 2 | |||
|
181 | common: 1 | |||
|
182 | missing: 1 | |||
|
183 | remote heads: 1 | |||
|
184 | common: 0 | |||
|
185 | unknown: 1 | |||
|
186 | local changesets: 35 | |||
|
187 | common: 5 | |||
|
188 | missing: 30 | |||
98 | common heads: bebd167eb94d |
|
189 | common heads: bebd167eb94d | |
99 |
|
190 | |||
100 | % -- a -> b set |
|
191 | % -- a -> b set | |
@@ -105,6 +196,19 b' Many new:' | |||||
105 | searching: 2 queries |
|
196 | searching: 2 queries | |
106 |
query 2; |
|
197 | query 2; still undecided: 29, sample size is: 29 | |
107 | 2 total queries in *.????s (glob) |
|
198 | 2 total queries in *.????s (glob) | |
|
199 | heads summary: | |||
|
200 | total common heads: 1 | |||
|
201 | also local heads: 1 | |||
|
202 | also remote heads: 0 | |||
|
203 | local heads: 2 | |||
|
204 | common: 1 | |||
|
205 | missing: 1 | |||
|
206 | remote heads: 1 | |||
|
207 | common: 0 | |||
|
208 | unknown: 1 | |||
|
209 | local changesets: 35 | |||
|
210 | common: 5 | |||
|
211 | missing: 30 | |||
108 | common heads: bebd167eb94d |
|
212 | common heads: bebd167eb94d | |
109 |
|
213 | |||
110 | % -- a -> b set (tip only) |
|
214 | % -- a -> b set (tip only) | |
@@ -115,12 +219,38 b' Many new:' | |||||
115 | searching: 2 queries |
|
219 | searching: 2 queries | |
116 | query 2; still undecided: 31, sample size is: 31 |
|
220 | query 2; still undecided: 31, sample size is: 31 | |
117 | 2 total queries in *.????s (glob) |
|
221 | 2 total queries in *.????s (glob) | |
|
222 | heads summary: | |||
|
223 | total common heads: 1 | |||
|
224 | also local heads: 0 | |||
|
225 | also remote heads: 0 | |||
|
226 | local heads: 2 | |||
|
227 | common: 0 | |||
|
228 | missing: 2 | |||
|
229 | remote heads: 1 | |||
|
230 | common: 0 | |||
|
231 | unknown: 1 | |||
|
232 | local changesets: 35 | |||
|
233 | common: 2 | |||
|
234 | missing: 33 | |||
118 | common heads: 66f7d451a68b |
|
235 | common heads: 66f7d451a68b | |
119 |
|
236 | |||
120 | % -- b -> a tree |
|
237 | % -- b -> a tree | |
121 | comparing with a |
|
238 | comparing with a | |
122 | searching for changes |
|
239 | searching for changes | |
123 | unpruned common: 66f7d451a68b bebd167eb94d |
|
240 | unpruned common: 66f7d451a68b bebd167eb94d | |
|
241 | heads summary: | |||
|
242 | total common heads: 1 | |||
|
243 | also local heads: 0 | |||
|
244 | also remote heads: 1 | |||
|
245 | local heads: 1 | |||
|
246 | common: 0 | |||
|
247 | missing: 1 | |||
|
248 | remote heads: 2 | |||
|
249 | common: 1 | |||
|
250 | unknown: 1 | |||
|
251 | local changesets: 8 | |||
|
252 | common: 5 | |||
|
253 | missing: 3 | |||
124 | common heads: bebd167eb94d |
|
254 | common heads: bebd167eb94d | |
125 |
|
255 | |||
126 | % -- b -> a set |
|
256 | % -- b -> a set | |
@@ -131,6 +261,19 b' Many new:' | |||||
131 | searching: 2 queries |
|
261 | searching: 2 queries | |
132 |
query 2; |
|
262 | query 2; still undecided: 2, sample size is: 2 | |
133 | 2 total queries in *.????s (glob) |
|
263 | 2 total queries in *.????s (glob) | |
|
264 | heads summary: | |||
|
265 | total common heads: 1 | |||
|
266 | also local heads: 0 | |||
|
267 | also remote heads: 1 | |||
|
268 | local heads: 1 | |||
|
269 | common: 0 | |||
|
270 | missing: 1 | |||
|
271 | remote heads: 2 | |||
|
272 | common: 1 | |||
|
273 | unknown: 1 | |||
|
274 | local changesets: 8 | |||
|
275 | common: 5 | |||
|
276 | missing: 3 | |||
134 | common heads: bebd167eb94d |
|
277 | common heads: bebd167eb94d | |
135 |
|
278 | |||
136 | % -- b -> a set (tip only) |
|
279 | % -- b -> a set (tip only) | |
@@ -141,6 +284,19 b' Many new:' | |||||
141 | searching: 2 queries |
|
284 | searching: 2 queries | |
142 |
query 2; |
|
285 | query 2; still undecided: 2, sample size is: 2 | |
143 | 2 total queries in *.????s (glob) |
|
286 | 2 total queries in *.????s (glob) | |
|
287 | heads summary: | |||
|
288 | total common heads: 1 | |||
|
289 | also local heads: 0 | |||
|
290 | also remote heads: 1 | |||
|
291 | local heads: 1 | |||
|
292 | common: 0 | |||
|
293 | missing: 1 | |||
|
294 | remote heads: 2 | |||
|
295 | common: 1 | |||
|
296 | unknown: 1 | |||
|
297 | local changesets: 8 | |||
|
298 | common: 5 | |||
|
299 | missing: 3 | |||
144 | common heads: bebd167eb94d |
|
300 | common heads: bebd167eb94d | |
145 |
|
301 | |||
146 | Both sides many new with stub: |
|
302 | Both sides many new with stub: | |
@@ -153,6 +309,19 b' Both sides many new with stub:' | |||||
153 | comparing with b |
|
309 | comparing with b | |
154 | searching for changes |
|
310 | searching for changes | |
155 | unpruned common: 2dc09a01254d |
|
311 | unpruned common: 2dc09a01254d | |
|
312 | heads summary: | |||
|
313 | total common heads: 1 | |||
|
314 | also local heads: 1 | |||
|
315 | also remote heads: 0 | |||
|
316 | local heads: 2 | |||
|
317 | common: 1 | |||
|
318 | missing: 1 | |||
|
319 | remote heads: 1 | |||
|
320 | common: 0 | |||
|
321 | unknown: 1 | |||
|
322 | local changesets: 34 | |||
|
323 | common: 4 | |||
|
324 | missing: 30 | |||
156 | common heads: 2dc09a01254d |
|
325 | common heads: 2dc09a01254d | |
157 |
|
326 | |||
158 | % -- a -> b set |
|
327 | % -- a -> b set | |
@@ -163,6 +332,19 b' Both sides many new with stub:' | |||||
163 | searching: 2 queries |
|
332 | searching: 2 queries | |
164 |
query 2; |
|
333 | query 2; still undecided: 29, sample size is: 29 | |
165 | 2 total queries in *.????s (glob) |
|
334 | 2 total queries in *.????s (glob) | |
|
335 | heads summary: | |||
|
336 | total common heads: 1 | |||
|
337 | also local heads: 1 | |||
|
338 | also remote heads: 0 | |||
|
339 | local heads: 2 | |||
|
340 | common: 1 | |||
|
341 | missing: 1 | |||
|
342 | remote heads: 1 | |||
|
343 | common: 0 | |||
|
344 | unknown: 1 | |||
|
345 | local changesets: 34 | |||
|
346 | common: 4 | |||
|
347 | missing: 30 | |||
166 | common heads: 2dc09a01254d |
|
348 | common heads: 2dc09a01254d | |
167 |
|
349 | |||
168 | % -- a -> b set (tip only) |
|
350 | % -- a -> b set (tip only) | |
@@ -173,12 +355,38 b' Both sides many new with stub:' | |||||
173 | searching: 2 queries |
|
355 | searching: 2 queries | |
174 | query 2; still undecided: 31, sample size is: 31 |
|
356 | query 2; still undecided: 31, sample size is: 31 | |
175 | 2 total queries in *.????s (glob) |
|
357 | 2 total queries in *.????s (glob) | |
|
358 | heads summary: | |||
|
359 | total common heads: 1 | |||
|
360 | also local heads: 0 | |||
|
361 | also remote heads: 0 | |||
|
362 | local heads: 2 | |||
|
363 | common: 0 | |||
|
364 | missing: 2 | |||
|
365 | remote heads: 1 | |||
|
366 | common: 0 | |||
|
367 | unknown: 1 | |||
|
368 | local changesets: 34 | |||
|
369 | common: 2 | |||
|
370 | missing: 32 | |||
176 | common heads: 66f7d451a68b |
|
371 | common heads: 66f7d451a68b | |
177 |
|
372 | |||
178 | % -- b -> a tree |
|
373 | % -- b -> a tree | |
179 | comparing with a |
|
374 | comparing with a | |
180 | searching for changes |
|
375 | searching for changes | |
181 | unpruned common: 2dc09a01254d 66f7d451a68b |
|
376 | unpruned common: 2dc09a01254d 66f7d451a68b | |
|
377 | heads summary: | |||
|
378 | total common heads: 1 | |||
|
379 | also local heads: 0 | |||
|
380 | also remote heads: 1 | |||
|
381 | local heads: 1 | |||
|
382 | common: 0 | |||
|
383 | missing: 1 | |||
|
384 | remote heads: 2 | |||
|
385 | common: 1 | |||
|
386 | unknown: 1 | |||
|
387 | local changesets: 34 | |||
|
388 | common: 4 | |||
|
389 | missing: 30 | |||
182 | common heads: 2dc09a01254d |
|
390 | common heads: 2dc09a01254d | |
183 |
|
391 | |||
184 | % -- b -> a set |
|
392 | % -- b -> a set | |
@@ -189,6 +397,19 b' Both sides many new with stub:' | |||||
189 | searching: 2 queries |
|
397 | searching: 2 queries | |
190 |
query 2; |
|
398 | query 2; still undecided: 29, sample size is: 29 | |
191 | 2 total queries in *.????s (glob) |
|
399 | 2 total queries in *.????s (glob) | |
|
400 | heads summary: | |||
|
401 | total common heads: 1 | |||
|
402 | also local heads: 0 | |||
|
403 | also remote heads: 1 | |||
|
404 | local heads: 1 | |||
|
405 | common: 0 | |||
|
406 | missing: 1 | |||
|
407 | remote heads: 2 | |||
|
408 | common: 1 | |||
|
409 | unknown: 1 | |||
|
410 | local changesets: 34 | |||
|
411 | common: 4 | |||
|
412 | missing: 30 | |||
192 | common heads: 2dc09a01254d |
|
413 | common heads: 2dc09a01254d | |
193 |
|
414 | |||
194 | % -- b -> a set (tip only) |
|
415 | % -- b -> a set (tip only) | |
@@ -199,6 +420,19 b' Both sides many new with stub:' | |||||
199 | searching: 2 queries |
|
420 | searching: 2 queries | |
200 |
query 2; |
|
421 | query 2; still undecided: 29, sample size is: 29 | |
201 | 2 total queries in *.????s (glob) |
|
422 | 2 total queries in *.????s (glob) | |
|
423 | heads summary: | |||
|
424 | total common heads: 1 | |||
|
425 | also local heads: 0 | |||
|
426 | also remote heads: 1 | |||
|
427 | local heads: 1 | |||
|
428 | common: 0 | |||
|
429 | missing: 1 | |||
|
430 | remote heads: 2 | |||
|
431 | common: 1 | |||
|
432 | unknown: 1 | |||
|
433 | local changesets: 34 | |||
|
434 | common: 4 | |||
|
435 | missing: 30 | |||
202 | common heads: 2dc09a01254d |
|
436 | common heads: 2dc09a01254d | |
203 |
|
437 | |||
204 |
|
438 | |||
@@ -212,6 +446,19 b' Both many new:' | |||||
212 | comparing with b |
|
446 | comparing with b | |
213 | searching for changes |
|
447 | searching for changes | |
214 | unpruned common: 66f7d451a68b |
|
448 | unpruned common: 66f7d451a68b | |
|
449 | heads summary: | |||
|
450 | total common heads: 1 | |||
|
451 | also local heads: 0 | |||
|
452 | also remote heads: 0 | |||
|
453 | local heads: 1 | |||
|
454 | common: 0 | |||
|
455 | missing: 1 | |||
|
456 | remote heads: 1 | |||
|
457 | common: 0 | |||
|
458 | unknown: 1 | |||
|
459 | local changesets: 32 | |||
|
460 | common: 2 | |||
|
461 | missing: 30 | |||
215 | common heads: 66f7d451a68b |
|
462 | common heads: 66f7d451a68b | |
216 |
|
463 | |||
217 | % -- a -> b set |
|
464 | % -- a -> b set | |
@@ -222,6 +469,19 b' Both many new:' | |||||
222 | searching: 2 queries |
|
469 | searching: 2 queries | |
223 | query 2; still undecided: 31, sample size is: 31 |
|
470 | query 2; still undecided: 31, sample size is: 31 | |
224 | 2 total queries in *.????s (glob) |
|
471 | 2 total queries in *.????s (glob) | |
|
472 | heads summary: | |||
|
473 | total common heads: 1 | |||
|
474 | also local heads: 0 | |||
|
475 | also remote heads: 0 | |||
|
476 | local heads: 1 | |||
|
477 | common: 0 | |||
|
478 | missing: 1 | |||
|
479 | remote heads: 1 | |||
|
480 | common: 0 | |||
|
481 | unknown: 1 | |||
|
482 | local changesets: 32 | |||
|
483 | common: 2 | |||
|
484 | missing: 30 | |||
225 | common heads: 66f7d451a68b |
|
485 | common heads: 66f7d451a68b | |
226 |
|
486 | |||
227 | % -- a -> b set (tip only) |
|
487 | % -- a -> b set (tip only) | |
@@ -232,12 +492,38 b' Both many new:' | |||||
232 | searching: 2 queries |
|
492 | searching: 2 queries | |
233 | query 2; still undecided: 31, sample size is: 31 |
|
493 | query 2; still undecided: 31, sample size is: 31 | |
234 | 2 total queries in *.????s (glob) |
|
494 | 2 total queries in *.????s (glob) | |
|
495 | heads summary: | |||
|
496 | total common heads: 1 | |||
|
497 | also local heads: 0 | |||
|
498 | also remote heads: 0 | |||
|
499 | local heads: 1 | |||
|
500 | common: 0 | |||
|
501 | missing: 1 | |||
|
502 | remote heads: 1 | |||
|
503 | common: 0 | |||
|
504 | unknown: 1 | |||
|
505 | local changesets: 32 | |||
|
506 | common: 2 | |||
|
507 | missing: 30 | |||
235 | common heads: 66f7d451a68b |
|
508 | common heads: 66f7d451a68b | |
236 |
|
509 | |||
237 | % -- b -> a tree |
|
510 | % -- b -> a tree | |
238 | comparing with a |
|
511 | comparing with a | |
239 | searching for changes |
|
512 | searching for changes | |
240 | unpruned common: 66f7d451a68b |
|
513 | unpruned common: 66f7d451a68b | |
|
514 | heads summary: | |||
|
515 | total common heads: 1 | |||
|
516 | also local heads: 0 | |||
|
517 | also remote heads: 0 | |||
|
518 | local heads: 1 | |||
|
519 | common: 0 | |||
|
520 | missing: 1 | |||
|
521 | remote heads: 1 | |||
|
522 | common: 0 | |||
|
523 | unknown: 1 | |||
|
524 | local changesets: 32 | |||
|
525 | common: 2 | |||
|
526 | missing: 30 | |||
241 | common heads: 66f7d451a68b |
|
527 | common heads: 66f7d451a68b | |
242 |
|
528 | |||
243 | % -- b -> a set |
|
529 | % -- b -> a set | |
@@ -248,6 +534,19 b' Both many new:' | |||||
248 | searching: 2 queries |
|
534 | searching: 2 queries | |
249 | query 2; still undecided: 31, sample size is: 31 |
|
535 | query 2; still undecided: 31, sample size is: 31 | |
250 | 2 total queries in *.????s (glob) |
|
536 | 2 total queries in *.????s (glob) | |
|
537 | heads summary: | |||
|
538 | total common heads: 1 | |||
|
539 | also local heads: 0 | |||
|
540 | also remote heads: 0 | |||
|
541 | local heads: 1 | |||
|
542 | common: 0 | |||
|
543 | missing: 1 | |||
|
544 | remote heads: 1 | |||
|
545 | common: 0 | |||
|
546 | unknown: 1 | |||
|
547 | local changesets: 32 | |||
|
548 | common: 2 | |||
|
549 | missing: 30 | |||
251 | common heads: 66f7d451a68b |
|
550 | common heads: 66f7d451a68b | |
252 |
|
551 | |||
253 | % -- b -> a set (tip only) |
|
552 | % -- b -> a set (tip only) | |
@@ -258,6 +557,19 b' Both many new:' | |||||
258 | searching: 2 queries |
|
557 | searching: 2 queries | |
259 | query 2; still undecided: 31, sample size is: 31 |
|
558 | query 2; still undecided: 31, sample size is: 31 | |
260 | 2 total queries in *.????s (glob) |
|
559 | 2 total queries in *.????s (glob) | |
|
560 | heads summary: | |||
|
561 | total common heads: 1 | |||
|
562 | also local heads: 0 | |||
|
563 | also remote heads: 0 | |||
|
564 | local heads: 1 | |||
|
565 | common: 0 | |||
|
566 | missing: 1 | |||
|
567 | remote heads: 1 | |||
|
568 | common: 0 | |||
|
569 | unknown: 1 | |||
|
570 | local changesets: 32 | |||
|
571 | common: 2 | |||
|
572 | missing: 30 | |||
261 | common heads: 66f7d451a68b |
|
573 | common heads: 66f7d451a68b | |
262 |
|
574 | |||
263 |
|
575 | |||
@@ -271,6 +583,19 b' Both many new skewed:' | |||||
271 | comparing with b |
|
583 | comparing with b | |
272 | searching for changes |
|
584 | searching for changes | |
273 | unpruned common: 66f7d451a68b |
|
585 | unpruned common: 66f7d451a68b | |
|
586 | heads summary: | |||
|
587 | total common heads: 1 | |||
|
588 | also local heads: 0 | |||
|
589 | also remote heads: 0 | |||
|
590 | local heads: 1 | |||
|
591 | common: 0 | |||
|
592 | missing: 1 | |||
|
593 | remote heads: 1 | |||
|
594 | common: 0 | |||
|
595 | unknown: 1 | |||
|
596 | local changesets: 52 | |||
|
597 | common: 2 | |||
|
598 | missing: 50 | |||
274 | common heads: 66f7d451a68b |
|
599 | common heads: 66f7d451a68b | |
275 |
|
600 | |||
276 | % -- a -> b set |
|
601 | % -- a -> b set | |
@@ -281,6 +606,19 b' Both many new skewed:' | |||||
281 | searching: 2 queries |
|
606 | searching: 2 queries | |
282 | query 2; still undecided: 51, sample size is: 51 |
|
607 | query 2; still undecided: 51, sample size is: 51 | |
283 | 2 total queries in *.????s (glob) |
|
608 | 2 total queries in *.????s (glob) | |
|
609 | heads summary: | |||
|
610 | total common heads: 1 | |||
|
611 | also local heads: 0 | |||
|
612 | also remote heads: 0 | |||
|
613 | local heads: 1 | |||
|
614 | common: 0 | |||
|
615 | missing: 1 | |||
|
616 | remote heads: 1 | |||
|
617 | common: 0 | |||
|
618 | unknown: 1 | |||
|
619 | local changesets: 52 | |||
|
620 | common: 2 | |||
|
621 | missing: 50 | |||
284 | common heads: 66f7d451a68b |
|
622 | common heads: 66f7d451a68b | |
285 |
|
623 | |||
286 | % -- a -> b set (tip only) |
|
624 | % -- a -> b set (tip only) | |
@@ -291,12 +629,38 b' Both many new skewed:' | |||||
291 | searching: 2 queries |
|
629 | searching: 2 queries | |
292 | query 2; still undecided: 51, sample size is: 51 |
|
630 | query 2; still undecided: 51, sample size is: 51 | |
293 | 2 total queries in *.????s (glob) |
|
631 | 2 total queries in *.????s (glob) | |
|
632 | heads summary: | |||
|
633 | total common heads: 1 | |||
|
634 | also local heads: 0 | |||
|
635 | also remote heads: 0 | |||
|
636 | local heads: 1 | |||
|
637 | common: 0 | |||
|
638 | missing: 1 | |||
|
639 | remote heads: 1 | |||
|
640 | common: 0 | |||
|
641 | unknown: 1 | |||
|
642 | local changesets: 52 | |||
|
643 | common: 2 | |||
|
644 | missing: 50 | |||
294 | common heads: 66f7d451a68b |
|
645 | common heads: 66f7d451a68b | |
295 |
|
646 | |||
296 | % -- b -> a tree |
|
647 | % -- b -> a tree | |
297 | comparing with a |
|
648 | comparing with a | |
298 | searching for changes |
|
649 | searching for changes | |
299 | unpruned common: 66f7d451a68b |
|
650 | unpruned common: 66f7d451a68b | |
|
651 | heads summary: | |||
|
652 | total common heads: 1 | |||
|
653 | also local heads: 0 | |||
|
654 | also remote heads: 0 | |||
|
655 | local heads: 1 | |||
|
656 | common: 0 | |||
|
657 | missing: 1 | |||
|
658 | remote heads: 1 | |||
|
659 | common: 0 | |||
|
660 | unknown: 1 | |||
|
661 | local changesets: 32 | |||
|
662 | common: 2 | |||
|
663 | missing: 30 | |||
300 | common heads: 66f7d451a68b |
|
664 | common heads: 66f7d451a68b | |
301 |
|
665 | |||
302 | % -- b -> a set |
|
666 | % -- b -> a set | |
@@ -307,6 +671,19 b' Both many new skewed:' | |||||
307 | searching: 2 queries |
|
671 | searching: 2 queries | |
308 | query 2; still undecided: 31, sample size is: 31 |
|
672 | query 2; still undecided: 31, sample size is: 31 | |
309 | 2 total queries in *.????s (glob) |
|
673 | 2 total queries in *.????s (glob) | |
|
674 | heads summary: | |||
|
675 | total common heads: 1 | |||
|
676 | also local heads: 0 | |||
|
677 | also remote heads: 0 | |||
|
678 | local heads: 1 | |||
|
679 | common: 0 | |||
|
680 | missing: 1 | |||
|
681 | remote heads: 1 | |||
|
682 | common: 0 | |||
|
683 | unknown: 1 | |||
|
684 | local changesets: 32 | |||
|
685 | common: 2 | |||
|
686 | missing: 30 | |||
310 | common heads: 66f7d451a68b |
|
687 | common heads: 66f7d451a68b | |
311 |
|
688 | |||
312 | % -- b -> a set (tip only) |
|
689 | % -- b -> a set (tip only) | |
@@ -317,6 +694,19 b' Both many new skewed:' | |||||
317 | searching: 2 queries |
|
694 | searching: 2 queries | |
318 | query 2; still undecided: 31, sample size is: 31 |
|
695 | query 2; still undecided: 31, sample size is: 31 | |
319 | 2 total queries in *.????s (glob) |
|
696 | 2 total queries in *.????s (glob) | |
|
697 | heads summary: | |||
|
698 | total common heads: 1 | |||
|
699 | also local heads: 0 | |||
|
700 | also remote heads: 0 | |||
|
701 | local heads: 1 | |||
|
702 | common: 0 | |||
|
703 | missing: 1 | |||
|
704 | remote heads: 1 | |||
|
705 | common: 0 | |||
|
706 | unknown: 1 | |||
|
707 | local changesets: 32 | |||
|
708 | common: 2 | |||
|
709 | missing: 30 | |||
320 | common heads: 66f7d451a68b |
|
710 | common heads: 66f7d451a68b | |
321 |
|
711 | |||
322 |
|
712 | |||
@@ -330,6 +720,19 b' Both many new on top of long history:' | |||||
330 | comparing with b |
|
720 | comparing with b | |
331 | searching for changes |
|
721 | searching for changes | |
332 | unpruned common: 7ead0cba2838 |
|
722 | unpruned common: 7ead0cba2838 | |
|
723 | heads summary: | |||
|
724 | total common heads: 1 | |||
|
725 | also local heads: 0 | |||
|
726 | also remote heads: 0 | |||
|
727 | local heads: 1 | |||
|
728 | common: 0 | |||
|
729 | missing: 1 | |||
|
730 | remote heads: 1 | |||
|
731 | common: 0 | |||
|
732 | unknown: 1 | |||
|
733 | local changesets: 1050 | |||
|
734 | common: 1000 | |||
|
735 | missing: 50 | |||
333 | common heads: 7ead0cba2838 |
|
736 | common heads: 7ead0cba2838 | |
334 |
|
737 | |||
335 | % -- a -> b set |
|
738 | % -- a -> b set | |
@@ -343,6 +746,19 b' Both many new on top of long history:' | |||||
343 | searching: 3 queries |
|
746 | searching: 3 queries | |
344 | query 3; still undecided: 31, sample size is: 31 |
|
747 | query 3; still undecided: 31, sample size is: 31 | |
345 | 3 total queries in *.????s (glob) |
|
748 | 3 total queries in *.????s (glob) | |
|
749 | heads summary: | |||
|
750 | total common heads: 1 | |||
|
751 | also local heads: 0 | |||
|
752 | also remote heads: 0 | |||
|
753 | local heads: 1 | |||
|
754 | common: 0 | |||
|
755 | missing: 1 | |||
|
756 | remote heads: 1 | |||
|
757 | common: 0 | |||
|
758 | unknown: 1 | |||
|
759 | local changesets: 1050 | |||
|
760 | common: 1000 | |||
|
761 | missing: 50 | |||
346 | common heads: 7ead0cba2838 |
|
762 | common heads: 7ead0cba2838 | |
347 |
|
763 | |||
348 | % -- a -> b set (tip only) |
|
764 | % -- a -> b set (tip only) | |
@@ -356,12 +772,38 b' Both many new on top of long history:' | |||||
356 | searching: 3 queries |
|
772 | searching: 3 queries | |
357 | query 3; still undecided: 31, sample size is: 31 |
|
773 | query 3; still undecided: 31, sample size is: 31 | |
358 | 3 total queries in *.????s (glob) |
|
774 | 3 total queries in *.????s (glob) | |
|
775 | heads summary: | |||
|
776 | total common heads: 1 | |||
|
777 | also local heads: 0 | |||
|
778 | also remote heads: 0 | |||
|
779 | local heads: 1 | |||
|
780 | common: 0 | |||
|
781 | missing: 1 | |||
|
782 | remote heads: 1 | |||
|
783 | common: 0 | |||
|
784 | unknown: 1 | |||
|
785 | local changesets: 1050 | |||
|
786 | common: 1000 | |||
|
787 | missing: 50 | |||
359 | common heads: 7ead0cba2838 |
|
788 | common heads: 7ead0cba2838 | |
360 |
|
789 | |||
361 | % -- b -> a tree |
|
790 | % -- b -> a tree | |
362 | comparing with a |
|
791 | comparing with a | |
363 | searching for changes |
|
792 | searching for changes | |
364 | unpruned common: 7ead0cba2838 |
|
793 | unpruned common: 7ead0cba2838 | |
|
794 | heads summary: | |||
|
795 | total common heads: 1 | |||
|
796 | also local heads: 0 | |||
|
797 | also remote heads: 0 | |||
|
798 | local heads: 1 | |||
|
799 | common: 0 | |||
|
800 | missing: 1 | |||
|
801 | remote heads: 1 | |||
|
802 | common: 0 | |||
|
803 | unknown: 1 | |||
|
804 | local changesets: 1030 | |||
|
805 | common: 1000 | |||
|
806 | missing: 30 | |||
365 | common heads: 7ead0cba2838 |
|
807 | common heads: 7ead0cba2838 | |
366 |
|
808 | |||
367 | % -- b -> a set |
|
809 | % -- b -> a set | |
@@ -375,6 +817,19 b' Both many new on top of long history:' | |||||
375 | searching: 3 queries |
|
817 | searching: 3 queries | |
376 | query 3; still undecided: 15, sample size is: 15 |
|
818 | query 3; still undecided: 15, sample size is: 15 | |
377 | 3 total queries in *.????s (glob) |
|
819 | 3 total queries in *.????s (glob) | |
|
820 | heads summary: | |||
|
821 | total common heads: 1 | |||
|
822 | also local heads: 0 | |||
|
823 | also remote heads: 0 | |||
|
824 | local heads: 1 | |||
|
825 | common: 0 | |||
|
826 | missing: 1 | |||
|
827 | remote heads: 1 | |||
|
828 | common: 0 | |||
|
829 | unknown: 1 | |||
|
830 | local changesets: 1030 | |||
|
831 | common: 1000 | |||
|
832 | missing: 30 | |||
378 | common heads: 7ead0cba2838 |
|
833 | common heads: 7ead0cba2838 | |
379 |
|
834 | |||
380 | % -- b -> a set (tip only) |
|
835 | % -- b -> a set (tip only) | |
@@ -388,6 +843,19 b' Both many new on top of long history:' | |||||
388 | searching: 3 queries |
|
843 | searching: 3 queries | |
389 | query 3; still undecided: 15, sample size is: 15 |
|
844 | query 3; still undecided: 15, sample size is: 15 | |
390 | 3 total queries in *.????s (glob) |
|
845 | 3 total queries in *.????s (glob) | |
|
846 | heads summary: | |||
|
847 | total common heads: 1 | |||
|
848 | also local heads: 0 | |||
|
849 | also remote heads: 0 | |||
|
850 | local heads: 1 | |||
|
851 | common: 0 | |||
|
852 | missing: 1 | |||
|
853 | remote heads: 1 | |||
|
854 | common: 0 | |||
|
855 | unknown: 1 | |||
|
856 | local changesets: 1030 | |||
|
857 | common: 1000 | |||
|
858 | missing: 30 | |||
391 | common heads: 7ead0cba2838 |
|
859 | common heads: 7ead0cba2838 | |
392 |
|
860 | |||
393 |
|
861 | |||
@@ -453,6 +921,19 b' One with >200 heads, which used to use u' | |||||
453 | searching: 6 queries |
|
921 | searching: 6 queries | |
454 | query 6; still undecided: \d+, sample size is: \d+ (re) |
|
922 | query 6; still undecided: \d+, sample size is: \d+ (re) | |
455 | 6 total queries in *.????s (glob) |
|
923 | 6 total queries in *.????s (glob) | |
|
924 | heads summary: | |||
|
925 | total common heads: 1 | |||
|
926 | also local heads: 0 | |||
|
927 | also remote heads: 0 | |||
|
928 | local heads: 260 | |||
|
929 | common: 0 | |||
|
930 | missing: 260 | |||
|
931 | remote heads: 1 | |||
|
932 | common: 0 | |||
|
933 | unknown: 1 | |||
|
934 | local changesets: 1340 | |||
|
935 | common: 300 | |||
|
936 | missing: 1040 | |||
456 | common heads: 3ee37d65064a |
|
937 | common heads: 3ee37d65064a | |
457 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip |
|
938 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip | |
458 | comparing with b |
|
939 | comparing with b | |
@@ -465,6 +946,19 b' One with >200 heads, which used to use u' | |||||
465 | searching: 3 queries |
|
946 | searching: 3 queries | |
466 | query 3; still undecided: 3, sample size is: 3 |
|
947 | query 3; still undecided: 3, sample size is: 3 | |
467 | 3 total queries in *.????s (glob) |
|
948 | 3 total queries in *.????s (glob) | |
|
949 | heads summary: | |||
|
950 | total common heads: 1 | |||
|
951 | also local heads: 0 | |||
|
952 | also remote heads: 0 | |||
|
953 | local heads: 260 | |||
|
954 | common: 0 | |||
|
955 | missing: 260 | |||
|
956 | remote heads: 1 | |||
|
957 | common: 0 | |||
|
958 | unknown: 1 | |||
|
959 | local changesets: 1340 | |||
|
960 | common: 300 | |||
|
961 | missing: 1040 | |||
468 | common heads: 3ee37d65064a |
|
962 | common heads: 3ee37d65064a | |
469 |
|
963 | |||
470 | Test actual protocol when pulling one new head in addition to common heads |
|
964 | Test actual protocol when pulling one new head in addition to common heads |
General Comments 0
You need to be logged in to leave comments.
Login now