| rdamazio | |
| durin42 | |
| quark | |
| dsp |
| hg-reviewers |
This replaces patterns such as this:
if f in self._copymap:
del self._copymap[f]with this:
self._copymap.pop(f, None)
Although eliminating the extra lookup/call may be a negligible performance win
in the standard dirstate, alternative implementations, such as
sqldirstate
may see a bigger win where each of these calls results in an RPC,
so the savings is greater.
make tests
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
I wonder if that is something that we can find with check-code to reduce the overall usage of these kind of patterns.
| candidatefiles = self._nonnormalset.union(self._otherparentset) | candidatefiles = self._nonnormalset.union(self._otherparentset) | ||||
| for f in candidatefiles: | for f in candidatefiles: | ||||
| s = self._map.get(f) | s = self._map.get(f) | ||||
| if s is None: | if s is None: | ||||
| continue | continue | ||||
| # Discard 'm' markers when moving away from a merge state | # Discard 'm' markers when moving away from a merge state | ||||
| if s[0] == 'm': | if s[0] == 'm': | ||||
| if f in self._copymap: | source = self._copymap.get(f) | ||||
| copies[f] = self._copymap[f] | if source: | ||||
| copies[f] = source | |||||
| self.normallookup(f) | self.normallookup(f) | ||||
| # Also fix up otherparent markers | # Also fix up otherparent markers | ||||
| elif s[0] == 'n' and s[2] == -2: | elif s[0] == 'n' and s[2] == -2: | ||||
| if f in self._copymap: | source = self._copymap.get(f) | ||||
| copies[f] = self._copymap[f] | if source: | ||||
| copies[f] = source | |||||
| self.add(f) | self.add(f) | ||||
| return copies | return copies | ||||
| def setbranch(self, branch): | def setbranch(self, branch): | ||||
| self._branch = encoding.fromlocal(branch) | self._branch = encoding.fromlocal(branch) | ||||
| f = self._opener('branch', 'w', atomictemp=True, checkambig=True) | f = self._opener('branch', 'w', atomictemp=True, checkambig=True) | ||||
| try: | try: | ||||
| f.write(self._branch + '\n') | f.write(self._branch + '\n') | ||||
| """Mark dest as a copy of source. Unmark dest if source is None.""" | """Mark dest as a copy of source. Unmark dest if source is None.""" | ||||
| if source == dest: | if source == dest: | ||||
| return | return | ||||
| self._dirty = True | self._dirty = True | ||||
| if source is not None: | if source is not None: | ||||
| self._copymap[dest] = source | self._copymap[dest] = source | ||||
| self._updatedfiles.add(source) | self._updatedfiles.add(source) | ||||
| self._updatedfiles.add(dest) | self._updatedfiles.add(dest) | ||||
| elif dest in self._copymap: | elif self._copymap.pop(dest, None): | ||||
| del self._copymap[dest] | |||||
| self._updatedfiles.add(dest) | self._updatedfiles.add(dest) | ||||
| def copied(self, file): | def copied(self, file): | ||||
| return self._copymap.get(file, None) | return self._copymap.get(file, None) | ||||
| def copies(self): | def copies(self): | ||||
| return self._copymap | return self._copymap | ||||
| self._otherparentset.add(f) | self._otherparentset.add(f) | ||||
| def normal(self, f): | def normal(self, f): | ||||
| '''Mark a file normal and clean.''' | '''Mark a file normal and clean.''' | ||||
| s = os.lstat(self._join(f)) | s = os.lstat(self._join(f)) | ||||
| mtime = s.st_mtime | mtime = s.st_mtime | ||||
| self._addpath(f, 'n', s.st_mode, | self._addpath(f, 'n', s.st_mode, | ||||
| s.st_size & _rangemask, mtime & _rangemask) | s.st_size & _rangemask, mtime & _rangemask) | ||||
| if f in self._copymap: | self._copymap.pop(f, None) | ||||
| del self._copymap[f] | |||||
| if f in self._nonnormalset: | if f in self._nonnormalset: | ||||
| self._nonnormalset.remove(f) | self._nonnormalset.remove(f) | ||||
| if mtime > self._lastnormaltime: | if mtime > self._lastnormaltime: | ||||
| # Remember the most recent modification timeslot for status(), | # Remember the most recent modification timeslot for status(), | ||||
| # to make sure we won't miss future size-preserving file content | # to make sure we won't miss future size-preserving file content | ||||
| # modifications that happen within the same timeslot. | # modifications that happen within the same timeslot. | ||||
| self._lastnormaltime = mtime | self._lastnormaltime = mtime | ||||
| elif entry[2] == -2: | elif entry[2] == -2: | ||||
| self.otherparent(f) | self.otherparent(f) | ||||
| if source: | if source: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: | if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: | ||||
| return | return | ||||
| self._addpath(f, 'n', 0, -1, -1) | self._addpath(f, 'n', 0, -1, -1) | ||||
| if f in self._copymap: | self._copymap.pop(f, None) | ||||
| del self._copymap[f] | |||||
| if f in self._nonnormalset: | if f in self._nonnormalset: | ||||
| self._nonnormalset.remove(f) | self._nonnormalset.remove(f) | ||||
| def otherparent(self, f): | def otherparent(self, f): | ||||
| '''Mark as coming from the other parent, always dirty.''' | '''Mark as coming from the other parent, always dirty.''' | ||||
| if self._pl[1] == nullid: | if self._pl[1] == nullid: | ||||
| raise error.Abort(_("setting %r to other parent " | raise error.Abort(_("setting %r to other parent " | ||||
| "only allowed in merges") % f) | "only allowed in merges") % f) | ||||
| if f in self and self[f] == 'n': | if f in self and self[f] == 'n': | ||||
| # merge-like | # merge-like | ||||
| self._addpath(f, 'm', 0, -2, -1) | self._addpath(f, 'm', 0, -2, -1) | ||||
| else: | else: | ||||
| # add-like | # add-like | ||||
| self._addpath(f, 'n', 0, -2, -1) | self._addpath(f, 'n', 0, -2, -1) | ||||
| self._copymap.pop(f, None) | |||||
| if f in self._copymap: | |||||
| del self._copymap[f] | |||||
| def add(self, f): | def add(self, f): | ||||
| '''Mark a file added.''' | '''Mark a file added.''' | ||||
| self._addpath(f, 'a', 0, -1, -1) | self._addpath(f, 'a', 0, -1, -1) | ||||
| if f in self._copymap: | self._copymap.pop(f, None) | ||||
| del self._copymap[f] | |||||
| def remove(self, f): | def remove(self, f): | ||||
| '''Mark a file removed.''' | '''Mark a file removed.''' | ||||
| self._dirty = True | self._dirty = True | ||||
| self._droppath(f) | self._droppath(f) | ||||
| size = 0 | size = 0 | ||||
| if self._pl[1] != nullid and f in self._map: | if self._pl[1] != nullid and f in self._map: | ||||
| # backup the previous state | # backup the previous state | ||||
| entry = self._map[f] | entry = self._map[f] | ||||
| if entry[0] == 'm': # merge | if entry[0] == 'm': # merge | ||||
| size = -1 | size = -1 | ||||
| elif entry[0] == 'n' and entry[2] == -2: # other parent | elif entry[0] == 'n' and entry[2] == -2: # other parent | ||||
| size = -2 | size = -2 | ||||
| self._otherparentset.add(f) | self._otherparentset.add(f) | ||||
| self._map[f] = dirstatetuple('r', 0, size, 0) | self._map[f] = dirstatetuple('r', 0, size, 0) | ||||
| self._nonnormalset.add(f) | self._nonnormalset.add(f) | ||||
| if size == 0 and f in self._copymap: | if size == 0: | ||||
| del self._copymap[f] | self._copymap.pop(f, None) | ||||
| def merge(self, f): | def merge(self, f): | ||||
| '''Mark a file merged.''' | '''Mark a file merged.''' | ||||
| if self._pl[1] == nullid: | if self._pl[1] == nullid: | ||||
| return self.normallookup(f) | return self.normallookup(f) | ||||
| return self.otherparent(f) | return self.otherparent(f) | ||||
| def drop(self, f): | def drop(self, f): | ||||
| '''Drop a file from the dirstate''' | '''Drop a file from the dirstate''' | ||||
| if f in self._map: | if f in self._map: | ||||
| self._dirty = True | self._dirty = True | ||||
| self._droppath(f) | self._droppath(f) | ||||
| del self._map[f] | del self._map[f] | ||||
| if f in self._nonnormalset: | if f in self._nonnormalset: | ||||
| self._nonnormalset.remove(f) | self._nonnormalset.remove(f) | ||||
| if f in self._copymap: | self._copymap.pop(f, None) | ||||
| del self._copymap[f] | |||||
| def _discoverpath(self, path, normed, ignoremissing, exists, storemap): | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): | ||||
| if exists is None: | if exists is None: | ||||
| exists = os.path.lexists(os.path.join(self._root, path)) | exists = os.path.lexists(os.path.join(self._root, path)) | ||||
| if not exists: | if not exists: | ||||
| # Maybe a path component exists | # Maybe a path component exists | ||||
| if not ignoremissing and '/' in path: | if not ignoremissing and '/' in path: | ||||
| d, f = path.rsplit('/', 1) | d, f = path.rsplit('/', 1) | ||||