Show More
@@ -260,10 +260,23 b' def buildobsmarkerspart(bundler, markers' | |||||
260 | def _forcebundle1(op): |
|
260 | def _forcebundle1(op): | |
261 | """return true if a pull/push must use bundle1 |
|
261 | """return true if a pull/push must use bundle1 | |
262 |
|
262 | |||
263 | Feel free to nuke this function when we drop the experimental option""" |
|
263 | This function is used to allow testing of the older bundle version""" | |
264 | return not (op.repo.ui.configbool('experimental', 'bundle2-exp', True) |
|
264 | ui = op.repo.ui | |
265 | and op.remote.capable('bundle2')) |
|
265 | forcebundle1 = False | |
|
266 | # The goal is this config is to allow developper to choose the bundle | |||
|
267 | # version used during exchanged. This is especially handy during test. | |||
|
268 | # Value is a list of bundle version to be picked from, highest version | |||
|
269 | # should be used. | |||
|
270 | # | |||
|
271 | # developer config: devel.legacy.exchange | |||
|
272 | exchange = ui.configlist('devel', 'legacy.exchange') | |||
|
273 | if not exchange: | |||
|
274 | forcebundle1 = not ui.configbool('experimental', 'bundle2-exp', True) | |||
|
275 | # developer config: devel.legacy.exchange | |||
|
276 | else: | |||
|
277 | forcebundle1 = 'bundle2' not in exchange and 'bundle1' in exchange | |||
266 |
|
278 | |||
|
279 | return forcebundle1 or not op.remote.capable('bundle2') | |||
267 |
|
280 | |||
268 | class pushoperation(object): |
|
281 | class pushoperation(object): | |
269 | """A object that represent a single push operation |
|
282 | """A object that represent a single push operation |
General Comments 0
You need to be logged in to leave comments.
Login now