This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8428

upgrade: clearly list optimisation
ClosedPublic

Authored by marmoute on Apr 15 2020, 4:16 PM.

Details

Reviewers
mharbison72
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5ee4b2119af9: upgrade: clearly list optimisations
Summary

This make the command operation clearer. And this will before necessary to have
a short version of this information with the next changesets, teaching `hg
debugupgraderepo` about --quiet.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (13 lines)
Mtests/test-upgrade-repo.t (20 lines)

Diff 21299

mercurial/upgrade.py

ui.write((b'\n')) ui.write((b'\n'))
added = newreqs - repo.requirements added = newreqs - repo.requirements
if added: if added:
ui.write(_(b' added: ')) ui.write(_(b' added: '))
write_labeled(added, "upgrade-repo.requirement.added") write_labeled(added, "upgrade-repo.requirement.added")
ui.write((b'\n')) ui.write((b'\n'))
ui.write(b'\n') ui.write(b'\n')
def printoptimisations():
optimisations = [a for a in actions if a.type == optimisation]
optimisations.sort(key=lambda a: a.name)
if optimisations:
ui.write(_(b'optimisations: '))
write_labeled(
[a.name for a in optimisations],
"upgrade-repo.optimisation.performed",
)
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.write(b'%s\n %s\n\n' % (a.name, a.upgrademessage))
if not run: if not run:
fromconfig = [] fromconfig = []
onlydefault = [] onlydefault = []
ui.write( ui.write(
_( _(
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()
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.write(
_( _(
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.write(_(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()
printupgradeactions() printupgradeactions()
upgradeactions = [a.name for a in actions] upgradeactions = [a.name for a in actions]
ui.write(_(b'beginning upgrade...\n')) ui.write(_(b'beginning upgrade...\n'))
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
ui.write(_(b'repository locked and read-only\n')) ui.write(_(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,

tests/test-upgrade-repo.t

$ 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
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
additional optimizations are available by specifying "--optimize <name>": additional optimizations are available by specifying "--optimize <name>":
re-delta-multibase re-delta-multibase
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.
modern form of the option modern form of the option
$ hg debugupgrade --optimize re-delta-parent $ hg debugupgrade --optimize re-delta-parent
(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
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
additional optimizations are available by specifying "--optimize <name>": additional optimizations are available by specifying "--optimize <name>":
re-delta-multibase re-delta-multibase
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
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:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
Check we can select negatively Check we can select negatively
$ hg debugupgrade --optimize re-delta-parent --run --no-manifest --no-backup --debug --traceback $ hg debugupgrade --optimize re-delta-parent --run --no-manifest --no-backup --debug --traceback
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
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
Check that we can select changelog only Check that we can select changelog only
$ hg debugupgrade --optimize re-delta-parent --run --changelog --no-backup --debug --traceback $ hg debugupgrade --optimize re-delta-parent --run --changelog --no-backup --debug --traceback
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
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
Check that we can select filelog only Check that we can select filelog only
$ hg debugupgrade --optimize re-delta-parent --run --no-changelog --no-manifest --no-backup --debug --traceback $ hg debugupgrade --optimize re-delta-parent --run --no-changelog --no-manifest --no-backup --debug --traceback
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
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
$ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback $ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
ignoring revlogs selection flags, format requirements change: sparserevlog ignoring revlogs selection flags, format requirements change: sparserevlog
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, store preserved: dotencode, fncache, generaldelta, revlogv1, store
removed: sparserevlog removed: sparserevlog
optimisations: re-delta-parent
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/upgradegd/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)
$ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback $ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
ignoring revlogs selection flags, format requirements change: sparserevlog ignoring revlogs selection flags, format requirements change: sparserevlog
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, store preserved: dotencode, fncache, generaldelta, revlogv1, store
added: sparserevlog added: sparserevlog
optimisations: re-delta-parent
sparserevlog sparserevlog
Revlog supports delta chain with more unused data between payload. These gaps will be skipped at read time. This allows for better delta chains, making a better compression and faster exchange with server. Revlog supports delta chain with more unused data between payload. These gaps will be skipped at read time. This allows for better delta chains, making a better compression and faster exchange with server.
re-delta-parent re-delta-parent
deltas within internal storage will choose a new base revision if needed deltas within internal storage will choose a new base revision if needed
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
copy of old repository backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob) copy of old repository backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob)
the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
$ hg debugupgraderepo --run --optimize redeltafulladd $ hg debugupgraderepo --run --optimize redeltafulladd
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
optimisations: re-delta-fulladd
re-delta-fulladd re-delta-fulladd
each revision will be added as new content to the internal storage; this will likely drastically slow down execution time, but some extensions might need it each revision will be added as new content to the internal storage; this will likely drastically slow down execution time, but some extensions might need it
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/store-filenames/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/store-filenames/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 3 total revisions (1 in filelogs, 1 in manifests, 1 in changelog)
2 1 2 0 other 30 200 107 0.53500 128 21 0.19626 128 128 0.83594 1 2 1 2 0 other 30 200 107 0.53500 128 21 0.19626 128 128 0.83594 1
$ hg debugupgraderepo --run --optimize redeltaall $ hg debugupgraderepo --run --optimize redeltaall
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
optimisations: re-delta-all
re-delta-all re-delta-all
deltas within internal storage will be fully recomputed; this will likely drastically slow down execution time deltas within internal storage will be fully recomputed; this will likely drastically slow down execution time
beginning upgrade... beginning upgrade...
repository locked and read-only repository locked and read-only
creating temporary repository to stage migrated data: $TESTTMP/localconfig/.hg/upgrade.* (glob) creating temporary repository to stage migrated data: $TESTTMP/localconfig/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (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 9 total revisions (3 in filelogs, 3 in manifests, 3 in changelog)