This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2645

setdiscovery: remove unnecessary sample size limiting
ClosedPublic

Authored by martinvonz on Mar 4 2018, 11:58 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0968e400406c: setdiscovery: remove unnecessary sample size limiting
Summary

Both _takequicksample() and _takefullsample() already limit their
result to the request size, so there's no need to let the caller do
that again.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 4 2018, 11:58 AM
indygreg accepted this revision.Mar 4 2018, 2:22 PM
This revision is now accepted and ready to land.Mar 4 2018, 2:22 PM
Closed by commit rHG0968e400406c: setdiscovery: remove unnecessary sample size limiting (authored by martinvonz). · Explain WhyMar 4 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (1 line)

Diff 6595

mercurial/setdiscovery.py

# use even cheaper initial sample # use even cheaper initial sample
ui.debug("taking quick initial sample\n") ui.debug("taking quick initial sample\n")
samplefunc = _takequicksample samplefunc = _takequicksample
targetsize = initialsamplesize targetsize = initialsamplesize
if len(undecided) < targetsize: if len(undecided) < targetsize:
sample = list(undecided) sample = list(undecided)
else: else:
sample = samplefunc(dag, undecided, targetsize) sample = samplefunc(dag, undecided, targetsize)
sample = _limitsample(sample, targetsize)
roundtrips += 1 roundtrips += 1
ui.progress(_('searching'), roundtrips, unit=_('queries')) ui.progress(_('searching'), roundtrips, unit=_('queries'))
ui.debug("query %i; still undecided: %i, sample size is: %i\n" ui.debug("query %i; still undecided: %i, sample size is: %i\n"
% (roundtrips, len(undecided), len(sample))) % (roundtrips, len(undecided), len(sample)))
# indices between sample and externalized version must match # indices between sample and externalized version must match
sample = list(sample) sample = list(sample)
yesno = remote.known(dag.externalizeall(sample)) yesno = remote.known(dag.externalizeall(sample))