As part of moving dirstate storage to its own class, let's move the
nonnormalentries logic onto the dirstatemap class. This will let extensions
replace the nonnormalentries logic with a persisted cache.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| '''Get "now" timestamp on filesystem''' | '''Get "now" timestamp on filesystem''' | ||||
| tmpfd, tmpname = vfs.mkstemp() | tmpfd, tmpname = vfs.mkstemp() | ||||
| try: | try: | ||||
| return os.fstat(tmpfd).st_mtime | return os.fstat(tmpfd).st_mtime | ||||
| finally: | finally: | ||||
| os.close(tmpfd) | os.close(tmpfd) | ||||
| vfs.unlink(tmpname) | vfs.unlink(tmpname) | ||||
| def nonnormalentries(dmap): | |||||
| '''Compute the nonnormal dirstate entries from the dmap''' | |||||
| try: | |||||
| return parsers.nonnormalotherparententries(dmap._map) | |||||
| except AttributeError: | |||||
| nonnorm = set() | |||||
| otherparent = set() | |||||
| for fname, e in dmap.iteritems(): | |||||
| if e[0] != 'n' or e[3] == -1: | |||||
| nonnorm.add(fname) | |||||
| if e[0] == 'n' and e[2] == -2: | |||||
| otherparent.add(fname) | |||||
| return nonnorm, otherparent | |||||
| class dirstate(object): | class dirstate(object): | ||||
| def __init__(self, opener, ui, root, validate, sparsematchfn): | def __init__(self, opener, ui, root, validate, sparsematchfn): | ||||
| '''Create a new dirstate object. | '''Create a new dirstate object. | ||||
| opener is an open()-like callable that can be used to open the | opener is an open()-like callable that can be used to open the | ||||
| dirstate file; root is the root of the directory tracked by | dirstate file; root is the root of the directory tracked by | ||||
| the dirstate. | the dirstate. | ||||
| @propertycache | @propertycache | ||||
| def _identity(self): | def _identity(self): | ||||
| self._read() | self._read() | ||||
| return self._identity | return self._identity | ||||
| @propertycache | @propertycache | ||||
| def _nonnormalset(self): | def _nonnormalset(self): | ||||
| nonnorm, otherparents = nonnormalentries(self._map) | nonnorm, otherparents = self._map.nonnormalentries() | ||||
| self._otherparentset = otherparents | self._otherparentset = otherparents | ||||
| return nonnorm | return nonnorm | ||||
| @propertycache | @propertycache | ||||
| def _otherparentset(self): | def _otherparentset(self): | ||||
| nonnorm, otherparents = nonnormalentries(self._map) | nonnorm, otherparents = self._map.nonnormalentries() | ||||
| self._nonnormalset = nonnorm | self._nonnormalset = nonnorm | ||||
| return otherparents | return otherparents | ||||
| @propertycache | @propertycache | ||||
| def _filefoldmap(self): | def _filefoldmap(self): | ||||
| try: | try: | ||||
| makefilefoldmap = parsers.make_file_foldmap | makefilefoldmap = parsers.make_file_foldmap | ||||
| except AttributeError: | except AttributeError: | ||||
| start = int(clock) - (int(clock) % delaywrite) | start = int(clock) - (int(clock) % delaywrite) | ||||
| end = start + delaywrite | end = start + delaywrite | ||||
| time.sleep(end - clock) | time.sleep(end - clock) | ||||
| now = end # trust our estimate that the end is near now | now = end # trust our estimate that the end is near now | ||||
| break | break | ||||
| st.write(parsers.pack_dirstate(self._map._map, self._copymap, self._pl, | st.write(parsers.pack_dirstate(self._map._map, self._copymap, self._pl, | ||||
| now)) | now)) | ||||
| self._nonnormalset, self._otherparentset = nonnormalentries(self._map) | self._nonnormalset, self._otherparentset = self._map.nonnormalentries() | ||||
| st.close() | st.close() | ||||
| self._lastnormaltime = 0 | self._lastnormaltime = 0 | ||||
| self._dirty = self._dirtypl = False | self._dirty = self._dirtypl = False | ||||
| def _dirignore(self, f): | def _dirignore(self, f): | ||||
| if f == '.': | if f == '.': | ||||
| return False | return False | ||||
| if self._ignore(f): | if self._ignore(f): | ||||
| def __getitem__(self, key): | def __getitem__(self, key): | ||||
| return self._map[key] | return self._map[key] | ||||
| def __delitem__(self, key): | def __delitem__(self, key): | ||||
| del self._map[key] | del self._map[key] | ||||
| def keys(self): | def keys(self): | ||||
| return self._map.keys() | return self._map.keys() | ||||
| def nonnormalentries(self): | |||||
| '''Compute the nonnormal dirstate entries from the dmap''' | |||||
| try: | |||||
| return parsers.nonnormalotherparententries(self._map) | |||||
| except AttributeError: | |||||
| nonnorm = set() | |||||
| otherparent = set() | |||||
| for fname, e in self._map.iteritems(): | |||||
| if e[0] != 'n' or e[3] == -1: | |||||
| nonnorm.add(fname) | |||||
| if e[0] == 'n' and e[2] == -2: | |||||
| otherparent.add(fname) | |||||
| return nonnorm, otherparent | |||||