diff -r 05d19ca33b33 -r 034d94f8761b mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Aug 10 15:47:21 2020 +0530 +++ b/mercurial/localrepo.py Tue Aug 11 13:43:43 2020 +0530 @@ -448,7 +448,7 @@ # This is an absolute path for ``shared`` and relative to # ``.hg/`` for ``relshared``. sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') - if b'relshared' in requirements: + if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: sharedpath = hgvfs.join(sharedpath) sharedvfs = vfsmod.vfs(sharedpath, realpath=True) @@ -585,7 +585,10 @@ # accessed is determined by various requirements. If `shared` or # `relshared` requirements are present, this indicates current repository # is a share and store exists in path mentioned in `.hg/sharedpath` - shared = b'shared' in requirements or b'relshared' in requirements + shared = ( + requirementsmod.SHARED_REQUIREMENT in requirements + or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements + ) if shared: sharedvfs = _getsharedvfs(hgvfs, requirements) storebasepath = sharedvfs.base @@ -1047,8 +1050,8 @@ _basesupported = supportedformats | { b'store', b'fncache', - b'shared', - b'relshared', + requirementsmod.SHARED_REQUIREMENT, + requirementsmod.RELATIVE_SHARED_REQUIREMENT, b'dotencode', requirementsmod.SPARSE_REQUIREMENT, requirementsmod.INTERNAL_PHASE_REQUIREMENT, @@ -3232,9 +3235,9 @@ if b'sharedrepo' in createopts: requirements = set(createopts[b'sharedrepo'].requirements) if createopts.get(b'sharedrelative'): - requirements.add(b'relshared') + requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) else: - requirements.add(b'shared') + requirements.add(requirementsmod.SHARED_REQUIREMENT) return requirements @@ -3343,7 +3346,10 @@ ) dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) - if b'shared' in requirements or b'relshared' in requirements: + if ( + requirementsmod.SHARED_REQUIREMENT in requirements + or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements + ): raise error.Abort( _( b"cannot create shared repository as source was created"