Show More
@@ -1,1118 +1,1120 b'' | |||
|
1 | 1 | |
|
2 | 2 | Function to test discovery between two repos in both directions, using both the local shortcut |
|
3 | 3 | (which is currently not activated by default) and the full remotable protocol: |
|
4 | 4 | |
|
5 | 5 | $ testdesc() { # revs_a, revs_b, dagdesc |
|
6 | 6 | > if [ -d foo ]; then rm -rf foo; fi |
|
7 | 7 | > hg init foo |
|
8 | 8 | > cd foo |
|
9 | 9 | > hg debugbuilddag "$3" |
|
10 | 10 | > hg clone . a $1 --quiet |
|
11 | 11 | > hg clone . b $2 --quiet |
|
12 | 12 | > echo |
|
13 | 13 | > echo "% -- a -> b tree" |
|
14 | 14 | > hg -R a debugdiscovery b --verbose --old |
|
15 | 15 | > echo |
|
16 | 16 | > echo "% -- a -> b set" |
|
17 | 17 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true |
|
18 | 18 | > echo |
|
19 | 19 | > echo "% -- a -> b set (tip only)" |
|
20 | 20 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip |
|
21 | 21 | > echo |
|
22 | 22 | > echo "% -- b -> a tree" |
|
23 | 23 | > hg -R b debugdiscovery a --verbose --old |
|
24 | 24 | > echo |
|
25 | 25 | > echo "% -- b -> a set" |
|
26 | 26 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true |
|
27 | 27 | > echo |
|
28 | 28 | > echo "% -- b -> a set (tip only)" |
|
29 | 29 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip |
|
30 | 30 | > cd .. |
|
31 | 31 | > } |
|
32 | 32 | |
|
33 | 33 | |
|
34 | 34 | Small superset: |
|
35 | 35 | |
|
36 | 36 | $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' |
|
37 | 37 | > +2:f +1:a1:b1 |
|
38 | 38 | > <f +4 :a2 |
|
39 | 39 | > +5 :b2 |
|
40 | 40 | > <f +3 :b3' |
|
41 | 41 | |
|
42 | 42 | % -- a -> b tree |
|
43 | 43 | comparing with b |
|
44 | 44 | searching for changes |
|
45 | 45 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 |
|
46 | 46 | elapsed time: * seconds (glob) |
|
47 | 47 | heads summary: |
|
48 | 48 | total common heads: 2 |
|
49 | 49 | also local heads: 2 |
|
50 | 50 | also remote heads: 1 |
|
51 | 51 | both: 1 |
|
52 | 52 | local heads: 2 |
|
53 | 53 | common: 2 |
|
54 | 54 | missing: 0 |
|
55 | 55 | remote heads: 3 |
|
56 | 56 | common: 1 |
|
57 | 57 | unknown: 2 |
|
58 | 58 | local changesets: 7 |
|
59 | 59 | common: 7 |
|
60 | 60 | missing: 0 |
|
61 | 61 | common heads: 01241442b3c2 b5714e113bc0 |
|
62 | 62 | |
|
63 | 63 | % -- a -> b set |
|
64 | 64 | comparing with b |
|
65 | 65 | query 1; heads |
|
66 | 66 | searching for changes |
|
67 | 67 | all local heads known remotely |
|
68 | 68 | elapsed time: * seconds (glob) |
|
69 | 69 | heads summary: |
|
70 | 70 | total common heads: 2 |
|
71 | 71 | also local heads: 2 |
|
72 | 72 | also remote heads: 1 |
|
73 | 73 | both: 1 |
|
74 | 74 | local heads: 2 |
|
75 | 75 | common: 2 |
|
76 | 76 | missing: 0 |
|
77 | 77 | remote heads: 3 |
|
78 | 78 | common: 1 |
|
79 | 79 | unknown: 2 |
|
80 | 80 | local changesets: 7 |
|
81 | 81 | common: 7 |
|
82 | 82 | missing: 0 |
|
83 | 83 | common heads: 01241442b3c2 b5714e113bc0 |
|
84 | 84 | |
|
85 | 85 | % -- a -> b set (tip only) |
|
86 | 86 | comparing with b |
|
87 | 87 | query 1; heads |
|
88 | 88 | searching for changes |
|
89 | 89 | all local heads known remotely |
|
90 | 90 | elapsed time: * seconds (glob) |
|
91 | 91 | heads summary: |
|
92 | 92 | total common heads: 1 |
|
93 | 93 | also local heads: 1 |
|
94 | 94 | also remote heads: 0 |
|
95 | 95 | both: 0 |
|
96 | 96 | local heads: 2 |
|
97 | 97 | common: 1 |
|
98 | 98 | missing: 1 |
|
99 | 99 | remote heads: 3 |
|
100 | 100 | common: 0 |
|
101 | 101 | unknown: 3 |
|
102 | 102 | local changesets: 7 |
|
103 | 103 | common: 6 |
|
104 | 104 | missing: 1 |
|
105 | 105 | common heads: b5714e113bc0 |
|
106 | 106 | |
|
107 | 107 | % -- b -> a tree |
|
108 | 108 | comparing with a |
|
109 | 109 | searching for changes |
|
110 | 110 | unpruned common: 01241442b3c2 b5714e113bc0 |
|
111 | 111 | elapsed time: * seconds (glob) |
|
112 | 112 | heads summary: |
|
113 | 113 | total common heads: 2 |
|
114 | 114 | also local heads: 1 |
|
115 | 115 | also remote heads: 2 |
|
116 | 116 | both: 1 |
|
117 | 117 | local heads: 3 |
|
118 | 118 | common: 1 |
|
119 | 119 | missing: 2 |
|
120 | 120 | remote heads: 2 |
|
121 | 121 | common: 2 |
|
122 | 122 | unknown: 0 |
|
123 | 123 | local changesets: 15 |
|
124 | 124 | common: 7 |
|
125 | 125 | missing: 8 |
|
126 | 126 | common heads: 01241442b3c2 b5714e113bc0 |
|
127 | 127 | |
|
128 | 128 | % -- b -> a set |
|
129 | 129 | comparing with a |
|
130 | 130 | query 1; heads |
|
131 | 131 | searching for changes |
|
132 | 132 | all remote heads known locally |
|
133 | 133 | elapsed time: * seconds (glob) |
|
134 | 134 | heads summary: |
|
135 | 135 | total common heads: 2 |
|
136 | 136 | also local heads: 1 |
|
137 | 137 | also remote heads: 2 |
|
138 | 138 | both: 1 |
|
139 | 139 | local heads: 3 |
|
140 | 140 | common: 1 |
|
141 | 141 | missing: 2 |
|
142 | 142 | remote heads: 2 |
|
143 | 143 | common: 2 |
|
144 | 144 | unknown: 0 |
|
145 | 145 | local changesets: 15 |
|
146 | 146 | common: 7 |
|
147 | 147 | missing: 8 |
|
148 | 148 | common heads: 01241442b3c2 b5714e113bc0 |
|
149 | 149 | |
|
150 | 150 | % -- b -> a set (tip only) |
|
151 | 151 | comparing with a |
|
152 | 152 | query 1; heads |
|
153 | 153 | searching for changes |
|
154 | 154 | all remote heads known locally |
|
155 | 155 | elapsed time: * seconds (glob) |
|
156 | 156 | heads summary: |
|
157 | 157 | total common heads: 2 |
|
158 | 158 | also local heads: 1 |
|
159 | 159 | also remote heads: 2 |
|
160 | 160 | both: 1 |
|
161 | 161 | local heads: 3 |
|
162 | 162 | common: 1 |
|
163 | 163 | missing: 2 |
|
164 | 164 | remote heads: 2 |
|
165 | 165 | common: 2 |
|
166 | 166 | unknown: 0 |
|
167 | 167 | local changesets: 15 |
|
168 | 168 | common: 7 |
|
169 | 169 | missing: 8 |
|
170 | 170 | common heads: 01241442b3c2 b5714e113bc0 |
|
171 | 171 | |
|
172 | 172 | |
|
173 | 173 | Many new: |
|
174 | 174 | |
|
175 | 175 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
176 | 176 | > +2:f +3:a1 +3:b |
|
177 | 177 | > <f +30 :a2' |
|
178 | 178 | |
|
179 | 179 | % -- a -> b tree |
|
180 | 180 | comparing with b |
|
181 | 181 | searching for changes |
|
182 | 182 | unpruned common: bebd167eb94d |
|
183 | 183 | elapsed time: * seconds (glob) |
|
184 | 184 | heads summary: |
|
185 | 185 | total common heads: 1 |
|
186 | 186 | also local heads: 1 |
|
187 | 187 | also remote heads: 0 |
|
188 | 188 | both: 0 |
|
189 | 189 | local heads: 2 |
|
190 | 190 | common: 1 |
|
191 | 191 | missing: 1 |
|
192 | 192 | remote heads: 1 |
|
193 | 193 | common: 0 |
|
194 | 194 | unknown: 1 |
|
195 | 195 | local changesets: 35 |
|
196 | 196 | common: 5 |
|
197 | 197 | missing: 30 |
|
198 | 198 | common heads: bebd167eb94d |
|
199 | 199 | |
|
200 | 200 | % -- a -> b set |
|
201 | 201 | comparing with b |
|
202 | 202 | query 1; heads |
|
203 | 203 | searching for changes |
|
204 | 204 | taking initial sample |
|
205 | 205 | searching: 2 queries |
|
206 | 206 | query 2; still undecided: 29, sample size is: 29 |
|
207 | 207 | 2 total queries in *.????s (glob) |
|
208 | 208 | elapsed time: * seconds (glob) |
|
209 | 209 | heads summary: |
|
210 | 210 | total common heads: 1 |
|
211 | 211 | also local heads: 1 |
|
212 | 212 | also remote heads: 0 |
|
213 | 213 | both: 0 |
|
214 | 214 | local heads: 2 |
|
215 | 215 | common: 1 |
|
216 | 216 | missing: 1 |
|
217 | 217 | remote heads: 1 |
|
218 | 218 | common: 0 |
|
219 | 219 | unknown: 1 |
|
220 | 220 | local changesets: 35 |
|
221 | 221 | common: 5 |
|
222 | 222 | missing: 30 |
|
223 | 223 | common heads: bebd167eb94d |
|
224 | 224 | |
|
225 | 225 | % -- a -> b set (tip only) |
|
226 | 226 | comparing with b |
|
227 | 227 | query 1; heads |
|
228 | 228 | searching for changes |
|
229 | 229 | taking quick initial sample |
|
230 | 230 | searching: 2 queries |
|
231 | 231 | query 2; still undecided: 31, sample size is: 31 |
|
232 | 232 | 2 total queries in *.????s (glob) |
|
233 | 233 | elapsed time: * seconds (glob) |
|
234 | 234 | heads summary: |
|
235 | 235 | total common heads: 1 |
|
236 | 236 | also local heads: 0 |
|
237 | 237 | also remote heads: 0 |
|
238 | 238 | both: 0 |
|
239 | 239 | local heads: 2 |
|
240 | 240 | common: 0 |
|
241 | 241 | missing: 2 |
|
242 | 242 | remote heads: 1 |
|
243 | 243 | common: 0 |
|
244 | 244 | unknown: 1 |
|
245 | 245 | local changesets: 35 |
|
246 | 246 | common: 2 |
|
247 | 247 | missing: 33 |
|
248 | 248 | common heads: 66f7d451a68b |
|
249 | 249 | |
|
250 | 250 | % -- b -> a tree |
|
251 | 251 | comparing with a |
|
252 | 252 | searching for changes |
|
253 | 253 | unpruned common: 66f7d451a68b bebd167eb94d |
|
254 | 254 | elapsed time: * seconds (glob) |
|
255 | 255 | heads summary: |
|
256 | 256 | total common heads: 1 |
|
257 | 257 | also local heads: 0 |
|
258 | 258 | also remote heads: 1 |
|
259 | 259 | both: 0 |
|
260 | 260 | local heads: 1 |
|
261 | 261 | common: 0 |
|
262 | 262 | missing: 1 |
|
263 | 263 | remote heads: 2 |
|
264 | 264 | common: 1 |
|
265 | 265 | unknown: 1 |
|
266 | 266 | local changesets: 8 |
|
267 | 267 | common: 5 |
|
268 | 268 | missing: 3 |
|
269 | 269 | common heads: bebd167eb94d |
|
270 | 270 | |
|
271 | 271 | % -- b -> a set |
|
272 | 272 | comparing with a |
|
273 | 273 | query 1; heads |
|
274 | 274 | searching for changes |
|
275 | 275 | taking initial sample |
|
276 | 276 | searching: 2 queries |
|
277 | 277 | query 2; still undecided: 2, sample size is: 2 |
|
278 | 278 | 2 total queries in *.????s (glob) |
|
279 | 279 | elapsed time: * seconds (glob) |
|
280 | 280 | heads summary: |
|
281 | 281 | total common heads: 1 |
|
282 | 282 | also local heads: 0 |
|
283 | 283 | also remote heads: 1 |
|
284 | 284 | both: 0 |
|
285 | 285 | local heads: 1 |
|
286 | 286 | common: 0 |
|
287 | 287 | missing: 1 |
|
288 | 288 | remote heads: 2 |
|
289 | 289 | common: 1 |
|
290 | 290 | unknown: 1 |
|
291 | 291 | local changesets: 8 |
|
292 | 292 | common: 5 |
|
293 | 293 | missing: 3 |
|
294 | 294 | common heads: bebd167eb94d |
|
295 | 295 | |
|
296 | 296 | % -- b -> a set (tip only) |
|
297 | 297 | comparing with a |
|
298 | 298 | query 1; heads |
|
299 | 299 | searching for changes |
|
300 | 300 | taking initial sample |
|
301 | 301 | searching: 2 queries |
|
302 | 302 | query 2; still undecided: 2, sample size is: 2 |
|
303 | 303 | 2 total queries in *.????s (glob) |
|
304 | 304 | elapsed time: * seconds (glob) |
|
305 | 305 | heads summary: |
|
306 | 306 | total common heads: 1 |
|
307 | 307 | also local heads: 0 |
|
308 | 308 | also remote heads: 1 |
|
309 | 309 | both: 0 |
|
310 | 310 | local heads: 1 |
|
311 | 311 | common: 0 |
|
312 | 312 | missing: 1 |
|
313 | 313 | remote heads: 2 |
|
314 | 314 | common: 1 |
|
315 | 315 | unknown: 1 |
|
316 | 316 | local changesets: 8 |
|
317 | 317 | common: 5 |
|
318 | 318 | missing: 3 |
|
319 | 319 | common heads: bebd167eb94d |
|
320 | 320 | |
|
321 | 321 | Both sides many new with stub: |
|
322 | 322 | |
|
323 | 323 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
324 | 324 | > +2:f +2:a1 +30 :b |
|
325 | 325 | > <f +30 :a2' |
|
326 | 326 | |
|
327 | 327 | % -- a -> b tree |
|
328 | 328 | comparing with b |
|
329 | 329 | searching for changes |
|
330 | 330 | unpruned common: 2dc09a01254d |
|
331 | 331 | elapsed time: * seconds (glob) |
|
332 | 332 | heads summary: |
|
333 | 333 | total common heads: 1 |
|
334 | 334 | also local heads: 1 |
|
335 | 335 | also remote heads: 0 |
|
336 | 336 | both: 0 |
|
337 | 337 | local heads: 2 |
|
338 | 338 | common: 1 |
|
339 | 339 | missing: 1 |
|
340 | 340 | remote heads: 1 |
|
341 | 341 | common: 0 |
|
342 | 342 | unknown: 1 |
|
343 | 343 | local changesets: 34 |
|
344 | 344 | common: 4 |
|
345 | 345 | missing: 30 |
|
346 | 346 | common heads: 2dc09a01254d |
|
347 | 347 | |
|
348 | 348 | % -- a -> b set |
|
349 | 349 | comparing with b |
|
350 | 350 | query 1; heads |
|
351 | 351 | searching for changes |
|
352 | 352 | taking initial sample |
|
353 | 353 | searching: 2 queries |
|
354 | 354 | query 2; still undecided: 29, sample size is: 29 |
|
355 | 355 | 2 total queries in *.????s (glob) |
|
356 | 356 | elapsed time: * seconds (glob) |
|
357 | 357 | heads summary: |
|
358 | 358 | total common heads: 1 |
|
359 | 359 | also local heads: 1 |
|
360 | 360 | also remote heads: 0 |
|
361 | 361 | both: 0 |
|
362 | 362 | local heads: 2 |
|
363 | 363 | common: 1 |
|
364 | 364 | missing: 1 |
|
365 | 365 | remote heads: 1 |
|
366 | 366 | common: 0 |
|
367 | 367 | unknown: 1 |
|
368 | 368 | local changesets: 34 |
|
369 | 369 | common: 4 |
|
370 | 370 | missing: 30 |
|
371 | 371 | common heads: 2dc09a01254d |
|
372 | 372 | |
|
373 | 373 | % -- a -> b set (tip only) |
|
374 | 374 | comparing with b |
|
375 | 375 | query 1; heads |
|
376 | 376 | searching for changes |
|
377 | 377 | taking quick initial sample |
|
378 | 378 | searching: 2 queries |
|
379 | 379 | query 2; still undecided: 31, sample size is: 31 |
|
380 | 380 | 2 total queries in *.????s (glob) |
|
381 | 381 | elapsed time: * seconds (glob) |
|
382 | 382 | heads summary: |
|
383 | 383 | total common heads: 1 |
|
384 | 384 | also local heads: 0 |
|
385 | 385 | also remote heads: 0 |
|
386 | 386 | both: 0 |
|
387 | 387 | local heads: 2 |
|
388 | 388 | common: 0 |
|
389 | 389 | missing: 2 |
|
390 | 390 | remote heads: 1 |
|
391 | 391 | common: 0 |
|
392 | 392 | unknown: 1 |
|
393 | 393 | local changesets: 34 |
|
394 | 394 | common: 2 |
|
395 | 395 | missing: 32 |
|
396 | 396 | common heads: 66f7d451a68b |
|
397 | 397 | |
|
398 | 398 | % -- b -> a tree |
|
399 | 399 | comparing with a |
|
400 | 400 | searching for changes |
|
401 | 401 | unpruned common: 2dc09a01254d 66f7d451a68b |
|
402 | 402 | elapsed time: * seconds (glob) |
|
403 | 403 | heads summary: |
|
404 | 404 | total common heads: 1 |
|
405 | 405 | also local heads: 0 |
|
406 | 406 | also remote heads: 1 |
|
407 | 407 | both: 0 |
|
408 | 408 | local heads: 1 |
|
409 | 409 | common: 0 |
|
410 | 410 | missing: 1 |
|
411 | 411 | remote heads: 2 |
|
412 | 412 | common: 1 |
|
413 | 413 | unknown: 1 |
|
414 | 414 | local changesets: 34 |
|
415 | 415 | common: 4 |
|
416 | 416 | missing: 30 |
|
417 | 417 | common heads: 2dc09a01254d |
|
418 | 418 | |
|
419 | 419 | % -- b -> a set |
|
420 | 420 | comparing with a |
|
421 | 421 | query 1; heads |
|
422 | 422 | searching for changes |
|
423 | 423 | taking initial sample |
|
424 | 424 | searching: 2 queries |
|
425 | 425 | query 2; still undecided: 29, sample size is: 29 |
|
426 | 426 | 2 total queries in *.????s (glob) |
|
427 | 427 | elapsed time: * seconds (glob) |
|
428 | 428 | heads summary: |
|
429 | 429 | total common heads: 1 |
|
430 | 430 | also local heads: 0 |
|
431 | 431 | also remote heads: 1 |
|
432 | 432 | both: 0 |
|
433 | 433 | local heads: 1 |
|
434 | 434 | common: 0 |
|
435 | 435 | missing: 1 |
|
436 | 436 | remote heads: 2 |
|
437 | 437 | common: 1 |
|
438 | 438 | unknown: 1 |
|
439 | 439 | local changesets: 34 |
|
440 | 440 | common: 4 |
|
441 | 441 | missing: 30 |
|
442 | 442 | common heads: 2dc09a01254d |
|
443 | 443 | |
|
444 | 444 | % -- b -> a set (tip only) |
|
445 | 445 | comparing with a |
|
446 | 446 | query 1; heads |
|
447 | 447 | searching for changes |
|
448 | 448 | taking initial sample |
|
449 | 449 | searching: 2 queries |
|
450 | 450 | query 2; still undecided: 29, sample size is: 29 |
|
451 | 451 | 2 total queries in *.????s (glob) |
|
452 | 452 | elapsed time: * seconds (glob) |
|
453 | 453 | heads summary: |
|
454 | 454 | total common heads: 1 |
|
455 | 455 | also local heads: 0 |
|
456 | 456 | also remote heads: 1 |
|
457 | 457 | both: 0 |
|
458 | 458 | local heads: 1 |
|
459 | 459 | common: 0 |
|
460 | 460 | missing: 1 |
|
461 | 461 | remote heads: 2 |
|
462 | 462 | common: 1 |
|
463 | 463 | unknown: 1 |
|
464 | 464 | local changesets: 34 |
|
465 | 465 | common: 4 |
|
466 | 466 | missing: 30 |
|
467 | 467 | common heads: 2dc09a01254d |
|
468 | 468 | |
|
469 | 469 | |
|
470 | 470 | Both many new: |
|
471 | 471 | |
|
472 | 472 | $ testdesc '-ra' '-rb' ' |
|
473 | 473 | > +2:f +30 :b |
|
474 | 474 | > <f +30 :a' |
|
475 | 475 | |
|
476 | 476 | % -- a -> b tree |
|
477 | 477 | comparing with b |
|
478 | 478 | searching for changes |
|
479 | 479 | unpruned common: 66f7d451a68b |
|
480 | 480 | elapsed time: * seconds (glob) |
|
481 | 481 | heads summary: |
|
482 | 482 | total common heads: 1 |
|
483 | 483 | also local heads: 0 |
|
484 | 484 | also remote heads: 0 |
|
485 | 485 | both: 0 |
|
486 | 486 | local heads: 1 |
|
487 | 487 | common: 0 |
|
488 | 488 | missing: 1 |
|
489 | 489 | remote heads: 1 |
|
490 | 490 | common: 0 |
|
491 | 491 | unknown: 1 |
|
492 | 492 | local changesets: 32 |
|
493 | 493 | common: 2 |
|
494 | 494 | missing: 30 |
|
495 | 495 | common heads: 66f7d451a68b |
|
496 | 496 | |
|
497 | 497 | % -- a -> b set |
|
498 | 498 | comparing with b |
|
499 | 499 | query 1; heads |
|
500 | 500 | searching for changes |
|
501 | 501 | taking quick initial sample |
|
502 | 502 | searching: 2 queries |
|
503 | 503 | query 2; still undecided: 31, sample size is: 31 |
|
504 | 504 | 2 total queries in *.????s (glob) |
|
505 | 505 | elapsed time: * seconds (glob) |
|
506 | 506 | heads summary: |
|
507 | 507 | total common heads: 1 |
|
508 | 508 | also local heads: 0 |
|
509 | 509 | also remote heads: 0 |
|
510 | 510 | both: 0 |
|
511 | 511 | local heads: 1 |
|
512 | 512 | common: 0 |
|
513 | 513 | missing: 1 |
|
514 | 514 | remote heads: 1 |
|
515 | 515 | common: 0 |
|
516 | 516 | unknown: 1 |
|
517 | 517 | local changesets: 32 |
|
518 | 518 | common: 2 |
|
519 | 519 | missing: 30 |
|
520 | 520 | common heads: 66f7d451a68b |
|
521 | 521 | |
|
522 | 522 | % -- a -> b set (tip only) |
|
523 | 523 | comparing with b |
|
524 | 524 | query 1; heads |
|
525 | 525 | searching for changes |
|
526 | 526 | taking quick initial sample |
|
527 | 527 | searching: 2 queries |
|
528 | 528 | query 2; still undecided: 31, sample size is: 31 |
|
529 | 529 | 2 total queries in *.????s (glob) |
|
530 | 530 | elapsed time: * seconds (glob) |
|
531 | 531 | heads summary: |
|
532 | 532 | total common heads: 1 |
|
533 | 533 | also local heads: 0 |
|
534 | 534 | also remote heads: 0 |
|
535 | 535 | both: 0 |
|
536 | 536 | local heads: 1 |
|
537 | 537 | common: 0 |
|
538 | 538 | missing: 1 |
|
539 | 539 | remote heads: 1 |
|
540 | 540 | common: 0 |
|
541 | 541 | unknown: 1 |
|
542 | 542 | local changesets: 32 |
|
543 | 543 | common: 2 |
|
544 | 544 | missing: 30 |
|
545 | 545 | common heads: 66f7d451a68b |
|
546 | 546 | |
|
547 | 547 | % -- b -> a tree |
|
548 | 548 | comparing with a |
|
549 | 549 | searching for changes |
|
550 | 550 | unpruned common: 66f7d451a68b |
|
551 | 551 | elapsed time: * seconds (glob) |
|
552 | 552 | heads summary: |
|
553 | 553 | total common heads: 1 |
|
554 | 554 | also local heads: 0 |
|
555 | 555 | also remote heads: 0 |
|
556 | 556 | both: 0 |
|
557 | 557 | local heads: 1 |
|
558 | 558 | common: 0 |
|
559 | 559 | missing: 1 |
|
560 | 560 | remote heads: 1 |
|
561 | 561 | common: 0 |
|
562 | 562 | unknown: 1 |
|
563 | 563 | local changesets: 32 |
|
564 | 564 | common: 2 |
|
565 | 565 | missing: 30 |
|
566 | 566 | common heads: 66f7d451a68b |
|
567 | 567 | |
|
568 | 568 | % -- b -> a set |
|
569 | 569 | comparing with a |
|
570 | 570 | query 1; heads |
|
571 | 571 | searching for changes |
|
572 | 572 | taking quick initial sample |
|
573 | 573 | searching: 2 queries |
|
574 | 574 | query 2; still undecided: 31, sample size is: 31 |
|
575 | 575 | 2 total queries in *.????s (glob) |
|
576 | 576 | elapsed time: * seconds (glob) |
|
577 | 577 | heads summary: |
|
578 | 578 | total common heads: 1 |
|
579 | 579 | also local heads: 0 |
|
580 | 580 | also remote heads: 0 |
|
581 | 581 | both: 0 |
|
582 | 582 | local heads: 1 |
|
583 | 583 | common: 0 |
|
584 | 584 | missing: 1 |
|
585 | 585 | remote heads: 1 |
|
586 | 586 | common: 0 |
|
587 | 587 | unknown: 1 |
|
588 | 588 | local changesets: 32 |
|
589 | 589 | common: 2 |
|
590 | 590 | missing: 30 |
|
591 | 591 | common heads: 66f7d451a68b |
|
592 | 592 | |
|
593 | 593 | % -- b -> a set (tip only) |
|
594 | 594 | comparing with a |
|
595 | 595 | query 1; heads |
|
596 | 596 | searching for changes |
|
597 | 597 | taking quick initial sample |
|
598 | 598 | searching: 2 queries |
|
599 | 599 | query 2; still undecided: 31, sample size is: 31 |
|
600 | 600 | 2 total queries in *.????s (glob) |
|
601 | 601 | elapsed time: * seconds (glob) |
|
602 | 602 | heads summary: |
|
603 | 603 | total common heads: 1 |
|
604 | 604 | also local heads: 0 |
|
605 | 605 | also remote heads: 0 |
|
606 | 606 | both: 0 |
|
607 | 607 | local heads: 1 |
|
608 | 608 | common: 0 |
|
609 | 609 | missing: 1 |
|
610 | 610 | remote heads: 1 |
|
611 | 611 | common: 0 |
|
612 | 612 | unknown: 1 |
|
613 | 613 | local changesets: 32 |
|
614 | 614 | common: 2 |
|
615 | 615 | missing: 30 |
|
616 | 616 | common heads: 66f7d451a68b |
|
617 | 617 | |
|
618 | 618 | |
|
619 | 619 | Both many new skewed: |
|
620 | 620 | |
|
621 | 621 | $ testdesc '-ra' '-rb' ' |
|
622 | 622 | > +2:f +30 :b |
|
623 | 623 | > <f +50 :a' |
|
624 | 624 | |
|
625 | 625 | % -- a -> b tree |
|
626 | 626 | comparing with b |
|
627 | 627 | searching for changes |
|
628 | 628 | unpruned common: 66f7d451a68b |
|
629 | 629 | elapsed time: * seconds (glob) |
|
630 | 630 | heads summary: |
|
631 | 631 | total common heads: 1 |
|
632 | 632 | also local heads: 0 |
|
633 | 633 | also remote heads: 0 |
|
634 | 634 | both: 0 |
|
635 | 635 | local heads: 1 |
|
636 | 636 | common: 0 |
|
637 | 637 | missing: 1 |
|
638 | 638 | remote heads: 1 |
|
639 | 639 | common: 0 |
|
640 | 640 | unknown: 1 |
|
641 | 641 | local changesets: 52 |
|
642 | 642 | common: 2 |
|
643 | 643 | missing: 50 |
|
644 | 644 | common heads: 66f7d451a68b |
|
645 | 645 | |
|
646 | 646 | % -- a -> b set |
|
647 | 647 | comparing with b |
|
648 | 648 | query 1; heads |
|
649 | 649 | searching for changes |
|
650 | 650 | taking quick initial sample |
|
651 | 651 | searching: 2 queries |
|
652 | 652 | query 2; still undecided: 51, sample size is: 51 |
|
653 | 653 | 2 total queries in *.????s (glob) |
|
654 | 654 | elapsed time: * seconds (glob) |
|
655 | 655 | heads summary: |
|
656 | 656 | total common heads: 1 |
|
657 | 657 | also local heads: 0 |
|
658 | 658 | also remote heads: 0 |
|
659 | 659 | both: 0 |
|
660 | 660 | local heads: 1 |
|
661 | 661 | common: 0 |
|
662 | 662 | missing: 1 |
|
663 | 663 | remote heads: 1 |
|
664 | 664 | common: 0 |
|
665 | 665 | unknown: 1 |
|
666 | 666 | local changesets: 52 |
|
667 | 667 | common: 2 |
|
668 | 668 | missing: 50 |
|
669 | 669 | common heads: 66f7d451a68b |
|
670 | 670 | |
|
671 | 671 | % -- a -> b set (tip only) |
|
672 | 672 | comparing with b |
|
673 | 673 | query 1; heads |
|
674 | 674 | searching for changes |
|
675 | 675 | taking quick initial sample |
|
676 | 676 | searching: 2 queries |
|
677 | 677 | query 2; still undecided: 51, sample size is: 51 |
|
678 | 678 | 2 total queries in *.????s (glob) |
|
679 | 679 | elapsed time: * seconds (glob) |
|
680 | 680 | heads summary: |
|
681 | 681 | total common heads: 1 |
|
682 | 682 | also local heads: 0 |
|
683 | 683 | also remote heads: 0 |
|
684 | 684 | both: 0 |
|
685 | 685 | local heads: 1 |
|
686 | 686 | common: 0 |
|
687 | 687 | missing: 1 |
|
688 | 688 | remote heads: 1 |
|
689 | 689 | common: 0 |
|
690 | 690 | unknown: 1 |
|
691 | 691 | local changesets: 52 |
|
692 | 692 | common: 2 |
|
693 | 693 | missing: 50 |
|
694 | 694 | common heads: 66f7d451a68b |
|
695 | 695 | |
|
696 | 696 | % -- b -> a tree |
|
697 | 697 | comparing with a |
|
698 | 698 | searching for changes |
|
699 | 699 | unpruned common: 66f7d451a68b |
|
700 | 700 | elapsed time: * seconds (glob) |
|
701 | 701 | heads summary: |
|
702 | 702 | total common heads: 1 |
|
703 | 703 | also local heads: 0 |
|
704 | 704 | also remote heads: 0 |
|
705 | 705 | both: 0 |
|
706 | 706 | local heads: 1 |
|
707 | 707 | common: 0 |
|
708 | 708 | missing: 1 |
|
709 | 709 | remote heads: 1 |
|
710 | 710 | common: 0 |
|
711 | 711 | unknown: 1 |
|
712 | 712 | local changesets: 32 |
|
713 | 713 | common: 2 |
|
714 | 714 | missing: 30 |
|
715 | 715 | common heads: 66f7d451a68b |
|
716 | 716 | |
|
717 | 717 | % -- b -> a set |
|
718 | 718 | comparing with a |
|
719 | 719 | query 1; heads |
|
720 | 720 | searching for changes |
|
721 | 721 | taking quick initial sample |
|
722 | 722 | searching: 2 queries |
|
723 | 723 | query 2; still undecided: 31, sample size is: 31 |
|
724 | 724 | 2 total queries in *.????s (glob) |
|
725 | 725 | elapsed time: * seconds (glob) |
|
726 | 726 | heads summary: |
|
727 | 727 | total common heads: 1 |
|
728 | 728 | also local heads: 0 |
|
729 | 729 | also remote heads: 0 |
|
730 | 730 | both: 0 |
|
731 | 731 | local heads: 1 |
|
732 | 732 | common: 0 |
|
733 | 733 | missing: 1 |
|
734 | 734 | remote heads: 1 |
|
735 | 735 | common: 0 |
|
736 | 736 | unknown: 1 |
|
737 | 737 | local changesets: 32 |
|
738 | 738 | common: 2 |
|
739 | 739 | missing: 30 |
|
740 | 740 | common heads: 66f7d451a68b |
|
741 | 741 | |
|
742 | 742 | % -- b -> a set (tip only) |
|
743 | 743 | comparing with a |
|
744 | 744 | query 1; heads |
|
745 | 745 | searching for changes |
|
746 | 746 | taking quick initial sample |
|
747 | 747 | searching: 2 queries |
|
748 | 748 | query 2; still undecided: 31, sample size is: 31 |
|
749 | 749 | 2 total queries in *.????s (glob) |
|
750 | 750 | elapsed time: * seconds (glob) |
|
751 | 751 | heads summary: |
|
752 | 752 | total common heads: 1 |
|
753 | 753 | also local heads: 0 |
|
754 | 754 | also remote heads: 0 |
|
755 | 755 | both: 0 |
|
756 | 756 | local heads: 1 |
|
757 | 757 | common: 0 |
|
758 | 758 | missing: 1 |
|
759 | 759 | remote heads: 1 |
|
760 | 760 | common: 0 |
|
761 | 761 | unknown: 1 |
|
762 | 762 | local changesets: 32 |
|
763 | 763 | common: 2 |
|
764 | 764 | missing: 30 |
|
765 | 765 | common heads: 66f7d451a68b |
|
766 | 766 | |
|
767 | 767 | |
|
768 | 768 | Both many new on top of long history: |
|
769 | 769 | |
|
770 | 770 | $ testdesc '-ra' '-rb' ' |
|
771 | 771 | > +1000:f +30 :b |
|
772 | 772 | > <f +50 :a' |
|
773 | 773 | |
|
774 | 774 | % -- a -> b tree |
|
775 | 775 | comparing with b |
|
776 | 776 | searching for changes |
|
777 | 777 | unpruned common: 7ead0cba2838 |
|
778 | 778 | elapsed time: * seconds (glob) |
|
779 | 779 | heads summary: |
|
780 | 780 | total common heads: 1 |
|
781 | 781 | also local heads: 0 |
|
782 | 782 | also remote heads: 0 |
|
783 | 783 | both: 0 |
|
784 | 784 | local heads: 1 |
|
785 | 785 | common: 0 |
|
786 | 786 | missing: 1 |
|
787 | 787 | remote heads: 1 |
|
788 | 788 | common: 0 |
|
789 | 789 | unknown: 1 |
|
790 | 790 | local changesets: 1050 |
|
791 | 791 | common: 1000 |
|
792 | 792 | missing: 50 |
|
793 | 793 | common heads: 7ead0cba2838 |
|
794 | 794 | |
|
795 | 795 | % -- a -> b set |
|
796 | 796 | comparing with b |
|
797 | 797 | query 1; heads |
|
798 | 798 | searching for changes |
|
799 | 799 | taking quick initial sample |
|
800 | 800 | searching: 2 queries |
|
801 | 801 | query 2; still undecided: 1049, sample size is: 11 |
|
802 | 802 | sampling from both directions |
|
803 | 803 | searching: 3 queries |
|
804 | 804 | query 3; still undecided: 31, sample size is: 31 |
|
805 | 805 | 3 total queries in *.????s (glob) |
|
806 | 806 | elapsed time: * seconds (glob) |
|
807 | 807 | heads summary: |
|
808 | 808 | total common heads: 1 |
|
809 | 809 | also local heads: 0 |
|
810 | 810 | also remote heads: 0 |
|
811 | 811 | both: 0 |
|
812 | 812 | local heads: 1 |
|
813 | 813 | common: 0 |
|
814 | 814 | missing: 1 |
|
815 | 815 | remote heads: 1 |
|
816 | 816 | common: 0 |
|
817 | 817 | unknown: 1 |
|
818 | 818 | local changesets: 1050 |
|
819 | 819 | common: 1000 |
|
820 | 820 | missing: 50 |
|
821 | 821 | common heads: 7ead0cba2838 |
|
822 | 822 | |
|
823 | 823 | % -- a -> b set (tip only) |
|
824 | 824 | comparing with b |
|
825 | 825 | query 1; heads |
|
826 | 826 | searching for changes |
|
827 | 827 | taking quick initial sample |
|
828 | 828 | searching: 2 queries |
|
829 | 829 | query 2; still undecided: 1049, sample size is: 11 |
|
830 | 830 | sampling from both directions |
|
831 | 831 | searching: 3 queries |
|
832 | 832 | query 3; still undecided: 31, sample size is: 31 |
|
833 | 833 | 3 total queries in *.????s (glob) |
|
834 | 834 | elapsed time: * seconds (glob) |
|
835 | 835 | heads summary: |
|
836 | 836 | total common heads: 1 |
|
837 | 837 | also local heads: 0 |
|
838 | 838 | also remote heads: 0 |
|
839 | 839 | both: 0 |
|
840 | 840 | local heads: 1 |
|
841 | 841 | common: 0 |
|
842 | 842 | missing: 1 |
|
843 | 843 | remote heads: 1 |
|
844 | 844 | common: 0 |
|
845 | 845 | unknown: 1 |
|
846 | 846 | local changesets: 1050 |
|
847 | 847 | common: 1000 |
|
848 | 848 | missing: 50 |
|
849 | 849 | common heads: 7ead0cba2838 |
|
850 | 850 | |
|
851 | 851 | % -- b -> a tree |
|
852 | 852 | comparing with a |
|
853 | 853 | searching for changes |
|
854 | 854 | unpruned common: 7ead0cba2838 |
|
855 | 855 | elapsed time: * seconds (glob) |
|
856 | 856 | heads summary: |
|
857 | 857 | total common heads: 1 |
|
858 | 858 | also local heads: 0 |
|
859 | 859 | also remote heads: 0 |
|
860 | 860 | both: 0 |
|
861 | 861 | local heads: 1 |
|
862 | 862 | common: 0 |
|
863 | 863 | missing: 1 |
|
864 | 864 | remote heads: 1 |
|
865 | 865 | common: 0 |
|
866 | 866 | unknown: 1 |
|
867 | 867 | local changesets: 1030 |
|
868 | 868 | common: 1000 |
|
869 | 869 | missing: 30 |
|
870 | 870 | common heads: 7ead0cba2838 |
|
871 | 871 | |
|
872 | 872 | % -- b -> a set |
|
873 | 873 | comparing with a |
|
874 | 874 | query 1; heads |
|
875 | 875 | searching for changes |
|
876 | 876 | taking quick initial sample |
|
877 | 877 | searching: 2 queries |
|
878 | 878 | query 2; still undecided: 1029, sample size is: 11 |
|
879 | 879 | sampling from both directions |
|
880 | 880 | searching: 3 queries |
|
881 | 881 | query 3; still undecided: 15, sample size is: 15 |
|
882 | 882 | 3 total queries in *.????s (glob) |
|
883 | 883 | elapsed time: * seconds (glob) |
|
884 | 884 | heads summary: |
|
885 | 885 | total common heads: 1 |
|
886 | 886 | also local heads: 0 |
|
887 | 887 | also remote heads: 0 |
|
888 | 888 | both: 0 |
|
889 | 889 | local heads: 1 |
|
890 | 890 | common: 0 |
|
891 | 891 | missing: 1 |
|
892 | 892 | remote heads: 1 |
|
893 | 893 | common: 0 |
|
894 | 894 | unknown: 1 |
|
895 | 895 | local changesets: 1030 |
|
896 | 896 | common: 1000 |
|
897 | 897 | missing: 30 |
|
898 | 898 | common heads: 7ead0cba2838 |
|
899 | 899 | |
|
900 | 900 | % -- b -> a set (tip only) |
|
901 | 901 | comparing with a |
|
902 | 902 | query 1; heads |
|
903 | 903 | searching for changes |
|
904 | 904 | taking quick initial sample |
|
905 | 905 | searching: 2 queries |
|
906 | 906 | query 2; still undecided: 1029, sample size is: 11 |
|
907 | 907 | sampling from both directions |
|
908 | 908 | searching: 3 queries |
|
909 | 909 | query 3; still undecided: 15, sample size is: 15 |
|
910 | 910 | 3 total queries in *.????s (glob) |
|
911 | 911 | elapsed time: * seconds (glob) |
|
912 | 912 | heads summary: |
|
913 | 913 | total common heads: 1 |
|
914 | 914 | also local heads: 0 |
|
915 | 915 | also remote heads: 0 |
|
916 | 916 | both: 0 |
|
917 | 917 | local heads: 1 |
|
918 | 918 | common: 0 |
|
919 | 919 | missing: 1 |
|
920 | 920 | remote heads: 1 |
|
921 | 921 | common: 0 |
|
922 | 922 | unknown: 1 |
|
923 | 923 | local changesets: 1030 |
|
924 | 924 | common: 1000 |
|
925 | 925 | missing: 30 |
|
926 | 926 | common heads: 7ead0cba2838 |
|
927 | 927 | |
|
928 | 928 | |
|
929 | 929 | One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. |
|
930 | 930 | |
|
931 | 931 | $ hg init manyheads |
|
932 | 932 | $ cd manyheads |
|
933 | 933 | $ echo "+300:r @a" >dagdesc |
|
934 | 934 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
935 | 935 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
936 | 936 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
937 | 937 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
938 | 938 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
939 | 939 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
940 | 940 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
941 | 941 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
942 | 942 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
943 | 943 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
944 | 944 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
945 | 945 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
946 | 946 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
947 | 947 | $ echo "@b *r+3" >>dagdesc # one more head |
|
948 | 948 | $ hg debugbuilddag <dagdesc |
|
949 | 949 | reading DAG from stdin |
|
950 | 950 | |
|
951 | 951 | $ hg heads -t --template . | wc -c |
|
952 | 952 | \s*261 (re) |
|
953 | 953 | |
|
954 | 954 | $ hg clone -b a . a |
|
955 | 955 | adding changesets |
|
956 | 956 | adding manifests |
|
957 | 957 | adding file changes |
|
958 | 958 | added 1340 changesets with 0 changes to 0 files (+259 heads) |
|
959 | 959 | new changesets 1ea73414a91b:1c51e2c80832 |
|
960 | 960 | updating to branch a |
|
961 | 961 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
962 | 962 | $ hg clone -b b . b |
|
963 | 963 | adding changesets |
|
964 | 964 | adding manifests |
|
965 | 965 | adding file changes |
|
966 | 966 | added 304 changesets with 0 changes to 0 files |
|
967 | 967 | new changesets 1ea73414a91b:513314ca8b3a |
|
968 | 968 | updating to branch b |
|
969 | 969 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
970 | 970 | |
|
971 | 971 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true |
|
972 | 972 | comparing with b |
|
973 | 973 | query 1; heads |
|
974 | 974 | searching for changes |
|
975 | 975 | taking quick initial sample |
|
976 | 976 | searching: 2 queries |
|
977 | 977 | query 2; still undecided: 1080, sample size is: 100 |
|
978 | 978 | sampling from both directions |
|
979 | 979 | searching: 3 queries |
|
980 | 980 | query 3; still undecided: 980, sample size is: 200 |
|
981 | 981 | sampling from both directions |
|
982 | 982 | searching: 4 queries |
|
983 | query 4; still undecided: 435, sample size is: 210 | |
|
983 | query 4; still undecided: 435, sample size is: 210 (no-py3 !) | |
|
984 | query 4; still undecided: 430, sample size is: 210 (py3 !) | |
|
984 | 985 | sampling from both directions |
|
985 | 986 | searching: 5 queries |
|
986 | query 5; still undecided: 185, sample size is: 185 | |
|
987 | query 5; still undecided: 185, sample size is: 185 (no-py3 !) | |
|
988 | query 5; still undecided: 187, sample size is: 187 (py3 !) | |
|
987 | 989 | 5 total queries in *.????s (glob) |
|
988 | 990 | elapsed time: * seconds (glob) |
|
989 | 991 | heads summary: |
|
990 | 992 | total common heads: 1 |
|
991 | 993 | also local heads: 0 |
|
992 | 994 | also remote heads: 0 |
|
993 | 995 | both: 0 |
|
994 | 996 | local heads: 260 |
|
995 | 997 | common: 0 |
|
996 | 998 | missing: 260 |
|
997 | 999 | remote heads: 1 |
|
998 | 1000 | common: 0 |
|
999 | 1001 | unknown: 1 |
|
1000 | 1002 | local changesets: 1340 |
|
1001 | 1003 | common: 300 |
|
1002 | 1004 | missing: 1040 |
|
1003 | 1005 | common heads: 3ee37d65064a |
|
1004 | 1006 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip |
|
1005 | 1007 | comparing with b |
|
1006 | 1008 | query 1; heads |
|
1007 | 1009 | searching for changes |
|
1008 | 1010 | taking quick initial sample |
|
1009 | 1011 | searching: 2 queries |
|
1010 | 1012 | query 2; still undecided: 303, sample size is: 9 |
|
1011 | 1013 | sampling from both directions |
|
1012 | 1014 | searching: 3 queries |
|
1013 | 1015 | query 3; still undecided: 3, sample size is: 3 |
|
1014 | 1016 | 3 total queries in *.????s (glob) |
|
1015 | 1017 | elapsed time: * seconds (glob) |
|
1016 | 1018 | heads summary: |
|
1017 | 1019 | total common heads: 1 |
|
1018 | 1020 | also local heads: 0 |
|
1019 | 1021 | also remote heads: 0 |
|
1020 | 1022 | both: 0 |
|
1021 | 1023 | local heads: 260 |
|
1022 | 1024 | common: 0 |
|
1023 | 1025 | missing: 260 |
|
1024 | 1026 | remote heads: 1 |
|
1025 | 1027 | common: 0 |
|
1026 | 1028 | unknown: 1 |
|
1027 | 1029 | local changesets: 1340 |
|
1028 | 1030 | common: 300 |
|
1029 | 1031 | missing: 1040 |
|
1030 | 1032 | common heads: 3ee37d65064a |
|
1031 | 1033 | |
|
1032 | 1034 | Test actual protocol when pulling one new head in addition to common heads |
|
1033 | 1035 | |
|
1034 | 1036 | $ hg clone -U b c |
|
1035 | 1037 | $ hg -R c id -ir tip |
|
1036 | 1038 | 513314ca8b3a |
|
1037 | 1039 | $ hg -R c up -qr default |
|
1038 | 1040 | $ touch c/f |
|
1039 | 1041 | $ hg -R c ci -Aqm "extra head" |
|
1040 | 1042 | $ hg -R c id -i |
|
1041 | 1043 | e64a39e7da8b |
|
1042 | 1044 | |
|
1043 | 1045 | $ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1044 | 1046 | $ cat hg.pid >> $DAEMON_PIDS |
|
1045 | 1047 | |
|
1046 | 1048 | $ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n' |
|
1047 | 1049 | comparing with http://localhost:$HGPORT/ |
|
1048 | 1050 | searching for changes |
|
1049 | 1051 | e64a39e7da8b |
|
1050 | 1052 | |
|
1051 | 1053 | $ killdaemons.py |
|
1052 | 1054 | $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling |
|
1053 | 1055 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
1054 | 1056 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1055 | 1057 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1056 | 1058 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1057 | 1059 | $ cat errors.log |
|
1058 | 1060 | |
|
1059 | 1061 | $ cd .. |
|
1060 | 1062 | |
|
1061 | 1063 | |
|
1062 | 1064 | Issue 4438 - test coverage for 3ef893520a85 issues. |
|
1063 | 1065 | |
|
1064 | 1066 | $ mkdir issue4438 |
|
1065 | 1067 | $ cd issue4438 |
|
1066 | 1068 | #if false |
|
1067 | 1069 | generate new bundles: |
|
1068 | 1070 | $ hg init r1 |
|
1069 | 1071 | $ for i in `"$PYTHON" $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done |
|
1070 | 1072 | $ hg clone -q r1 r2 |
|
1071 | 1073 | $ for i in `"$PYTHON" $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done |
|
1072 | 1074 | $ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change |
|
1073 | 1075 | $ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg |
|
1074 | 1076 | $ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg |
|
1075 | 1077 | #else |
|
1076 | 1078 | use existing bundles: |
|
1077 | 1079 | $ hg init r1 |
|
1078 | 1080 | $ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg |
|
1079 | 1081 | $ hg -R r1 -q up |
|
1080 | 1082 | $ hg init r2 |
|
1081 | 1083 | $ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg |
|
1082 | 1084 | $ hg -R r2 -q up |
|
1083 | 1085 | #endif |
|
1084 | 1086 | |
|
1085 | 1087 | Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650: |
|
1086 | 1088 | |
|
1087 | 1089 | $ hg -R r1 outgoing r2 -T'{rev} ' |
|
1088 | 1090 | comparing with r2 |
|
1089 | 1091 | searching for changes |
|
1090 | 1092 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
1091 | 1093 | |
|
1092 | 1094 | The case where all the 'initialsamplesize' samples already were common would |
|
1093 | 1095 | give 'all remote heads known locally' without checking the remaining heads - |
|
1094 | 1096 | fixed in 86c35b7ae300: |
|
1095 | 1097 | |
|
1096 | 1098 | $ cat >> $TESTTMP/unrandomsample.py << EOF |
|
1097 | 1099 | > import random |
|
1098 | 1100 | > def sample(population, k): |
|
1099 | 1101 | > return sorted(population)[:k] |
|
1100 | 1102 | > random.sample = sample |
|
1101 | 1103 | > EOF |
|
1102 | 1104 | |
|
1103 | 1105 | $ cat >> r1/.hg/hgrc << EOF |
|
1104 | 1106 | > [extensions] |
|
1105 | 1107 | > unrandomsample = $TESTTMP/unrandomsample.py |
|
1106 | 1108 | > EOF |
|
1107 | 1109 | |
|
1108 | 1110 | $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \ |
|
1109 | 1111 | > --config blackbox.track='command commandfinish discovery' |
|
1110 | 1112 | comparing with r2 |
|
1111 | 1113 | searching for changes |
|
1112 | 1114 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
1113 | 1115 | $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track= |
|
1114 | 1116 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) |
|
1115 | 1117 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob) |
|
1116 | 1118 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob) |
|
1117 | 1119 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) |
|
1118 | 1120 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now