mercurial-scm/hg-stable: mercurial/upgrade

comparison mercurial/upgrade_utils/engine.py @ 46451:ee9002b99595

engine: add `if True` to prepare for next patch This will help making next patch easier to read. Differential Revision: https://phab.mercurial-scm.org/D9774

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Thu, 14 Jan 2021 16:34:58 +0530
parents	2e8a844d0ae0
children	f2c4224e6648

comparison

equal deleted inserted replaced

-:8b02f132adf6
+:ee9002b99595
 b'(it is safe to interrupt this process any time before '
 b'data migration completes)\n'
 )
 )
-with dstrepo.transaction(b'upgrade') as tr:
+if True:
-_clonerevlogs(
+with dstrepo.transaction(b'upgrade') as tr:
-ui,
+_clonerevlogs(
-srcrepo,
+ui,
-dstrepo,
+srcrepo,
-tr,
+dstrepo,
-upgrade_op,
+tr,
-)
+upgrade_op,
+)
-# Now copy other files in the store directory.
-for p in _files_to_copy_post_revlog_clone(srcrepo):
+# Now copy other files in the store directory.
-srcrepo.ui.status(_(b'copying %s\n') % p)
+for p in _files_to_copy_post_revlog_clone(srcrepo):
-src = srcrepo.store.rawvfs.join(p)
+srcrepo.ui.status(_(b'copying %s\n') % p)
-dst = dstrepo.store.rawvfs.join(p)
+src = srcrepo.store.rawvfs.join(p)
-util.copyfile(src, dst, copystat=True)
+dst = dstrepo.store.rawvfs.join(p)
+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:
-backuppath = pycompat.mkdtemp(
+if upgrade_op.backup_store:
-prefix=b'upgradebackup.', dir=srcrepo.path
+backuppath = pycompat.mkdtemp(
-)
+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.
-util.copyfile(
+# Make a backup of requires file first, as it is the first to be modified.
-srcrepo.vfs.join(b'requires'), backupvfs.join(b'requires')
+util.copyfile(
-)
+srcrepo.vfs.join(b'requires'), backupvfs.join(b'requires')
+)
-# We install an arbitrary requirement that clients must not support
-# as a mechanism to lock out new clients during the data swap. This is
+# We install an arbitrary requirement that clients must not support
-# better than allowing a client to continue while the repository is in
+# as a mechanism to lock out new clients during the data swap. This is
-# an inconsistent state.
+# better than allowing a client to continue while the repository is in
-ui.status(
+# an inconsistent state.
-_(
+ui.status(
-b'marking source repository as being upgraded; clients will be '
+_(
-b'unable to read from repository\n'
+b'marking source repository as being upgraded; clients will be '
-)
+b'unable to read from repository\n'
 )
-scmutil.writereporequirements(
+)
-srcrepo, srcrepo.requirements | {b'upgradeinprogress'}
+scmutil.writereporequirements(
-)
+srcrepo, srcrepo.requirements | {b'upgradeinprogress'}
+)
-ui.status(_(b'starting in-place swap of repository data\n'))
-if upgrade_op.backup_store:
+ui.status(_(b'starting in-place swap of repository data\n'))
-ui.status(_(b'replaced files will be backed up at %s\n') % backuppath)
+if upgrade_op.backup_store:
+ui.status(
-# Now swap in the new store directory. Doing it as a rename should make
+_(b'replaced files will be backed up at %s\n') % backuppath
-# the operation nearly instantaneous and atomic (at least in well-behaved
+)
-# environments).
-ui.status(_(b'replacing store...\n'))
+# Now swap in the new store directory. Doing it as a rename should make
-tstart = util.timer()
+# the operation nearly instantaneous and atomic (at least in well-behaved
-_replacestores(srcrepo, dstrepo, backupvfs, upgrade_op)
+# environments).
-elapsed = util.timer() - tstart
+ui.status(_(b'replacing store...\n'))
-ui.status(
+tstart = util.timer()
-_(
+_replacestores(srcrepo, dstrepo, backupvfs, upgrade_op)
-b'store replacement complete; repository was inconsistent for '
+elapsed = util.timer() - tstart
-b'%0.1fs\n'
+ui.status(
-)
+_(
-% elapsed
+b'store replacement complete; repository was inconsistent for '
-)
+b'%0.1fs\n'
+)
-# We first write the requirements file. Any new requirements will lock
+% elapsed
-# out legacy clients.
+)
-ui.status(
-_(
+# We first write the requirements file. Any new requirements will lock
-b'finalizing requirements file and making repository readable '
+# out legacy clients.
-b'again\n'
+ui.status(
-)
+_(
-)
+b'finalizing requirements file and making repository readable '
-scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)
+b'again\n'
+)
-if upgrade_op.backup_store:
+)
-# The lock file from the old store won't be removed because nothing has a
+scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)
-# reference to its new location. So clean it up manually. Alternatively, we
-# could update srcrepo.svfs and other variables to point to the new
+if upgrade_op.backup_store:
-# location. This is simpler.
+# The lock file from the old store won't be removed because nothing has a
-backupvfs.unlink(b'store/lock')
+# reference to its new location. So clean it up manually. Alternatively, we
+# could update srcrepo.svfs and other variables to point to the new
+# location. This is simpler.
+backupvfs.unlink(b'store/lock')
+else:
+pass
 return backuppath

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/upgrade_utils/engine.py @ 46451:ee9002b99595