Show More
@@ -1559,23 +1559,22 b' def _getbundlechangegrouppart(bundler, r' | |||||
1559 | cg = None |
|
1559 | cg = None | |
1560 | if kwargs.get('cg', True): |
|
1560 | if kwargs.get('cg', True): | |
1561 | # build changegroup bundle here. |
|
1561 | # build changegroup bundle here. | |
1562 |
version = |
|
1562 | version = '01' | |
1563 | cgversions = b2caps.get('changegroup') |
|
1563 | cgversions = b2caps.get('changegroup') | |
1564 | getcgkwargs = {} |
|
|||
1565 | if cgversions: # 3.1 and 3.2 ship with an empty value |
|
1564 | if cgversions: # 3.1 and 3.2 ship with an empty value | |
1566 | cgversions = [v for v in cgversions |
|
1565 | cgversions = [v for v in cgversions | |
1567 | if v in changegroup.supportedoutgoingversions(repo)] |
|
1566 | if v in changegroup.supportedoutgoingversions(repo)] | |
1568 | if not cgversions: |
|
1567 | if not cgversions: | |
1569 | raise ValueError(_('no common changegroup version')) |
|
1568 | raise ValueError(_('no common changegroup version')) | |
1570 |
version |
|
1569 | version = max(cgversions) | |
1571 | outgoing = changegroup.computeoutgoing(repo, heads, common) |
|
1570 | outgoing = changegroup.computeoutgoing(repo, heads, common) | |
1572 | cg = changegroup.getlocalchangegroupraw(repo, source, outgoing, |
|
1571 | cg = changegroup.getlocalchangegroupraw(repo, source, outgoing, | |
1573 | bundlecaps=bundlecaps, |
|
1572 | bundlecaps=bundlecaps, | |
1574 |
|
|
1573 | version=version) | |
1575 |
|
1574 | |||
1576 | if cg: |
|
1575 | if cg: | |
1577 | part = bundler.newpart('changegroup', data=cg) |
|
1576 | part = bundler.newpart('changegroup', data=cg) | |
1578 |
if version |
|
1577 | if cgversions: | |
1579 | part.addparam('version', version) |
|
1578 | part.addparam('version', version) | |
1580 | part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False) |
|
1579 | part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False) | |
1581 | if 'treemanifest' in repo.requirements: |
|
1580 | if 'treemanifest' in repo.requirements: |
General Comments 0
You need to be logged in to leave comments.
Login now