Show More
@@ -445,9 +445,23 b' def _pushb2ctx(pushop, bundler):' | |||||
445 | pushop.outgoing) |
|
445 | pushop.outgoing) | |
446 | if not pushop.force: |
|
446 | if not pushop.force: | |
447 | bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) |
|
447 | bundler.newpart('B2X:CHECK:HEADS', data=iter(pushop.remoteheads)) | |
448 | cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', |
|
448 | b2caps = bundle2.bundle2caps(pushop.remote) | |
449 | pushop.outgoing) |
|
449 | version = None | |
|
450 | cgversions = b2caps.get('b2x:changegroup') | |||
|
451 | if cgversions is None: | |||
|
452 | cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', | |||
|
453 | pushop.outgoing) | |||
|
454 | else: | |||
|
455 | cgversions = [v for v in cgversions if v in changegroup.packermap] | |||
|
456 | if not cgversions: | |||
|
457 | raise ValueError(_('no common changegroup version')) | |||
|
458 | version = max(cgversions) | |||
|
459 | cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', | |||
|
460 | pushop.outgoing, | |||
|
461 | version=version) | |||
450 | cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg) |
|
462 | cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg) | |
|
463 | if version is not None: | |||
|
464 | cgpart.addparam('version', version) | |||
451 | def handlereply(op): |
|
465 | def handlereply(op): | |
452 | """extract addchangegroup returns from server reply""" |
|
466 | """extract addchangegroup returns from server reply""" | |
453 | cgreplies = op.records.getreplies(cgpart.id) |
|
467 | cgreplies = op.records.getreplies(cgpart.id) |
General Comments 0
You need to be logged in to leave comments.
Login now