comparison mercurial/setdiscovery.py @ 36717:0968e400406c

setdiscovery: remove unnecessary sample size limiting Both _takequicksample() and _takefullsample() already limit their result to the request size, so there's no need to let the caller do that again. Differential Revision: https://phab.mercurial-scm.org/D2645
author Martin von Zweigbergk <martinvonz@google.com>
date Sun, 04 Mar 2018 07:40:11 -0800
parents bf485b70d0ae
children 59802fa590db
comparison
equal deleted inserted replaced
36716:bf485b70d0ae 36717:0968e400406c
219 targetsize = initialsamplesize 219 targetsize = initialsamplesize
220 if len(undecided) < targetsize: 220 if len(undecided) < targetsize:
221 sample = list(undecided) 221 sample = list(undecided)
222 else: 222 else:
223 sample = samplefunc(dag, undecided, targetsize) 223 sample = samplefunc(dag, undecided, targetsize)
224 sample = _limitsample(sample, targetsize)
225 224
226 roundtrips += 1 225 roundtrips += 1
227 ui.progress(_('searching'), roundtrips, unit=_('queries')) 226 ui.progress(_('searching'), roundtrips, unit=_('queries'))
228 ui.debug("query %i; still undecided: %i, sample size is: %i\n" 227 ui.debug("query %i; still undecided: %i, sample size is: %i\n"
229 % (roundtrips, len(undecided), len(sample))) 228 % (roundtrips, len(undecided), len(sample)))