Mercurial > hg
changeset 23178:5e895ed5e955
changegroup: allow use of different cg#packer in getchangegroupraw
This will allow the use of general delta aware changegroup formats.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Fri, 17 Oct 2014 14:41:21 +0200 |
parents | 706547a14b8b |
children | 6bb9533fa8fa |
files | mercurial/changegroup.py |
diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/changegroup.py Fri Oct 17 14:41:02 2014 +0200 +++ b/mercurial/changegroup.py Fri Oct 17 14:41:21 2014 +0200 @@ -488,14 +488,15 @@ bundler = cg1packer(repo) return getsubset(repo, outgoing, bundler, source) -def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None): +def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None, + version='01'): """Like getbundle, but taking a discovery.outgoing as an argument. This is only implemented for local repos and reuses potentially precomputed sets in outgoing. Returns a raw changegroup generator.""" if not outgoing.missing: return None - bundler = cg1packer(repo, bundlecaps) + bundler = packermap[version][0](repo, bundlecaps) return getsubsetraw(repo, outgoing, bundler, source) def getlocalchangegroup(repo, source, outgoing, bundlecaps=None): @@ -527,17 +528,21 @@ heads = cl.heads() return discovery.outgoing(cl, common, heads) -def getchangegroupraw(repo, source, heads=None, common=None, bundlecaps=None): +def getchangegroupraw(repo, source, heads=None, common=None, bundlecaps=None, + version='01'): """Like changegroupsubset, but returns the set difference between the ancestors of heads and the ancestors common. If heads is None, use the local heads. If common is None, use [nullid]. + If version is None, use a version '1' changegroup. + The nodes in common might not all be known locally due to the way the current discovery protocol works. Returns a raw changegroup generator. """ outgoing = _computeoutgoing(repo, heads, common) - return getlocalchangegroupraw(repo, source, outgoing, bundlecaps=bundlecaps) + return getlocalchangegroupraw(repo, source, outgoing, bundlecaps=bundlecaps, + version=version) def getchangegroup(repo, source, heads=None, common=None, bundlecaps=None): """Like changegroupsubset, but returns the set difference between the