| quark | |
| durin42 |
| hg-reviewers |
Moving the identity function to the dirstatemap class will allow alternative
dirstate implementations to replace the implementation.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| @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 _identity(self): | |||||
| self._read() | |||||
| return self._identity | |||||
| @propertycache | |||||
| def _filefoldmap(self): | def _filefoldmap(self): | ||||
| return self._map.filefoldmap() | return self._map.filefoldmap() | ||||
| @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._dirs: | ||||
| ce = self._filecache['_branch'] | ce = self._filecache['_branch'] | ||||
| if ce: | if ce: | ||||
| ce.refresh() | ce.refresh() | ||||
| except: # re-raises | except: # re-raises | ||||
| f.discard() | f.discard() | ||||
| raise | raise | ||||
| def _read(self): | def _read(self): | ||||
| # ignore HG_PENDING because identity is used only for writing | |||||
| self._identity = util.filestat.frompath( | |||||
| self._opener.join(self._filename)) | |||||
| self._map = dirstatemap(self._ui, self._opener, self._root) | self._map = dirstatemap(self._ui, self._opener, self._root) | ||||
| self._map.read() | self._map.read() | ||||
| 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", "_identity", | for a in ("_map", "_filefoldmap", "_dirfoldmap", "_branch", | ||||
| "_filefoldmap", "_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 | ||||
| self._dirty = True | self._dirty = True | ||||
| def identity(self): | def identity(self): | ||||
| '''Return identity of dirstate itself to detect changing in storage | '''Return identity of dirstate itself to detect changing in storage | ||||
| If identity of previous dirstate is equal to this, writing | If identity of previous dirstate is equal to this, writing | ||||
| changes based on the former dirstate out can keep consistency. | changes based on the former dirstate out can keep consistency. | ||||
| ''' | ''' | ||||
| return self._identity | return self._map.identity | ||||
| def write(self, tr): | def write(self, tr): | ||||
| if not self._dirty: | if not self._dirty: | ||||
| return | return | ||||
| filename = self._filename | filename = self._filename | ||||
| if tr: | if tr: | ||||
| # 'dirstate.write()' is not only for writing in-memory | # 'dirstate.write()' is not only for writing in-memory | ||||
| return self._parents | return self._parents | ||||
| def setparents(self, p1, p2): | def setparents(self, p1, p2): | ||||
| self._parents = (p1, p2) | self._parents = (p1, p2) | ||||
| self._dirtyparents = True | self._dirtyparents = True | ||||
| def read(self): | def read(self): | ||||
| # ignore HG_PENDING because identity is used only for writing | |||||
| self.identity = util.filestat.frompath( | |||||
| self._opener.join(self._filename)) | |||||
| try: | try: | ||||
| fp = self._opendirstatefile() | fp = self._opendirstatefile() | ||||
| try: | try: | ||||
| st = fp.read() | st = fp.read() | ||||
| finally: | finally: | ||||
| fp.close() | fp.close() | ||||
| except IOError as err: | except IOError as err: | ||||
| if err.errno != errno.ENOENT: | if err.errno != errno.ENOENT: | ||||
| return nonnorm | return nonnorm | ||||
| @propertycache | @propertycache | ||||
| def otherparentset(self): | def otherparentset(self): | ||||
| nonnorm, otherparents = self.nonnormalentries() | nonnorm, otherparents = self.nonnormalentries() | ||||
| self.nonnormalset = nonnorm | self.nonnormalset = nonnorm | ||||
| return otherparents | return otherparents | ||||
| @propertycache | |||||
| def identity(self): | |||||
| self.read() | |||||
| return self.identity | |||||