| quark | |
| durin42 |
| hg-reviewers |
Now that dirstatemap is the source of truth for the list of directories, let's
move _dirfoldmap on to it.
This pattern of moving cached variables onto the dirstate map makes it easier to
invalidate them, as seen by how the cache invalidation functions are slowly
shrinking to just be recreating the dirstatemap instance.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
The series looks straightforward. After the change, it might make sense to rename _map to _storage or something to make it clear that it contains extra logic than just a map.
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (4 lines) | |||
| M | mercurial/dirstate.py (24 lines) |
| fm.end() | fm.end() | ||||
| @command('perfdirfoldmap', formatteropts) | @command('perfdirfoldmap', formatteropts) | ||||
| def perfdirfoldmap(ui, repo, **opts): | def perfdirfoldmap(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
| 'a' in dirstate | 'a' in dirstate | ||||
| def d(): | def d(): | ||||
| dirstate._dirfoldmap.get('a') | dirstate._map.dirfoldmap.get('a') | ||||
| del dirstate._dirfoldmap | del dirstate._map.dirfoldmap | ||||
| del dirstate._map.dirs | del dirstate._map.dirs | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstatewrite', formatteropts) | @command('perfdirstatewrite', formatteropts) | ||||
| def perfdirstatewrite(ui, repo, **opts): | def perfdirstatewrite(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| ds = repo.dirstate | ds = repo.dirstate | ||||
| @propertycache | @propertycache | ||||
| def _map(self): | def _map(self): | ||||
| '''Return the dirstate contents as a map from filename to | '''Return the dirstate contents as a map from filename to | ||||
| (state, mode, size, time).''' | (state, mode, size, time).''' | ||||
| self._read() | self._read() | ||||
| return self._map | return self._map | ||||
| @propertycache | |||||
| def _dirfoldmap(self): | |||||
| f = {} | |||||
| normcase = util.normcase | |||||
| for name in self._map.dirs: | |||||
| f[normcase(name)] = name | |||||
| return f | |||||
| @property | @property | ||||
| def _sparsematcher(self): | def _sparsematcher(self): | ||||
| """The matcher for the sparse checkout. | """The matcher for the sparse checkout. | ||||
| The working directory may not include every file from a manifest. The | The working directory may not include every file from a manifest. The | ||||
| matcher obtained by this property will match a path if it is to be | matcher obtained by this property will match a path if it is to be | ||||
| included in the working directory. | included in the working directory. | ||||
| """ | """ | ||||
| def invalidate(self): | def invalidate(self): | ||||
| '''Causes the next access to reread the dirstate. | '''Causes the next access to reread the dirstate. | ||||
| This is different from localrepo.invalidatedirstate() because it always | This is different from localrepo.invalidatedirstate() because it always | ||||
| rereads the dirstate. Use localrepo.invalidatedirstate() if you want to | rereads the dirstate. Use localrepo.invalidatedirstate() if you want to | ||||
| check whether the dirstate has changed before rereading it.''' | check whether the dirstate has changed before rereading it.''' | ||||
| for a in ("_map", "_dirfoldmap", "_branch", | for a in ("_map", "_branch", "_ignore"): | ||||
| "_ignore"): | |||||
| if a in self.__dict__: | if a in self.__dict__: | ||||
| delattr(self, a) | delattr(self, a) | ||||
| self._lastnormaltime = 0 | self._lastnormaltime = 0 | ||||
| self._dirty = False | self._dirty = False | ||||
| self._updatedfiles.clear() | self._updatedfiles.clear() | ||||
| self._parentwriters = 0 | self._parentwriters = 0 | ||||
| self._origpl = None | self._origpl = None | ||||
| folded = self._discoverpath(path, normed, ignoremissing, exists, | folded = self._discoverpath(path, normed, ignoremissing, exists, | ||||
| self._map.filefoldmap) | self._map.filefoldmap) | ||||
| return folded | return folded | ||||
| def _normalize(self, path, isknown, ignoremissing=False, exists=None): | def _normalize(self, path, isknown, ignoremissing=False, exists=None): | ||||
| normed = util.normcase(path) | normed = util.normcase(path) | ||||
| folded = self._map.filefoldmap.get(normed, None) | folded = self._map.filefoldmap.get(normed, None) | ||||
| if folded is None: | if folded is None: | ||||
| folded = self._dirfoldmap.get(normed, None) | folded = self._map.dirfoldmap.get(normed, None) | ||||
| if folded is None: | if folded is None: | ||||
| if isknown: | if isknown: | ||||
| folded = path | folded = path | ||||
| else: | else: | ||||
| # store discovered result in dirfoldmap so that future | # store discovered result in dirfoldmap so that future | ||||
| # normalizefile calls don't start matching directories | # normalizefile calls don't start matching directories | ||||
| folded = self._discoverpath(path, normed, ignoremissing, exists, | folded = self._discoverpath(path, normed, ignoremissing, exists, | ||||
| self._dirfoldmap) | self._map.dirfoldmap) | ||||
| return folded | return folded | ||||
| def normalize(self, path, isknown=False, ignoremissing=False): | def normalize(self, path, isknown=False, ignoremissing=False): | ||||
| ''' | ''' | ||||
| normalize the case of a pathname when on a casefolding filesystem | normalize the case of a pathname when on a casefolding filesystem | ||||
| isknown specifies whether the filename came from walking the | isknown specifies whether the filename came from walking the | ||||
| disk, to avoid extra filesystem access. | disk, to avoid extra filesystem access. | ||||
| normed[nc] = paths | normed[nc] = paths | ||||
| paths.add(f) | paths.add(f) | ||||
| for norm, paths in normed.iteritems(): | for norm, paths in normed.iteritems(): | ||||
| if len(paths) > 1: | if len(paths) > 1: | ||||
| for path in paths: | for path in paths: | ||||
| folded = self._discoverpath(path, norm, True, None, | folded = self._discoverpath(path, norm, True, None, | ||||
| self._dirfoldmap) | self._map.dirfoldmap) | ||||
| if path != folded: | if path != folded: | ||||
| results[path] = None | results[path] = None | ||||
| return results, dirsfound, dirsnotfound | return results, dirsfound, dirsnotfound | ||||
| def walk(self, match, subrepos, unknown, ignored, full=True): | def walk(self, match, subrepos, unknown, ignored, full=True): | ||||
| ''' | ''' | ||||
| Walk recursively through the directory tree, finding all files | Walk recursively through the directory tree, finding all files | ||||
| self.nonnormalset = nonnorm | self.nonnormalset = nonnorm | ||||
| return otherparents | return otherparents | ||||
| @propertycache | @propertycache | ||||
| def identity(self): | def identity(self): | ||||
| self.read() | self.read() | ||||
| return self.identity | return self.identity | ||||
| @propertycache | |||||
| def dirfoldmap(self): | |||||
| f = {} | |||||
| normcase = util.normcase | |||||
| for name in self.dirs: | |||||
| f[normcase(name)] = name | |||||
| return f | |||||