| Alphare |
| hg-reviewers |
All code have been migrated to the new APIs.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (26 lines) |
| if s is None: | if s is None: | ||||
| continue | continue | ||||
| # Discard "merged" markers when moving away from a merge state | # Discard "merged" markers when moving away from a merge state | ||||
| if s.merged: | if s.merged: | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if source: | if source: | ||||
| copies[f] = source | copies[f] = source | ||||
| self.normallookup(f) | self._normallookup(f) | ||||
| # Also fix up otherparent markers | # Also fix up otherparent markers | ||||
| elif s.from_p2: | elif s.from_p2: | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if source: | if source: | ||||
| copies[f] = source | copies[f] = source | ||||
| self._add(f) | self._add(f) | ||||
| return copies | return copies | ||||
| return True the file was previously untracked, False otherwise. | return True the file was previously untracked, False otherwise. | ||||
| """ | """ | ||||
| entry = self._map.get(filename) | entry = self._map.get(filename) | ||||
| if entry is None: | if entry is None: | ||||
| self._add(filename) | self._add(filename) | ||||
| return True | return True | ||||
| elif not entry.tracked: | elif not entry.tracked: | ||||
| self.normallookup(filename) | self._normallookup(filename) | ||||
| return True | return True | ||||
| # XXX This is probably overkill for more case, but we need this to | # XXX This is probably overkill for more case, but we need this to | ||||
| # fully replace the `normallookup` call with `set_tracked` one. | # fully replace the `normallookup` call with `set_tracked` one. | ||||
| # Consider smoothing this in the future. | # Consider smoothing this in the future. | ||||
| self.set_possibly_dirty(filename) | self.set_possibly_dirty(filename) | ||||
| return False | return False | ||||
| @requires_no_parents_change | @requires_no_parents_change | ||||
| 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 | ||||
| def normallookup(self, f): | def normallookup(self, f): | ||||
| '''Mark a file normal, but possibly dirty.''' | '''Mark a file normal, but possibly dirty.''' | ||||
| if self.pendingparentchange(): | |||||
| util.nouideprecwarn( | |||||
| b"do not use `normallookup` inside of update/merge context." | |||||
| b" Use `update_file` or `update_file_p1`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| else: | |||||
| util.nouideprecwarn( | |||||
| b"do not use `normallookup` outside of update/merge context." | |||||
| b" Use `set_possibly_dirty` or `set_tracked`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| self._normallookup(f) | |||||
| def _normallookup(self, f): | |||||
| '''Mark a file normal, but possibly dirty.''' | |||||
| if self.in_merge: | if self.in_merge: | ||||
| # if there is a merge going on and the file was either | # if there is a merge going on and the file was either | ||||
| # "merged" or coming from other parent (-2) before | # "merged" or coming from other parent (-2) before | ||||
| # being removed, restore that state. | # being removed, restore that state. | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if entry is not None: | if entry is not None: | ||||
| # XXX this should probably be dealt with a a lower level | # XXX this should probably be dealt with a a lower level | ||||
| # (see `merged_removed` and `from_p2_removed`) | # (see `merged_removed` and `from_p2_removed`) | ||||
| """internal function to mark a file removed""" | """internal function to mark a file removed""" | ||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(filename) | self._updatedfiles.add(filename) | ||||
| self._map.removefile(filename, in_merge=self.in_merge) | self._map.removefile(filename, in_merge=self.in_merge) | ||||
| def merge(self, f): | def merge(self, f): | ||||
| '''Mark a file merged.''' | '''Mark a file merged.''' | ||||
| if not self.in_merge: | if not self.in_merge: | ||||
| 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 not self.pendingparentchange(): | if not self.pendingparentchange(): | ||||
| util.nouideprecwarn( | util.nouideprecwarn( | ||||
| b"do not use `drop` outside of update/merge context." | b"do not use `drop` outside of update/merge context." | ||||
| b" Use `set_untracked`", | b" Use `set_untracked`", | ||||
| to_lookup = changedfilesset & set(allfiles) | to_lookup = changedfilesset & set(allfiles) | ||||
| to_drop = changedfilesset - to_lookup | to_drop = changedfilesset - to_lookup | ||||
| if self._origpl is None: | if self._origpl is None: | ||||
| self._origpl = self._pl | self._origpl = self._pl | ||||
| self._map.setparents(parent, self._nodeconstants.nullid) | self._map.setparents(parent, self._nodeconstants.nullid) | ||||
| for f in to_lookup: | for f in to_lookup: | ||||
| self.normallookup(f) | self._normallookup(f) | ||||
| for f in to_drop: | for f in to_drop: | ||||
| self._drop(f) | self._drop(f) | ||||
| 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 | ||||