obshashrange: enable by default
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 31 Aug 2018 00:31:01 +0200
changeset 4056 235f15c40556
parent 4055 555028f992eb
child 4057 054d288680b4
obshashrange: enable by default We have been testing this in various placed and specific stress test have been performed. It is time to enable this by default
CHANGELOG
hgext3rd/evolve/obsdiscovery.py
hgext3rd/evolve/utility.py
tests/test-evolve-serveronly-bundle2.t
tests/test-wireproto.t
--- a/CHANGELOG	Thu Aug 30 22:50:26 2018 +0200
+++ b/CHANGELOG	Fri Aug 31 00:31:01 2018 +0200
@@ -6,6 +6,7 @@
 
   * prune: rename `--biject` flag to `--pair` (old flag is kept as an alias)
   * pick: rename the "grab" command to "pick" to avoid ambiguity with graft
+  * discovery: enable obshashrange based discovery by default
 
 8.1.2 -- 2018-08-28
 -------------------
--- a/hgext3rd/evolve/obsdiscovery.py	Thu Aug 30 22:50:26 2018 +0200
+++ b/hgext3rd/evolve/obsdiscovery.py	Fri Aug 31 00:31:01 2018 +0200
@@ -737,7 +737,7 @@
     return encodelist(hashes)
 
 def _useobshashrange(repo):
-    base = repo.ui.configbool('experimental', 'obshashrange', False)
+    base = repo.ui.configbool('experimental', 'obshashrange', True)
     if base:
         maxrevs = repo.ui.configint('experimental', 'obshashrange.max-revs', None)
         if maxrevs is not None and maxrevs < len(repo.unfiltered()):
--- a/hgext3rd/evolve/utility.py	Thu Aug 30 22:50:26 2018 +0200
+++ b/hgext3rd/evolve/utility.py	Fri Aug 31 00:31:01 2018 +0200
@@ -64,7 +64,7 @@
         # note: we should not get to the default case
         warm = configbool('experimental', 'obshashrange.warm-cache', True)
 
-    if not configbool('experimental', 'obshashrange', False):
+    if not configbool('experimental', 'obshashrange', True):
         return False
     if not warm:
         return False
--- a/tests/test-evolve-serveronly-bundle2.t	Thu Aug 30 22:50:26 2018 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t	Fri Aug 31 00:31:01 2018 +0200
@@ -86,9 +86,9 @@
 ===================
 
   $ curl -s http://localhost:$HGPORT/?cmd=hello
-  capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 batch * (glob)
+  capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 batch * (no-eol) (glob)
+  _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (no-eol) (glob)
 
   $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
@@ -151,9 +151,9 @@
   obsolete	
   phases	
   $ curl -s http://localhost:$HGPORT/?cmd=hello
-  capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 batch * (glob)
+  capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 batch * (no-eol) (glob)
+  _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (no-eol) (glob)
 
   $ echo '[experimental]' >> server/.hg/hgrc
   $ echo 'evolution=!' >> server/.hg/hgrc
@@ -178,9 +178,9 @@
   phases	
 
   $ curl -s http://localhost:$HGPORT/?cmd=hello
-  capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 batch * (glob)
+  capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 batch * (no-eol) (glob)
+  _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (no-eol) (glob)
 
 Test obshashrange discover
 ===========================================
--- a/tests/test-wireproto.t	Thu Aug 30 22:50:26 2018 +0200
+++ b/tests/test-wireproto.t	Fri Aug 31 00:31:01 2018 +0200
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
 
 Check we cannot use pushkey for marker exchange anymore
 
@@ -215,7 +215,6 @@
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
-  obsmarker-exchange: 274 bytes received
 
   $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers
   pulling from http://localhost:$HGPORT/