Show More
@@ -180,14 +180,17 b' def pullbundle2extraprepare(orig, pullop' | |||||
180 | kwargs['oldexcludepats'] = exclude |
|
180 | kwargs['oldexcludepats'] = exclude | |
181 | kwargs['includepats'] = include |
|
181 | kwargs['includepats'] = include | |
182 | kwargs['excludepats'] = exclude |
|
182 | kwargs['excludepats'] = exclude | |
183 | kwargs['known'] = [node.hex(ctx.node()) for ctx in |
|
183 | # calculate known nodes only in ellipses cases because in non-ellipses cases | |
184 | repo.set('::%ln', pullop.common) |
|
184 | # we have all the nodes | |
185 | if ctx.node() != node.nullid] |
|
185 | if narrowbundle2.ELLIPSESCAP in pullop.remote.capabilities(): | |
186 | if not kwargs['known']: |
|
186 | kwargs['known'] = [node.hex(ctx.node()) for ctx in | |
187 | # Mercurial serialized an empty list as '' and deserializes it as |
|
187 | repo.set('::%ln', pullop.common) | |
188 | # [''], so delete it instead to avoid handling the empty string on the |
|
188 | if ctx.node() != node.nullid] | |
189 | # server. |
|
189 | if not kwargs['known']: | |
190 | del kwargs['known'] |
|
190 | # Mercurial serializes an empty list as '' and deserializes it as | |
|
191 | # [''], so delete it instead to avoid handling the empty string on | |||
|
192 | # the server. | |||
|
193 | del kwargs['known'] | |||
191 |
|
194 | |||
192 | extensions.wrapfunction(exchange,'_pullbundle2extraprepare', |
|
195 | extensions.wrapfunction(exchange,'_pullbundle2extraprepare', | |
193 | pullbundle2extraprepare) |
|
196 | pullbundle2extraprepare) |
General Comments 0
You need to be logged in to leave comments.
Login now