This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9775

upgrade: update only requirements if we can
ClosedPublic

Authored by pulkit on Jan 14 2021, 7:54 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGf2c4224e6648: upgrade: update only requirements if we can
Summary

Upgrade operations which involves just upgrading requirements earlier used to go
through whole revlog cloning business.
Now we just upgrade the requirement and skip the cloning part.

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.Jan 14 2021, 7:54 AM
mharbison72 accepted this revision.Jan 18 2021, 9:23 PM
This revision is now accepted and ready to land.Jan 18 2021, 9:23 PM
baymax updated this revision to Diff 25203.Jan 21 2021, 9:28 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit added a commit: rHGf2c4224e6648: upgrade: update only requirements if we can.Jan 26 2021, 12:43 AM
Closed by commit rHGf2c4224e6648: upgrade: update only requirements if we can (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25260

mercurial/upgrade_utils/engine.py

ui.status( ui.status(
_( _(
b'(it is safe to interrupt this process any time before ' b'(it is safe to interrupt this process any time before '
b'data migration completes)\n' b'data migration completes)\n'
) )
) )
if True: if not upgrade_op.requirements_only:
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, upgrade_op,
) )
if upgrade_op.backup_store: if upgrade_op.backup_store:
# The lock file from the old store won't be removed because nothing has a # The lock file from the old store won't be removed because nothing has a
# reference to its new location. So clean it up manually. Alternatively, we # reference to its new location. So clean it up manually. Alternatively, we
# could update srcrepo.svfs and other variables to point to the new # could update srcrepo.svfs and other variables to point to the new
# location. This is simpler. # location. This is simpler.
backupvfs.unlink(b'store/lock') backupvfs.unlink(b'store/lock')
else: else:
pass ui.status(_(b'upgrading repository requirements\n'))
scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)
return backuppath return backuppath

tests/test-share-safe.t

- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage upgraded data: $TESTTMP/non-share-safe/.hg/upgrade.* (glob) creating temporary repository to stage upgraded data: $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (it is safe to interrupt this process any time before data migration completes)
migrating 6 total revisions (2 in filelogs, 2 in manifests, 2 in changelog) upgrading repository requirements
migrating 626 bytes in store; 271 bytes tracked data
migrating 2 filelogs containing 2 revisions (138 bytes in store; 8 bytes tracked data)
finished migrating 2 filelog revisions across 2 filelogs; change in size: 0 bytes
migrating 1 manifests containing 2 revisions (230 bytes in store; 135 bytes tracked data)
finished migrating 2 manifest revisions across 1 manifests; change in size: 0 bytes
migrating changelog containing 2 revisions (258 bytes in store; 128 bytes tracked data)
finished migrating 2 changelog revisions; change in size: 0 bytes
finished migrating 6 total revisions; total change in store size: 0 bytes
copying phaseroots
data fully upgraded in a temporary repository
marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/non-share-safe/.hg/upgradebackup.* (glob)
replacing store...
store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again
removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
copy of old repository backed up at $TESTTMP/non-share-safe/.hg/upgradebackup.* (glob)
the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode. repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode.
$ hg debugrequirements $ hg debugrequirements
dotencode dotencode
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
share-safe share-safe
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage upgraded data: $TESTTMP/non-share-safe/.hg/upgrade.* (glob) creating temporary repository to stage upgraded data: $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (it is safe to interrupt this process any time before data migration completes)
migrating 6 total revisions (2 in filelogs, 2 in manifests, 2 in changelog) upgrading repository requirements
migrating 626 bytes in store; 271 bytes tracked data
migrating 2 filelogs containing 2 revisions (138 bytes in store; 8 bytes tracked data)
finished migrating 2 filelog revisions across 2 filelogs; change in size: 0 bytes
migrating 1 manifests containing 2 revisions (230 bytes in store; 135 bytes tracked data)
finished migrating 2 manifest revisions across 1 manifests; change in size: 0 bytes
migrating changelog containing 2 revisions (258 bytes in store; 128 bytes tracked data)
finished migrating 2 changelog revisions; change in size: 0 bytes
finished migrating 6 total revisions; total change in store size: 0 bytes
copying phaseroots
copying requires
data fully upgraded in a temporary repository
marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/non-share-safe/.hg/upgradebackup.* (glob)
replacing store...
store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again
removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
copy of old repository backed up at $TESTTMP/non-share-safe/.hg/upgradebackup.* (glob)
the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared. repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared.
$ hg debugrequirements $ hg debugrequirements
dotencode dotencode
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog