Show More
@@ -197,12 +197,10 b' def findcommonheads(ui, local, remote,' | |||||
197 | if not undecided: |
|
197 | if not undecided: | |
198 | break |
|
198 | break | |
199 |
|
199 | |||
|
200 | if full or common.hasbases(): | |||
200 | if full: |
|
201 | if full: | |
201 | ui.note(_("sampling from both directions\n")) |
|
202 | ui.note(_("sampling from both directions\n")) | |
202 | sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
203 | else: | |
203 | targetsize = fullsamplesize |
|
|||
204 | elif common.hasbases(): |
|
|||
205 | # use cheapish initial sample |
|
|||
206 | ui.debug("taking initial sample\n") |
|
204 | ui.debug("taking initial sample\n") | |
207 | sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
205 | sample = _takefullsample(dag, undecided, size=fullsamplesize) | |
208 | targetsize = fullsamplesize |
|
206 | targetsize = fullsamplesize |
General Comments 0
You need to be logged in to leave comments.
Login now