This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9851

share-safe: fix an abort message that references the experimental requirement
ClosedPublic

Authored by mharbison72 on Jan 21 2021, 11:27 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG085294a8c0e0: share-safe: fix an abort message that references the experimental requirement

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

mharbison72 created this revision.Jan 21 2021, 11:27 PM
pulkit accepted this revision.Jan 22 2021, 4:57 AM
This revision is now accepted and ready to land.Jan 22 2021, 4:57 AM
pulkit added a comment.Jan 22 2021, 4:57 AM

Thanks for the patches. I got caught up in something else.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (4 lines)
Mtests/test-share-safe.t (2 lines)

Diff 25234

mercurial/localrepo.py

hgvfs, hgvfs,
sharedvfs, sharedvfs,
requirements, requirements,
mismatch_config, mismatch_config,
mismatch_warn, mismatch_warn,
) )
elif mismatch_config == b'abort': elif mismatch_config == b'abort':
raise error.Abort( raise error.Abort(
_( _(b"share source does not support share-safe requirement"),
b"share source does not support exp-sharesafe requirement"
),
hint=hint, hint=hint,
) )
else: else:
raise error.Abort( raise error.Abort(
_( _(
b"share-safe mismatch with source.\nUnrecognized" b"share-safe mismatch with source.\nUnrecognized"
b" value '%s' of `share.safe-mismatch.source-not-safe`" b" value '%s' of `share.safe-mismatch.source-not-safe`"
b" set." b" set."

tests/test-share-safe.t

$ 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
$ hg log -GT "{node}: {desc}\n" -R ../ss-share $ hg log -GT "{node}: {desc}\n" -R ../ss-share
abort: share source does not support exp-sharesafe requirement abort: share source does not support share-safe requirement
(see `hg help config.format.use-share-safe` for more information) (see `hg help config.format.use-share-safe` for more information)
[255] [255]
Testing automatic downgrade of shares when config is set Testing automatic downgrade of shares when config is set
$ touch ../ss-share/.hg/wlock $ touch ../ss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort $ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort
abort: failed to downgrade share, got error: Lock held abort: failed to downgrade share, got error: Lock held