This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4318

setdiscovery: pass heads into _updatesample()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG754f389b87f2: setdiscovery: pass heads into _updatesample()
Summary

In preparation for eliminating the use of dagutil. Since
_takefullsample() operates on the inverted DAG, it is easier
to have the caller pass in the relevant set instead of teaching
_updatesample() about when to invert the DAG.

We keep the logic identical for now: future commits will remove
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.

Event Timeline

indygreg created this revision.Aug 17 2018, 5:30 PM
Closed by commit rHG754f389b87f2: setdiscovery: pass heads into _updatesample() (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 (17 lines)

Diff 10439

mercurial/setdiscovery.py

nullrev, nullrev,
) )
from . import ( from . import (
dagutil, dagutil,
error, error,
util, util,
) )
def _updatesample(dag, revs, sample, quicksamplesize=0): def _updatesample(dag, revs, heads, sample, quicksamplesize=0):
"""update an existing sample to match the expected size """update an existing sample to match the expected size
The sample is updated with revs exponentially distant from each head of the The sample is updated with revs exponentially distant from each head of the
<revs> set. (H~1, H~2, H~4, H~8, etc). <revs> set. (H~1, H~2, H~4, H~8, etc).
If a target size is specified, the sampling will stop once this size is If a target size is specified, the sampling will stop once this size is
reached. Otherwise sampling will happen until roots of the <revs> set are reached. Otherwise sampling will happen until roots of the <revs> set are
reached. reached.
:dag: a dag object from dagutil :dag: a dag object from dagutil
:revs: set of revs we want to discover (if None, assume the whole dag) :revs: set of revs we want to discover (if None, assume the whole dag)
:heads: set of DAG head revs
:sample: a sample to update :sample: a sample to update
:quicksamplesize: optional target size of the sample""" :quicksamplesize: optional target size of the sample"""
# if revs is empty we scan the entire graph
if revs:
heads = dag.headsetofconnecteds(revs)
else:
heads = dag.heads()
dist = {} dist = {}
visit = collections.deque(heads) visit = collections.deque(heads)
seen = set() seen = set()
factor = 1 factor = 1
while visit: while visit:
curr = visit.popleft() curr = visit.popleft()
if curr in seen: if curr in seen:
continue continue
: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 = 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, sample, quicksamplesize=size)
_updatesample(dag, None, dag.heads(), sample, quicksamplesize=size)
return sample return sample
def _takefullsample(repo, dag, revs, size): def _takefullsample(repo, dag, 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, sample) _updatesample(dag, revs, dag.headsetofconnecteds(revs), sample)
# update from roots # update from roots
_updatesample(dag.inverse(), revs, sample) inverteddag = dag.inverse()
_updatesample(inverteddag, revs, inverteddag.headsetofconnecteds(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)
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):