| quark | |
| durin42 |
| hg-reviewers |
Now that dirs is source of truthed on the dirstatemap, let's get rid of the
_dirs propertycache on the dirstate.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (8 lines) | |||
| M | mercurial/dirstate.py (25 lines) |
| @command('perfdirs', formatteropts) | @command('perfdirs', formatteropts) | ||||
| def perfdirs(ui, repo, **opts): | def perfdirs(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.dirs() | dirstate.dirs() | ||||
| del dirstate._dirs | del dirstate._map.dirs | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstate', formatteropts) | @command('perfdirstate', formatteropts) | ||||
| def perfdirstate(ui, repo, **opts): | def perfdirstate(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| "a" in repo.dirstate | "a" in repo.dirstate | ||||
| def d(): | def d(): | ||||
| repo.dirstate.invalidate() | repo.dirstate.invalidate() | ||||
| "a" in repo.dirstate | "a" in repo.dirstate | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstatedirs', formatteropts) | @command('perfdirstatedirs', formatteropts) | ||||
| def perfdirstatedirs(ui, repo, **opts): | def perfdirstatedirs(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| "a" in repo.dirstate | "a" in repo.dirstate | ||||
| def d(): | def d(): | ||||
| "a" in repo.dirstate._dirs | "a" in repo.dirstate._map.dirs | ||||
| del repo.dirstate._dirs | del repo.dirstate._map.dirs | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstatefoldmap', formatteropts) | @command('perfdirstatefoldmap', formatteropts) | ||||
| def perfdirstatefoldmap(ui, repo, **opts): | def perfdirstatefoldmap(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._map.filefoldmap.get('a') | dirstate._map.filefoldmap.get('a') | ||||
| del dirstate._map.filefoldmap | del dirstate._map.filefoldmap | ||||
| timer(d) | timer(d) | ||||
| 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._dirfoldmap.get('a') | ||||
| del dirstate._dirfoldmap | del dirstate._dirfoldmap | ||||
| del dirstate._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 | ||||
| "a" in ds | "a" in ds | ||||
| (state, mode, size, time).''' | (state, mode, size, time).''' | ||||
| self._read() | self._read() | ||||
| return self._map | return self._map | ||||
| @propertycache | @propertycache | ||||
| def _dirfoldmap(self): | def _dirfoldmap(self): | ||||
| f = {} | f = {} | ||||
| normcase = util.normcase | normcase = util.normcase | ||||
| for name in self._dirs: | for name in self._map.dirs: | ||||
| f[normcase(name)] = name | f[normcase(name)] = name | ||||
| return f | 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 | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| return "default" | return "default" | ||||
| @property | @property | ||||
| def _pl(self): | def _pl(self): | ||||
| return self._map.parents() | return self._map.parents() | ||||
| @propertycache | |||||
| def _dirs(self): | |||||
| return self._map.dirs() | |||||
| def dirs(self): | def dirs(self): | ||||
| return self._dirs | return self._map.dirs | ||||
| @rootcache('.hgignore') | @rootcache('.hgignore') | ||||
| def _ignore(self): | def _ignore(self): | ||||
| files = self._ignorefiles() | files = self._ignorefiles() | ||||
| if not files: | if not files: | ||||
| return matchmod.never(self._root, '') | return matchmod.never(self._root, '') | ||||
| pats = ['include:%s' % f for f in files] | pats = ['include:%s' % f for f in files] | ||||
| 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", "_dirfoldmap", "_branch", | ||||
| "_dirs", "_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 | ||||
| def copied(self, file): | def copied(self, file): | ||||
| return self._map.copymap.get(file, None) | return self._map.copymap.get(file, None) | ||||
| def copies(self): | def copies(self): | ||||
| return self._map.copymap | return self._map.copymap | ||||
| def _droppath(self, f): | def _droppath(self, f): | ||||
| if self[f] not in "?r" and "_dirs" in self.__dict__: | if self[f] not in "?r" and "dirs" in self._map.__dict__: | ||||
| self._dirs.delpath(f) | self._map.dirs.delpath(f) | ||||
| if "filefoldmap" in self._map.__dict__: | if "filefoldmap" in self._map.__dict__: | ||||
| normed = util.normcase(f) | normed = util.normcase(f) | ||||
| if normed in self._map.filefoldmap: | if normed in self._map.filefoldmap: | ||||
| del self._map.filefoldmap[normed] | del self._map.filefoldmap[normed] | ||||
| self._updatedfiles.add(f) | self._updatedfiles.add(f) | ||||
| def _addpath(self, f, state, mode, size, mtime): | def _addpath(self, f, state, mode, size, mtime): | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| if state == 'a' or oldstate == 'r': | if state == 'a' or oldstate == 'r': | ||||
| scmutil.checkfilename(f) | scmutil.checkfilename(f) | ||||
| if f in self._dirs: | if f in self._map.dirs: | ||||
| raise error.Abort(_('directory %r already in dirstate') % f) | raise error.Abort(_('directory %r already in dirstate') % f) | ||||
| # shadows | # shadows | ||||
| for d in util.finddirs(f): | for d in util.finddirs(f): | ||||
| if d in self._dirs: | if d in self._map.dirs: | ||||
| break | break | ||||
| entry = self._map.get(d) | entry = self._map.get(d) | ||||
| if entry is not None and entry[0] != 'r': | if entry is not None and entry[0] != 'r': | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _('file %r in dirstate clashes with %r') % (d, f)) | _('file %r in dirstate clashes with %r') % (d, f)) | ||||
| if oldstate in "?r" and "_dirs" in self.__dict__: | if oldstate in "?r" and "dirs" in self._map.__dict__: | ||||
| self._dirs.addpath(f) | self._map.dirs.addpath(f) | ||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(f) | self._updatedfiles.add(f) | ||||
| self._map[f] = dirstatetuple(state, mode, size, mtime) | self._map[f] = dirstatetuple(state, mode, size, mtime) | ||||
| if state != 'n' or mtime == -1: | if state != 'n' or mtime == -1: | ||||
| self._map.nonnormalset.add(f) | self._map.nonnormalset.add(f) | ||||
| if size == -2: | if size == -2: | ||||
| self._map.otherparentset.add(f) | self._map.otherparentset.add(f) | ||||
| ''' | ''' | ||||
| if self._checkcase: | if self._checkcase: | ||||
| return self._normalize(path, isknown, ignoremissing) | return self._normalize(path, isknown, ignoremissing) | ||||
| return path | return path | ||||
| def clear(self): | def clear(self): | ||||
| self._map = dirstatemap(self._ui, self._opener, self._root) | self._map = dirstatemap(self._ui, self._opener, self._root) | ||||
| if "_dirs" in self.__dict__: | |||||
| delattr(self, "_dirs") | |||||
| self._map.setparents(nullid, nullid) | self._map.setparents(nullid, nullid) | ||||
| self._lastnormaltime = 0 | self._lastnormaltime = 0 | ||||
| self._updatedfiles.clear() | self._updatedfiles.clear() | ||||
| self._dirty = True | self._dirty = True | ||||
| def rebuild(self, parent, allfiles, changedfiles=None): | def rebuild(self, parent, allfiles, changedfiles=None): | ||||
| if changedfiles is None: | if changedfiles is None: | ||||
| # Rebuild entire dirstate | # Rebuild entire dirstate | ||||
| f = {} | f = {} | ||||
| normcase = util.normcase | normcase = util.normcase | ||||
| for name, s in self._map.iteritems(): | for name, s in self._map.iteritems(): | ||||
| if s[0] != 'r': | if s[0] != 'r': | ||||
| f[normcase(name)] = name | f[normcase(name)] = name | ||||
| f['.'] = '.' # prevents useless util.fspath() invocation | f['.'] = '.' # prevents useless util.fspath() invocation | ||||
| return f | return f | ||||
| @propertycache | |||||
| def dirs(self): | def dirs(self): | ||||
| """Returns a set-like object containing all the directories in the | """Returns a set-like object containing all the directories in the | ||||
| current dirstate. | current dirstate. | ||||
| """ | """ | ||||
| return util.dirs(self._map, 'r') | return util.dirs(self._map, 'r') | ||||
| def _opendirstatefile(self): | def _opendirstatefile(self): | ||||
| fp, mode = txnutil.trypending(self._root, self._opener, self._filename) | fp, mode = txnutil.trypending(self._root, self._opener, self._filename) | ||||