diff --git a/contrib/dirstatenonnormalcheck.py b/contrib/dirstatenonnormalcheck.py --- a/contrib/dirstatenonnormalcheck.py +++ b/contrib/dirstatenonnormalcheck.py @@ -59,7 +59,6 @@ if paranoid: # 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, 'normallookup', _checkdirstate) extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate) extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) extensions.wrapfunction(dirstatecl, 'add', _checkdirstate) diff --git a/hgext/sparse.py b/hgext/sparse.py --- a/hgext/sparse.py +++ b/hgext/sparse.py @@ -258,7 +258,6 @@ b'set_tracked', b'set_untracked', b'add', - b'normallookup', b'copy', b'remove', b'merge', diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -720,24 +720,6 @@ # modifications that happen within the same timeslot. self._lastnormaltime = mtime - def normallookup(self, f): - '''Mark a file normal, but possibly dirty.''' - if self.pendingparentchange(): - util.nouideprecwarn( - b"do not use `normallookup` inside of update/merge context." - b" Use `update_file` or `update_file_p1`", - b'6.0', - stacklevel=2, - ) - else: - util.nouideprecwarn( - b"do not use `normallookup` outside of update/merge context." - b" Use `set_possibly_dirty` or `set_tracked`", - b'6.0', - stacklevel=2, - ) - self._normallookup(f) - def _normallookup(self, f): '''Mark a file normal, but possibly dirty.''' if self.in_merge: 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 normallookup(f): - '''Mark a file normal, but possibly dirty.''' - def otherparent(f): '''Mark as coming from the other parent, always dirty.'''