comparison mercurial/upgrade_utils/engine.py @ 46217:02df91e895bd

engine: pass upgrade operation inside `_perform_clone()` Same as previous patch. Differential Revision: https://phab.mercurial-scm.org/D9668
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 30 Dec 2020 16:33:49 +0530
parents 34efa84a43a1
children 3f92a9bb80f0
comparison
equal deleted inserted replaced
46216:34efa84a43a1 46217:02df91e895bd
122 ui, 122 ui,
123 dstrepo, 123 dstrepo,
124 tr, 124 tr,
125 old_revlog, 125 old_revlog,
126 unencoded, 126 unencoded,
127 deltareuse, 127 upgrade_op,
128 forcedeltabothparents,
129 revlogs,
130 sidedatacompanion, 128 sidedatacompanion,
131 oncopiedrevision, 129 oncopiedrevision,
132 ): 130 ):
133 """ returns the new revlog object created""" 131 """ returns the new revlog object created"""
134 newrl = None 132 newrl = None
135 if matchrevlog(revlogs, unencoded): 133 if matchrevlog(upgrade_op.revlogs_to_process, unencoded):
136 ui.note( 134 ui.note(
137 _(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded) 135 _(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded)
138 ) 136 )
139 newrl = _revlogfrompath(dstrepo, unencoded) 137 newrl = _revlogfrompath(dstrepo, unencoded)
140 old_revlog.clone( 138 old_revlog.clone(
141 tr, 139 tr,
142 newrl, 140 newrl,
143 addrevisioncb=oncopiedrevision, 141 addrevisioncb=oncopiedrevision,
144 deltareuse=deltareuse, 142 deltareuse=upgrade_op.delta_reuse_mode,
145 forcedeltabothparents=forcedeltabothparents, 143 forcedeltabothparents=upgrade_op.has_upgrade_action(
144 b're-delta-multibase'
145 ),
146 sidedatacompanion=sidedatacompanion, 146 sidedatacompanion=sidedatacompanion,
147 ) 147 )
148 else: 148 else:
149 msg = _(b'blindly copying %s containing %i revisions\n') 149 msg = _(b'blindly copying %s containing %i revisions\n')
150 ui.note(msg % (unencoded, len(old_revlog))) 150 ui.note(msg % (unencoded, len(old_revlog)))
274 ui, 274 ui,
275 dstrepo, 275 dstrepo,
276 tr, 276 tr,
277 oldrl, 277 oldrl,
278 unencoded, 278 unencoded,
279 upgrade_op.delta_reuse_mode, 279 upgrade_op,
280 upgrade_op.has_upgrade_action(b're-delta-multibase'),
281 upgrade_op.revlogs_to_process,
282 sidedatacompanion, 280 sidedatacompanion,
283 oncopiedrevision, 281 oncopiedrevision,
284 ) 282 )
285 info = newrl.storageinfo(storedsize=True) 283 info = newrl.storageinfo(storedsize=True)
286 fdstsize += info[b'storedsize'] or 0 284 fdstsize += info[b'storedsize'] or 0
315 ui, 313 ui,
316 dstrepo, 314 dstrepo,
317 tr, 315 tr,
318 oldrl, 316 oldrl,
319 unencoded, 317 unencoded,
320 upgrade_op.delta_reuse_mode, 318 upgrade_op,
321 upgrade_op.has_upgrade_action(b're-delta-multibase'),
322 upgrade_op.revlogs_to_process,
323 sidedatacompanion, 319 sidedatacompanion,
324 oncopiedrevision, 320 oncopiedrevision,
325 ) 321 )
326 info = newrl.storageinfo(storedsize=True) 322 info = newrl.storageinfo(storedsize=True)
327 mdstsize += info[b'storedsize'] or 0 323 mdstsize += info[b'storedsize'] or 0
355 ui, 351 ui,
356 dstrepo, 352 dstrepo,
357 tr, 353 tr,
358 oldrl, 354 oldrl,
359 unencoded, 355 unencoded,
360 upgrade_op.delta_reuse_mode, 356 upgrade_op,
361 upgrade_op.has_upgrade_action(b're-delta-multibase'),
362 upgrade_op.revlogs_to_process,
363 sidedatacompanion, 357 sidedatacompanion,
364 oncopiedrevision, 358 oncopiedrevision,
365 ) 359 )
366 info = newrl.storageinfo(storedsize=True) 360 info = newrl.storageinfo(storedsize=True)
367 cdstsize += info[b'storedsize'] or 0 361 cdstsize += info[b'storedsize'] or 0