mercurial-scm/hg: mercurial/upgrade.py comparison

comparison mercurial/upgrade.py @ 44798:e295ba238bd8

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

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Wed, 15 Apr 2020 18:58:35 +0200
parents	5ee4b2119af9
children	ea9563e9e65a

comparison

equal deleted inserted replaced

-:5ee4b2119af9
+:e295ba238bd8
 error.ProgrammingError(b'unknown revlog type')
 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)))
 )
 # Used to keep track of progress.
 continue
 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'
 )
 % (mrevcount, mcount, util.bytecount(mdstsize - msrcsize))
 )
-ui.write(
+ui.status(
 _(
 b'migrating changelog containing %d revisions '
 b'(%s in store; %s tracked data)\n'
 )
 % (
 seen.add(b'c')
 progress = srcrepo.ui.makeprogress(
 _(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'
 )
 % (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'
 )
 % (
 progress.complete()
 progress = srcrepo.ui.makeprogress(
 _(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'
 )
 % (
 else:
 fdstsize += datasize
 progress.complete()
-ui.write(
+ui.status(
 _(
 b'finished migrating %d changelog revisions; change in size: '
 b'%s\n'
 )
 % (crevcount, util.bytecount(cdstsize - csrcsize))
 )
-ui.write(
+ui.status(
 _(
 b'finished migrating %d total revisions; total change in store '
 b'size: %s\n'
 )
 % (revcount, util.bytecount(dstsize - srcsize))
 readers and without corrupting the source repository.
 """
 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'
 )
 )
 # The sorted() makes execution deterministic.
 for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)):
 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)
 # Make a backup of requires file first, as it is the first to be modified.
 # We install an arbitrary requirement that clients must not support
 # 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'
 )
 )
 scmutil.writerequires(
 srcrepo.vfs, srcrepo.requirements | {b'upgradeinprogress'}
 )
-ui.write(_(b'starting in-place swap of repository data\n'))
+ui.status(_(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'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'
 )
 % elapsed
 )
 # 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'
 )
 )
 )
 ui.write(b'\n\n')
 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 = []
 onlydefault = []
 onlydefault.append(d)
 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'
 )
 )
 printupgradeactions()
 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.
 ui.write(_(b'upgrade will perform the following actions:\n\n'))
 printrequirements()
 printoptimisations()
 printupgradeactions()
 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
 # to create a new repo object than to instantiate all the components
 # (like the store) separately.
 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'
 )
 % tmppath
 with dstrepo.wlock(), dstrepo.lock():
 backuppath = _upgraderepo(
 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
 )
 ui.warn(
 _(

Mercurial > public > mercurial-scm > hg

comparison mercurial/upgrade.py @ 44798:e295ba238bd8