Mercurial > hg
comparison mercurial/wireproto.py @ 21148:468cd774aa22
bundle2: require both client and server to opt in
Even if the server is bundle2-enabled, the client now has to opt-in in the
config too.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 17 Apr 2014 16:04:58 -0400 |
parents | 2a246e737f92 |
children | 60ad2ea5b106 |
comparison
equal
deleted
inserted
replaced
21147:2a246e737f92 | 21148:468cd774aa22 |
---|---|
583 if not requiredformats - set(('revlogv1',)): | 583 if not requiredformats - set(('revlogv1',)): |
584 caps.append('stream') | 584 caps.append('stream') |
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 self.ui.configbool('experimental', 'bundle2-exp', False): | 588 if repo.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)) |
592 caps.append('httpheader=1024') | 592 caps.append('httpheader=1024') |
593 return caps | 593 return caps |