This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9784

localrepo: disallow share if there is a version mismatch by default
ClosedPublic

Authored by pulkit on Jan 15 2021, 1:47 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG8788981c95f8: localrepo: disallow share if there is a version mismatch by default
Summary

Earlier we used to allow shares which don't use share-safe mechanism to access
repository which uses share-safe mechanism. This defeats the purpose and is bad
behavior. This patch disallows that.

Next patch will introduce a config option to allow that and have clearer
understanding around various options.

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.Jan 15 2021, 1:47 AM
marmoute added a subscriber: marmoute.Jan 15 2021, 5:16 AM

That patch itself is good.

The error message it touch should get a hint pointing to the appriate documentation so that the user can understand and fix the situation.

marmoute accepted this revision.Jan 15 2021, 5:16 AM

(please follow up for the message)

mharbison72 requested changes to this revision.Jan 17 2021, 5:19 PM
mharbison72 added a subscriber: mharbison72.
mharbison72 added inline comments.
mercurial/localrepo.py
614–615

"the source uses", or at least s/use/uses/. I'd fix this in flight, but it looks like none of the rest of the series applies without the previous patch anyway.

This revision now requires changes to proceed.Jan 17 2021, 5:19 PM
marmoute added a comment.Jan 17 2021, 5:25 PM

note: I am fine with D9783 being taken in its current forms and the locking being fixed as a follow up. Overall the series is still an improvement.

marmoute accepted this revision.Jan 18 2021, 10:47 AM
mharbison72 accepted this revision.Jan 18 2021, 9:08 PM
This revision is now accepted and ready to land.Jan 18 2021, 9:08 PM

Revision Contents
Changeset List

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

Diff 25147

mercurial/localrepo.py

from . import upgrade from . import upgrade
upgrade.upgrade_share_to_safe( upgrade.upgrade_share_to_safe(
ui, ui,
hgvfs, hgvfs,
storevfs, storevfs,
requirements, requirements,
) )
elif ui.configbool( else:
b'experimental', b'sharesafe-warn-outdated-shares' raise error.Abort(
):
ui.warn(
_( _(
b'warning: source repository supports share-safe functionality.' b'version mismatch: source uses share-safe'
b' Reshare to upgrade.\n' b' functionality while the current share does not'
mharbison72Unsubmitted
Not Done

"the source uses", or at least s/use/uses/. I'd fix this in flight, but it looks like none of the rest of the series applies without the previous patch anyway.

mharbison72: "the source uses", or at least s/use/uses/. I'd fix this in flight, but it looks like none of…
) )
) )
# The .hg/hgrc file may load extensions or contain config options # The .hg/hgrc file may load extensions or contain config options
# that influence repository construction. Attempt to load it and # that influence repository construction. Attempt to load it and
# process any new extensions that it may have pulled in. # process any new extensions that it may have pulled in.
if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
afterhgrcload(ui, wdirvfs, hgvfs, requirements) afterhgrcload(ui, wdirvfs, hgvfs, requirements)

tests/test-share-safe.t

store store
$ hg log -GT "{node}: {desc}\n" $ hg log -GT "{node}: {desc}\n"
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Make sure existing shares still works Make sure existing shares dont work with default config
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-warn-outdated-shares=false
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ 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. abort: version mismatch: source uses share-safe functionality while the current share does not
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar [255]
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
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
dotencode dotencode
exp-sharesafe exp-sharesafe
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog
store store
$ 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. abort: version mismatch: source uses share-safe functionality while the current share does not
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar [255]
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Check that if lock is taken, upgrade fails but read operation are successful Check that if lock is taken, upgrade fails but read operation are successful
$ touch ../nss-share/.hg/wlock $ touch ../nss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true
failed to upgrade share, got error: Lock held failed to upgrade share, got error: Lock held
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo