comparison mercurial/dirstate.py @ 47992:14fa2e583422

dirstate: replace the use of `_normallookup` in `rebuild`

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

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

47991:625b84c1abdd

        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(parent, self._nodeconstants.nullid)

        for f in to_lookup:
            self._normallookup(f)
        for f in to_drop:
            if self._map.dropfile(f):
                self._updatedfiles.add(f)

        self._dirty = True

47992:14fa2e583422

        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(parent, self._nodeconstants.nullid)

        for f in to_lookup:

            if self.in_merge:
                self.set_tracked(f)
            else:
                self._map.reset_state(
                    f,
                    wc_tracked=True,
                    p1_tracked=True,
                    possibly_dirty=True,
                )
            self._updatedfiles.add(f)
        for f in to_drop:
            if self._map.dropfile(f):
                self._updatedfiles.add(f)

        self._dirty = True