##// END OF EJS Templates
discovery: add config options to control sample size...
marmoute -
r47068:0600e846 default
parent child Browse files
Show More
@@ -729,6 +729,18 b' coreconfigitem('
729 b'discovery.randomize',
729 b'discovery.randomize',
730 default=True,
730 default=True,
731 )
731 )
732 # Control the initial size of the discovery sample
733 coreconfigitem(
734 b'devel',
735 b'discovery.sample-size',
736 default=200,
737 )
738 # Control the initial size of the discovery for initial change
739 coreconfigitem(
740 b'devel',
741 b'discovery.sample-size.initial',
742 default=100,
743 )
732 _registerdiffopts(section=b'diff')
744 _registerdiffopts(section=b'diff')
733 coreconfigitem(
745 coreconfigitem(
734 b'email',
746 b'email',
@@ -286,8 +286,6 b' def findcommonheads('
286 ui,
286 ui,
287 local,
287 local,
288 remote,
288 remote,
289 initialsamplesize=100,
290 fullsamplesize=200,
291 abortwhenunrelated=True,
289 abortwhenunrelated=True,
292 ancestorsof=None,
290 ancestorsof=None,
293 audit=None,
291 audit=None,
@@ -315,7 +313,8 b' def findcommonheads('
315 ownheads = [rev for rev in cl.headrevs() if rev != nullrev]
313 ownheads = [rev for rev in cl.headrevs() if rev != nullrev]
316
314
317 initial_head_exchange = ui.configbool(b'devel', b'discovery.exchange-heads')
315 initial_head_exchange = ui.configbool(b'devel', b'discovery.exchange-heads')
318
316 initialsamplesize = ui.configint(b'devel', b'discovery.sample-size.initial')
317 fullsamplesize = ui.configint(b'devel', b'discovery.sample-size')
319 # We also ask remote about all the local heads. That set can be arbitrarily
318 # We also ask remote about all the local heads. That set can be arbitrarily
320 # large, so we used to limit it size to `initialsamplesize`. We no longer
319 # large, so we used to limit it size to `initialsamplesize`. We no longer
321 # do as it proved counter productive. The skipped heads could lead to a
320 # do as it proved counter productive. The skipped heads could lead to a
@@ -1328,25 +1328,25 b' One with >200 heads. We now switch to se'
1328 updating to branch b
1328 updating to branch b
1329 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1329 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1330
1330
1331 $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --config devel.discovery.randomize=false
1331 $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --config devel.discovery.randomize=false --config devel.discovery.sample-size.initial=50
1332 comparing with b
1332 comparing with b
1333 query 1; heads
1333 query 1; heads
1334 searching for changes
1334 searching for changes
1335 taking quick initial sample
1335 taking quick initial sample
1336 searching: 2 queries
1336 searching: 2 queries
1337 query 2; still undecided: 1080, sample size is: 100
1337 query 2; still undecided: 1080, sample size is: 50
1338 sampling from both directions
1338 sampling from both directions
1339 searching: 3 queries
1339 searching: 3 queries
1340 query 3; still undecided: 980, sample size is: 200
1340 query 3; still undecided: 1030, sample size is: 200
1341 sampling from both directions
1341 sampling from both directions
1342 searching: 4 queries
1342 searching: 4 queries
1343 query 4; still undecided: 497, sample size is: 210
1343 query 4; still undecided: 547, sample size is: 210
1344 sampling from both directions
1344 sampling from both directions
1345 searching: 5 queries
1345 searching: 5 queries
1346 query 5; still undecided: 285, sample size is: 220
1346 query 5; still undecided: 336, sample size is: 220
1347 sampling from both directions
1347 sampling from both directions
1348 searching: 6 queries
1348 searching: 6 queries
1349 query 6; still undecided: 63, sample size is: 63
1349 query 6; still undecided: 114, sample size is: 114
1350 6 total queries in *.????s (glob)
1350 6 total queries in *.????s (glob)
1351 elapsed time: * seconds (glob)
1351 elapsed time: * seconds (glob)
1352 round-trips: 6
1352 round-trips: 6
@@ -1412,22 +1412,30 b' One with >200 heads. We now switch to se'
1412 missing: 1040
1412 missing: 1040
1413 common heads: 3ee37d65064a
1413 common heads: 3ee37d65064a
1414
1414
1415 $ hg -R a debugdiscovery b --debug --config devel.discovery.exchange-heads=false --config devel.discovery.randomize=false --config devel.discovery.grow-sample.rate=1.01
1415 $ hg -R a debugdiscovery b --debug --config devel.discovery.exchange-heads=false --config devel.discovery.randomize=false --config devel.discovery.grow-sample.rate=1.20 --config devel.discovery.sample-size=50
1416 comparing with b
1416 comparing with b
1417 searching for changes
1417 searching for changes
1418 sampling from both directions
1418 sampling from both directions
1419 query 1; still undecided: 1340, sample size is: 200
1419 query 1; still undecided: 1340, sample size is: 50
1420 sampling from both directions
1421 query 2; still undecided: 995, sample size is: 60
1420 sampling from both directions
1422 sampling from both directions
1421 query 2; still undecided: 795, sample size is: 202
1423 query 3; still undecided: 913, sample size is: 72
1422 sampling from both directions
1424 sampling from both directions
1423 query 3; still undecided: 525, sample size is: 204
1425 query 4; still undecided: 816, sample size is: 204
1426 sampling from both directions
1427 query 5; still undecided: 612, sample size is: 153
1424 sampling from both directions
1428 sampling from both directions
1425 query 4; still undecided: 252, sample size is: 206
1429 query 6; still undecided: 456, sample size is: 123
1430 sampling from both directions
1431 query 7; still undecided: 332, sample size is: 147
1426 sampling from both directions
1432 sampling from both directions
1427 query 5; still undecided: 44, sample size is: 44
1433 query 8; still undecided: 184, sample size is: 176
1428 5 total queries in *s (glob)
1434 sampling from both directions
1429 elapsed time: * seconds (glob)
1435 query 9; still undecided: 8, sample size is: 8
1430 round-trips: 5
1436 9 total queries in *s (glob)
1437 elapsed time: * seconds (glob)
1438 round-trips: 9
1431 heads summary:
1439 heads summary:
1432 total common heads: 1
1440 total common heads: 1
1433 also local heads: 0
1441 also local heads: 0
General Comments 0
You need to be logged in to leave comments. Login now