Show More
@@ -237,20 +237,13 b' def getbundlechangegrouppart_narrow(bund' | |||||
237 | outgoing = exchange._computeoutgoing(repo, heads, common) |
|
237 | outgoing = exchange._computeoutgoing(repo, heads, common) | |
238 | if not outgoing.missing: |
|
238 | if not outgoing.missing: | |
239 | return |
|
239 | return | |
240 | if util.safehasattr(changegroup, 'getsubsetraw'): |
|
240 | def wrappedgetbundler(orig, *args, **kwargs): | |
241 | # getsubsetraw was replaced with makestream in hg in 92f1e2be8ab6 |
|
241 | bundler = orig(*args, **kwargs) | |
242 | # (2017/09/10). |
|
242 | bundler._narrow_matcher = lambda : newmatch | |
243 | packer = changegroup.getbundler(version, repo) |
|
243 | return bundler | |
244 | packer._narrow_matcher = lambda : newmatch |
|
244 | with extensions.wrappedfunction(changegroup, 'getbundler', | |
245 | cg = changegroup.getsubsetraw(repo, outgoing, packer, source) |
|
245 | wrappedgetbundler): | |
246 | else: |
|
246 | cg = changegroup.makestream(repo, outgoing, version, source) | |
247 | def wrappedgetbundler(orig, *args, **kwargs): |
|
|||
248 | bundler = orig(*args, **kwargs) |
|
|||
249 | bundler._narrow_matcher = lambda : newmatch |
|
|||
250 | return bundler |
|
|||
251 | with extensions.wrappedfunction(changegroup, 'getbundler', |
|
|||
252 | wrappedgetbundler): |
|
|||
253 | cg = changegroup.makestream(repo, outgoing, version, source) |
|
|||
254 | part = bundler.newpart('changegroup', data=cg) |
|
247 | part = bundler.newpart('changegroup', data=cg) | |
255 | part.addparam('version', version) |
|
248 | part.addparam('version', version) | |
256 | if 'treemanifest' in repo.requirements: |
|
249 | if 'treemanifest' in repo.requirements: |
General Comments 0
You need to be logged in to leave comments.
Login now