equal
deleted
inserted
replaced
157 def _clonerevlogs( |
157 def _clonerevlogs( |
158 ui, |
158 ui, |
159 srcrepo, |
159 srcrepo, |
160 dstrepo, |
160 dstrepo, |
161 tr, |
161 tr, |
162 deltareuse, |
162 upgrade_op, |
163 forcedeltabothparents, |
|
164 revlogs=UPGRADE_ALL_REVLOGS, |
|
165 ): |
163 ): |
166 """Copy revlogs between 2 repos.""" |
164 """Copy revlogs between 2 repos.""" |
167 revcount = 0 |
165 revcount = 0 |
168 srcsize = 0 |
166 srcsize = 0 |
169 srcrawsize = 0 |
167 srcrawsize = 0 |
276 ui, |
274 ui, |
277 dstrepo, |
275 dstrepo, |
278 tr, |
276 tr, |
279 oldrl, |
277 oldrl, |
280 unencoded, |
278 unencoded, |
281 deltareuse, |
279 upgrade_op.delta_reuse_mode, |
282 forcedeltabothparents, |
280 upgrade_op.has_upgrade_action(b're-delta-multibase'), |
283 revlogs, |
281 upgrade_op.revlogs_to_process, |
284 sidedatacompanion, |
282 sidedatacompanion, |
285 oncopiedrevision, |
283 oncopiedrevision, |
286 ) |
284 ) |
287 info = newrl.storageinfo(storedsize=True) |
285 info = newrl.storageinfo(storedsize=True) |
288 fdstsize += info[b'storedsize'] or 0 |
286 fdstsize += info[b'storedsize'] or 0 |
317 ui, |
315 ui, |
318 dstrepo, |
316 dstrepo, |
319 tr, |
317 tr, |
320 oldrl, |
318 oldrl, |
321 unencoded, |
319 unencoded, |
322 deltareuse, |
320 upgrade_op.delta_reuse_mode, |
323 forcedeltabothparents, |
321 upgrade_op.has_upgrade_action(b're-delta-multibase'), |
324 revlogs, |
322 upgrade_op.revlogs_to_process, |
325 sidedatacompanion, |
323 sidedatacompanion, |
326 oncopiedrevision, |
324 oncopiedrevision, |
327 ) |
325 ) |
328 info = newrl.storageinfo(storedsize=True) |
326 info = newrl.storageinfo(storedsize=True) |
329 mdstsize += info[b'storedsize'] or 0 |
327 mdstsize += info[b'storedsize'] or 0 |
357 ui, |
355 ui, |
358 dstrepo, |
356 dstrepo, |
359 tr, |
357 tr, |
360 oldrl, |
358 oldrl, |
361 unencoded, |
359 unencoded, |
362 deltareuse, |
360 upgrade_op.delta_reuse_mode, |
363 forcedeltabothparents, |
361 upgrade_op.has_upgrade_action(b're-delta-multibase'), |
364 revlogs, |
362 upgrade_op.revlogs_to_process, |
365 sidedatacompanion, |
363 sidedatacompanion, |
366 oncopiedrevision, |
364 oncopiedrevision, |
367 ) |
365 ) |
368 info = newrl.storageinfo(storedsize=True) |
366 info = newrl.storageinfo(storedsize=True) |
369 cdstsize += info[b'storedsize'] or 0 |
367 cdstsize += info[b'storedsize'] or 0 |
450 _clonerevlogs( |
448 _clonerevlogs( |
451 ui, |
449 ui, |
452 srcrepo, |
450 srcrepo, |
453 dstrepo, |
451 dstrepo, |
454 tr, |
452 tr, |
455 upgrade_op.delta_reuse_mode, |
453 upgrade_op, |
456 upgrade_op.has_upgrade_action(b're-delta-multibase'), |
|
457 revlogs=upgrade_op.revlogs_to_process, |
|
458 ) |
454 ) |
459 |
455 |
460 # Now copy other files in the store directory. |
456 # Now copy other files in the store directory. |
461 # The sorted() makes execution deterministic. |
457 # The sorted() makes execution deterministic. |
462 for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)): |
458 for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)): |