Mercurial > public > mercurial-scm > hg

comparison mercurial/exchange.py @ 28667:e7bf227e33a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: get rid of "getcgkwargs" variable This also makes the "version" argument explicit (never relies on getlocalchangegroupraw()'s default), which I think is a good thing.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 25 Mar 2016 16:01:40 -0700
parents d9d51da7a850
children 07f1fbf1f758
comparison
equal deleted inserted replaced
28666:ae53ecc47414 28667:e7bf227e33a5
1557 b2caps=None, heads=None, common=None, **kwargs): 1557 b2caps=None, heads=None, common=None, **kwargs):
1558 """add a changegroup part to the requested bundle""" 1558 """add a changegroup part to the requested bundle"""
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 = None 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 = getcgkwargs['version'] = max(cgversions) 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 **getcgkwargs) 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 is not None: 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:
1582 part.addparam('treemanifest', '1') 1581 part.addparam('treemanifest', '1')
1583 1582