This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9692

sharesafe: introduce config to disallow outdated shares if upgrade fails
ClosedPublic

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

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd159d0fafa78: sharesafe: introduce config to disallow outdated shares if upgrade fails
Summary

After this patch, we have config option to control all aspects of shares
when share source is upgraded or downgraded.

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, 9:46 PM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
mercurial/localrepo.py
611–618 ↗(On Diff #24646)

We will want the abort to get into play when the upgrade was tried, but failed.

This revision now requires changes to proceed.Jan 8 2021, 9:46 PM
baymax retitled this revision from sharesafe: introduce config to disallow outdated shares from working to sharesafe: introduce config to disallow outdated shares if upgrade fails.Jan 9 2021, 8:03 AM
baymax updated this revision to Diff 24697.

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

pulkit added a comment.Jan 9 2021, 2:10 PM

Incorporated the suggestion.

Alphare accepted this revision.Jan 12 2021, 11:42 AM
Alphare added a subscriber: Alphare.

This looks good on its own, but I haven't seen any user-facing documentation/help text for the config options. Please send a follow-up.

pulkit updated this revision to Diff 24779.Jan 13 2021, 6:30 AM
pulkit added a commit: rHGd159d0fafa78: sharesafe: introduce config to disallow outdated shares if upgrade fails.Jan 13 2021, 2:40 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd159d0fafa78: sharesafe: introduce config to disallow outdated shares if upgrade fails (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (5 lines)
Mmercurial/upgrade.py (7 lines)
Mtests/test-share-safe.t (4 lines)

Diff 24798

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-auto-upgrade-fail-error',
default=False,
)
coreconfigitem(
b'experimental',
b'sharesafe-warn-outdated-shares', b'sharesafe-warn-outdated-shares',
default=True, default=True,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'single-head-per-branch', b'single-head-per-branch',
default=False, default=False,
) )

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'): if ui.configbool(b'experimental', b'sharesafe-auto-upgrade-fail-error'):
raise error.Abort(
_(b'failed to upgrade share, got error: %s')
% stringutil.forcebytestr(e.strerror)
)
elif 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()

tests/test-share-safe.t

$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true --config experimental.sharesafe-warn-outdated-shares=false $ 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 @ 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-auto-upgrade-fail-error=true
abort: failed to upgrade share, got error: Lock held
[255]
$ 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