marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY eh ;-) REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11350 AFFECTED FILES contrib/dirstatenonnormalcheck.py mercurial/dirstate.py mercurial/interfaces/dirstate.py CHANGE DETAILS diff --git a/mercurial/interfaces/dirstate.py b/mercurial/interfaces/dirstate.py --- a/mercurial/interfaces/dirstate.py +++ b/mercurial/interfaces/dirstate.py @@ -132,9 +132,6 @@ def copies(): pass - def drop(f): - '''Drop a file from the dirstate''' - def normalize(path, isknown=False, ignoremissing=False): """ normalize the case of a pathname when on a casefolding filesystem diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -767,24 +767,6 @@ return self._normallookup(f) return self._otherparent(f) - def drop(self, f): - '''Drop a file from the dirstate''' - if self.pendingparentchange(): - util.nouideprecwarn( - b"do not use `drop` inside of update/merge context." - b" Use `update_file`", - b'6.0', - stacklevel=2, - ) - else: - util.nouideprecwarn( - b"do not use `drop` outside of update/merge context." - b" Use `set_untracked`", - b'6.0', - stacklevel=2, - ) - self._drop(f) - def _drop(self, filename): """internal function to drop a file from the dirstate""" if self._map.dropfile(filename): diff --git a/contrib/dirstatenonnormalcheck.py b/contrib/dirstatenonnormalcheck.py --- a/contrib/dirstatenonnormalcheck.py +++ b/contrib/dirstatenonnormalcheck.py @@ -60,7 +60,6 @@ # We don't do all these checks when paranoid is disable as it would # make the extension run very slowly on large repos extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) - extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate) extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate) extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate) extensions.wrapfunction( 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
