Patchwork D6346: discovery: new devel.discovery.randomize option

login
register
mail settings
Submitter phabricator
Date May 6, 2019, 3:31 p.m.
Message ID <differential-rev-PHID-DREV-jaaegbve5bxfkvw3x6px-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39969/
State Superseded
Headers show

Comments

phabricator - May 6, 2019, 3:31 p.m.
gracinet created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  By default, this is True, but setting it to False is a uniform
  way to kill all randomness in integration tests such as test-setdiscovery.t
  
  By "uniform" we mean that it can be passed to implementations in other
  languages, for which the monkey-patching of random.sample would be
  irrelevant.
  
  In the above mentioned test file, we use it right away,
  replacing the adhoc extension that had the same purpose, and to derandomize a
  case with many round-trips, that we'll need to behave uniformly in the Rust
  version.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6346

AFFECTED FILES
  mercurial/configitems.py
  mercurial/setdiscovery.py
  tests/test-setdiscovery.t

CHANGE DETAILS




To: gracinet, #hg-reviewers
Cc: mercurial-devel
phabricator - May 22, 2019, 4:40 p.m.
gracinet abandoned this revision.
gracinet added a subscriber: kevincox.
gracinet added a comment.


  I'm abandoning this revision because I have to resubmit the whole series after partial incorrect application last week and subsequent droping from the actual repo.
  
  @kevincox, that's the last one. I'll try and make it explicit to you in the new series what's new and what's unchanged

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6346

To: gracinet, #hg-reviewers
Cc: kevincox, mercurial-devel

Patch

diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t
+++ b/tests/test-setdiscovery.t
@@ -968,7 +968,7 @@ 
   updating to branch b
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-  $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true
+  $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --config devel.discovery.randomize=false
   comparing with b
   query 1; heads
   searching for changes
@@ -983,8 +983,11 @@ 
   query 4; still undecided: \d+, sample size is: 200 (re)
   sampling from both directions
   searching: 5 queries
-  query 5; still undecided: 195, sample size is: 195
-  5 total queries in *.????s (glob)
+  query 5; still undecided: 297, sample size is: 200
+  sampling from both directions
+  searching: 6 queries
+  query 6; still undecided: 96, sample size is: 96
+  6 total queries in *.????s (glob)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
@@ -1093,16 +1096,9 @@ 
 give 'all remote heads known locally' without checking the remaining heads -
 fixed in 86c35b7ae300:
 
-  $ cat >> $TESTTMP/unrandomsample.py << EOF
-  > import random
-  > def sample(population, k):
-  >     return sorted(population)[:k]
-  > random.sample = sample
-  > EOF
-
   $ cat >> r1/.hg/hgrc << EOF
-  > [extensions]
-  > unrandomsample = $TESTTMP/unrandomsample.py
+  > [devel]
+  > discovery.randomize = False
   > EOF
 
   $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \
diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -386,7 +386,9 @@ 
 
     # full blown discovery
 
-    disco = partialdiscovery(local, ownheads)
+    randomize = ui.configbool('devel', 'discovery.randomize')
+    disco = partialdiscovery(local, ownheads, randomize=randomize)
+
     # treat remote heads (and maybe own heads) as a first implicit sample
     # response
     disco.addcommons(knownsrvheads)
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -412,6 +412,9 @@ 
 coreconfigitem('devel', 'debug.peer-request',
     default=False,
 )
+coreconfigitem('devel', 'discovery.randomize',
+    default=True,
+)
 _registerdiffopts(section='diff')
 coreconfigitem('email', 'bcc',
     default=None,