This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4321

setdiscovery: use revsets for computing a subset's heads and roots
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG56279660d264: setdiscovery: use revsets for computing a subset's heads and roots
Summary

revlogdag.headsetofconnecteds() obtains the set of DAG heads in a
given set of revs.

revlogdag.inverse() inverts the DAG order and makes
headsetofconnecteds() obtain the DAG roots in a given subset.

Both of these can be expressed with a revset.

Like other patches in this series, revlogdag uses revlog.index
and thus doesn't take filtering into account. Revsets do. So there
is a chance for regressions with this change. But no tests fail.
And I think this code should take filtering into account since
hidden changesets shouldn't factor into discovery (unless operating
on the hidden repository).

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 (8 lines)

Diff 10442

mercurial/setdiscovery.py

_updatesample(dag, None, headrevs, sample, quicksamplesize=size) _updatesample(dag, None, headrevs, sample, quicksamplesize=size)
return sample return sample
def _takefullsample(repo, dag, headrevs, 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) revsheads = set(repo.revs('heads(%ld)', revs))
_updatesample(dag, revs, revsheads, sample)
# update from roots # update from roots
inverteddag = dag.inverse() revsroots = set(repo.revs('roots(%ld)', revs))
_updatesample(inverteddag, revs, inverteddag.headsetofconnecteds(revs), _updatesample(dag.inverse(), revs, revsroots, sample)
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)
sample.update(random.sample(list(revs - sample), more)) sample.update(random.sample(list(revs - sample), more))
return sample return sample
def _limitsample(sample, desiredlen): def _limitsample(sample, desiredlen):