| pulkit |
| hg-reviewers |
We said we'd drop support for it after 5.1, so it's time to clean it
up now.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| @encoding.strmethod | @encoding.strmethod | ||||
| def __repr__(self): | def __repr__(self): | ||||
| s = stringutil.buildrepr(self._predrepr) or pycompat.byterepr( | s = stringutil.buildrepr(self._predrepr) or pycompat.byterepr( | ||||
| self.matchfn | self.matchfn | ||||
| ) | ) | ||||
| return b'<predicatenmatcher pred=%s>' % s | return b'<predicatenmatcher pred=%s>' % s | ||||
| def normalizerootdir(dir, funcname): | |||||
| if dir == b'.': | |||||
| util.nouideprecwarn( | |||||
| b"match.%s() no longer accepts '.', use '' instead." % funcname, | |||||
| b'5.1', | |||||
| ) | |||||
| return b'' | |||||
| return dir | |||||
| class patternmatcher(basematcher): | class patternmatcher(basematcher): | ||||
| """Matches a set of (kind, pat, source) against a 'root' directory. | """Matches a set of (kind, pat, source) against a 'root' directory. | ||||
| >>> kindpats = [ | >>> kindpats = [ | ||||
| ... (b're', br'.*\.c$', b''), | ... (b're', br'.*\.c$', b''), | ||||
| ... (b'path', b'foo/a', b''), | ... (b'path', b'foo/a', b''), | ||||
| ... (b'relpath', b'b', b''), | ... (b'relpath', b'b', b''), | ||||
| ... (b'glob', b'*.h', b''), | ... (b'glob', b'*.h', b''), | ||||
| self._prefix = _prefix(kindpats) | self._prefix = _prefix(kindpats) | ||||
| self._pats, self.matchfn = _buildmatch(kindpats, b'$', root) | self._pats, self.matchfn = _buildmatch(kindpats, b'$', root) | ||||
| @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): | ||||
| dir = normalizerootdir(dir, b'visitdir') | |||||
| 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._fileset | dir in self._fileset | ||||
| or dir in self._dirs | or dir in self._dirs | ||||
| or any( | or any( | ||||
| parentdir in self._fileset for parentdir in util.finddirs(dir) | parentdir in self._fileset for parentdir in util.finddirs(dir) | ||||
| ) | ) | ||||
| self._roots = set(roots) | self._roots = set(roots) | ||||
| # dirs are directories which are non-recursively included. | # dirs are directories which are non-recursively included. | ||||
| self._dirs = set(dirs) | self._dirs = set(dirs) | ||||
| # parents are directories which are non-recursively included because | # parents are directories which are non-recursively included because | ||||
| # they are needed to get to items in _dirs or _roots. | # they are needed to get to items in _dirs or _roots. | ||||
| self._parents = parents | self._parents = parents | ||||
| def visitdir(self, dir): | def visitdir(self, dir): | ||||
| dir = normalizerootdir(dir, b'visitdir') | |||||
| if self._prefix and dir in self._roots: | if self._prefix and dir in self._roots: | ||||
| return b'all' | return b'all' | ||||
| return ( | return ( | ||||
| dir in self._roots | dir in self._roots | ||||
| or dir in self._dirs | or dir in self._dirs | ||||
| or dir in self._parents | or dir in self._parents | ||||
| or any(parentdir in self._roots for parentdir in util.finddirs(dir)) | or any(parentdir in self._roots for parentdir in util.finddirs(dir)) | ||||
| ) | ) | ||||
| matchfn = basematcher.exact | matchfn = basematcher.exact | ||||
| @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): | ||||
| dir = normalizerootdir(dir, b'visitdir') | |||||
| return dir in self._dirs | return dir in self._dirs | ||||
| def visitchildrenset(self, dir): | def visitchildrenset(self, dir): | ||||
| dir = normalizerootdir(dir, b'visitchildrenset') | |||||
| if not self._fileset or dir not in self._dirs: | if not self._fileset or dir not in self._dirs: | ||||
| return set() | return set() | ||||
| candidates = self._fileset | self._dirs - {b''} | candidates = self._fileset | self._dirs - {b''} | ||||
| if dir != b'': | if dir != b'': | ||||
| d = dir + b'/' | d = dir + b'/' | ||||
| candidates = set(c[len(d) :] for c in candidates if c.startswith(d)) | candidates = set(c[len(d) :] for c in candidates if c.startswith(d)) | ||||
| # self._dirs includes all of the directories, recursively, so if | # self._dirs includes all of the directories, recursively, so if | ||||
| def matchfn(self, f): | def matchfn(self, f): | ||||
| # Some information is lost in the superclass's constructor, so we | # Some information is lost in the superclass's constructor, so we | ||||
| # can not accurately create the matching function for the subdirectory | # can not accurately create the matching function for the subdirectory | ||||
| # from the inputs. Instead, we override matchfn() and visitdir() to | # from the inputs. Instead, we override matchfn() and visitdir() to | ||||
| # call the original matcher with the subdirectory path prepended. | # call the original matcher with the subdirectory path prepended. | ||||
| return self._matcher.matchfn(self._path + b"/" + f) | return self._matcher.matchfn(self._path + b"/" + f) | ||||
| def visitdir(self, dir): | def visitdir(self, dir): | ||||
| dir = normalizerootdir(dir, b'visitdir') | |||||
| if dir == b'': | if dir == b'': | ||||
| dir = self._path | dir = self._path | ||||
| else: | else: | ||||
| dir = self._path + b"/" + dir | dir = self._path + b"/" + dir | ||||
| return self._matcher.visitdir(dir) | return self._matcher.visitdir(dir) | ||||
| def visitchildrenset(self, dir): | def visitchildrenset(self, dir): | ||||
| dir = normalizerootdir(dir, b'visitchildrenset') | |||||
| if dir == b'': | if dir == b'': | ||||
| dir = self._path | dir = self._path | ||||
| else: | else: | ||||
| dir = self._path + b"/" + dir | dir = self._path + b"/" + dir | ||||
| return self._matcher.visitchildrenset(dir) | return self._matcher.visitchildrenset(dir) | ||||
| def always(self): | def always(self): | ||||
| return self._always | return self._always | ||||