Show More
@@ -305,7 +305,7 b' class localrepository(object):' | |||||
305 | def _restrictcapabilities(self, caps): |
|
305 | def _restrictcapabilities(self, caps): | |
306 | # bundle2 is not ready for prime time, drop it unless explicitly |
|
306 | # bundle2 is not ready for prime time, drop it unless explicitly | |
307 | # required by the tests (or some brave tester) |
|
307 | # required by the tests (or some brave tester) | |
308 |
if self.ui.configbool(' |
|
308 | if self.ui.configbool('experimental', 'bundle2-exp', False): | |
309 | caps = set(caps) |
|
309 | caps = set(caps) | |
310 | capsblob = bundle2.encodecaps(self.bundle2caps) |
|
310 | capsblob = bundle2.encodecaps(self.bundle2caps) | |
311 | caps.add('bundle2-exp=' + urllib.quote(capsblob)) |
|
311 | caps.add('bundle2-exp=' + urllib.quote(capsblob)) |
@@ -585,7 +585,7 b' def _capabilities(repo, proto):' | |||||
585 | # otherwise, add 'streamreqs' detailing our local revlog format |
|
585 | # otherwise, add 'streamreqs' detailing our local revlog format | |
586 | else: |
|
586 | else: | |
587 | caps.append('streamreqs=%s' % ','.join(requiredformats)) |
|
587 | caps.append('streamreqs=%s' % ','.join(requiredformats)) | |
588 |
if |
|
588 | if self.ui.configbool('experimental', 'bundle2-exp', False): | |
589 | capsblob = bundle2.encodecaps(repo.bundle2caps) |
|
589 | capsblob = bundle2.encodecaps(repo.bundle2caps) | |
590 | caps.append('bundle2-exp=' + urllib.quote(capsblob)) |
|
590 | caps.append('bundle2-exp=' + urllib.quote(capsblob)) | |
591 | caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority)) |
|
591 | caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority)) |
@@ -174,8 +174,8 b' Create an extension to test bundle2 API' | |||||
174 | $ cat >> $HGRCPATH << EOF |
|
174 | $ cat >> $HGRCPATH << EOF | |
175 | > [extensions] |
|
175 | > [extensions] | |
176 | > bundle2=$TESTTMP/bundle2.py |
|
176 | > bundle2=$TESTTMP/bundle2.py | |
177 |
> [ |
|
177 | > [experimental] | |
178 | > bundle2=True |
|
178 | > bundle2-exp=True | |
179 | > [ui] |
|
179 | > [ui] | |
180 | > ssh=python "$TESTDIR/dummyssh" |
|
180 | > ssh=python "$TESTDIR/dummyssh" | |
181 | > [web] |
|
181 | > [web] |
General Comments 0
You need to be logged in to leave comments.
Login now