comparison mercurial/wireproto.py @ 28666:ae53ecc47414

bundle: move writebundle() from changegroup.py to bundle2.py (API) writebundle() writes a bundle2 bundle or a plain changegroup1. Imagine away the "2" in "bundle2.py" for a moment and this change should makes sense. The bundle wraps the changegroup, so it makes sense that it knows about it. Another sign that this is correct is that the delayed import of bundle2 in changegroup goes away. I'll leave it for another time to remove the "2" in "bundle2.py" (alternatively, extract a new bundle.py from it).
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 28 Mar 2016 14:41:29 -0700
parents fd2acc5046f6
children 032c4c2f802a
comparison
equal deleted inserted replaced
28655:0e330d7d9f53 28666:ae53ecc47414
683 else: 683 else:
684 caps.append('streamreqs=%s' % ','.join(sorted(requiredformats))) 684 caps.append('streamreqs=%s' % ','.join(sorted(requiredformats)))
685 if repo.ui.configbool('experimental', 'bundle2-advertise', True): 685 if repo.ui.configbool('experimental', 'bundle2-advertise', True):
686 capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) 686 capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo))
687 caps.append('bundle2=' + urllib.quote(capsblob)) 687 caps.append('bundle2=' + urllib.quote(capsblob))
688 caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority)) 688 caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority))
689 caps.append( 689 caps.append(
690 'httpheader=%d' % repo.ui.configint('server', 'maxhttpheaderlen', 1024)) 690 'httpheader=%d' % repo.ui.configint('server', 'maxhttpheaderlen', 1024))
691 if repo.ui.configbool('experimental', 'httppostargs', False): 691 if repo.ui.configbool('experimental', 'httppostargs', False):
692 caps.append('httppostargs') 692 caps.append('httppostargs')
693 return caps 693 return caps