| quark | |
| durin42 |
| hg-reviewers |
Now that the filefoldmap is source of truthed on the dirstatemap, let's get rid
of the property cache on the dirstate.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (4 lines) | |||
| M | mercurial/dirstate.py (19 lines) |
| 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._filefoldmap.get('a') | dirstate._map.filefoldmap.get('a') | ||||
| del dirstate._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 | ||||
| @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 | @propertycache | ||||
| def _filefoldmap(self): | |||||
| return self._map.filefoldmap() | |||||
| @propertycache | |||||
| def _dirfoldmap(self): | def _dirfoldmap(self): | ||||
| f = {} | f = {} | ||||
| normcase = util.normcase | normcase = util.normcase | ||||
| for name in self._dirs: | for name in self._dirs: | ||||
| f[normcase(name)] = name | f[normcase(name)] = name | ||||
| return f | return f | ||||
| @property | @property | ||||
| 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", "_filefoldmap", "_dirfoldmap", "_branch", | for a in ("_map", "_dirfoldmap", "_branch", | ||||
| "_dirs", "_ignore"): | "_dirs", "_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 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.__dict__: | ||||
| self._dirs.delpath(f) | self._dirs.delpath(f) | ||||
| if "_filefoldmap" in self.__dict__: | if "filefoldmap" in self._map.__dict__: | ||||
| normed = util.normcase(f) | normed = util.normcase(f) | ||||
| if normed in self._filefoldmap: | if normed in self._map.filefoldmap: | ||||
| del self._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._dirs: | ||||
| else: | else: | ||||
| folded = util.fspath(normed, self._root) | folded = util.fspath(normed, self._root) | ||||
| storemap[normed] = folded | storemap[normed] = folded | ||||
| return folded | return folded | ||||
| def _normalizefile(self, path, isknown, ignoremissing=False, exists=None): | def _normalizefile(self, path, isknown, ignoremissing=False, exists=None): | ||||
| normed = util.normcase(path) | normed = util.normcase(path) | ||||
| folded = self._filefoldmap.get(normed, None) | folded = self._map.filefoldmap.get(normed, None) | ||||
| if folded is None: | if folded is None: | ||||
| if isknown: | if isknown: | ||||
| folded = path | folded = path | ||||
| else: | else: | ||||
| folded = self._discoverpath(path, normed, ignoremissing, exists, | folded = self._discoverpath(path, normed, ignoremissing, exists, | ||||
| self._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._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._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 | ||||
| otherparent = set() | otherparent = set() | ||||
| for fname, e in self._map.iteritems(): | for fname, e in self._map.iteritems(): | ||||
| if e[0] != 'n' or e[3] == -1: | if e[0] != 'n' or e[3] == -1: | ||||
| nonnorm.add(fname) | nonnorm.add(fname) | ||||
| if e[0] == 'n' and e[2] == -2: | if e[0] == 'n' and e[2] == -2: | ||||
| otherparent.add(fname) | otherparent.add(fname) | ||||
| return nonnorm, otherparent | return nonnorm, otherparent | ||||
| @propertycache | |||||
| def filefoldmap(self): | def filefoldmap(self): | ||||
| """Returns a dictionary mapping normalized case paths to their | """Returns a dictionary mapping normalized case paths to their | ||||
| non-normalized versions. | non-normalized versions. | ||||
| """ | """ | ||||
| try: | try: | ||||
| makefilefoldmap = parsers.make_file_foldmap | makefilefoldmap = parsers.make_file_foldmap | ||||
| except AttributeError: | except AttributeError: | ||||
| pass | pass | ||||