D4679: bundle2: graduate bundle2.stream option from experimental to server section
av6 (Anton Shestakov)
phabricator at mercurial-scm.org
Thu Sep 20 19:28:00 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1b5880352314: bundle2: graduate bundle2.stream option from experimental to server section (authored by av6, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4679?vs=11216&id=11220
REVISION DETAIL
https://phab.mercurial-scm.org/D4679
AFFECTED FILES
mercurial/bundle2.py
mercurial/configitems.py
mercurial/help/config.txt
tests/test-clone-uncompressed.t
CHANGE DETAILS
diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t
--- a/tests/test-clone-uncompressed.t
+++ b/tests/test-clone-uncompressed.t
@@ -4,7 +4,7 @@
#if stream-bundle2
$ cat << EOF >> $HGRCPATH
- > [experimental]
+ > [server]
> bundle2.stream = yes
> EOF
#endif
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -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
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -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,
)
diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -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')
To: av6, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list