Mercurial > public > mercurial-scm > hg
comparison mercurial/setdiscovery.py @ 23811:e2b262e2ee73
setdiscovery: stop using '_setupsample' in '_takefullsample'
Very few of the return values of '_setupsample' remain in use, so we
directly retrieve the value we care about and drop the '_setupsample'
call.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 07 Jan 2015 17:17:56 -0800 |
| parents | b681d3a2bf04 |
| children | db58186dd8e3 |
comparison
equal
deleted
inserted
replaced
| 23810:b681d3a2bf04 | 23811:e2b262e2ee73 |
|---|---|
| 103 _updatesample(dag, None, sample, always, quicksamplesize=desiredlen) | 103 _updatesample(dag, None, sample, always, quicksamplesize=desiredlen) |
| 104 sample.update(always) | 104 sample.update(always) |
| 105 return sample | 105 return sample |
| 106 | 106 |
| 107 def _takefullsample(dag, nodes, size): | 107 def _takefullsample(dag, nodes, size): |
| 108 always, sample, desiredlen = _setupsample(dag, nodes, size) | 108 always = dag.headsetofconnecteds(nodes) |
| 109 if sample is None: | 109 if size <= len(always): |
| 110 return always | 110 return always |
| 111 sample = set() | |
| 111 # update from heads | 112 # update from heads |
| 112 _updatesample(dag, nodes, sample, always) | 113 _updatesample(dag, nodes, sample, always) |
| 113 # update from roots | 114 # update from roots |
| 114 _updatesample(dag.inverse(), nodes, sample, always) | 115 _updatesample(dag.inverse(), nodes, sample, always) |
| 115 assert sample | 116 assert sample |