Mercurial > hg
diff mercurial/dirstate.py @ 47991:625b84c1abdd
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
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 15 Sep 2021 18:16:16 +0200 |
parents | 0d2a404f1932 |
children | 14fa2e583422 |
line wrap: on
line diff
--- 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)