Mercurial > hg-stable
changeset 46222:e22aed089567
upgrade: migrated -> upgraded in ui messages
Differential Revision: https://phab.mercurial-scm.org/D9676
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 31 Dec 2020 19:42:10 +0530 |
| parents | 0ca98ed828f9 |
| children | 24bfd98978da |
| files | mercurial/upgrade.py mercurial/upgrade_utils/engine.py tests/test-upgrade-repo.t |
| diffstat | 3 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/upgrade.py Thu Dec 31 19:24:23 2020 +0530 +++ b/mercurial/upgrade.py Thu Dec 31 19:42:10 2020 +0530 @@ -191,7 +191,7 @@ try: ui.status( _( - b'creating temporary repository to stage migrated ' + b'creating temporary repository to stage upgraded ' b'data: %s\n' ) % tmppath
--- a/mercurial/upgrade_utils/engine.py Thu Dec 31 19:24:23 2020 +0530 +++ b/mercurial/upgrade_utils/engine.py Thu Dec 31 19:42:10 2020 +0530 @@ -479,7 +479,7 @@ finishdatamigration(ui, srcrepo, dstrepo, requirements) - ui.status(_(b'data fully migrated to temporary repository\n')) + ui.status(_(b'data fully upgraded in a temporary repository\n')) backuppath = pycompat.mkdtemp(prefix=b'upgradebackup.', dir=srcrepo.path) backupvfs = vfsmod.vfs(backuppath)
--- a/tests/test-upgrade-repo.t Thu Dec 31 19:24:23 2020 +0530 +++ b/tests/test-upgrade-repo.t Thu Dec 31 19:42:10 2020 +0530 @@ -483,9 +483,9 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/modern/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/modern/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) - data fully migrated to temporary repository + 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/modern/.hg/upgradebackup.* (glob) @@ -539,7 +539,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -551,7 +551,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: -17 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -640,7 +640,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -652,7 +652,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -682,7 +682,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -699,7 +699,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -762,7 +762,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -779,7 +779,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -813,7 +813,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -830,7 +830,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -864,7 +864,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -881,7 +881,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -922,7 +922,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -939,7 +939,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -981,7 +981,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 519 KB in store; 1.05 MB tracked data @@ -998,7 +998,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/upgradegd/.hg/upgradebackup.* (glob) @@ -1037,7 +1037,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/store-filenames/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/store-filenames/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 3 total revisions (1 in filelogs, 1 in manifests, 1 in changelog) migrating 301 bytes in store; 107 bytes tracked data @@ -1050,7 +1050,7 @@ finished migrating 3 total revisions; total change in store size: 0 bytes copying .XX_special_filename copying phaseroots - data fully migrated to temporary repository + 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/store-filenames/.hg/upgradebackup.* (glob) @@ -1078,7 +1078,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/store-filenames/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/store-filenames/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 3 total revisions (1 in filelogs, 1 in manifests, 1 in changelog) migrating 301 bytes in store; 107 bytes tracked data @@ -1091,7 +1091,7 @@ finished migrating 3 total revisions; total change in store size: 0 bytes copying .XX_special_filename copying phaseroots - data fully migrated to temporary repository + 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/store-filenames/.hg/upgradebackup.* (glob) @@ -1144,7 +1144,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/largefilesrepo/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/largefilesrepo/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 3 total revisions (1 in filelogs, 1 in manifests, 1 in changelog) migrating 355 bytes in store; 160 bytes tracked data @@ -1156,7 +1156,7 @@ finished migrating 1 changelog revisions; change in size: 0 bytes finished migrating 3 total revisions; total change in store size: 0 bytes copying phaseroots - data fully migrated to temporary repository + 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/largefilesrepo/.hg/upgradebackup.* (glob) @@ -1202,7 +1202,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/largefilesrepo/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/largefilesrepo/.hg/upgrade.* (glob) (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) migrating 801 bytes in store; 467 bytes tracked data @@ -1215,7 +1215,7 @@ finished migrating 6 total revisions; total change in store size: 0 bytes copying phaseroots copying lfs blob d0beab232adff5ba365880366ad30b1edb85c4c5372442b5d2fe27adc96d653f - data fully migrated to temporary repository + 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/largefilesrepo/.hg/upgradebackup.* (glob) @@ -1307,7 +1307,7 @@ beginning upgrade... repository locked and read-only - creating temporary repository to stage migrated data: $TESTTMP/localconfig/.hg/upgrade.* (glob) + creating temporary repository to stage upgraded data: $TESTTMP/localconfig/.hg/upgrade.* (glob) (it is safe to interrupt this process any time before data migration completes) migrating 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog) migrating 1019 bytes in store; 882 bytes tracked data @@ -1319,7 +1319,7 @@ finished migrating 3 changelog revisions; change in size: 0 bytes finished migrating 9 total revisions; total change in store size: -9 bytes copying phaseroots - data fully migrated to temporary repository + 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/localconfig/.hg/upgradebackup.* (glob)