This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8001

pathauditor: drop a redundant call to bytes.lower()
ClosedPublic

Authored by martinvonz on Jan 24 2020, 8:40 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd84420232492: pathauditor: drop a redundant call to bytes.lower()
Summary

_lowerclean(s) calls s.lower(), so we don't need to do that before
calling it.

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.

Event Timeline

martinvonz created this revision.Jan 24 2020, 8:40 PM
pulkit accepted this revision.Jan 25 2020, 7:01 PM
This revision is now accepted and ready to land.Jan 25 2020, 7:01 PM
martinvonz added a commit: rHGd84420232492: pathauditor: drop a redundant call to bytes.lower().Jan 25 2020, 7:26 PM
Closed by commit rHGd84420232492: pathauditor: drop a redundant call to bytes.lower() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pathutil.py (2 lines)

Diff 19618

mercurial/pathutil.py

for p in parts: for p in parts:
if b"~" in p: if b"~" in p:
first, last = p.split(b"~", 1) first, last = p.split(b"~", 1)
if last.isdigit() and first.upper() in [b"HG", b"HG8B6C"]: if last.isdigit() and first.upper() in [b"HG", b"HG8B6C"]:
raise error.Abort( raise error.Abort(
_(b"path contains illegal component: %s") % path _(b"path contains illegal component: %s") % path
) )
if b'.hg' in _lowerclean(path): if b'.hg' in _lowerclean(path):
lparts = [_lowerclean(p.lower()) for p in parts] lparts = [_lowerclean(p) for p in parts]
for p in b'.hg', b'.hg.': for p in b'.hg', b'.hg.':
if p in lparts[1:]: if p in lparts[1:]:
pos = lparts.index(p) pos = lparts.index(p)
base = os.path.join(*parts[:pos]) base = os.path.join(*parts[:pos])
raise error.Abort( raise error.Abort(
_(b"path '%s' is inside nested repo %r") _(b"path '%s' is inside nested repo %r")
% (path, pycompat.bytestr(base)) % (path, pycompat.bytestr(base))
) )