This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9512

formatting: re-blacken match.py
ClosedPublic

Authored by mharbison72 on Dec 3 2020, 1:47 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1f0ed7e63c2a: formatting: re-blacken match.py

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

mharbison72 created this revision.Dec 3 2020, 1:47 AM
Alphare added a subscriber: Alphare.Dec 7 2020, 5:13 AM

Is this because we changed the Black version a few days ago? I'm just making sure that you're using the right one.

mharbison72 added a comment.Dec 7 2020, 11:06 AM
In D9512#143440, @Alphare wrote:

Is this because we changed the Black version a few days ago? I'm just making sure that you're using the right one.

I don't think so. I don't think the original version would have been happy with the extra spaces in the first diff. I checked both python installs I have in WSL, as well as the black command, and everything is saying 20.8b1.

pulkit accepted this revision.Dec 7 2020, 12:57 PM
This revision is now accepted and ready to land.Dec 7 2020, 12:57 PM
mharbison72 added a commit: rHG1f0ed7e63c2a: formatting: re-blacken match.py.Dec 7 2020, 1:20 PM
Closed by commit rHG1f0ed7e63c2a: formatting: re-blacken match.py (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (7 lines)

Diff 24090

mercurial/match.py

return False return False
if path in prefix_set: if path in prefix_set:
return True return True
# If there's more than 5 paths in prefix_set, it's *probably* quicker to # If there's more than 5 paths in prefix_set, it's *probably* quicker to
# "walk up" the directory hierarchy instead, with the assumption that most # "walk up" the directory hierarchy instead, with the assumption that most
# directory hierarchies are relatively shallow and hash lookup is cheap. # directory hierarchies are relatively shallow and hash lookup is cheap.
if l > 5: if l > 5:
return any( return any(
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: if pycompat.ispy3:
@propertycache @propertycache
def _dirs(self): def _dirs(self):
return set(pathutil.dirs(self._fileset)) return set(pathutil.dirs(self._fileset))
def visitdir(self, dir): def visitdir(self, dir):
if self._prefix and dir in self._fileset: if self._prefix and dir in self._fileset:
return b'all' return b'all'
return ( return dir in self._dirs or path_or_parents_in_set(dir, self._fileset)
dir in self._dirs
or path_or_parents_in_set(dir, self._fileset)
)
def visitchildrenset(self, dir): def visitchildrenset(self, dir):
ret = self.visitdir(dir) ret = self.visitdir(dir)
if ret is True: if ret is True:
return b'this' return b'this'
elif not ret: elif not ret:
return set() return set()
assert ret == b'all' assert ret == b'all'