Show More
@@ -84,15 +84,11 b' def _setupsample(dag, nodes, size):' | |||||
84 | return always, None, desiredlen |
|
84 | return always, None, desiredlen | |
85 | return always, set(), desiredlen |
|
85 | return always, set(), desiredlen | |
86 |
|
86 | |||
87 |
def _takequicksample(dag, nodes, size |
|
87 | def _takequicksample(dag, nodes, size): | |
88 | always, sample, desiredlen = _setupsample(dag, nodes, size) |
|
88 | always, sample, desiredlen = _setupsample(dag, nodes, size) | |
89 | if sample is None: |
|
89 | if sample is None: | |
90 | return always |
|
90 | return always | |
91 | if initial: |
|
91 | _updatesample(dag, None, sample, always, quicksamplesize=desiredlen) | |
92 | fromset = None |
|
|||
93 | else: |
|
|||
94 | fromset = nodes |
|
|||
95 | _updatesample(dag, fromset, sample, always, quicksamplesize=desiredlen) |
|
|||
96 | sample.update(always) |
|
92 | sample.update(always) | |
97 | return sample |
|
93 | return sample | |
98 |
|
94 | |||
@@ -207,8 +203,7 b' def findcommonheads(ui, local, remote,' | |||||
207 | else: |
|
203 | else: | |
208 | # use even cheaper initial sample |
|
204 | # use even cheaper initial sample | |
209 | ui.debug("taking quick initial sample\n") |
|
205 | ui.debug("taking quick initial sample\n") | |
210 |
sample = _takequicksample(dag, undecided, size=initialsamplesize |
|
206 | sample = _takequicksample(dag, undecided, size=initialsamplesize) | |
211 | initial=True) |
|
|||
212 | targetsize = initialsamplesize |
|
207 | targetsize = initialsamplesize | |
213 | sample = _limitsample(sample, targetsize) |
|
208 | sample = _limitsample(sample, targetsize) | |
214 |
|
209 |
General Comments 0
You need to be logged in to leave comments.
Login now