Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: graduate bundle2.stream option from experimental to server section
authorAnton Shestakov <av6@dwimlabs.net>
Mon, 17 Sep 2018 16:52:34 +0800
changeset 39721 1b5880352314
parent 39720 7d9b1b50cad5
child 39722 4bd6e444c76f
bundle2: graduate bundle2.stream option from experimental to server section Differential Revision: https://phab.mercurial-scm.org/D4679
mercurial/bundle2.py file | annotate | diff | comparison | revisions
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/help/config.txt file | annotate | diff | comparison | revisions
tests/test-clone-uncompressed.t file | annotate | diff | comparison | revisions 
--- a/mercurial/bundle2.py	Thu Sep 20 17:02:31 2018 +0800
+++ b/mercurial/bundle2.py	Mon Sep 17 16:52:34 2018 +0800
@@ -1532,7 +1532,7 @@
     if role == 'server':
         streamsupported = repo.ui.configbool('server', 'uncompressed',
                                              untrusted=True)
-        featuresupported = repo.ui.configbool('experimental', 'bundle2.stream')
+        featuresupported = repo.ui.configbool('server', 'bundle2.stream')
 
         if not streamsupported or not featuresupported:
             caps.pop('stream')
--- a/mercurial/configitems.py	Thu Sep 20 17:02:31 2018 +0800
+++ b/mercurial/configitems.py	Mon Sep 17 16:52:34 2018 +0800
@@ -456,9 +456,6 @@
 coreconfigitem('experimental', 'bundle2.pushback',
     default=False,
 )
-coreconfigitem('experimental', 'bundle2.stream',
-    default=False,
-)
 coreconfigitem('experimental', 'bundle2lazylocking',
     default=False,
 )
@@ -973,6 +970,10 @@
 coreconfigitem('server', 'bundle1gd.push',
     default=None,
 )
+coreconfigitem('server', 'bundle2.stream',
+    default=False,
+    alias=[('experimental', 'bundle2.stream')]
+)
 coreconfigitem('server', 'compressionengines',
     default=list,
 )
--- a/mercurial/help/config.txt	Thu Sep 20 17:02:31 2018 +0800
+++ b/mercurial/help/config.txt	Mon Sep 17 16:52:34 2018 +0800
@@ -1927,6 +1927,10 @@
     repositories to the exchange format required by the bundle1 data
     format can consume a lot of CPU.
 
+``bundle2.stream``
+    Whether to allow clients to pull using the bundle2 streaming protocol.
+    (default: False)
+
 ``zliblevel``
     Integer between ``-1`` and ``9`` that controls the zlib compression level
     for wire protocol commands that send zlib compressed output (notably the
--- a/tests/test-clone-uncompressed.t	Thu Sep 20 17:02:31 2018 +0800
+++ b/tests/test-clone-uncompressed.t	Mon Sep 17 16:52:34 2018 +0800
@@ -4,7 +4,7 @@
 
 #if stream-bundle2
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
+  > [server]
   > bundle2.stream = yes
   > EOF
 #endif
Mercurial