Show More
@@ -80,15 +80,15 b' def narrow_widen(repo, proto, oldinclude' | |||
|
80 | 80 | ellipses = bool(ellipses) |
|
81 | 81 | cgversion = cgversion |
|
82 | 82 | |
|
83 | bundler = bundle2.bundle20(repo.ui) | |
|
83 | 84 | if not ellipses: |
|
84 | 85 | newmatch = narrowspec.match(repo.root, include=newincludes, |
|
85 | 86 | exclude=newexcludes) |
|
86 | 87 | oldmatch = narrowspec.match(repo.root, include=oldincludes, |
|
87 | 88 | exclude=oldexcludes) |
|
88 |
|
|
|
89 |
|
|
|
89 | bundle2.widen_bundle(bundler, repo, oldmatch, newmatch, common, | |
|
90 | known, cgversion, ellipses) | |
|
90 | 91 | else: |
|
91 | bundler = bundle2.bundle20(repo.ui) | |
|
92 | 92 | narrowbundle2.generateellipsesbundle2(bundler, repo, oldincludes, |
|
93 | 93 | oldexcludes, newincludes, newexcludes, cgversion, common, |
|
94 | 94 | list(common), known, None) |
@@ -2298,10 +2298,11 b' def handlestreamv2bundle(op, part):' | |||
|
2298 | 2298 | streamclone.applybundlev2(repo, part, filecount, bytecount, |
|
2299 | 2299 | requirements) |
|
2300 | 2300 | |
|
2301 |
def widen_bundle(repo, oldmatcher, newmatcher, common, |
|
|
2302 | ellipses): | |
|
2301 | def widen_bundle(bundler, repo, oldmatcher, newmatcher, common, | |
|
2302 | known, cgversion, ellipses): | |
|
2303 | 2303 | """generates bundle2 for widening a narrow clone |
|
2304 | 2304 | |
|
2305 | bundler is the bundle to which data should be added | |
|
2305 | 2306 | repo is the localrepository instance |
|
2306 | 2307 | oldmatcher matches what the client already has |
|
2307 | 2308 | newmatcher matches what the client needs (including what it already has) |
@@ -2312,7 +2313,6 b' def widen_bundle(repo, oldmatcher, newma' | |||
|
2312 | 2313 | |
|
2313 | 2314 | returns bundle2 of the data required for extending |
|
2314 | 2315 | """ |
|
2315 | bundler = bundle20(repo.ui) | |
|
2316 | 2316 | commonnodes = set() |
|
2317 | 2317 | cl = repo.changelog |
|
2318 | 2318 | for r in repo.revs("::%ln", common): |
General Comments 0
You need to be logged in to leave comments.
Login now