This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9288

share: fix a typo in a safe share error message
AbandonedPublic

Authored by mharbison72 on Nov 9 2020, 7:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Nov 9 2020, 7:09 PM
mharbison72 added a subscriber: pulkit.Nov 10 2020, 7:31 PM
mharbison72 added inline comments.
mercurial/commands.py
2230–2236

Hmm... This whole block actually looks unreachable. Any idea where this is supposed to go @pulkit ? Is the raise clause above this supposed to come after this conditional?

pulkit added inline comments.Nov 19 2020, 4:22 AM
mercurial/commands.py
2230–2236

Oops, this if requirements... not in ... should come after if not repo.shared() instead of nested inside it.

pulkit added inline comments.Nov 21 2020, 8:09 AM
mercurial/commands.py
2230–2236

Sent D9360 to fix this.

mharbison72 abandoned this revision.Nov 23 2020, 11:53 AM

Superseded by D9360

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 23446

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"
) )
) )
mharbison72AuthorUnsubmitted
Done

Hmm... This whole block actually looks unreachable. Any idea where this is supposed to go @pulkit ? Is the raise clause above this supposed to come after this conditional?

mharbison72: Hmm... This whole block actually looks unreachable. Any idea where this is supposed to go…
pulkitUnsubmitted
Not Done

Oops, this if requirements... not in ... should come after if not repo.shared() instead of nested inside it.

pulkit: Oops, this `if requirements... not in ...` should come after `if not repo.shared()` instead of…
pulkitUnsubmitted
Not Done

Sent D9360 to fix this.

pulkit: Sent D9360 to fix this.
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):