( )⚙ D12287 match: delete Python 2 conditional code

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12287

match: delete Python 2 conditional code
ClosedPublic

Authored by indygreg on Mar 2 2022, 6:30 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7f5e91cdebcd: match: delete Python 2 conditional code

Diff Detail

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

Event Timeline

indygreg created this revision.Mar 2 2022, 6:30 PM
Alphare accepted this revision.Mar 3 2022, 4:58 AM
This revision is now accepted and ready to land.Mar 3 2022, 4:58 AM
indygreg added a commit: rHG7f5e91cdebcd: match: delete Python 2 conditional code.Mar 3 2022, 11:52 AM
Closed by commit rHG7f5e91cdebcd: match: delete Python 2 conditional code (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (5 lines)

Diff 32412

mercurial/match.py

parentdir in prefix_set for parentdir in pathutil.finddirs(path) parentdir in prefix_set for parentdir in pathutil.finddirs(path)
) )
# FIXME: Ideally we'd never get to this point if this is the case - we'd # FIXME: Ideally we'd never get to this point if this is the case - we'd
# recognize ourselves as an 'always' matcher and skip this. # recognize ourselves as an 'always' matcher and skip this.
if b'' in prefix_set: if b'' in prefix_set:
return True return True
if pycompat.ispy3:
sl = ord(b'/') sl = ord(b'/')
else:
sl = '/'
# We already checked that path isn't in prefix_set exactly, so # We already checked that path isn't in prefix_set exactly, so
# `path[len(pf)] should never raise IndexError. # `path[len(pf)] should never raise IndexError.
return any(path.startswith(pf) and path[len(pf)] == sl for pf in prefix_set) return any(path.startswith(pf) and path[len(pf)] == sl for pf in prefix_set)
class patternmatcher(basematcher): class patternmatcher(basematcher):
r"""Matches a set of (kind, pat, source) against a 'root' directory. r"""Matches a set of (kind, pat, source) against a 'root' directory.