This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4317

setdiscovery: use a revset for finding DAG heads in a subset
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG140992750187: setdiscovery: use a revset for finding DAG heads in a subset
Summary

The march towards moving away from dagutil continues.

Like other patches moving us away from dagutil, there is the
potential for regressions to occur because revlogdag's
headsetofconnecteds() uses revlog.index, which doesn't take
filtering into account. The revset layer does. But no tests
fail, so we appear to be in the clear.

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

indygreg created this revision.Aug 17 2018, 5:30 PM
Closed by commit rHG140992750187: setdiscovery: use a revset for finding DAG heads in a subset (authored by indygreg). · Explain WhyAug 18 2018, 4:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (12 lines)

Diff 10438

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(dag, revs, size): def _takequicksample(repo, dag, 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
: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 = dag.headsetofconnecteds(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, sample, quicksamplesize=size) _updatesample(dag, None, sample, quicksamplesize=size)
return sample return sample
def _takefullsample(dag, revs, size): def _takefullsample(repo, dag, revs, size):
sample = dag.headsetofconnecteds(revs) sample = set(repo.revs('heads(%ld)', revs))
# update from heads # update from heads
_updatesample(dag, revs, sample) _updatesample(dag, revs, sample)
# update from roots # update from roots
_updatesample(dag.inverse(), revs, sample) _updatesample(dag.inverse(), revs, sample)
assert sample assert sample
sample = _limitsample(sample, size) sample = _limitsample(sample, size)
if len(sample) < size: if len(sample) < size:
more = size - len(sample) more = size - len(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(dag, undecided, targetsize) sample = samplefunc(local, dag, 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)