Show More
@@ -1532,7 +1532,7 b' def getrepocaps(repo, allowpushback=Fals' | |||||
1532 | if role == 'server': |
|
1532 | if role == 'server': | |
1533 | streamsupported = repo.ui.configbool('server', 'uncompressed', |
|
1533 | streamsupported = repo.ui.configbool('server', 'uncompressed', | |
1534 | untrusted=True) |
|
1534 | untrusted=True) | |
1535 |
featuresupported = repo.ui.configbool(' |
|
1535 | featuresupported = repo.ui.configbool('server', 'bundle2.stream') | |
1536 |
|
1536 | |||
1537 | if not streamsupported or not featuresupported: |
|
1537 | if not streamsupported or not featuresupported: | |
1538 | caps.pop('stream') |
|
1538 | caps.pop('stream') |
@@ -456,9 +456,6 b" coreconfigitem('experimental', 'bundle2-" | |||||
456 | coreconfigitem('experimental', 'bundle2.pushback', |
|
456 | coreconfigitem('experimental', 'bundle2.pushback', | |
457 | default=False, |
|
457 | default=False, | |
458 | ) |
|
458 | ) | |
459 | coreconfigitem('experimental', 'bundle2.stream', |
|
|||
460 | default=False, |
|
|||
461 | ) |
|
|||
462 | coreconfigitem('experimental', 'bundle2lazylocking', |
|
459 | coreconfigitem('experimental', 'bundle2lazylocking', | |
463 | default=False, |
|
460 | default=False, | |
464 | ) |
|
461 | ) | |
@@ -973,6 +970,10 b" coreconfigitem('server', 'bundle1.push'," | |||||
973 | coreconfigitem('server', 'bundle1gd.push', |
|
970 | coreconfigitem('server', 'bundle1gd.push', | |
974 | default=None, |
|
971 | default=None, | |
975 | ) |
|
972 | ) | |
|
973 | coreconfigitem('server', 'bundle2.stream', | |||
|
974 | default=False, | |||
|
975 | alias=[('experimental', 'bundle2.stream')] | |||
|
976 | ) | |||
976 | coreconfigitem('server', 'compressionengines', |
|
977 | coreconfigitem('server', 'compressionengines', | |
977 | default=list, |
|
978 | default=list, | |
978 | ) |
|
979 | ) |
@@ -1927,6 +1927,10 b' Controls generic server settings.' | |||||
1927 | repositories to the exchange format required by the bundle1 data |
|
1927 | repositories to the exchange format required by the bundle1 data | |
1928 | format can consume a lot of CPU. |
|
1928 | format can consume a lot of CPU. | |
1929 |
|
1929 | |||
|
1930 | ``bundle2.stream`` | |||
|
1931 | Whether to allow clients to pull using the bundle2 streaming protocol. | |||
|
1932 | (default: False) | |||
|
1933 | ||||
1930 | ``zliblevel`` |
|
1934 | ``zliblevel`` | |
1931 | Integer between ``-1`` and ``9`` that controls the zlib compression level |
|
1935 | Integer between ``-1`` and ``9`` that controls the zlib compression level | |
1932 | for wire protocol commands that send zlib compressed output (notably the |
|
1936 | for wire protocol commands that send zlib compressed output (notably the |
General Comments 0
You need to be logged in to leave comments.
Login now