Show More
@@ -256,7 +256,8 def findcommonheads(ui, local, remote, | |||||
256 | initialsamplesize=100, |
|
256 | initialsamplesize=100, | |
257 | fullsamplesize=200, |
|
257 | fullsamplesize=200, | |
258 | abortwhenunrelated=True, |
|
258 | abortwhenunrelated=True, | |
259 |
ancestorsof=None |
|
259 | ancestorsof=None, | |
|
260 | samplegrowth=1.05): | |||
260 | '''Return a tuple (common, anyincoming, remoteheads) used to identify |
|
261 | '''Return a tuple (common, anyincoming, remoteheads) used to identify | |
261 | missing nodes from or in remote. |
|
262 | missing nodes from or in remote. | |
262 | ''' |
|
263 | ''' | |
@@ -389,6 +390,8 def findcommonheads(ui, local, remote, | |||||
389 | ui.debug("taking initial sample\n") |
|
390 | ui.debug("taking initial sample\n") | |
390 | samplefunc = disco.takefullsample |
|
391 | samplefunc = disco.takefullsample | |
391 | targetsize = fullsamplesize |
|
392 | targetsize = fullsamplesize | |
|
393 | if not remote.limitedarguments: | |||
|
394 | fullsamplesize = int(fullsamplesize * samplegrowth) | |||
392 | else: |
|
395 | else: | |
393 | # use even cheaper initial sample |
|
396 | # use even cheaper initial sample | |
394 | ui.debug("taking quick initial sample\n") |
|
397 | ui.debug("taking quick initial sample\n") |
@@ -980,10 +980,10 One with >200 heads. We now switch to se | |||||
980 | query 3; still undecided: 980, sample size is: 200 |
|
980 | query 3; still undecided: 980, sample size is: 200 | |
981 | sampling from both directions |
|
981 | sampling from both directions | |
982 | searching: 4 queries |
|
982 | searching: 4 queries | |
983 |
query 4; still undecided: |
|
983 | query 4; still undecided: 435, sample size is: 210 | |
984 | sampling from both directions |
|
984 | sampling from both directions | |
985 | searching: 5 queries |
|
985 | searching: 5 queries | |
986 |
query 5; still undecided: 1 |
|
986 | query 5; still undecided: 185, sample size is: 185 | |
987 | 5 total queries in *.????s (glob) |
|
987 | 5 total queries in *.????s (glob) | |
988 | elapsed time: * seconds (glob) |
|
988 | elapsed time: * seconds (glob) | |
989 | heads summary: |
|
989 | heads summary: |
General Comments 0
You need to be logged in to leave comments.
Login now