This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9358

upgrade: add support to downgrade share safe mode
ClosedPublic

Authored by pulkit on Nov 21 2020, 8:07 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGc6a1fa42e325: upgrade: add support to downgrade share safe mode
Summary

In previous patch we added support to upgrade current repository to use share
safe mode. This patch adds support to downgrade to remove share-safe mode.

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

pulkit created this revision.Nov 21 2020, 8:07 AM
mharbison72 added a subscriber: mharbison72.Nov 21 2020, 2:39 PM

I haven't followed all of the sharesafe stuff, but should the nonsharedhgrc be folded into the hgrc when downgrading or unsharing? I don't see that, at least in the unshare code.

Alphare added a subscriber: Alphare.Nov 23 2020, 11:10 AM
Alphare added inline comments.
mercurial/upgrade.py
1479

Not sure what Re-share existing shares means. Is it a suggestion?

pulkit added a comment.Nov 27 2020, 7:18 AM
In D9358#140795, @mharbison72 wrote:

I haven't followed all of the sharesafe stuff, but should the nonsharedhgrc be folded into the hgrc when downgrading or unsharing? I don't see that, at least in the unshare code.

There is no need for that because whether the repository is shared or not, we always try to read hgrc-not-shared always. https://www.mercurial-scm.org/repo/hg-committed/file/default/mercurial/localrepo.py#l735

pulkit added inline comments.Nov 27 2020, 7:20 AM
mercurial/upgrade.py
1479

Yes, I will reword it so that it's clearer.

pulkit retitled this revision from upgrade: add support do downgrade share safe mode to upgrade: add support to downgrade share safe mode.Nov 27 2020, 10:41 AM
pulkit updated this revision to Diff 23715.
mharbison72 added inline comments.Dec 2 2020, 12:14 AM
mercurial/localrepo.py
568

Needs bytes?

mharbison72 accepted this revision.Dec 2 2020, 12:35 PM
This revision is now accepted and ready to land.Dec 2 2020, 12:35 PM
pulkit added a commit: rHGc6a1fa42e325: upgrade: add support to downgrade share safe mode.Dec 2 2020, 12:40 PM
Closed by commit rHGc6a1fa42e325: upgrade: add support to downgrade share safe mode (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (10 lines)
Mmercurial/upgrade.py (9 lines)
Mtests/test-share-safe.t (75 lines)

Diff 23949

mercurial/localrepo.py

sharedvfs = _getsharedvfs(hgvfs, requirements) sharedvfs = _getsharedvfs(hgvfs, requirements)
# if .hg/requires contains the sharesafe requirement, it means # if .hg/requires contains the sharesafe requirement, it means
# there exists a `.hg/store/requires` too and we should read it # there exists a `.hg/store/requires` too and we should read it
# NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
# is present. We never write SHARESAFE_REQUIREMENT for a repo if store # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
# is not present, refer checkrequirementscompat() for that # is not present, refer checkrequirementscompat() for that
if requirementsmod.SHARESAFE_REQUIREMENT in requirements: if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
if (
shared
and requirementsmod.SHARESAFE_REQUIREMENT
not in _readrequires(sharedvfs, True)
):
raise error.Abort(
_(b"share source does not support exp-sharesafe requirement")
mharbison72Unsubmitted
Not Done

Needs bytes?

mharbison72: Needs bytes?
)
if shared: if shared:
# This is a shared repo # This is a shared repo
storevfs = vfsmod.vfs(sharedvfs.join(b'store')) storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
else: else:
storevfs = vfsmod.vfs(hgvfs.join(b'store')) storevfs = vfsmod.vfs(hgvfs.join(b'store'))
requirements |= _readrequires(storevfs, False) requirements |= _readrequires(storevfs, False)

mercurial/upgrade.py

the dropped requirement must appear in the returned set for the upgrade the dropped requirement must appear in the returned set for the upgrade
to be allowed. to be allowed.
""" """
supported = { supported = {
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.SIDEDATA_REQUIREMENT, requirements.SIDEDATA_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT, requirements.COPIESSDC_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]
if engine.available() and engine.revlogheader(): if engine.available() and engine.revlogheader():
supported.add(b'exp-compression-%s' % name) supported.add(b'exp-compression-%s' % name)
if engine.name() == b'zstd': if engine.name() == b'zstd':
supported.add(b'revlog-compression-zstd') supported.add(b'revlog-compression-zstd')
return supported return supported
ui.warn( ui.warn(
_( _(
b'repository upgraded to share safe mode, existing' b'repository upgraded to share safe mode, existing'
b' shares will still work in old non-safe mode. ' b' shares will still work in old non-safe mode. '
b'Re-share existing shares to use them in safe mode' b'Re-share existing shares to use them in safe mode'
b' New shares will be created in safe mode.\n' b' New shares will be created in safe mode.\n'
) )
) )
if sharedsafe.name in removedreqs:
ui.warn(
_(
b'repository downgraded to not use share safe mode, '
b'existing shares will not work and needs to'
b' be reshared.\n'
AlphareUnsubmitted
Not Done

Not sure what Re-share existing shares means. Is it a suggestion?

Alphare: Not sure what `Re-share existing shares` means. Is it a suggestion?
pulkitAuthorUnsubmitted
Done

Yes, I will reword it so that it's clearer.

pulkit: Yes, I will reword it so that it's clearer.
)
)

tests/test-share-safe.t

Make sure existing shares still works Make sure existing shares still works
$ hg log -GT "{node}: {desc}\n" -R ../nss-share $ hg log -GT "{node}: {desc}\n" -R ../nss-share
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Create a safe share from upgrade one
$ cd ..
$ hg share non-share-safe ss-share
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ss-share
$ hg log -GT "{node}: {desc}\n"
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ cd ../non-share-safe
Test that downgrading works too
$ cat >> $HGRCPATH <<EOF
> [extensions]
> share =
> [format]
> exp-share-safe = False
> EOF
$ hg debugupgraderepo -q
requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
removed: exp-sharesafe
$ hg debugupgraderepo -q --run
upgrade will perform the following actions:
requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
removed: exp-sharesafe
repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared.
$ hg debugrequirements
dotencode
fncache
generaldelta
revlogv1
sparserevlog
store
$ cat .hg/requires
dotencode
fncache
generaldelta
revlogv1
sparserevlog
store
$ test -f .hg/store/requires
[1]
$ hg log -GT "{node}: {desc}\n"
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Make sure existing shares still works
$ hg log -GT "{node}: {desc}\n" -R ../nss-share
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg unshare -R ../nss-share $ hg unshare -R ../nss-share
$ hg log -GT "{node}: {desc}\n" -R ../ss-share
abort: share source does not support exp-sharesafe requirement
[255]