| marmoute |
| hg-reviewers |
In next patch, we will need this variable in else statement too. So, let's take
it out.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| raise error.RepoError(_(b'repository %s not found') % path) | raise error.RepoError(_(b'repository %s not found') % path) | ||||
| requirements = _readrequires(hgvfs, True) | requirements = _readrequires(hgvfs, True) | ||||
| shared = ( | shared = ( | ||||
| requirementsmod.SHARED_REQUIREMENT in requirements | requirementsmod.SHARED_REQUIREMENT in requirements | ||||
| or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | ||||
| ) | ) | ||||
| storevfs = None | |||||
| if shared: | if shared: | ||||
| # This is a shared repo | |||||
| sharedvfs = _getsharedvfs(hgvfs, requirements) | sharedvfs = _getsharedvfs(hgvfs, requirements) | ||||
| storevfs = vfsmod.vfs(sharedvfs.join(b'store')) | |||||
| else: | |||||
| storevfs = vfsmod.vfs(hgvfs.join(b'store')) | |||||
| # 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 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the | ||||
| # repository was shared the old way. We check the share source .hg/requires | # repository was shared the old way. We check the share source .hg/requires | ||||
| # for SHARESAFE_REQUIREMENT to detect whether the current repository needs | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs | ||||
| # to be reshared | # to be reshared | ||||
| if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | ||||
| if ( | if ( | ||||
| shared | shared | ||||
| and requirementsmod.SHARESAFE_REQUIREMENT | and requirementsmod.SHARESAFE_REQUIREMENT | ||||
| not in _readrequires(sharedvfs, True) | not in _readrequires(sharedvfs, True) | ||||
| ): | ): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"share source does not support exp-sharesafe requirement") | _(b"share source does not support exp-sharesafe requirement") | ||||
| ) | ) | ||||
| if shared: | |||||
| # This is a shared repo | |||||
| storevfs = vfsmod.vfs(sharedvfs.join(b'store')) | |||||
| else: | |||||
| storevfs = vfsmod.vfs(hgvfs.join(b'store')) | |||||
| requirements |= _readrequires(storevfs, False) | requirements |= _readrequires(storevfs, False) | ||||
| elif shared: | elif shared: | ||||
| sourcerequires = _readrequires(sharedvfs, False) | sourcerequires = _readrequires(sharedvfs, False) | ||||
| if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: | ||||
| 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' | ||||