marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This merge dropfile in set_untracked. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11419 AFFECTED FILES mercurial/dirstate.py mercurial/dirstatemap.py CHANGE DETAILS diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -299,14 +299,22 @@ def set_untracked(self, f): """Mark a file as no longer tracked in the dirstate map""" - entry = self[f] - self._dirs_decr(f, old_entry=entry, remove_variant=True) - if entry.from_p2: - self.otherparentset.add(f) - elif not entry.merged: - self.copymap.pop(f, None) - entry.set_untracked() - self.nonnormalset.add(f) + entry = self.get(f) + 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: + self.otherparentset.add(f) + entry.set_untracked() + return True def dropfile(self, f): """ @@ -648,7 +656,16 @@ # # the inner rust dirstate map code need to be adjusted once the API # for dirstate/dirstatemap/DirstateItem is a bit more settled - self._rustmap.removefile(f, in_merge=True) + 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) + return True def removefile(self, *args, **kwargs): return self._rustmap.removefile(*args, **kwargs) diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -493,17 +493,11 @@ return True the file was previously tracked, False otherwise. """ - entry = self._map.get(filename) - if entry is None: - return False - else: + ret = self._map.set_untracked(filename) + if ret: self._dirty = True self._updatedfiles.add(filename) - if entry.added: - self._map.dropfile(filename) - else: - self._map.set_untracked(filename) - return True + return ret @requires_no_parents_change def set_clean(self, filename, parentfiledata=None): To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
