Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 47990:0d2a404f1932 | 47991:625b84c1abdd |
|---|---|
| 399 # Discard "merged" markers when moving away from a merge state | 399 # Discard "merged" markers when moving away from a merge state |
| 400 if s.merged: | 400 if s.merged: |
| 401 source = self._map.copymap.get(f) | 401 source = self._map.copymap.get(f) |
| 402 if source: | 402 if source: |
| 403 copies[f] = source | 403 copies[f] = source |
| 404 self._normallookup(f) | 404 self._map.reset_state( |
| 405 f, | |
| 406 wc_tracked=True, | |
| 407 p1_tracked=True, | |
| 408 possibly_dirty=True, | |
| 409 ) | |
| 405 # Also fix up otherparent markers | 410 # Also fix up otherparent markers |
| 406 elif s.from_p2: | 411 elif s.from_p2: |
| 407 source = self._map.copymap.get(f) | 412 source = self._map.copymap.get(f) |
| 408 if source: | 413 if source: |
| 409 copies[f] = source | 414 copies[f] = source |