Show More
@@ -51,7 +51,7 b' def getrepocaps_narrow(orig, repo, **kwa' | |||
|
51 | 51 | caps[NARROWCAP] = ['v0'] |
|
52 | 52 | return caps |
|
53 | 53 | |
|
54 |
def widen_bundle(repo, diffmatcher, common, known, cgversion, |
|
|
54 | def widen_bundle(repo, diffmatcher, common, known, cgversion, ellipses): | |
|
55 | 55 | """generates changegroup for widening a narrow clone |
|
56 | 56 | |
|
57 | 57 | repo is the localrepository instance |
@@ -60,7 +60,6 b' def widen_bundle(repo, diffmatcher, comm' | |||
|
60 | 60 | common is set of common revs between server and client |
|
61 | 61 | known is a set of revs known on the client side (used in ellipses) |
|
62 | 62 | cgversion is the changegroup version to send |
|
63 | source is the command which called this codepath | |
|
64 | 63 | ellipses is boolean value telling whether to send ellipses data or not |
|
65 | 64 | |
|
66 | 65 | returns changegroup data of the changegroup built or return None if there |
@@ -80,7 +79,7 b' def widen_bundle(repo, diffmatcher, comm' | |||
|
80 | 79 | filematcher=diffmatcher, |
|
81 | 80 | fullnodes=commonnodes) |
|
82 | 81 | cgdata = packer.generate(set([nullid]), list(commonnodes), False, |
|
83 |
|
|
|
82 | 'narrow_widen', changelog=False) | |
|
84 | 83 | |
|
85 | 84 | return cgdata |
|
86 | 85 | |
@@ -114,8 +113,7 b' def getbundlechangegrouppart_widen(bundl' | |||
|
114 | 113 | common = set(common or [nullid]) |
|
115 | 114 | |
|
116 | 115 | if (oldinclude != include or oldexclude != exclude): |
|
117 | cgdata = widen_bundle(repo, diffmatch, common, [], version, | |
|
118 | source, False) | |
|
116 | cgdata = widen_bundle(repo, diffmatch, common, [], version, False) | |
|
119 | 117 | if cgdata is not None: |
|
120 | 118 | part = bundler.newpart('changegroup', data=cgdata) |
|
121 | 119 | part.addparam('version', version) |
@@ -194,7 +192,7 b' def getbundlechangegrouppart_narrow(bund' | |||
|
194 | 192 | shallow=depth is not None, |
|
195 | 193 | ellipsisroots=newellipsis, |
|
196 | 194 | fullnodes=newfull) |
|
197 |
cgdata = packer.generate(common, newvisit, False, |
|
|
195 | cgdata = packer.generate(common, newvisit, False, 'narrow_widen') | |
|
198 | 196 | |
|
199 | 197 | part = bundler.newpart('changegroup', data=cgdata) |
|
200 | 198 | part.addparam('version', version) |
@@ -212,7 +210,7 b' def getbundlechangegrouppart_narrow(bund' | |||
|
212 | 210 | shallow=depth is not None, |
|
213 | 211 | ellipsisroots=ellipsisroots, |
|
214 | 212 | fullnodes=relevant_nodes) |
|
215 |
cgdata = packer.generate(common, visitnodes, False, |
|
|
213 | cgdata = packer.generate(common, visitnodes, False, 'narrow_widen') | |
|
216 | 214 | |
|
217 | 215 | part = bundler.newpart('changegroup', data=cgdata) |
|
218 | 216 | part.addparam('version', version) |
General Comments 0
You need to be logged in to leave comments.
Login now