# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1610121856 -19800 # Node ID 9796cf108e4eac4f6853daaaad87521067750fcc # Parent bc884e31b8c81920552ac893619ad4423b750269 sharesafe: make warning about outdated share configurable 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. Differential Revision: https://phab.mercurial-scm.org/D9691 diff -r bc884e31b8c8 -r 9796cf108e4e mercurial/configitems.py --- a/mercurial/configitems.py Fri Jan 08 18:07:33 2021 +0530 +++ b/mercurial/configitems.py Fri Jan 08 21:34:16 2021 +0530 @@ -1084,6 +1084,11 @@ ) coreconfigitem( b'experimental', + b'sharesafe-warn-outdated-shares', + default=True, +) +coreconfigitem( + b'experimental', b'single-head-per-branch', default=False, ) diff -r bc884e31b8c8 -r 9796cf108e4e mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Jan 08 18:07:33 2021 +0530 +++ b/mercurial/localrepo.py Fri Jan 08 21:34:16 2021 +0530 @@ -607,7 +607,9 @@ storevfs, requirements, ) - else: + elif ui.configbool( + b'experimental', b'sharesafe-warn-outdated-shares' + ): ui.warn( _( b'warning: source repository supports share-safe functionality.' diff -r bc884e31b8c8 -r 9796cf108e4e mercurial/upgrade.py --- a/mercurial/upgrade.py Fri Jan 08 18:07:33 2021 +0530 +++ b/mercurial/upgrade.py Fri Jan 08 21:34:16 2021 +0530 @@ -257,10 +257,11 @@ current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) ui.warn(_(b'repository upgraded to use share-safe mode\n')) except error.LockError as e: - ui.warn( - _(b'failed to upgrade share, got error: %s\n') - % stringutil.forcebytestr(e.strerror) - ) + if ui.configbool(b'experimental', b'sharesafe-warn-outdated-shares'): + ui.warn( + _(b'failed to upgrade share, got error: %s\n') + % stringutil.forcebytestr(e.strerror) + ) finally: if wlock: wlock.release() diff -r bc884e31b8c8 -r 9796cf108e4e tests/test-share-safe.t --- a/tests/test-share-safe.t Fri Jan 08 18:07:33 2021 +0530 +++ b/tests/test-share-safe.t Fri Jan 08 21:34:16 2021 +0530 @@ -392,6 +392,12 @@ 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 warning: source repository supports share-safe functionality. Reshare to upgrade. @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @@ -544,6 +550,13 @@ | 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 $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true repository upgraded to use share-safe mode