| mharbison72 | |
| pulkit | |
| Alphare |
| hg-reviewers |
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.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
I think it might make sense to make some of these messages note() or debug(), but this is still an improvement.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/upgrade.py (70 lines) | |||
| M | tests/test-lfs-serve.t (24 lines) | |||
| M | tests/test-upgrade-repo.t (88 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute |
| fsrcsize += datasize | fsrcsize += datasize | ||||
| frawsize += rawsize | frawsize += rawsize | ||||
| else: | else: | ||||
| error.ProgrammingError(b'unknown revlog type') | error.ProgrammingError(b'unknown revlog type') | ||||
| if not revcount: | if not revcount: | ||||
| return | return | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'migrating %d total revisions (%d in filelogs, %d in manifests, ' | b'migrating %d total revisions (%d in filelogs, %d in manifests, ' | ||||
| b'%d in changelog)\n' | b'%d in changelog)\n' | ||||
| ) | ) | ||||
| % (revcount, frevcount, mrevcount, crevcount) | % (revcount, frevcount, mrevcount, crevcount) | ||||
| ) | ) | ||||
| ui.write( | ui.status( | ||||
| _(b'migrating %s in store; %s tracked data\n') | _(b'migrating %s in store; %s tracked data\n') | ||||
| % ((util.bytecount(srcsize), util.bytecount(srcrawsize))) | % ((util.bytecount(srcsize), util.bytecount(srcrawsize))) | ||||
| ) | ) | ||||
| # Used to keep track of progress. | # Used to keep track of progress. | ||||
| progress = None | progress = None | ||||
| def oncopiedrevision(rl, rev, node): | def oncopiedrevision(rl, rev, node): | ||||
| progress.increment() | progress.increment() | ||||
| sidedatacompanion = getsidedatacompanion(srcrepo, dstrepo) | sidedatacompanion = getsidedatacompanion(srcrepo, dstrepo) | ||||
| # Do the actual copying. | # Do the actual copying. | ||||
| # FUTURE this operation can be farmed off to worker processes. | # FUTURE this operation can be farmed off to worker processes. | ||||
| seen = set() | seen = set() | ||||
| for unencoded, encoded, size in alldatafiles: | for unencoded, encoded, size in alldatafiles: | ||||
| if unencoded.endswith(b'.d'): | if unencoded.endswith(b'.d'): | ||||
| continue | continue | ||||
| oldrl = _revlogfrompath(srcrepo, unencoded) | oldrl = _revlogfrompath(srcrepo, unencoded) | ||||
| if isinstance(oldrl, changelog.changelog) and b'c' not in seen: | if isinstance(oldrl, changelog.changelog) and b'c' not in seen: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'finished migrating %d manifest revisions across %d ' | b'finished migrating %d manifest revisions across %d ' | ||||
| b'manifests; change in size: %s\n' | b'manifests; change in size: %s\n' | ||||
| ) | ) | ||||
| % (mrevcount, mcount, util.bytecount(mdstsize - msrcsize)) | % (mrevcount, mcount, util.bytecount(mdstsize - msrcsize)) | ||||
| ) | ) | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'migrating changelog containing %d revisions ' | b'migrating changelog containing %d revisions ' | ||||
| b'(%s in store; %s tracked data)\n' | b'(%s in store; %s tracked data)\n' | ||||
| ) | ) | ||||
| % ( | % ( | ||||
| crevcount, | crevcount, | ||||
| util.bytecount(csrcsize), | util.bytecount(csrcsize), | ||||
| util.bytecount(crawsize), | util.bytecount(crawsize), | ||||
| ) | ) | ||||
| ) | ) | ||||
| seen.add(b'c') | seen.add(b'c') | ||||
| progress = srcrepo.ui.makeprogress( | progress = srcrepo.ui.makeprogress( | ||||
| _(b'changelog revisions'), total=crevcount | _(b'changelog revisions'), total=crevcount | ||||
| ) | ) | ||||
| elif isinstance(oldrl, manifest.manifestrevlog) and b'm' not in seen: | elif isinstance(oldrl, manifest.manifestrevlog) and b'm' not in seen: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'finished migrating %d filelog revisions across %d ' | b'finished migrating %d filelog revisions across %d ' | ||||
| b'filelogs; change in size: %s\n' | b'filelogs; change in size: %s\n' | ||||
| ) | ) | ||||
| % (frevcount, fcount, util.bytecount(fdstsize - fsrcsize)) | % (frevcount, fcount, util.bytecount(fdstsize - fsrcsize)) | ||||
| ) | ) | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'migrating %d manifests containing %d revisions ' | b'migrating %d manifests containing %d revisions ' | ||||
| b'(%s in store; %s tracked data)\n' | b'(%s in store; %s tracked data)\n' | ||||
| ) | ) | ||||
| % ( | % ( | ||||
| mcount, | mcount, | ||||
| mrevcount, | mrevcount, | ||||
| util.bytecount(msrcsize), | util.bytecount(msrcsize), | ||||
| util.bytecount(mrawsize), | util.bytecount(mrawsize), | ||||
| ) | ) | ||||
| ) | ) | ||||
| seen.add(b'm') | seen.add(b'm') | ||||
| if progress: | if progress: | ||||
| progress.complete() | progress.complete() | ||||
| progress = srcrepo.ui.makeprogress( | progress = srcrepo.ui.makeprogress( | ||||
| _(b'manifest revisions'), total=mrevcount | _(b'manifest revisions'), total=mrevcount | ||||
| ) | ) | ||||
| elif b'f' not in seen: | elif b'f' not in seen: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'migrating %d filelogs containing %d revisions ' | b'migrating %d filelogs containing %d revisions ' | ||||
| b'(%s in store; %s tracked data)\n' | b'(%s in store; %s tracked data)\n' | ||||
| ) | ) | ||||
| % ( | % ( | ||||
| fcount, | fcount, | ||||
| frevcount, | frevcount, | ||||
| util.bytecount(fsrcsize), | util.bytecount(fsrcsize), | ||||
| cdstsize += datasize | cdstsize += datasize | ||||
| elif isinstance(newrl, manifest.manifestrevlog): | elif isinstance(newrl, manifest.manifestrevlog): | ||||
| mdstsize += datasize | mdstsize += datasize | ||||
| else: | else: | ||||
| fdstsize += datasize | fdstsize += datasize | ||||
| progress.complete() | progress.complete() | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'finished migrating %d changelog revisions; change in size: ' | b'finished migrating %d changelog revisions; change in size: ' | ||||
| b'%s\n' | b'%s\n' | ||||
| ) | ) | ||||
| % (crevcount, util.bytecount(cdstsize - csrcsize)) | % (crevcount, util.bytecount(cdstsize - csrcsize)) | ||||
| ) | ) | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'finished migrating %d total revisions; total change in store ' | b'finished migrating %d total revisions; total change in store ' | ||||
| b'size: %s\n' | b'size: %s\n' | ||||
| ) | ) | ||||
| % (revcount, util.bytecount(dstsize - srcsize)) | % (revcount, util.bytecount(dstsize - srcsize)) | ||||
| ) | ) | ||||
| The source repository is unmodified for as long as possible so the | The source repository is unmodified for as long as possible so the | ||||
| upgrade can abort at any time without causing loss of service for | upgrade can abort at any time without causing loss of service for | ||||
| readers and without corrupting the source repository. | readers and without corrupting the source repository. | ||||
| """ | """ | ||||
| assert srcrepo.currentwlock() | assert srcrepo.currentwlock() | ||||
| assert dstrepo.currentwlock() | assert dstrepo.currentwlock() | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'(it is safe to interrupt this process any time before ' | b'(it is safe to interrupt this process any time before ' | ||||
| b'data migration completes)\n' | b'data migration completes)\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| if b're-delta-all' in actions: | if b're-delta-all' in actions: | ||||
| deltareuse = revlog.revlog.DELTAREUSENEVER | deltareuse = revlog.revlog.DELTAREUSENEVER | ||||
| ) | ) | ||||
| # Now copy other files in the store directory. | # Now copy other files in the store directory. | ||||
| # The sorted() makes execution deterministic. | # The sorted() makes execution deterministic. | ||||
| for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)): | for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)): | ||||
| if not _filterstorefile(srcrepo, dstrepo, requirements, p, kind, st): | if not _filterstorefile(srcrepo, dstrepo, requirements, p, kind, st): | ||||
| continue | continue | ||||
| srcrepo.ui.write(_(b'copying %s\n') % p) | srcrepo.ui.status(_(b'copying %s\n') % p) | ||||
| src = srcrepo.store.rawvfs.join(p) | src = srcrepo.store.rawvfs.join(p) | ||||
| dst = dstrepo.store.rawvfs.join(p) | dst = dstrepo.store.rawvfs.join(p) | ||||
| util.copyfile(src, dst, copystat=True) | util.copyfile(src, dst, copystat=True) | ||||
| _finishdatamigration(ui, srcrepo, dstrepo, requirements) | _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) | 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. | # Make a backup of requires file first, as it is the first to be modified. | ||||
| util.copyfile(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 | # We install an arbitrary requirement that clients must not support | ||||
| # as a mechanism to lock out new clients during the data swap. This is | # 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 | # better than allowing a client to continue while the repository is in | ||||
| # an inconsistent state. | # an inconsistent state. | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'marking source repository as being upgraded; clients will be ' | b'marking source repository as being upgraded; clients will be ' | ||||
| b'unable to read from repository\n' | b'unable to read from repository\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| scmutil.writerequires( | scmutil.writerequires( | ||||
| srcrepo.vfs, srcrepo.requirements | {b'upgradeinprogress'} | 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 | # 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 | # the operation nearly instantaneous and atomic (at least in well-behaved | ||||
| # environments). | # environments). | ||||
| ui.write(_(b'replacing store...\n')) | ui.status(_(b'replacing store...\n')) | ||||
| tstart = util.timer() | tstart = util.timer() | ||||
| util.rename(srcrepo.spath, backupvfs.join(b'store')) | util.rename(srcrepo.spath, backupvfs.join(b'store')) | ||||
| util.rename(dstrepo.spath, srcrepo.spath) | util.rename(dstrepo.spath, srcrepo.spath) | ||||
| elapsed = util.timer() - tstart | elapsed = util.timer() - tstart | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'store replacement complete; repository was inconsistent for ' | b'store replacement complete; repository was inconsistent for ' | ||||
| b'%0.1fs\n' | b'%0.1fs\n' | ||||
| ) | ) | ||||
| % elapsed | % elapsed | ||||
| ) | ) | ||||
| # We first write the requirements file. Any new requirements will lock | # We first write the requirements file. Any new requirements will lock | ||||
| # out legacy clients. | # out legacy clients. | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'finalizing requirements file and making repository readable ' | b'finalizing requirements file and making repository readable ' | ||||
| b'again\n' | b'again\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| scmutil.writerequires(srcrepo.vfs, requirements) | scmutil.writerequires(srcrepo.vfs, requirements) | ||||
| # The lock file from the old store won't be removed because nothing has a | # The lock file from the old store won't be removed because nothing has a | ||||
| write_labeled( | write_labeled( | ||||
| [a.name for a in optimisations], | [a.name for a in optimisations], | ||||
| "upgrade-repo.optimisation.performed", | "upgrade-repo.optimisation.performed", | ||||
| ) | ) | ||||
| ui.write(b'\n\n') | ui.write(b'\n\n') | ||||
| def printupgradeactions(): | def printupgradeactions(): | ||||
| for a in actions: | 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: | if not run: | ||||
| fromconfig = [] | fromconfig = [] | ||||
| onlydefault = [] | onlydefault = [] | ||||
| for d in deficiencies: | for d in deficiencies: | ||||
| if d.fromconfig(repo): | if d.fromconfig(repo): | ||||
| fromconfig.append(d) | fromconfig.append(d) | ||||
| elif d.default: | elif d.default: | ||||
| onlydefault.append(d) | onlydefault.append(d) | ||||
| if fromconfig or onlydefault: | if fromconfig or onlydefault: | ||||
| if fromconfig: | if fromconfig: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'repository lacks features recommended by ' | b'repository lacks features recommended by ' | ||||
| b'current config options:\n\n' | b'current config options:\n\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| for i in fromconfig: | 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: | if onlydefault: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'repository lacks features used by the default ' | b'repository lacks features used by the default ' | ||||
| b'config options:\n\n' | b'config options:\n\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| for i in onlydefault: | 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: | else: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'(no feature deficiencies found in existing ' | b'(no feature deficiencies found in existing ' | ||||
| b'repository)\n' | b'repository)\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'performing an upgrade with "--run" will make the following ' | b'performing an upgrade with "--run" will make the following ' | ||||
| b'changes:\n\n' | b'changes:\n\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| printrequirements() | printrequirements() | ||||
| printoptimisations() | printoptimisations() | ||||
| printupgradeactions() | printupgradeactions() | ||||
| unusedoptimize = [i for i in alloptimizations if i not in actions] | unusedoptimize = [i for i in alloptimizations if i not in actions] | ||||
| if unusedoptimize: | if unusedoptimize: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'additional optimizations are available by specifying ' | b'additional optimizations are available by specifying ' | ||||
| b'"--optimize <name>":\n\n' | b'"--optimize <name>":\n\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| for i in unusedoptimize: | 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 | return | ||||
| # Else we're in the run=true case. | # Else we're in the run=true case. | ||||
| ui.write(_(b'upgrade will perform the following actions:\n\n')) | ui.write(_(b'upgrade will perform the following actions:\n\n')) | ||||
| printrequirements() | printrequirements() | ||||
| printoptimisations() | printoptimisations() | ||||
| printupgradeactions() | printupgradeactions() | ||||
| upgradeactions = [a.name for a in actions] | upgradeactions = [a.name for a in actions] | ||||
| ui.write(_(b'beginning upgrade...\n')) | ui.status(_(b'beginning upgrade...\n')) | ||||
| with repo.wlock(), repo.lock(): | 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, | # Our strategy for upgrading the repository is to create a new, | ||||
| # temporary repository, write data to it, then do a swap of the | # 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 | # 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 | # to create a new repo object than to instantiate all the components | ||||
| # (like the store) separately. | # (like the store) separately. | ||||
| tmppath = pycompat.mkdtemp(prefix=b'upgrade.', dir=repo.path) | tmppath = pycompat.mkdtemp(prefix=b'upgrade.', dir=repo.path) | ||||
| backuppath = None | backuppath = None | ||||
| try: | try: | ||||
| ui.write( | ui.status( | ||||
| _( | _( | ||||
| b'creating temporary repository to stage migrated ' | b'creating temporary repository to stage migrated ' | ||||
| b'data: %s\n' | b'data: %s\n' | ||||
| ) | ) | ||||
| % tmppath | % tmppath | ||||
| ) | ) | ||||
| # clone ui without using ui.copy because repo.ui is protected | # clone ui without using ui.copy because repo.ui is protected | ||||
| repoui = repo.ui.__class__(repo.ui) | repoui = repo.ui.__class__(repo.ui) | ||||
| 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 = _upgraderepo( | backuppath = _upgraderepo( | ||||
| ui, repo, dstrepo, newreqs, upgradeactions, revlogs=revlogs | ui, repo, dstrepo, newreqs, upgradeactions, revlogs=revlogs | ||||
| ) | ) | ||||
| if not (backup or backuppath is None): | 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) | repo.vfs.rmtree(backuppath, forcibly=True) | ||||
| backuppath = None | backuppath = None | ||||
| finally: | 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) | repo.vfs.rmtree(tmppath, forcibly=True) | ||||
| if backuppath: | if backuppath and not ui.quiet: | ||||
| ui.warn( | ui.warn( | ||||
| _(b'copy of old repository backed up at %s\n') % backuppath | _(b'copy of old repository backed up at %s\n') % backuppath | ||||
| ) | ) | ||||
| ui.warn( | ui.warn( | ||||
| _( | _( | ||||
| b'the old repository will not be deleted; remove ' | b'the old repository will not be deleted; remove ' | ||||
| b'it to free up disk space once the upgraded ' | b'it to free up disk space once the upgraded ' | ||||
| b'repository is verified\n' | b'repository is verified\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@ | ||||
| +non-lfs | +non-lfs | ||||
| *** runcommand debugupgraderepo -q --run | *** runcommand debugupgraderepo -q --run | ||||
| upgrade will perform the following actions: | upgrade will perform the following actions: | ||||
| requirements | requirements | ||||
| preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | 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 | $ grep 'lfs' .hg/requires $SERVER_REQUIRES | ||||
| [1] | [1] | ||||
| #if lfsremote-on | #if lfsremote-on | ||||
| $ hg push -q | $ hg push -q | ||||
| $ grep 'lfs' .hg/requires $SERVER_REQUIRES | $ grep 'lfs' .hg/requires $SERVER_REQUIRES | ||||
| re-delta-all | re-delta-all | ||||
| deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed | deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed | ||||
| re-delta-fulladd | 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. | 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 | --optimize can be used to add optimizations | ||||
| $ hg debugupgrade --optimize redeltaparent | $ hg debugupgrade --optimize redeltaparent | ||||
| (no feature deficiencies found in existing repository) | (no feature deficiencies found in existing repository) | ||||
| performing an upgrade with "--run" will make the following changes: | performing an upgrade with "--run" will make the following changes: | ||||
| requirements | requirements | ||||
| preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store | ||||
| deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges | deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges | ||||
| re-delta-all | re-delta-all | ||||
| deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed | deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed | ||||
| re-delta-fulladd | 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. | 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: | unknown optimization: | ||||
| $ hg debugupgrade --optimize foobar | $ hg debugupgrade --optimize foobar | ||||
| abort: unknown optimization action requested: foobar | abort: unknown optimization action requested: foobar | ||||
| (run without arguments to see valid optimizations) | (run without arguments to see valid optimizations) | ||||
| [255] | [255] | ||||
| deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges | deltas within internal storage will be recalculated against multiple base revision and the smallest difference will be used; the size of the repository may shrink significantly when there are many merges; this optimization will slow down execution in proportion to the number of merges in the repository and the amount of files in the repository; this slow down should not be significant unless there are tens of thousands of files and thousands of merges | ||||
| re-delta-all | re-delta-all | ||||
| deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed | deltas within internal storage will always be recalculated without reusing prior deltas; this will likely make execution run several times slower; this optimization is typically not needed | ||||
| re-delta-fulladd | 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. | 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 | $ hg --config format.dotencode=false debugupgraderepo | ||||
| repository lacks features recommended by current config options: | repository lacks features recommended by current config options: | ||||
| fncache | fncache | ||||
| long and reserved filenames may not work correctly; repository performance is sub-optimal | long and reserved filenames may not work correctly; repository performance is sub-optimal | ||||
| generaldelta | generaldelta | ||||
| $ cat .hg/requires | $ cat .hg/requires | ||||
| dotencode | dotencode | ||||
| fncache | fncache | ||||
| generaldelta | generaldelta | ||||
| revlogv1 | revlogv1 | ||||
| store | store | ||||
| Check that we can add the sparse-revlog format requirement | Check that we can add the sparse-revlog format requirement | ||||
| $ hg --config format.sparse-revlog=yes debugupgraderepo --run >/dev/null | $ hg --config format.sparse-revlog=yes debugupgraderepo --run --quiet | ||||
| copy of old repository backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob) | upgrade will perform the following actions: | ||||
| the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified | |||||
| requirements | |||||
| preserved: dotencode, fncache, generaldelta, revlogv1, store | |||||
| added: sparserevlog | |||||
| $ cat .hg/requires | $ cat .hg/requires | ||||
| dotencode | dotencode | ||||
| fncache | fncache | ||||
| generaldelta | generaldelta | ||||
| revlogv1 | revlogv1 | ||||
| sparserevlog | sparserevlog | ||||
| store | store | ||||
| Check that we can remove the sparse-revlog format requirement | Check that we can remove the sparse-revlog format requirement | ||||
| $ hg --config format.sparse-revlog=no debugupgraderepo --run >/dev/null | $ hg --config format.sparse-revlog=no debugupgraderepo --run --quiet | ||||
| copy of old repository backed up at $TESTTMP/sparserevlogrepo/.hg/upgradebackup.* (glob) | upgrade will perform the following actions: | ||||
| the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified | |||||
| requirements | |||||
| preserved: dotencode, fncache, generaldelta, revlogv1, store | |||||
| removed: sparserevlog | |||||
| $ cat .hg/requires | $ cat .hg/requires | ||||
| dotencode | dotencode | ||||
| fncache | fncache | ||||
| generaldelta | generaldelta | ||||
| revlogv1 | revlogv1 | ||||
| store | store | ||||
| #if zstd | #if zstd | ||||
| Check upgrading to a zstd revlog | Check upgrading to a zstd revlog | ||||
| -------------------------------- | -------------------------------- | ||||
| upgrade | 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 | $ hg debugformat -v | ||||
| format-variant repo config default | format-variant repo config default | ||||
| fncache: yes yes yes | fncache: yes yes yes | ||||
| dotencode: yes yes yes | dotencode: yes yes yes | ||||
| generaldelta: yes yes yes | generaldelta: yes yes yes | ||||
| sparserevlog: yes yes yes | sparserevlog: yes yes yes | ||||
| sidedata: no no no | sidedata: no no no | ||||
| copies-sdc: no no no | copies-sdc: no no no | ||||
| plain-cl-delta: yes yes yes | plain-cl-delta: yes yes yes | ||||
| compression: zstd zlib zlib | compression: zstd zlib zlib | ||||
| compression-level: default default default | compression-level: default default default | ||||
| $ cat .hg/requires | $ cat .hg/requires | ||||
| dotencode | dotencode | ||||
| fncache | fncache | ||||
| generaldelta | generaldelta | ||||
| revlog-compression-zstd | revlog-compression-zstd | ||||
| revlogv1 | revlogv1 | ||||
| sparserevlog | sparserevlog | ||||
| store | store | ||||
| downgrade | 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 | $ hg debugformat -v | ||||
| format-variant repo config default | format-variant repo config default | ||||
| fncache: yes yes yes | fncache: yes yes yes | ||||
| dotencode: yes yes yes | dotencode: yes yes yes | ||||
| generaldelta: yes yes yes | generaldelta: yes yes yes | ||||
| sparserevlog: yes yes yes | sparserevlog: yes yes yes | ||||
| sidedata: no no no | sidedata: no no no | ||||
| copies-sdc: no no no | copies-sdc: no no no | ||||
| store | store | ||||
| upgrade from hgrc | upgrade from hgrc | ||||
| $ cat >> .hg/hgrc << EOF | $ cat >> .hg/hgrc << EOF | ||||
| > [format] | > [format] | ||||
| > revlog-compression=zstd | > revlog-compression=zstd | ||||
| > EOF | > 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 | $ hg debugformat -v | ||||
| format-variant repo config default | format-variant repo config default | ||||
| fncache: yes yes yes | fncache: yes yes yes | ||||
| dotencode: yes yes yes | dotencode: yes yes yes | ||||
| generaldelta: yes yes yes | generaldelta: yes yes yes | ||||
| sparserevlog: yes yes yes | sparserevlog: yes yes yes | ||||
| sidedata: no no no | sidedata: no no no | ||||
| copies-sdc: no no no | copies-sdc: no no no | ||||
| #endif | #endif | ||||
| Check upgrading to a side-data revlog | Check upgrading to a side-data revlog | ||||
| ------------------------------------- | ------------------------------------- | ||||
| upgrade | 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 | $ hg debugformat -v | ||||
| format-variant repo config default | format-variant repo config default | ||||
| fncache: yes yes yes | fncache: yes yes yes | ||||
| dotencode: yes yes yes | dotencode: yes yes yes | ||||
| generaldelta: yes yes yes | generaldelta: yes yes yes | ||||
| sparserevlog: yes yes yes | sparserevlog: yes yes yes | ||||
| sidedata: yes no no | sidedata: yes no no | ||||
| copies-sdc: no no no | copies-sdc: no no no | ||||
| store | store | ||||
| $ hg debugsidedata -c 0 | $ hg debugsidedata -c 0 | ||||
| 2 sidedata entries | 2 sidedata entries | ||||
| entry-0001 size 4 | entry-0001 size 4 | ||||
| entry-0002 size 32 | entry-0002 size 32 | ||||
| downgrade | 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 | $ hg debugformat -v | ||||
| format-variant repo config default | format-variant repo config default | ||||
| fncache: yes yes yes | fncache: yes yes yes | ||||
| dotencode: yes yes yes | dotencode: yes yes yes | ||||
| generaldelta: yes yes yes | generaldelta: yes yes yes | ||||
| sparserevlog: yes yes yes | sparserevlog: yes yes yes | ||||
| sidedata: no no no | sidedata: no no no | ||||
| copies-sdc: no no no | copies-sdc: no no no | ||||
| $ hg debugsidedata -c 0 | $ hg debugsidedata -c 0 | ||||
| upgrade from hgrc | upgrade from hgrc | ||||
| $ cat >> .hg/hgrc << EOF | $ cat >> .hg/hgrc << EOF | ||||
| > [format] | > [format] | ||||
| > exp-use-side-data=yes | > exp-use-side-data=yes | ||||
| > EOF | > 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 | $ hg debugformat -v | ||||
| format-variant repo config default | format-variant repo config default | ||||
| fncache: yes yes yes | fncache: yes yes yes | ||||
| dotencode: yes yes yes | dotencode: yes yes yes | ||||
| generaldelta: yes yes yes | generaldelta: yes yes yes | ||||
| sparserevlog: yes yes yes | sparserevlog: yes yes yes | ||||
| sidedata: yes yes no | sidedata: yes yes no | ||||
| copies-sdc: no no no | copies-sdc: no no no | ||||