This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9360

commands: fix checking of share safe requirement on `config --shared`
ClosedPublic

Authored by pulkit on Nov 21 2020, 8:07 AM.

Details

Reviewers
Alphare
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG777e8d88f703: commands: fix checking of share safe requirement on `config --shared`
Summary

The if requirements.SHARESAFE_REQUIREMENT in ... was wrongly placed inside
another if statement which made the check unreachable.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (12 lines)

Diff 23682

mercurial/commands.py

paths = [repo.vfs.join(b'hgrc')] paths = [repo.vfs.join(b'hgrc')]
elif opts.get(b'global'): elif opts.get(b'global'):
paths = rcutil.systemrcpath() paths = rcutil.systemrcpath()
elif opts.get(b'shared'): elif opts.get(b'shared'):
if not repo.shared(): if not repo.shared():
raise error.InputError( raise error.InputError(
_(b"repository is not shared; can't use --shared") _(b"repository is not shared; can't use --shared")
) )
if requirements.SHARESAFE_REQUIREMENT not in repo.requirements: if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
raise error.InputError( raise error.InputError(
_( _(
b"share safe feature not unabled; " b"share safe feature not enabled; "
b"unable to edit shared source repository config" b"unable to edit shared source repository config"
) )
) )
paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')] paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
elif opts.get(b'non_shared'): elif opts.get(b'non_shared'):
paths = [repo.vfs.join(b'hgrc-not-shared')] paths = [repo.vfs.join(b'hgrc-not-shared')]
else: else:
paths = rcutil.userrcpath() paths = rcutil.userrcpath()
for f in paths: for f in paths:
if os.path.exists(f): if os.path.exists(f):