This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9774

engine: add `if True` to prepare for next patch
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGee9002b99595: engine: add `if True` to prepare for next patch
Summary

This will help making next patch easier to read.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Jan 14 2021, 7:54 AM
mharbison72 accepted this revision.Jan 18 2021, 9:22 PM
This revision is now accepted and ready to land.Jan 18 2021, 9:22 PM
baymax updated this revision to Diff 25202.Jan 21 2021, 9:28 AM

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

pulkit added a commit: rHGee9002b99595: engine: add `if True` to prepare for next patch.Jan 26 2021, 12:43 AM
Closed by commit rHGee9002b99595: engine: add `if True` to prepare for next patch (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 (143 lines)

Diff 25202

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:
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,
) )
# Now copy other files in the store directory. # Now copy other files in the store directory.
for p in _files_to_copy_post_revlog_clone(srcrepo): for p in _files_to_copy_post_revlog_clone(srcrepo):
srcrepo.ui.status(_(b'copying %s\n') % p) srcrepo.ui.status(_(b'copying %s\n') % p)
src = srcrepo.store.rawvfs.join(p) src = srcrepo.store.rawvfs.join(p)
dst = dstrepo.store.rawvfs.join(p) dst = dstrepo.store.rawvfs.join(p)
util.copyfile(src, dst, copystat=True) util.copyfile(src, dst, copystat=True)
finishdatamigration(ui, srcrepo, dstrepo, requirements) finishdatamigration(ui, srcrepo, dstrepo, requirements)
ui.status(_(b'data fully upgraded in a temporary repository\n')) ui.status(_(b'data fully upgraded in a temporary repository\n'))
if upgrade_op.backup_store: if upgrade_op.backup_store:
backuppath = pycompat.mkdtemp( backuppath = pycompat.mkdtemp(
prefix=b'upgradebackup.', dir=srcrepo.path prefix=b'upgradebackup.', dir=srcrepo.path
) )
backupvfs = vfsmod.vfs(backuppath) backupvfs = vfsmod.vfs(backuppath)
# Make a backup of requires file first, as it is the first to be modified. # Make a backup of requires file first, as it is the first to be modified.
util.copyfile( util.copyfile(
srcrepo.vfs.join(b'requires'), backupvfs.join(b'requires') srcrepo.vfs.join(b'requires'), backupvfs.join(b'requires')
) )
# We install an arbitrary requirement that clients must not support # We install an arbitrary requirement that clients must not support
# as a mechanism to lock out new clients during the data swap. This is # as a mechanism to lock out new clients during the data swap. This is
# better than allowing a client to continue while the repository is in # better than allowing a client to continue while the repository is in
# an inconsistent state. # an inconsistent state.
ui.status( ui.status(
_( _(
b'marking source repository as being upgraded; clients will be ' b'marking source repository as being upgraded; clients will be '
b'unable to read from repository\n' b'unable to read from repository\n'
) )
) )
scmutil.writereporequirements( scmutil.writereporequirements(
srcrepo, srcrepo.requirements | {b'upgradeinprogress'} srcrepo, srcrepo.requirements | {b'upgradeinprogress'}
) )
ui.status(_(b'starting in-place swap of repository data\n')) ui.status(_(b'starting in-place swap of repository data\n'))
if upgrade_op.backup_store: if upgrade_op.backup_store:
ui.status(_(b'replaced files will be backed up at %s\n') % backuppath) ui.status(
_(b'replaced files will be backed up at %s\n') % backuppath
)
# Now swap in the new store directory. Doing it as a rename should make # Now swap in the new store directory. Doing it as a rename should make
# the operation nearly instantaneous and atomic (at least in well-behaved # the operation nearly instantaneous and atomic (at least in well-behaved
# environments). # environments).
ui.status(_(b'replacing store...\n')) ui.status(_(b'replacing store...\n'))
tstart = util.timer() tstart = util.timer()
_replacestores(srcrepo, dstrepo, backupvfs, upgrade_op) _replacestores(srcrepo, dstrepo, backupvfs, upgrade_op)
elapsed = util.timer() - tstart elapsed = util.timer() - tstart
ui.status( ui.status(
_( _(
b'store replacement complete; repository was inconsistent for ' b'store replacement complete; repository was inconsistent for '
b'%0.1fs\n' b'%0.1fs\n'
) )
% elapsed % elapsed
) )
# We first write the requirements file. Any new requirements will lock # We first write the requirements file. Any new requirements will lock
# out legacy clients. # out legacy clients.
ui.status( ui.status(
_( _(
b'finalizing requirements file and making repository readable ' b'finalizing requirements file and making repository readable '
b'again\n' b'again\n'
) )
) )
scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)
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:
pass
return backuppath return backuppath