Mercurial > hg
changeset 39721:1b5880352314
bundle2: graduate bundle2.stream option from experimental to server section
Differential Revision: https://phab.mercurial-scm.org/D4679
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 17 Sep 2018 16:52:34 +0800 |
| parents | 7d9b1b50cad5 |
| children | 4bd6e444c76f |
| files | mercurial/bundle2.py mercurial/configitems.py mercurial/help/config.txt tests/test-clone-uncompressed.t |
| diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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