##// END OF EJS Templates
bundle2: rename server capability to bundle2-exp...
Pierre-Yves David -
r21145:0c5088be default
parent child Browse files
Show More
@@ -132,7 +132,7 b' def push(repo, remote, force=False, revs'
132 132 pushop.repo.prepushoutgoinghooks(pushop.repo,
133 133 pushop.remote,
134 134 pushop.outgoing)
135 if pushop.remote.capable('bundle2'):
135 if pushop.remote.capable('bundle2-exp'):
136 136 _pushbundle2(pushop)
137 137 else:
138 138 _pushchangeset(pushop)
@@ -207,7 +207,7 b' def _pushbundle2(pushop):'
207 207 The only currently supported type of data is changegroup but this will
208 208 evolve in the future."""
209 209 # Send known head to the server for race detection.
210 capsblob = urllib.unquote(pushop.remote.capable('bundle2'))
210 capsblob = urllib.unquote(pushop.remote.capable('bundle2-exp'))
211 211 caps = bundle2.decodecaps(capsblob)
212 212 bundler = bundle2.bundle20(pushop.ui, caps)
213 213 # create reply capability
@@ -515,7 +515,7 b' def pull(repo, remote, heads=None, force'
515 515 lock = pullop.repo.lock()
516 516 try:
517 517 _pulldiscovery(pullop)
518 if pullop.remote.capable('bundle2'):
518 if pullop.remote.capable('bundle2-exp'):
519 519 _pullbundle2(pullop)
520 520 if 'changegroup' in pullop.todosteps:
521 521 _pullchangeset(pullop)
@@ -308,7 +308,7 b' class localrepository(object):'
308 308 if self.ui.configbool('server', 'bundle2', False):
309 309 caps = set(caps)
310 310 capsblob = bundle2.encodecaps(self.bundle2caps)
311 caps.add('bundle2=' + urllib.quote(capsblob))
311 caps.add('bundle2-exp=' + urllib.quote(capsblob))
312 312 return caps
313 313
314 314 def _applyrequirements(self, requirements):
@@ -587,7 +587,7 b' def _capabilities(repo, proto):'
587 587 caps.append('streamreqs=%s' % ','.join(requiredformats))
588 588 if repo.ui.configbool('server', 'bundle2', False):
589 589 capsblob = bundle2.encodecaps(repo.bundle2caps)
590 caps.append('bundle2=' + urllib.quote(capsblob))
590 caps.append('bundle2-exp=' + urllib.quote(capsblob))
591 591 caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority))
592 592 caps.append('httpheader=1024')
593 593 return caps
General Comments 0
You need to be logged in to leave comments. Login now