201 break |
201 break |
202 |
202 |
203 if full: |
203 if full: |
204 ui.note(_("sampling from both directions\n")) |
204 ui.note(_("sampling from both directions\n")) |
205 sample = _takefullsample(dag, undecided, size=fullsamplesize) |
205 sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
206 targetsize = fullsamplesize |
206 elif common: |
207 elif common: |
207 # use cheapish initial sample |
208 # use cheapish initial sample |
208 ui.debug("taking initial sample\n") |
209 ui.debug("taking initial sample\n") |
209 sample = _takefullsample(dag, undecided, size=fullsamplesize) |
210 sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
211 targetsize = fullsamplesize |
210 else: |
212 else: |
211 # use even cheaper initial sample |
213 # use even cheaper initial sample |
212 ui.debug("taking quick initial sample\n") |
214 ui.debug("taking quick initial sample\n") |
213 sample = _takequicksample(dag, undecided, size=initialsamplesize, |
215 sample = _takequicksample(dag, undecided, size=initialsamplesize, |
214 initial=True) |
216 initial=True) |
|
217 targetsize = initialsamplesize |
|
218 sample = _limitsample(sample, targetsize) |
215 |
219 |
216 roundtrips += 1 |
220 roundtrips += 1 |
217 ui.progress(_('searching'), roundtrips, unit=_('queries')) |
221 ui.progress(_('searching'), roundtrips, unit=_('queries')) |
218 ui.debug("query %i; still undecided: %i, sample size is: %i\n" |
222 ui.debug("query %i; still undecided: %i, sample size is: %i\n" |
219 % (roundtrips, len(undecided), len(sample))) |
223 % (roundtrips, len(undecided), len(sample))) |