# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1631722576 -7200
# Node ID 625b84c1abddaaca8e76c6ab057f6fdddc6aaadd
# Parent  0d2a404f1932aa8dfb45d1d0bd232f5389d8f425
dirstate: replace the use of _normallookup in `setparents`

normal lookup is a complicated function that we want to get rid of.

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

diff -r 0d2a404f1932 -r 625b84c1abdd mercurial/dirstate.py
--- a/mercurial/dirstate.py	Wed Sep 15 18:05:39 2021 +0200
+++ b/mercurial/dirstate.py	Wed Sep 15 18:16:16 2021 +0200
@@ -401,7 +401,12 @@
                     source = self._map.copymap.get(f)
                     if source:
                         copies[f] = source
-                    self._normallookup(f)
+                    self._map.reset_state(
+                        f,
+                        wc_tracked=True,
+                        p1_tracked=True,
+                        possibly_dirty=True,
+                    )
                 # Also fix up otherparent markers
                 elif s.from_p2:
                     source = self._map.copymap.get(f)