Show More
@@ -203,15 +203,19 b' def findcommonheads(ui, local, remote,' | |||
|
203 | 203 | if full: |
|
204 | 204 | ui.note(_("sampling from both directions\n")) |
|
205 | 205 | sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
206 | targetsize = fullsamplesize | |
|
206 | 207 | elif common: |
|
207 | 208 | # use cheapish initial sample |
|
208 | 209 | ui.debug("taking initial sample\n") |
|
209 | 210 | sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
211 | targetsize = fullsamplesize | |
|
210 | 212 | else: |
|
211 | 213 | # use even cheaper initial sample |
|
212 | 214 | ui.debug("taking quick initial sample\n") |
|
213 | 215 | sample = _takequicksample(dag, undecided, size=initialsamplesize, |
|
214 | 216 | initial=True) |
|
217 | targetsize = initialsamplesize | |
|
218 | sample = _limitsample(sample, targetsize) | |
|
215 | 219 | |
|
216 | 220 | roundtrips += 1 |
|
217 | 221 | ui.progress(_('searching'), roundtrips, unit=_('queries')) |
@@ -311,17 +311,23 b' One with >200 heads, which used to use u' | |||
|
311 | 311 | searching for changes |
|
312 | 312 | taking quick initial sample |
|
313 | 313 | searching: 2 queries |
|
314 |
query 2; still undecided: 1240, sample size is: |
|
|
314 | query 2; still undecided: 1240, sample size is: 100 | |
|
315 | 315 | sampling from both directions |
|
316 | 316 | searching: 3 queries |
|
317 |
query 3; still undecided: |
|
|
317 | query 3; still undecided: 1140, sample size is: 200 | |
|
318 | 318 | sampling from both directions |
|
319 | 319 | searching: 4 queries |
|
320 |
query 4; still undecided: |
|
|
320 | query 4; still undecided: 940, sample size is: 200 | |
|
321 | 321 | sampling from both directions |
|
322 | 322 | searching: 5 queries |
|
323 |
query 5; still undecided: 4 |
|
|
324 | 5 total queries | |
|
323 | query 5; still undecided: 740, sample size is: 200 | |
|
324 | sampling from both directions | |
|
325 | searching: 6 queries | |
|
326 | query 6; still undecided: 540, sample size is: 200 | |
|
327 | sampling from both directions | |
|
328 | searching: 7 queries | |
|
329 | query 7; still undecided: 44, sample size is: 44 | |
|
330 | 7 total queries | |
|
325 | 331 | common heads: 3ee37d65064a |
|
326 | 332 | |
|
327 | 333 | 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