changegroup.getsubset: support multiple versions
authorEric Sumner <ericsumner@fb.com>
Thu, 15 Jan 2015 15:55:13 -0800
changeset 23897 f99a6e1865e5
parent 23896 becfecaf9087
child 23898 b21c2e0ee8a3
changegroup.getsubset: support multiple versions Allow a version parameter to specify which version of the packer should be used
mercurial/changegroup.py
--- a/mercurial/changegroup.py	Thu Jan 15 15:39:16 2015 -0800
+++ b/mercurial/changegroup.py	Thu Jan 15 15:55:13 2015 -0800
@@ -546,11 +546,11 @@
     _changegroupinfo(repo, csets, source)
     return bundler.generate(commonrevs, csets, fastpathlinkrev, source)
 
-def getsubset(repo, outgoing, bundler, source, fastpath=False):
+def getsubset(repo, outgoing, bundler, source, fastpath=False, version='01'):
     gengroup = getsubsetraw(repo, outgoing, bundler, source, fastpath)
-    return cg1unpacker(util.chunkbuffer(gengroup), 'UN')
+    return packermap[version][1](util.chunkbuffer(gengroup), 'UN')
 
-def changegroupsubset(repo, roots, heads, source):
+def changegroupsubset(repo, roots, heads, source, version='01'):
     """Compute a changegroup consisting of all the nodes that are
     descendants of any of the roots and ancestors of any of the heads.
     Return a chunkbuffer object whose read() method will return
@@ -572,8 +572,8 @@
     for n in roots:
         discbases.extend([p for p in cl.parents(n) if p != nullid])
     outgoing = discovery.outgoing(cl, discbases, heads)
-    bundler = cg1packer(repo)
-    return getsubset(repo, outgoing, bundler, source)
+    bundler = packermap[version][0](repo)
+    return getsubset(repo, outgoing, bundler, source, version=version)
 
 def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None,
                            version='01'):