Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: replace the use of _normallookup in `setparents`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 15 Sep 2021 18:16:16 +0200
changeset 48015 625b84c1abdd
parent 48014 0d2a404f1932
child 48016 14fa2e583422
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
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- 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)
hg-stable