diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py index 75e29fcc5a71679abf3ff7d1d10fa155952ea46a_bWVyY3VyaWFsL2NoYW5nZWdyb3VwLnB5..be0489770925f2c1a31db78e09c3b9081188dbcc_bWVyY3VyaWFsL2NoYW5nZWdyb3VwLnB5 100644 --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -584,5 +584,5 @@ _changegroupinfo(repo, csets, source) return bundler.generate(commonrevs, csets, fastpathlinkrev, source) -def getsubset(repo, outgoing, bundler, source, fastpath=False, version='01'): +def getsubset(repo, outgoing, bundler, source, fastpath=False): gengroup = getsubsetraw(repo, outgoing, bundler, source, fastpath) @@ -588,5 +588,5 @@ gengroup = getsubsetraw(repo, outgoing, bundler, source, fastpath) - return packermap[version][1](util.chunkbuffer(gengroup), None) + return packermap[bundler.version][1](util.chunkbuffer(gengroup), None) def changegroupsubset(repo, roots, heads, source, version='01'): """Compute a changegroup consisting of all the nodes that are @@ -613,7 +613,7 @@ discbases = [n for n in discbases if n not in included] outgoing = discovery.outgoing(cl, discbases, heads) bundler = packermap[version][0](repo) - return getsubset(repo, outgoing, bundler, source, version=version) + return getsubset(repo, outgoing, bundler, source) def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None, version='01'): diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t index 75e29fcc5a71679abf3ff7d1d10fa155952ea46a_dGVzdHMvdGVzdC1idW5kbGUtdHlwZS50..be0489770925f2c1a31db78e09c3b9081188dbcc_dGVzdHMvdGVzdC1idW5kbGUtdHlwZS50 100644 --- a/tests/test-bundle-type.t +++ b/tests/test-bundle-type.t @@ -63,7 +63,7 @@ 1 changesets found HG20\x00\x00 (esc) Stream params: {} - changegroup -- "{'version': '01'}" + changegroup -- "{'version': '02'}" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf % test bundle type v2 @@ -71,7 +71,7 @@ 1 changesets found HG20\x00\x00 (esc) Stream params: {'Compression': 'BZ'} - changegroup -- "{'version': '01'}" + changegroup -- "{'version': '02'}" c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf % test bundle type v1