| Alphare |
| hg-reviewers |
This merge dropfile in set_untracked.
| 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 (12 lines) | |||
| M | mercurial/dirstatemap.py (35 lines) |
| def set_untracked(self, filename): | def set_untracked(self, filename): | ||||
| """a "public" method for generic code to mark a file as untracked | """a "public" method for generic code to mark a file as untracked | ||||
| This function is to be called outside of "update/merge" case. For | This function is to be called outside of "update/merge" case. For | ||||
| example by a command like `hg remove X`. | example by a command like `hg remove X`. | ||||
| return True the file was previously tracked, False otherwise. | return True the file was previously tracked, False otherwise. | ||||
| """ | """ | ||||
| entry = self._map.get(filename) | ret = self._map.set_untracked(filename) | ||||
| if entry is None: | if ret: | ||||
| return False | |||||
| else: | |||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(filename) | self._updatedfiles.add(filename) | ||||
| if entry.added: | return ret | ||||
| self._map.dropfile(filename) | |||||
| else: | |||||
| self._map.set_untracked(filename) | |||||
| return True | |||||
| @requires_no_parents_change | @requires_no_parents_change | ||||
| def set_clean(self, filename, parentfiledata=None): | def set_clean(self, filename, parentfiledata=None): | ||||
| """record that the current state of the file on disk is known to be clean""" | """record that the current state of the file on disk is known to be clean""" | ||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(filename) | self._updatedfiles.add(filename) | ||||
| if parentfiledata: | if parentfiledata: | ||||
| (mode, size, mtime) = parentfiledata | (mode, size, mtime) = parentfiledata | ||||
| if entry.dm_otherparent: | if entry.dm_otherparent: | ||||
| self.otherparentset.add(filename) | self.otherparentset.add(filename) | ||||
| else: | else: | ||||
| self.otherparentset.discard(filename) | self.otherparentset.discard(filename) | ||||
| self._map[filename] = entry | self._map[filename] = entry | ||||
| def set_untracked(self, f): | def set_untracked(self, f): | ||||
| """Mark a file as no longer tracked in the dirstate map""" | """Mark a file as no longer tracked in the dirstate map""" | ||||
| entry = self[f] | entry = self.get(f) | ||||
| self._dirs_decr(f, old_entry=entry, remove_variant=True) | if entry is None: | ||||
| return False | |||||
| else: | |||||
| self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) | |||||
| if not entry.merged: | |||||
| self.copymap.pop(f, None) | |||||
| if entry.added: | |||||
| self.nonnormalset.discard(f) | |||||
| self._map.pop(f, None) | |||||
| else: | |||||
| self.nonnormalset.add(f) | |||||
| if entry.from_p2: | if entry.from_p2: | ||||
| self.otherparentset.add(f) | self.otherparentset.add(f) | ||||
| elif not entry.merged: | |||||
| self.copymap.pop(f, None) | |||||
| entry.set_untracked() | entry.set_untracked() | ||||
| self.nonnormalset.add(f) | return True | ||||
| def dropfile(self, f): | def dropfile(self, f): | ||||
| """ | """ | ||||
| Remove a file from the dirstate. Returns True if the file was | Remove a file from the dirstate. Returns True if the file was | ||||
| previously recorded. | previously recorded. | ||||
| """ | """ | ||||
| old_entry = self._map.pop(f, None) | old_entry = self._map.pop(f, None) | ||||
| self._dirs_decr(f, old_entry=old_entry) | self._dirs_decr(f, old_entry=old_entry) | ||||
| assert False, 'unreachable' | assert False, 'unreachable' | ||||
| def set_untracked(self, f): | def set_untracked(self, f): | ||||
| """Mark a file as no longer tracked in the dirstate map""" | """Mark a file as no longer tracked in the dirstate map""" | ||||
| # in merge is only trigger more logic, so it "fine" to pass it. | # in merge is only trigger more logic, so it "fine" to pass it. | ||||
| # | # | ||||
| # the inner rust dirstate map code need to be adjusted once the API | # the inner rust dirstate map code need to be adjusted once the API | ||||
| # for dirstate/dirstatemap/DirstateItem is a bit more settled | # for dirstate/dirstatemap/DirstateItem is a bit more settled | ||||
| entry = self.get(f) | |||||
| if entry is None: | |||||
| return False | |||||
| else: | |||||
| if entry.added: | |||||
| self._rustmap.copymap().pop(f, None) | |||||
| self._rustmap.dropfile(f) | |||||
| else: | |||||
| self._rustmap.removefile(f, in_merge=True) | self._rustmap.removefile(f, in_merge=True) | ||||
| return True | |||||
| def removefile(self, *args, **kwargs): | def removefile(self, *args, **kwargs): | ||||
| return self._rustmap.removefile(*args, **kwargs) | return self._rustmap.removefile(*args, **kwargs) | ||||
| def dropfile(self, f, *args, **kwargs): | def dropfile(self, f, *args, **kwargs): | ||||
| self._rustmap.copymap().pop(f, None) | self._rustmap.copymap().pop(f, None) | ||||
| return self._rustmap.dropfile(f, *args, **kwargs) | return self._rustmap.dropfile(f, *args, **kwargs) | ||||