Mercurial > hg-stable

changeset 47941:50bed873a765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop the deprecated `normallookup` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11345
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Aug 2021 21:08:37 +0200
parents f89ac1ed2bc6
children 3d2c17c5d7f2
files contrib/dirstatenonnormalcheck.py hgext/sparse.py mercurial/dirstate.py mercurial/interfaces/dirstate.py
diffstat 4 files changed, 0 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/dirstatenonnormalcheck.py	Tue Aug 24 21:08:09 2021 +0200
+++ b/contrib/dirstatenonnormalcheck.py	Tue Aug 24 21:08:37 2021 +0200
@@ -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)
--- a/hgext/sparse.py	Tue Aug 24 21:08:09 2021 +0200
+++ b/hgext/sparse.py	Tue Aug 24 21:08:37 2021 +0200
@@ -258,7 +258,6 @@
         b'set_tracked',
         b'set_untracked',
         b'add',
-        b'normallookup',
         b'copy',
         b'remove',
         b'merge',
--- a/mercurial/dirstate.py	Tue Aug 24 21:08:09 2021 +0200
+++ b/mercurial/dirstate.py	Tue Aug 24 21:08:37 2021 +0200
@@ -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:
--- a/mercurial/interfaces/dirstate.py	Tue Aug 24 21:08:09 2021 +0200
+++ b/mercurial/interfaces/dirstate.py	Tue Aug 24 21:08:37 2021 +0200
@@ -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.'''