This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9668

engine: pass upgrade operation inside `_perform_clone()`
ClosedPublic

Authored by pulkit on Dec 30 2020, 6:53 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG02df91e895bd: engine: pass upgrade operation inside `_perform_clone()`
Summary

Same as previous patch.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Dec 30 2020, 6:53 AM
marmoute accepted this revision.Jan 7 2021, 8:45 PM
mharbison72 accepted this revision.Jan 12 2021, 6:45 PM
This revision is now accepted and ready to land.Jan 12 2021, 6:45 PM
pulkit added a commit: rHG02df91e895bd: engine: pass upgrade operation inside `_perform_clone()`.Jan 12 2021, 6:53 PM
Closed by commit rHG02df91e895bd: engine: pass upgrade operation inside `_perform_clone()` (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade_utils/engine.py (24 lines)

Diff 24761

mercurial/upgrade_utils/engine.py

def _perform_clone( def _perform_clone(
ui, ui,
dstrepo, dstrepo,
tr, tr,
old_revlog, old_revlog,
unencoded, unencoded,
deltareuse, upgrade_op,
forcedeltabothparents,
revlogs,
sidedatacompanion, sidedatacompanion,
oncopiedrevision, oncopiedrevision,
): ):
""" returns the new revlog object created""" """ returns the new revlog object created"""
newrl = None newrl = None
if matchrevlog(revlogs, unencoded): if matchrevlog(upgrade_op.revlogs_to_process, unencoded):
ui.note( ui.note(
_(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded) _(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded)
) )
newrl = _revlogfrompath(dstrepo, unencoded) newrl = _revlogfrompath(dstrepo, unencoded)
old_revlog.clone( old_revlog.clone(
tr, tr,
newrl, newrl,
addrevisioncb=oncopiedrevision, addrevisioncb=oncopiedrevision,
deltareuse=deltareuse, deltareuse=upgrade_op.delta_reuse_mode,
forcedeltabothparents=forcedeltabothparents, forcedeltabothparents=upgrade_op.has_upgrade_action(
b're-delta-multibase'
),
sidedatacompanion=sidedatacompanion, sidedatacompanion=sidedatacompanion,
) )
else: else:
msg = _(b'blindly copying %s containing %i revisions\n') msg = _(b'blindly copying %s containing %i revisions\n')
ui.note(msg % (unencoded, len(old_revlog))) ui.note(msg % (unencoded, len(old_revlog)))
_copyrevlog(tr, dstrepo, old_revlog, unencoded) _copyrevlog(tr, dstrepo, old_revlog, unencoded)
newrl = _revlogfrompath(dstrepo, unencoded) newrl = _revlogfrompath(dstrepo, unencoded)
progress = srcrepo.ui.makeprogress(_(b'file revisions'), total=frevcount) progress = srcrepo.ui.makeprogress(_(b'file revisions'), total=frevcount)
for unencoded, oldrl in sorted(filelogs.items()): for unencoded, oldrl in sorted(filelogs.items()):
newrl = _perform_clone( newrl = _perform_clone(
ui, ui,
dstrepo, dstrepo,
tr, tr,
oldrl, oldrl,
unencoded, unencoded,
upgrade_op.delta_reuse_mode, upgrade_op,
upgrade_op.has_upgrade_action(b're-delta-multibase'),
upgrade_op.revlogs_to_process,
sidedatacompanion, sidedatacompanion,
oncopiedrevision, oncopiedrevision,
) )
info = newrl.storageinfo(storedsize=True) info = newrl.storageinfo(storedsize=True)
fdstsize += info[b'storedsize'] or 0 fdstsize += info[b'storedsize'] or 0
ui.status( ui.status(
_( _(
b'finished migrating %d filelog revisions across %d ' b'finished migrating %d filelog revisions across %d '
) )
for unencoded, oldrl in sorted(manifests.items()): for unencoded, oldrl in sorted(manifests.items()):
newrl = _perform_clone( newrl = _perform_clone(
ui, ui,
dstrepo, dstrepo,
tr, tr,
oldrl, oldrl,
unencoded, unencoded,
upgrade_op.delta_reuse_mode, upgrade_op,
upgrade_op.has_upgrade_action(b're-delta-multibase'),
upgrade_op.revlogs_to_process,
sidedatacompanion, sidedatacompanion,
oncopiedrevision, oncopiedrevision,
) )
info = newrl.storageinfo(storedsize=True) info = newrl.storageinfo(storedsize=True)
mdstsize += info[b'storedsize'] or 0 mdstsize += info[b'storedsize'] or 0
ui.status( ui.status(
_( _(
b'finished migrating %d manifest revisions across %d ' b'finished migrating %d manifest revisions across %d '
) )
for unencoded, oldrl in sorted(changelogs.items()): for unencoded, oldrl in sorted(changelogs.items()):
newrl = _perform_clone( newrl = _perform_clone(
ui, ui,
dstrepo, dstrepo,
tr, tr,
oldrl, oldrl,
unencoded, unencoded,
upgrade_op.delta_reuse_mode, upgrade_op,
upgrade_op.has_upgrade_action(b're-delta-multibase'),
upgrade_op.revlogs_to_process,
sidedatacompanion, sidedatacompanion,
oncopiedrevision, oncopiedrevision,
) )
info = newrl.storageinfo(storedsize=True) info = newrl.storageinfo(storedsize=True)
cdstsize += info[b'storedsize'] or 0 cdstsize += info[b'storedsize'] or 0
progress.complete() progress.complete()
ui.status( ui.status(
_( _(