This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9468

upgrade: add an explicite --filelogs arguments
ClosedPublic

Authored by marmoute on Nov 30 2020, 10:43 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7c539f0febbe: upgrade: add an explicite --filelogs arguments
Summary

This make it possible to select no revlog for upgrade, which is useful for some
upgrade target or in some specific cases (eg: persistent-nodemap or share-safe
update).

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.

Event Timeline

marmoute created this revision.Nov 30 2020, 10:43 AM
pulkit added a subscriber: pulkit.Nov 30 2020, 11:36 AM

This make it possible to select no revlog for upgrade, which is useful for some
upgrade target or in some specific cases.

Can you mention the cases you are talking about in commit message? I guess these are related to copy-info ones but not sure.

marmoute added a comment.Dec 1 2020, 3:16 AM
In D9468#142362, @pulkit wrote:

This make it possible to select no revlog for upgrade, which is useful for some
upgrade target or in some specific cases.

Can you mention the cases you are talking about in commit message? I guess these are related to copy-info ones but not sure.

No they are related to case where do don't need to touch the revlogs diff at all, like persistent-nodemap or share-safe

marmoute edited the summary of this revision. (Show Details)Dec 1 2020, 4:54 AM
pulkit added a comment.Dec 1 2020, 6:13 AM
In D9468#142432, @marmoute wrote:
In D9468#142362, @pulkit wrote:

This make it possible to select no revlog for upgrade, which is useful for some
upgrade target or in some specific cases.

Can you mention the cases you are talking about in commit message? I guess these are related to copy-info ones but not sure.

No they are related to case where do don't need to touch the revlogs diff at all, like persistent-nodemap or share-safe

In that case, we can better have --no-revlogs or something similar. It won't be obvious that --filelog can be or is meant to be used for such purposes.

marmoute added a comment.Dec 1 2020, 7:37 AM
In D9468#142463, @pulkit wrote:
In D9468#142432, @marmoute wrote:
In D9468#142362, @pulkit wrote:

This make it possible to select no revlog for upgrade, which is useful for some
upgrade target or in some specific cases.

Can you mention the cases you are talking about in commit message? I guess these are related to copy-info ones but not sure.

No they are related to case where do don't need to touch the revlogs diff at all, like persistent-nodemap or share-safe

In that case, we can better have --no-revlogs or something similar. It won't be obvious that --filelog can be or is meant to be used for such purposes.

adding --filelogs mean --no-filelogs get added too and is the one used for that purporses. (and the doc explains it)

pulkit accepted this revision.Dec 2 2020, 2:10 AM
This revision is now accepted and ready to land.Dec 2 2020, 2:10 AM
marmoute updated this revision to Diff 23928.Dec 2 2020, 2:59 AM
marmoute added a commit: rHG7c539f0febbe: upgrade: add an explicite --filelogs arguments.Dec 2 2020, 3:04 AM
Closed by commit rHG7c539f0febbe: upgrade: add an explicite --filelogs arguments (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23931

mercurial/debugcommands.py

[], [],
_(b'extra optimization to perform'), _(b'extra optimization to perform'),
_(b'NAME'), _(b'NAME'),
), ),
(b'', b'run', False, _(b'performs an upgrade')), (b'', b'run', False, _(b'performs an upgrade')),
(b'', b'backup', True, _(b'keep the old repository content around')), (b'', b'backup', True, _(b'keep the old repository content around')),
(b'', b'changelog', None, _(b'select the changelog for upgrade')), (b'', b'changelog', None, _(b'select the changelog for upgrade')),
(b'', b'manifest', None, _(b'select the manifest for upgrade')), (b'', b'manifest', None, _(b'select the manifest for upgrade')),
(b'', b'filelogs', None, _(b'select all filelogs for upgrade')),
], ],
) )
def debugupgraderepo(ui, repo, run=False, optimize=None, backup=True, **opts): def debugupgraderepo(ui, repo, run=False, optimize=None, backup=True, **opts):
"""upgrade a repository to use different features """upgrade a repository to use different features
If no arguments are specified, the repository is evaluated for upgrade If no arguments are specified, the repository is evaluated for upgrade
and a list of problems and potential optimizations is printed. and a list of problems and potential optimizations is printed.
By default, all revlog will be upgraded. You can restrict this using flag By default, all revlog will be upgraded. You can restrict this using flag
such as `--manifest`: such as `--manifest`:
* `--manifest`: only optimize the manifest * `--manifest`: only optimize the manifest
* `--no-manifest`: optimize all revlog but the manifest * `--no-manifest`: optimize all revlog but the manifest
* `--changelog`: optimize the changelog only * `--changelog`: optimize the changelog only
* `--no-changelog --no-manifest`: optimize filelogs only * `--no-changelog --no-manifest`: optimize filelogs only
* `--filelogs`: optimize the filelogs only
* `--no-changelog --no-manifest --no-filelogs`: skip all filelog optimisation
""" """
return upgrade.upgraderepo( return upgrade.upgraderepo(
ui, repo, run=run, optimize=optimize, backup=backup, **opts ui, repo, run=run, optimize=optimize, backup=backup, **opts
) )
@command( @command(
b'debugwalk', cmdutil.walkopts, _(b'[OPTION]... [FILE]...'), inferrepo=True b'debugwalk', cmdutil.walkopts, _(b'[OPTION]... [FILE]...'), inferrepo=True

mercurial/upgrade.py

def upgraderepo( def upgraderepo(
ui, ui,
repo, repo,
run=False, run=False,
optimize=None, optimize=None,
backup=True, backup=True,
manifest=None, manifest=None,
changelog=None, changelog=None,
filelogs=None,
): ):
"""Upgrade a repository in place.""" """Upgrade a repository in place."""
if optimize is None: if optimize is None:
optimize = [] optimize = []
optimize = {legacy_opts_map.get(o, o) for o in optimize} optimize = {legacy_opts_map.get(o, o) for o in optimize}
repo = repo.unfiltered() repo = repo.unfiltered()
revlogs = set(UPGRADE_ALL_REVLOGS) revlogs = set(UPGRADE_ALL_REVLOGS)
specentries = ( specentries = (
(UPGRADE_CHANGELOG, changelog), (UPGRADE_CHANGELOG, changelog),
(UPGRADE_MANIFEST, manifest) (UPGRADE_MANIFEST, manifest),
(UPGRADE_FILELOGS, filelogs),
) )
specified = [(y, x) for (y, x) in specentries if x is not None] specified = [(y, x) for (y, x) in specentries if x is not None]
if specified: if specified:
# we have some limitation on revlogs to be recloned # we have some limitation on revlogs to be recloned
if any(x for y, x in specified): if any(x for y, x in specified):
revlogs = set() revlogs = set()
for upgrade, enabled in specified: for upgrade, enabled in specified:
if enabled: if enabled:

tests/test-completion.t

debugstrip: rev, force, no-backup, nobackup, , keep, bookmark, soft debugstrip: rev, force, no-backup, nobackup, , keep, bookmark, soft
debugsub: rev debugsub: rev
debugsuccessorssets: closest debugsuccessorssets: closest
debugtagscache: debugtagscache:
debugtemplate: rev, define debugtemplate: rev, define
debuguigetpass: prompt debuguigetpass: prompt
debuguiprompt: prompt debuguiprompt: prompt
debugupdatecaches: debugupdatecaches:
debugupgraderepo: optimize, run, backup, changelog, manifest debugupgraderepo: optimize, run, backup, changelog, manifest, filelogs
debugwalk: include, exclude debugwalk: include, exclude
debugwhyunstable: debugwhyunstable:
debugwireargs: three, four, five, ssh, remotecmd, insecure debugwireargs: three, four, five, ssh, remotecmd, insecure
debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
files: rev, print0, include, exclude, template, subrepos files: rev, print0, include, exclude, template, subrepos
forget: interactive, include, exclude, dry-run forget: interactive, include, exclude, dry-run