This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9369

share: show warning if share is outdated while source supports share-safe
ClosedPublic

Authored by pulkit on Nov 23 2020, 4:29 AM.

Details

Reviewers
Alphare
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG49b4ab1d9f5e: share: show warning if share is outdated while source supports share-safe
Summary

Previous patches in the series and some which are already committed implements
share safe functionality where config and requirements will be shared too.

Rolling this feature has a problem that existing shares may never upgrade as
they will never learn about the new config. To help the transition, we show a
warning messafe if the share source supports share-safe mechanism. This provides
the source repo ability to upgrade and pass on the message to shares that you
should reshare and upgrade too.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (14 lines)
Mtests/test-share-safe.t (1 line)

Diff 23626

mercurial/localrepo.py

if shared: if shared:
sharedvfs = _getsharedvfs(hgvfs, requirements) sharedvfs = _getsharedvfs(hgvfs, requirements)
# if .hg/requires contains the sharesafe requirement, it means # if .hg/requires contains the sharesafe requirement, it means
# there exists a `.hg/store/requires` too and we should read it # there exists a `.hg/store/requires` too and we should read it
# NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
# is present. We never write SHARESAFE_REQUIREMENT for a repo if store # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
# is not present, refer checkrequirementscompat() for that # is not present, refer checkrequirementscompat() for that
#
# However, if SHARESAFE_REQUIREMENT is not present, it means that the
# repository was shared the old way. We check the share source .hg/requires
# for SHARESAFE_REQUIREMENT to detect whether the current repository needs
# to be reshared
if requirementsmod.SHARESAFE_REQUIREMENT in requirements: if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
if shared: if shared:
# This is a shared repo # This is a shared repo
storevfs = vfsmod.vfs(sharedvfs.join(b'store')) storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
else: else:
storevfs = vfsmod.vfs(hgvfs.join(b'store')) storevfs = vfsmod.vfs(hgvfs.join(b'store'))
requirements |= _readrequires(storevfs, False) requirements |= _readrequires(storevfs, False)
elif shared:
sourcerequires = _readrequires(sharedvfs, False)
if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
ui.warn(
_(
'warning: source repository supports share-safe functionality.'
' 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
# 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)
extensions.loadall(ui) extensions.loadall(ui)
extensions.populateui(ui) extensions.populateui(ui)

tests/test-share-safe.t

@ 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 $ hg log -GT "{node}: {desc}\n" -R ../nss-share
warning: source repository supports share-safe functionality. Reshare to upgrade.
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Test that downgrading works too Test that downgrading works too
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]