This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9583

upgrade: add a missing space in status message
ClosedPublic

Authored by pulkit on Dec 14 2020, 5:52 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGe2139e071b5c: upgrade: add a missing space in status message
Summary

Found while reading the code to refactor.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (2 lines)
Mtests/test-upgrade-repo.t (14 lines)

Diff 24208

mercurial/upgrade.py

dstrepo = hg.repository(repoui, path=tmppath, create=True) dstrepo = hg.repository(repoui, path=tmppath, create=True)
with dstrepo.wlock(), dstrepo.lock(): with dstrepo.wlock(), dstrepo.lock():
backuppath = upgrade_engine.upgrade( backuppath = upgrade_engine.upgrade(
ui, repo, dstrepo, upgrade_op ui, repo, dstrepo, upgrade_op
) )
if not (backup or backuppath is None): if not (backup or backuppath is None):
ui.status( ui.status(
_(b'removing old repository content%s\n') % backuppath _(b'removing old repository content %s\n') % backuppath
) )
repo.vfs.rmtree(backuppath, forcibly=True) repo.vfs.rmtree(backuppath, forcibly=True)
backuppath = None backuppath = None
finally: finally:
ui.status(_(b'removing temporary repository %s\n') % tmppath) ui.status(_(b'removing temporary repository %s\n') % tmppath)
repo.vfs.rmtree(tmppath, forcibly=True) repo.vfs.rmtree(tmppath, forcibly=True)

tests/test-upgrade-repo.t

copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for * (glob) store replacement complete; repository was inconsistent for * (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
$ ls -1 .hg/ | grep upgradebackup $ ls -1 .hg/ | grep upgradebackup
[1] [1]
We can restrict optimization to some revlog: We can restrict optimization to some revlog:
$ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback $ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
upgrade will perform the following actions: upgrade will perform the following actions:
copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
Check that the repo still works fine Check that the repo still works fine
$ hg log -G --stat $ hg log -G --stat
@ changeset: 2:76d4395f5413 (no-py3 !) @ changeset: 2:76d4395f5413 (no-py3 !)
@ changeset: 2:fca376863211 (py3 !) @ changeset: 2:fca376863211 (py3 !)
| tag: tip | tag: tip
copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 3 changes to 3 files checked 3 changesets with 3 changes to 3 files
copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 3 changes to 3 files checked 3 changesets with 3 changes to 3 files
copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 3 changes to 3 files checked 3 changesets with 3 changes to 3 files
copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 3 changes to 3 files checked 3 changesets with 3 changes to 3 files
copying phaseroots copying phaseroots
data fully migrated to temporary repository data fully migrated to temporary repository
marking source repository as being upgraded; clients will be unable to read from repository marking source repository as being upgraded; clients will be unable to read from repository
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing old repository content$TESTTMP/upgradegd/.hg/upgradebackup.* (glob) removing old repository content $TESTTMP/upgradegd/.hg/upgradebackup.* (glob)
removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/upgradegd/.hg/upgrade.* (glob)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 3 changes to 3 files checked 3 changesets with 3 changes to 3 files