This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9667

engine: pass upgrade operation inside _clonerevlogs()
ClosedPublic

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

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG34efa84a43a1: engine: pass upgrade operation inside _clonerevlogs()
Summary

Better to pass the operation instead of passing three of it's members (one of
the them is a function call) separately.

This will also be useful in future when we will like to control which things are
upgraded.

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: rHG34efa84a43a1: engine: pass upgrade operation inside _clonerevlogs().Jan 12 2021, 6:53 PM
Closed by commit rHG34efa84a43a1: engine: pass upgrade operation inside _clonerevlogs() (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 (26 lines)

Diff 24760

mercurial/upgrade_utils/engine.py

return newrl return newrl
def _clonerevlogs( def _clonerevlogs(
ui, ui,
srcrepo, srcrepo,
dstrepo, dstrepo,
tr, tr,
deltareuse, upgrade_op,
forcedeltabothparents,
revlogs=UPGRADE_ALL_REVLOGS,
): ):
"""Copy revlogs between 2 repos.""" """Copy revlogs between 2 repos."""
revcount = 0 revcount = 0
srcsize = 0 srcsize = 0
srcrawsize = 0 srcrawsize = 0
dstsize = 0 dstsize = 0
fcount = 0 fcount = 0
frevcount = 0 frevcount = 0
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,
deltareuse, upgrade_op.delta_reuse_mode,
forcedeltabothparents, upgrade_op.has_upgrade_action(b're-delta-multibase'),
revlogs, 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,
deltareuse, upgrade_op.delta_reuse_mode,
forcedeltabothparents, upgrade_op.has_upgrade_action(b're-delta-multibase'),
revlogs, 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,
deltareuse, upgrade_op.delta_reuse_mode,
forcedeltabothparents, upgrade_op.has_upgrade_action(b're-delta-multibase'),
revlogs, 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(
_( _(
) )
with dstrepo.transaction(b'upgrade') as tr: with dstrepo.transaction(b'upgrade') as tr:
_clonerevlogs( _clonerevlogs(
ui, ui,
srcrepo, srcrepo,
dstrepo, dstrepo,
tr, tr,
upgrade_op.delta_reuse_mode, upgrade_op,
upgrade_op.has_upgrade_action(b're-delta-multibase'),
revlogs=upgrade_op.revlogs_to_process,
) )
# Now copy other files in the store directory. # Now copy other files in the store directory.
# The sorted() makes execution deterministic. # The sorted() makes execution deterministic.
for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)): for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)):
if not _filterstorefile( if not _filterstorefile(
srcrepo, dstrepo, upgrade_op.new_requirements, p, kind, st srcrepo, dstrepo, upgrade_op.new_requirements, p, kind, st
): ):