# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1631702039 -7200
# Node ID ccb9cc47b7b68cb1211731cb62a5d2bfa91c4c8d
# Parent  eb1f8d6e9419c6856e7f4f85fd033574025dde73
dirstate: remove the `normallookup` function

All use have been migrated.

Differential Revision: https://phab.mercurial-scm.org/D11434

diff -r eb1f8d6e9419 -r ccb9cc47b7b6 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Thu Sep 16 14:14:33 2021 +0200
+++ b/mercurial/dirstate.py	Wed Sep 15 12:33:59 2021 +0200
@@ -718,31 +718,6 @@
         mtime = s[stat.ST_MTIME]
         return (mode, size, mtime)
 
-    def _normallookup(self, f):
-        '''Mark a file normal, but possibly dirty.'''
-        if self.in_merge:
-            # if there is a merge going on and the file was either
-            # "merged" or coming from other parent (-2) before
-            # being removed, restore that state.
-            entry = self._map.get(f)
-            if entry is not None:
-                # XXX this should probably be dealt with a a lower level
-                # (see `merged_removed` and `from_p2_removed`)
-                if entry.merged_removed or entry.from_p2_removed:
-                    source = self._map.copymap.get(f)
-                    if entry.merged_removed:
-                        self._addpath(f, merged=True)
-                    else:
-                        self._addpath(f, from_p2=True)
-                    self._map.copymap.pop(f, None)
-                    if source is not None:
-                        self.copy(source, f)
-                    return
-                elif entry.merged or entry.from_p2:
-                    return
-        self._addpath(f, possibly_dirty=True)
-        self._map.copymap.pop(f, None)
-
     def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
         if exists is None:
             exists = os.path.lexists(os.path.join(self._root, path))