| Alphare |
| hg-reviewers |
We want to split current user of dirstate.drop between hg rm-like cases and
update of the dirstate coming from update/merge.
To do this we will introduce new API. The first step is to introduces an
internal function that these new API migh use (or not use) to distinct between
the migrated users and the others.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
✅ refresh by Heptapod after a successful CI run (🐙 💚)
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (12 lines) |
| 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 self._map.dropfile(f): | self._drop(f) | ||||
| def _drop(self, filename): | |||||
| """internal function to drop a file from the dirstate""" | |||||
| if self._map.dropfile(filename): | |||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(f) | self._updatedfiles.add(filename) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(filename, None) | ||||
| 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 b'/' in path: | if not ignoremissing and b'/' in path: | ||||
| d, f = path.rsplit(b'/', 1) | d, f = path.rsplit(b'/', 1) | ||||
| 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 | ||||
| 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. | ||||