This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9570

debugcommands: introduce command to upgrade/downgrade shares
Changes PlannedPublic

Authored by pulkit on Dec 12 2020, 5:46 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

In past few months, we have developed functionality to share requirements and
configs of share-source and a way to upgrade repository from old format to
share-safe format using debugupgraderepo command.

However there is still no way to upgrade the shares as debugupgraderepo does
not support upgrading that.

Having share-safe rolled out in existing setup is quite important and hence we
need a way to upgrade existing shares once share-source upgrades.

This patch introduces a new debug command debugsharesafe which can be used to
upgrade or downgrade shares.

Functionality to upgrade shares to use the new method is the last thing left in
the whole work.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Dec 12 2020, 5:46 AM
marmoute added a subscriber: marmoute.Dec 18 2020, 7:00 AM

should we simply teach hg debugupgraderepo to do this type of upgrade on shares? I am not comfortable with adding new updata/downgradfe command for specific requirements as it would become a jungle quite quickly.

pulkit added a comment.Dec 18 2020, 7:24 AM
In D9570#145046, @marmoute wrote:

should we simply teach hg debugupgraderepo to do this type of upgrade on shares? I am not comfortable with adding new updata/downgradfe command for specific requirements as it would become a jungle quite quickly.

hg debugupgraderepo does not support upgrading shares. It will require some good amount of work to have hg debugupgraderepo support shares and hence I didn't go that way.

marmoute added a comment.Dec 22 2020, 3:30 AM
In D9570#145047, @pulkit wrote:
In D9570#145046, @marmoute wrote:

should we simply teach hg debugupgraderepo to do this type of upgrade on shares? I am not comfortable with adding new updata/downgradfe command for specific requirements as it would become a jungle quite quickly.

hg debugupgraderepo does not support upgrading shares. It will require some good amount of work to have hg debugupgraderepo support shares and hence I didn't go that way.

Do you think we could we have this as some early branching in debugupgraderepo ?

baymax updated this revision to Diff 24610.Jan 6 2021, 6:53 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit planned changes to this revision.Jan 6 2021, 7:12 AM

Revision Contents
Changeset List

Diff 24194

mercurial/debugcommands.py

obsutil, obsutil,
pathutil, pathutil,
phases, phases,
policy, policy,
pvec, pvec,
pycompat, pycompat,
registrar, registrar,
repair, repair,
requirements as requirementsmod,
revlog, revlog,
revset, revset,
revsetlang, revsetlang,
scmutil, scmutil,
setdiscovery, setdiscovery,
simplemerge, simplemerge,
sshpeer, sshpeer,
sslutil, sslutil,
) )
display(other, chlist, displayer) display(other, chlist, displayer)
displayer.close() displayer.close()
finally: finally:
cleanupfn() cleanupfn()
@command( @command(
b'debugsharesafe',
[
(b'', b'upgrade', False, _(b'upgrade current share to share safe')),
(b'', b'downgrade', False, _(b'downgrade current share')),
(b'', b'force', False, _(b'forcefully perform operation')),
],
)
def debugsharesafe(ui, repo, *args, **opts):
"""upgrade or downgrade shares to enable/disable share-safe mode"""
if not repo.shared():
raise error.InputError(_(b"current repository is not shared one"))
cmdutil.check_at_most_one_arg(opts, 'upgrade', 'downgrade')
upgrade = opts.get('upgrade')
downgrade = opts.get('downgrade')
if not upgrade and not downgrade:
raise error.InputError(_(b"nothing specified"))
current_requirements = repo.requirements
if upgrade:
if requirementsmod.SHARESAFE_REQUIREMENT in current_requirements:
raise error.StateError(
_(b"repository already uses share-safe method")
)
sharesourcerequires = localrepo._readrequires(
localrepo._getsharedvfs(repo.vfs, current_requirements), False
)
if requirementsmod.SHARESAFE_REQUIREMENT not in sharesourcerequires:
raise error.StateError(
_(
b"share source does not support share-safe, unable to upgrade"
)
)
# share source has SHARESAFE requirement present, hence all the
# requirements will be store requires
storerequires = localrepo._readrequires(repo.svfs, False)
# after upgrade, store requires will be shared, so lets find
# the requirements which are not present in store and
# write them to share's .hg/requires
diffrequires = current_requirements - storerequires
# add share-safe requirement as it will mark the share as share-safe
diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(repo.vfs, diffrequires)
ui.status(_(b"repository upgraded to use share-safe functionality\n"))
ui.status(
_(
b"requirements and configs of shared-source will be "
b"read from now onwards\n"
)
)
else:
if requirementsmod.SHARESAFE_REQUIREMENT not in current_requirements:
raise error.StateError(
_(b"repository does not uses share safe method, nothing to do")
)
sharesourcerequires = localrepo._readrequires(
localrepo._getsharedvfs(repo.vfs, current_requirements), False
)
if requirementsmod.SHARESAFE_REQUIREMENT in sharesourcerequires:
# we should copy the store requires in .hg/requires and remove
# share-safe requirement
storerequires = localrepo._readrequires(repo.svfs, False)
current_requirements |= storerequires
current_requirements.remove(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(repo.vfs, current_requirements)
ui.status(
_(
b"repository downgraded to not use share-safe functionality\n"
)
)
else:
# share source does not use share-safe and has requirements in
# .hg/requires. We cannot be sure which requirement were shared
# earlier in share-safe mode. In other words, there can be wdir
# specific requirements which should not be copied but we have
# no way to detect them
if not opts.get('force'):
raise error.Abort(
_(
b"shared source does not support share-safe "
b"functionality, downgrading may not lead correct result"
),
hint=_(b"use --force to still downgrade"),
)
current_requirements |= sharesourcerequires
current_requirements.remove(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(repo.vfs, current_requirements)
ui.status(
_(
b"repository downgraded to not use share-safe functionality\n"
)
)
@command(
b'debugsub', b'debugsub',
[(b'r', b'rev', b'', _(b'revision to check'), _(b'REV'))], [(b'r', b'rev', b'', _(b'revision to check'), _(b'REV'))],
_(b'[-r REV] [REV]'), _(b'[-r REV] [REV]'),
) )
def debugsub(ui, repo, rev=None): def debugsub(ui, repo, rev=None):
ctx = scmutil.revsingle(repo, rev, None) ctx = scmutil.revsingle(repo, rev, None)
for k, v in sorted(ctx.substate.items()): for k, v in sorted(ctx.substate.items()):
ui.writenoi18n(b'path %s\n' % k) ui.writenoi18n(b'path %s\n' % k)

tests/test-completion.t

debugrebuildfncache debugrebuildfncache
debugrename debugrename
debugrequires debugrequires
debugrevlog debugrevlog
debugrevlogindex debugrevlogindex
debugrevspec debugrevspec
debugserve debugserve
debugsetparents debugsetparents
debugsharesafe
debugsidedata debugsidedata
debugssl debugssl
debugstrip debugstrip
debugsub debugsub
debugsuccessorssets debugsuccessorssets
debugtagscache debugtagscache
debugtemplate debugtemplate
debuguigetpass debuguigetpass
debugrebuildfncache: debugrebuildfncache:
debugrename: rev debugrename: rev
debugrequires: debugrequires:
debugrevlog: changelog, manifest, dir, dump debugrevlog: changelog, manifest, dir, dump
debugrevlogindex: changelog, manifest, dir, format debugrevlogindex: changelog, manifest, dir, format
debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized
debugserve: sshstdio, logiofd, logiofile debugserve: sshstdio, logiofd, logiofile
debugsetparents: debugsetparents:
debugsharesafe: upgrade, downgrade, force
debugsidedata: changelog, manifest, dir debugsidedata: changelog, manifest, dir
debugssl: debugssl:
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

tests/test-help.t

print the current repo requirements print the current repo requirements
debugrevlog show data and statistics about a revlog debugrevlog show data and statistics about a revlog
debugrevlogindex debugrevlogindex
dump the contents of a revlog index dump the contents of a revlog index
debugrevspec parse and apply a revision specification debugrevspec parse and apply a revision specification
debugserve run a server with advanced settings debugserve run a server with advanced settings
debugsetparents debugsetparents
manually set the parents of the current working directory manually set the parents of the current working directory
debugsharesafe
upgrade or downgrade shares to enable/disable share-safe mode
debugsidedata debugsidedata
dump the side data for a cl/manifest/file revision dump the side data for a cl/manifest/file revision
debugssl test a secure connection to a server debugssl test a secure connection to a server
debugstrip strip changesets and all their descendants from the repository debugstrip strip changesets and all their descendants from the repository
debugsub (no help text available) debugsub (no help text available)
debugsuccessorssets debugsuccessorssets
show set of successors for revision show set of successors for revision
debugtagscache debugtagscache

tests/test-share-safe.t

revlogv1 revlogv1
shared shared
sparserevlog sparserevlog
store store
$ echo c > c $ echo c > c
$ hg ci -Aqm "added c" $ hg ci -Aqm "added c"
$ hg debugsharesafe
abort: nothing specified
[10]
$ hg debugsharesafe --upgrade --downgrade
abort: cannot specify both --upgrade and --downgrade
[10]
$ hg debugsharesafe --upgrade
abort: repository already uses share-safe method
[20]
Check that config of the source repository is also loaded Check that config of the source repository is also loaded
$ hg showconfig ui.curses $ hg showconfig ui.curses
[1] [1]
$ echo "[ui]" >> ../source/.hg/hgrc $ echo "[ui]" >> ../source/.hg/hgrc
$ echo "curses=true" >> ../source/.hg/hgrc $ echo "curses=true" >> ../source/.hg/hgrc
$ hg log -GT "{node}: {desc}\n" -R ../nss-share $ hg log -GT "{node}: {desc}\n" -R ../nss-share
warning: source repository supports share-safe functionality. Reshare to upgrade. warning: source repository supports share-safe functionality. Reshare to upgrade.
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg debugsharesafe -R ../nss-share --downgrade
warning: source repository supports share-safe functionality. Reshare to upgrade.
abort: repository does not uses share safe method, nothing to do
[20]
$ hg debugsharesafe -R ../nss-share --upgrade
warning: source repository supports share-safe functionality. Reshare to upgrade.
repository upgraded to use share-safe functionality
requirements and configs of shared-source will be read from now onwards
$ hg log -GT "{node}: {desc}\n" -R ../nss-share
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg debugsharesafe -R ../nss-share --downgrade
repository downgraded to not use share-safe functionality
Create a safe share from upgrade one Create a safe share from upgrade one
$ cd .. $ cd ..
$ hg share non-share-safe ss-share $ hg share non-share-safe ss-share
updating working directory updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ss-share $ cd ss-share