upgrade: support the --quiet flag
The command is currently very verbose with a various bit of output being time
sensitive or randomized. The make invocation bulky and hard to match in the
test. We move various message from `ui.write` to `ui.status` in order for the
`--quiet` flag to have effect and helps the situation.
As a side benefit, we can replace the various redirection to > /dev/null with the --quiet flag.
Differential Revision: https://phab.mercurial-scm.org/D8429
--- a/mercurial/upgrade.py Wed Apr 15 19:20:15 2020 +0200
+++ b/mercurial/upgrade.py Wed Apr 15 18:58:35 2020 +0200
@@ -807,14 +807,14 @@
if not revcount:
return
- ui.write(
+ ui.status(
_(
b'migrating %d total revisions (%d in filelogs, %d in manifests, '
b'%d in changelog)\n'
)
% (revcount, frevcount, mrevcount, crevcount)
)
- ui.write(
+ ui.status(
_(b'migrating %s in store; %s tracked data\n')
% ((util.bytecount(srcsize), util.bytecount(srcrawsize)))
)
@@ -837,7 +837,7 @@
oldrl = _revlogfrompath(srcrepo, unencoded)
if isinstance(oldrl, changelog.changelog) and b'c' not in seen:
- ui.write(
+ ui.status(
_(
b'finished migrating %d manifest revisions across %d '
b'manifests; change in size: %s\n'
@@ -845,7 +845,7 @@
% (mrevcount, mcount, util.bytecount(mdstsize - msrcsize))
)
- ui.write(
+ ui.status(
_(
b'migrating changelog containing %d revisions '
b'(%s in store; %s tracked data)\n'
@@ -861,7 +861,7 @@
_(b'changelog revisions'), total=crevcount
)
elif isinstance(oldrl, manifest.manifestrevlog) and b'm' not in seen:
- ui.write(
+ ui.status(
_(
b'finished migrating %d filelog revisions across %d '
b'filelogs; change in size: %s\n'
@@ -869,7 +869,7 @@
% (frevcount, fcount, util.bytecount(fdstsize - fsrcsize))
)
- ui.write(
+ ui.status(
_(
b'migrating %d manifests containing %d revisions '
b'(%s in store; %s tracked data)\n'
@@ -888,7 +888,7 @@
_(b'manifest revisions'), total=mrevcount
)
elif b'f' not in seen:
- ui.write(
+ ui.status(
_(
b'migrating %d filelogs containing %d revisions '
b'(%s in store; %s tracked data)\n'
@@ -941,7 +941,7 @@
progress.complete()
- ui.write(
+ ui.status(
_(
b'finished migrating %d changelog revisions; change in size: '
b'%s\n'
@@ -949,7 +949,7 @@
% (crevcount, util.bytecount(cdstsize - csrcsize))
)
- ui.write(
+ ui.status(
_(
b'finished migrating %d total revisions; total change in store '
b'size: %s\n'
@@ -1013,7 +1013,7 @@
assert srcrepo.currentwlock()
assert dstrepo.currentwlock()
- ui.write(
+ ui.status(
_(
b'(it is safe to interrupt this process any time before '
b'data migration completes)\n'
@@ -1048,14 +1048,14 @@
if not _filterstorefile(srcrepo, dstrepo, requirements, p, kind, st):
continue
- srcrepo.ui.write(_(b'copying %s\n') % p)
+ srcrepo.ui.status(_(b'copying %s\n') % p)
src = srcrepo.store.rawvfs.join(p)
dst = dstrepo.store.rawvfs.join(p)
util.copyfile(src, dst, copystat=True)
_finishdatamigration(ui, srcrepo, dstrepo, requirements)
- ui.write(_(b'data fully migrated to temporary repository\n'))
+ ui.status(_(b'data fully migrated to temporary repository\n'))
backuppath = pycompat.mkdtemp(prefix=b'upgradebackup.', dir=srcrepo.path)
backupvfs = vfsmod.vfs(backuppath)
@@ -1067,7 +1067,7 @@
# 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
# an inconsistent state.
- ui.write(
+ ui.status(
_(
b'marking source repository as being upgraded; clients will be '
b'unable to read from repository\n'
@@ -1077,18 +1077,18 @@
srcrepo.vfs, srcrepo.requirements | {b'upgradeinprogress'}
)
- ui.write(_(b'starting in-place swap of repository data\n'))
- ui.write(_(b'replaced files will be backed up at %s\n') % backuppath)
+ ui.status(_(b'starting in-place swap of repository data\n'))
+ 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
# the operation nearly instantaneous and atomic (at least in well-behaved
# environments).
- ui.write(_(b'replacing store...\n'))
+ ui.status(_(b'replacing store...\n'))
tstart = util.timer()
util.rename(srcrepo.spath, backupvfs.join(b'store'))
util.rename(dstrepo.spath, srcrepo.spath)
elapsed = util.timer() - tstart
- ui.write(
+ ui.status(
_(
b'store replacement complete; repository was inconsistent for '
b'%0.1fs\n'
@@ -1098,7 +1098,7 @@
# We first write the requirements file. Any new requirements will lock
# out legacy clients.
- ui.write(
+ ui.status(
_(
b'finalizing requirements file and making repository readable '
b'again\n'
@@ -1287,7 +1287,7 @@
def printupgradeactions():
for a in actions:
- ui.write(b'%s\n %s\n\n' % (a.name, a.upgrademessage))
+ ui.status(b'%s\n %s\n\n' % (a.name, a.upgrademessage))
if not run:
fromconfig = []
@@ -1302,35 +1302,35 @@
if fromconfig or onlydefault:
if fromconfig:
- ui.write(
+ ui.status(
_(
b'repository lacks features recommended by '
b'current config options:\n\n'
)
)
for i in fromconfig:
- ui.write(b'%s\n %s\n\n' % (i.name, i.description))
+ ui.status(b'%s\n %s\n\n' % (i.name, i.description))
if onlydefault:
- ui.write(
+ ui.status(
_(
b'repository lacks features used by the default '
b'config options:\n\n'
)
)
for i in onlydefault:
- ui.write(b'%s\n %s\n\n' % (i.name, i.description))
+ ui.status(b'%s\n %s\n\n' % (i.name, i.description))
- ui.write(b'\n')
+ ui.status(b'\n')
else:
- ui.write(
+ ui.status(
_(
b'(no feature deficiencies found in existing '
b'repository)\n'
)
)
- ui.write(
+ ui.status(
_(
b'performing an upgrade with "--run" will make the following '
b'changes:\n\n'
@@ -1344,14 +1344,14 @@
unusedoptimize = [i for i in alloptimizations if i not in actions]
if unusedoptimize:
- ui.write(
+ ui.status(
_(
b'additional optimizations are available by specifying '
b'"--optimize <name>":\n\n'
)
)
for i in unusedoptimize:
- ui.write(_(b'%s\n %s\n\n') % (i.name, i.description))
+ ui.status(_(b'%s\n %s\n\n') % (i.name, i.description))
return
# Else we're in the run=true case.
@@ -1362,9 +1362,9 @@
upgradeactions = [a.name for a in actions]
- ui.write(_(b'beginning upgrade...\n'))
+ ui.status(_(b'beginning upgrade...\n'))
with repo.wlock(), repo.lock():
- ui.write(_(b'repository locked and read-only\n'))
+ ui.status(_(b'repository locked and read-only\n'))
# Our strategy for upgrading the repository is to create a new,
# temporary repository, write data to it, then do a swap of the
# data. There are less heavyweight ways to do this, but it is easier
@@ -1373,7 +1373,7 @@
tmppath = pycompat.mkdtemp(prefix=b'upgrade.', dir=repo.path)
backuppath = None
try:
- ui.write(
+ ui.status(
_(
b'creating temporary repository to stage migrated '
b'data: %s\n'
@@ -1390,15 +1390,17 @@
ui, repo, dstrepo, newreqs, upgradeactions, revlogs=revlogs
)
if not (backup or backuppath is None):
- ui.write(_(b'removing old repository content%s\n') % backuppath)
+ ui.status(
+ _(b'removing old repository content%s\n') % backuppath
+ )
repo.vfs.rmtree(backuppath, forcibly=True)
backuppath = None
finally:
- ui.write(_(b'removing temporary repository %s\n') % tmppath)
+ ui.status(_(b'removing temporary repository %s\n') % tmppath)
repo.vfs.rmtree(tmppath, forcibly=True)
- if backuppath:
+ if backuppath and not ui.quiet:
ui.warn(
_(b'copy of old repository backed up at %s\n') % backuppath
)
--- a/tests/test-lfs-serve.t Wed Apr 15 19:20:15 2020 +0200
+++ b/tests/test-lfs-serve.t Wed Apr 15 18:58:35 2020 +0200
@@ -133,30 +133,6 @@
requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
- beginning upgrade...
- repository locked and read-only
- creating temporary repository to stage migrated data: * (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 324 bytes in store; 129 bytes tracked data
- migrating 1 filelogs containing 1 revisions (73 bytes in store; 8 bytes tracked data)
- finished migrating 1 filelog revisions across 1 filelogs; change in size: 0 bytes
- migrating 1 manifests containing 1 revisions (117 bytes in store; 52 bytes tracked data)
- finished migrating 1 manifest revisions across 1 manifests; change in size: 0 bytes
- migrating changelog containing 1 revisions (134 bytes in store; 69 bytes tracked data)
- 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
- 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 * (glob)
- replacing store...
- store replacement complete; repository was inconsistent for *s (glob)
- finalizing requirements file and making repository readable again
- removing temporary repository * (glob)
- copy of old repository backed up at * (glob)
- the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
$ grep 'lfs' .hg/requires $SERVER_REQUIRES
[1]
--- a/tests/test-upgrade-repo.t Wed Apr 15 19:20:15 2020 +0200
+++ b/tests/test-upgrade-repo.t Wed Apr 15 18:58:35 2020 +0200
@@ -174,6 +174,11 @@
every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
+ $ hg debugupgraderepo --quiet
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
+
+
--optimize can be used to add optimizations
$ hg debugupgrade --optimize redeltaparent
@@ -225,6 +230,12 @@
re-delta-fulladd
every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
+ $ hg debugupgrade --optimize re-delta-parent --quiet
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
+
+ optimisations: re-delta-parent
+
unknown optimization:
@@ -332,6 +343,11 @@
re-delta-fulladd
every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
+ $ hg debugupgraderepo --quiet
+ requirements
+ preserved: revlogv1, store
+ added: dotencode, fncache, generaldelta, sparserevlog
+
$ hg --config format.dotencode=false debugupgraderepo
repository lacks features recommended by current config options:
@@ -1210,9 +1226,13 @@
store
Check that we can add the sparse-revlog format requirement
- $ hg --config format.sparse-revlog=yes debugupgraderepo --run >/dev/null
- copy of old repository backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob)
- the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
+ $ hg --config format.sparse-revlog=yes debugupgraderepo --run --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, store
+ added: sparserevlog
+
$ cat .hg/requires
dotencode
fncache
@@ -1222,9 +1242,13 @@
store
Check that we can remove the sparse-revlog format requirement
- $ hg --config format.sparse-revlog=no debugupgraderepo --run >/dev/null
- copy of old repository backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob)
- the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
+ $ hg --config format.sparse-revlog=no debugupgraderepo --run --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, store
+ removed: sparserevlog
+
$ cat .hg/requires
dotencode
fncache
@@ -1239,7 +1263,13 @@
upgrade
- $ hg --config format.revlog-compression=zstd debugupgraderepo --run --no-backup >/dev/null
+ $ hg --config format.revlog-compression=zstd debugupgraderepo --run --no-backup --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, store
+ added: revlog-compression-zstd, sparserevlog
+
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
@@ -1262,7 +1292,13 @@
downgrade
- $ hg debugupgraderepo --run --no-backup > /dev/null
+ $ hg debugupgraderepo --run --no-backup --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
+ removed: revlog-compression-zstd
+
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
@@ -1288,7 +1324,13 @@
> [format]
> revlog-compression=zstd
> EOF
- $ hg debugupgraderepo --run --no-backup > /dev/null
+ $ hg debugupgraderepo --run --no-backup --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
+ added: revlog-compression-zstd
+
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
@@ -1316,7 +1358,15 @@
upgrade
- $ hg --config format.exp-use-side-data=yes debugupgraderepo --run --no-backup --config "extensions.sidedata=$TESTDIR/testlib/ext-sidedata.py" >/dev/null
+ $ hg --config format.exp-use-side-data=yes debugupgraderepo --run --no-backup --config "extensions.sidedata=$TESTDIR/testlib/ext-sidedata.py" --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, store (no-zstd !)
+ preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, sparserevlog, store (zstd !)
+ added: exp-sidedata-flag (zstd !)
+ added: exp-sidedata-flag, sparserevlog (no-zstd !)
+
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
@@ -1345,7 +1395,14 @@
downgrade
- $ hg debugupgraderepo --config format.exp-use-side-data=no --run --no-backup > /dev/null
+ $ hg debugupgraderepo --config format.exp-use-side-data=no --run --no-backup --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-zstd !)
+ preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, sparserevlog, store (zstd !)
+ removed: exp-sidedata-flag
+
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
@@ -1374,7 +1431,14 @@
> [format]
> exp-use-side-data=yes
> EOF
- $ hg debugupgraderepo --run --no-backup > /dev/null
+ $ hg debugupgraderepo --run --no-backup --quiet
+ upgrade will perform the following actions:
+
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-zstd !)
+ preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, sparserevlog, store (zstd !)
+ added: exp-sidedata-flag
+
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes