This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9691

sharesafe: make warning about outdated share configurable
ClosedPublic

Authored by pulkit on Jan 8 2021, 11:24 AM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9796cf108e4e: sharesafe: make warning about outdated share configurable
Summary

If the source repository upgrades to use sharesafe mode, we show a warning in
shares. This patch makes that warning configurable and some might not want their
users see this warning.

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 8 2021, 11:24 AM
marmoute requested changes to this revision.Jan 8 2021, 6:57 PM
marmoute added a subscriber: marmoute.

If the spirit of this setting is "do not bug the user with details it does not know about" (ie: large, managed install). We want this to also control the message issue if the automatic upgrade failed.

This revision now requires changes to proceed.Jan 8 2021, 6:57 PM
baymax updated this revision to Diff 24696.Jan 9 2021, 8:03 AM

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

pulkit added a comment.Jan 9 2021, 2:09 PM
In D9691#146606, @marmoute wrote:

If the spirit of this setting is "do not bug the user with details it does not know about" (ie: large, managed install). We want this to also control the message issue if the automatic upgrade failed.

Done.

Alphare accepted this revision.Jan 12 2021, 11:39 AM
pulkit updated this revision to Diff 24778.Jan 13 2021, 6:30 AM
pulkit added a commit: rHG9796cf108e4e: sharesafe: make warning about outdated share configurable.Jan 13 2021, 2:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9796cf108e4e: sharesafe: make warning about outdated share configurable (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24797

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'sharesafe-auto-upgrade-shares', b'sharesafe-auto-upgrade-shares',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'sharesafe-warn-outdated-shares',
default=True,
)
coreconfigitem(
b'experimental',
b'single-head-per-branch', b'single-head-per-branch',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'single-head-per-branch:account-closed-heads', b'single-head-per-branch:account-closed-heads',
default=False, default=False,
) )

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,
) )
else: elif ui.configbool(
b'experimental', b'sharesafe-warn-outdated-shares'
):
ui.warn( ui.warn(
_( _(
b'warning: source repository supports share-safe functionality.' b'warning: source repository supports share-safe functionality.'
b' Reshare to upgrade.\n' b' Reshare to upgrade.\n'
) )
) )
# The .hg/hgrc file may load extensions or contain config options # The .hg/hgrc file may load extensions or contain config options

mercurial/upgrade.py

# write them to share's .hg/requires # write them to share's .hg/requires
diffrequires = current_requirements - store_requirements diffrequires = current_requirements - store_requirements
# add share-safe requirement as it will mark the share as share-safe # add share-safe requirement as it will mark the share as share-safe
diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(hgvfs, diffrequires) scmutil.writerequires(hgvfs, diffrequires)
current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
ui.warn(_(b'repository upgraded to use share-safe mode\n')) ui.warn(_(b'repository upgraded to use share-safe mode\n'))
except error.LockError as e: except error.LockError as e:
if ui.configbool(b'experimental', b'sharesafe-warn-outdated-shares'):
ui.warn( ui.warn(
_(b'failed to upgrade share, got error: %s\n') _(b'failed to upgrade share, got error: %s\n')
% stringutil.forcebytestr(e.strerror) % stringutil.forcebytestr(e.strerror)
) )
finally: finally:
if wlock: if wlock:
wlock.release() wlock.release()
def downgrade_share_to_non_safe( def downgrade_share_to_non_safe(
ui, ui,
hgvfs, hgvfs,

tests/test-share-safe.t

$ 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 still works
$ 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. warning: source repository supports share-safe functionality. Reshare to upgrade.
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo 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
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true --config experimental.sharesafe-warn-outdated-shares=false
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ rm ../nss-share/.hg/wlock $ rm ../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
repository upgraded to use share-safe mode repository upgraded to use share-safe mode
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Test that unshare works Test that unshare works
$ hg unshare -R ../nss-share $ hg unshare -R ../nss-share
$ 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