This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4319

setdiscovery: pass head revisions into sample functions
ClosedPublic

Authored by indygreg on Aug 17 2018, 5:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGabce899c985f: setdiscovery: pass head revisions into sample functions
Summary

This eliminates the last remaining consumer of heads() and
related functionality in dagutil.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (9 lines)

Diff 10440

mercurial/setdiscovery.py

if quicksamplesize and (len(sample) >= quicksamplesize): if quicksamplesize and (len(sample) >= quicksamplesize):
return return
seen.add(curr) seen.add(curr)
for p in dag.parents(curr): for p in dag.parents(curr):
if not revs or p in revs: if not revs or p in revs:
dist.setdefault(p, d + 1) dist.setdefault(p, d + 1)
visit.append(p) visit.append(p)
def _takequicksample(repo, dag, revs, size): def _takequicksample(repo, dag, headrevs, revs, size):
"""takes a quick sample of size <size> """takes a quick sample of size <size>
It is meant for initial sampling and focuses on querying heads and close It is meant for initial sampling and focuses on querying heads and close
ancestors of heads. ancestors of heads.
:dag: a dag object :dag: a dag object
:headrevs: set of head revisions in local DAG to consider
:revs: set of revs to discover :revs: set of revs to discover
:size: the maximum size of the sample""" :size: the maximum size of the sample"""
sample = set(repo.revs('heads(%ld)', revs)) sample = set(repo.revs('heads(%ld)', revs))
if len(sample) >= size: if len(sample) >= size:
return _limitsample(sample, size) return _limitsample(sample, size)
_updatesample(dag, None, dag.heads(), sample, quicksamplesize=size) _updatesample(dag, None, headrevs, sample, quicksamplesize=size)
return sample return sample
def _takefullsample(repo, dag, revs, size): def _takefullsample(repo, dag, headrevs, revs, size):
sample = set(repo.revs('heads(%ld)', revs)) sample = set(repo.revs('heads(%ld)', revs))
# update from heads # update from heads
_updatesample(dag, revs, dag.headsetofconnecteds(revs), sample) _updatesample(dag, revs, dag.headsetofconnecteds(revs), sample)
# update from roots # update from roots
inverteddag = dag.inverse() inverteddag = dag.inverse()
_updatesample(inverteddag, revs, inverteddag.headsetofconnecteds(revs), _updatesample(inverteddag, revs, inverteddag.headsetofconnecteds(revs),
sample) sample)
else: else:
# 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(local, dag, undecided, targetsize) sample = samplefunc(local, dag, ownheads, undecided, targetsize)
roundtrips += 1 roundtrips += 1
progress.update(roundtrips) progress.update(roundtrips)
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)