Show More
@@ -701,23 +701,20 b' def _pushb2ctx(pushop, bundler):' | |||||
701 | _pushb2ctxcheckheads(pushop, bundler) |
|
701 | _pushb2ctxcheckheads(pushop, bundler) | |
702 |
|
702 | |||
703 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
703 | b2caps = bundle2.bundle2caps(pushop.remote) | |
704 |
version = |
|
704 | version = '01' | |
705 | cgversions = b2caps.get('changegroup') |
|
705 | cgversions = b2caps.get('changegroup') | |
706 |
if |
|
706 | if cgversions: # 3.1 and 3.2 ship with an empty value | |
707 | cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', |
|
|||
708 | pushop.outgoing) |
|
|||
709 | else: |
|
|||
710 | cgversions = [v for v in cgversions |
|
707 | cgversions = [v for v in cgversions | |
711 | if v in changegroup.supportedoutgoingversions( |
|
708 | if v in changegroup.supportedoutgoingversions( | |
712 | pushop.repo)] |
|
709 | pushop.repo)] | |
713 | if not cgversions: |
|
710 | if not cgversions: | |
714 | raise ValueError(_('no common changegroup version')) |
|
711 | raise ValueError(_('no common changegroup version')) | |
715 | version = max(cgversions) |
|
712 | version = max(cgversions) | |
716 |
|
|
713 | cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push', | |
717 |
|
|
714 | pushop.outgoing, | |
718 |
|
|
715 | version=version) | |
719 | cgpart = bundler.newpart('changegroup', data=cg) |
|
716 | cgpart = bundler.newpart('changegroup', data=cg) | |
720 |
if version |
|
717 | if cgversions: | |
721 | cgpart.addparam('version', version) |
|
718 | cgpart.addparam('version', version) | |
722 | if 'treemanifest' in pushop.repo.requirements: |
|
719 | if 'treemanifest' in pushop.repo.requirements: | |
723 | cgpart.addparam('treemanifest', '1') |
|
720 | cgpart.addparam('treemanifest', '1') |
General Comments 0
You need to be logged in to leave comments.
Login now