Mercurial > hg-stable
changeset 21147:2a246e737f92
bundle2: move bundle2 config option to section "experimental"
We highlight the fact that this is experimental by moving it to an "experimental"
section, and we match the config name with the server capability name
`bundle2-exp`.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 17 Apr 2014 16:01:58 -0400 |
| parents | 4676135ac555 |
| children | 468cd774aa22 |
| files | mercurial/localrepo.py mercurial/wireproto.py tests/test-bundle2.t |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Apr 17 15:45:12 2014 -0400 +++ b/mercurial/localrepo.py Thu Apr 17 16:01:58 2014 -0400 @@ -305,7 +305,7 @@ def _restrictcapabilities(self, caps): # bundle2 is not ready for prime time, drop it unless explicitly # required by the tests (or some brave tester) - if self.ui.configbool('server', 'bundle2', False): + if self.ui.configbool('experimental', 'bundle2-exp', False): caps = set(caps) capsblob = bundle2.encodecaps(self.bundle2caps) caps.add('bundle2-exp=' + urllib.quote(capsblob))
--- a/mercurial/wireproto.py Thu Apr 17 15:45:12 2014 -0400 +++ b/mercurial/wireproto.py Thu Apr 17 16:01:58 2014 -0400 @@ -585,7 +585,7 @@ # otherwise, add 'streamreqs' detailing our local revlog format else: caps.append('streamreqs=%s' % ','.join(requiredformats)) - if repo.ui.configbool('server', 'bundle2', False): + if self.ui.configbool('experimental', 'bundle2-exp', False): capsblob = bundle2.encodecaps(repo.bundle2caps) caps.append('bundle2-exp=' + urllib.quote(capsblob)) caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority))
--- a/tests/test-bundle2.t Thu Apr 17 15:45:12 2014 -0400 +++ b/tests/test-bundle2.t Thu Apr 17 16:01:58 2014 -0400 @@ -174,8 +174,8 @@ $ cat >> $HGRCPATH << EOF > [extensions] > bundle2=$TESTTMP/bundle2.py - > [server] - > bundle2=True + > [experimental] + > bundle2-exp=True > [ui] > ssh=python "$TESTDIR/dummyssh" > [web]