marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This is a step toward being able to remove the `_drop` method on `dirstate`. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11418 AFFECTED FILES mercurial/dirstate.py CHANGE DETAILS diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -496,13 +496,13 @@ entry = self._map.get(filename) if entry is None: return False - elif entry.added: - self._drop(filename) - return True else: self._dirty = True self._updatedfiles.add(filename) - self._map.set_untracked(filename) + if entry.added: + self._map.dropfile(filename) + else: + self._map.set_untracked(filename) return True @requires_no_parents_change 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
