Skip to content
Snippets Groups Projects
Commit 1b588035 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

bundle2: graduate bundle2.stream option from experimental to server section

Differential Revision: https://phab.mercurial-scm.org/D4679
parent 7d9b1b50
No related branches found
No related tags found
No related merge requests found
...@@ -1532,7 +1532,7 @@ ...@@ -1532,7 +1532,7 @@
if role == 'server': if role == 'server':
streamsupported = repo.ui.configbool('server', 'uncompressed', streamsupported = repo.ui.configbool('server', 'uncompressed',
untrusted=True) untrusted=True)
featuresupported = repo.ui.configbool('experimental', 'bundle2.stream') featuresupported = repo.ui.configbool('server', 'bundle2.stream')
if not streamsupported or not featuresupported: if not streamsupported or not featuresupported:
caps.pop('stream') caps.pop('stream')
......
...@@ -456,9 +456,6 @@ ...@@ -456,9 +456,6 @@
coreconfigitem('experimental', 'bundle2.pushback', coreconfigitem('experimental', 'bundle2.pushback',
default=False, default=False,
) )
coreconfigitem('experimental', 'bundle2.stream',
default=False,
)
coreconfigitem('experimental', 'bundle2lazylocking', coreconfigitem('experimental', 'bundle2lazylocking',
default=False, default=False,
) )
...@@ -973,6 +970,10 @@ ...@@ -973,6 +970,10 @@
coreconfigitem('server', 'bundle1gd.push', coreconfigitem('server', 'bundle1gd.push',
default=None, default=None,
) )
coreconfigitem('server', 'bundle2.stream',
default=False,
alias=[('experimental', 'bundle2.stream')]
)
coreconfigitem('server', 'compressionengines', coreconfigitem('server', 'compressionengines',
default=list, default=list,
) )
......
...@@ -1927,6 +1927,10 @@ ...@@ -1927,6 +1927,10 @@
repositories to the exchange format required by the bundle1 data repositories to the exchange format required by the bundle1 data
format can consume a lot of CPU. format can consume a lot of CPU.
``bundle2.stream``
Whether to allow clients to pull using the bundle2 streaming protocol.
(default: False)
``zliblevel`` ``zliblevel``
Integer between ``-1`` and ``9`` that controls the zlib compression level Integer between ``-1`` and ``9`` that controls the zlib compression level
for wire protocol commands that send zlib compressed output (notably the for wire protocol commands that send zlib compressed output (notably the
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#if stream-bundle2 #if stream-bundle2
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [experimental] > [server]
> bundle2.stream = yes > bundle2.stream = yes
> EOF > EOF
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment