comparison mercurial/dirstate.py @ 48140:98b3eb6c1479

dirstate: align the dirstatemap's API to the data change

We are passing different data, so lets simplify the dirstatemap API too.

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

48139:ab5a7fdbf75c

        entry = self._map.get(filename)
        if entry is None:
            wc_tracked = False
        else:
            wc_tracked = entry.tracked
        possibly_dirty = False
        if p1_tracked and wc_tracked:
            # the underlying reference might have changed, we will have to
            # check it.
            possibly_dirty = True
        elif not (p1_tracked or wc_tracked):
            # the file is no longer relevant to anyone
            if self._map.get(filename) is not None:
                self._map.reset_state(filename)
                self._dirty = True
        elif (not p1_tracked) and wc_tracked:
            if entry is not None and entry.added:
                return  # avoid dropping copy information (maybe?)
        elif p1_tracked and not wc_tracked:
            pass
        else:
            assert False, 'unreachable'

        # this mean we are doing call for file we do not really care about the
        # data (eg: added or removed), however this should be a minor overhead
        # compared to the overall update process calling this.
        parentfiledata = None

        self._map.reset_state(
            filename,
            wc_tracked,
            p1_tracked,
            possibly_dirty=possibly_dirty,
            parentfiledata=parentfiledata,
        )
        if (
            parentfiledata is not None
            and parentfiledata[2] > self._lastnormaltime

        self._map.reset_state(
            filename,
            wc_tracked,
            p1_tracked,
            p2_tracked=p2_tracked,
            merged=merged,
            clean_p1=clean_p1,
            clean_p2=clean_p2,
            possibly_dirty=possibly_dirty,
            parentfiledata=parentfiledata,
        )
        if (
            parentfiledata is not None
            and parentfiledata[2] > self._lastnormaltime

            else:
                self._map.reset_state(
                    f,
                    wc_tracked=True,
                    p1_tracked=True,
                    possibly_dirty=True,
                )
        for f in to_drop:
            self._map.reset_state(f)

        self._dirty = True

48140:98b3eb6c1479

        entry = self._map.get(filename)
        if entry is None:
            wc_tracked = False
        else:
            wc_tracked = entry.tracked
        if not (p1_tracked or wc_tracked):
            # the file is no longer relevant to anyone
            if self._map.get(filename) is not None:
                self._map.reset_state(filename)
                self._dirty = True
        elif (not p1_tracked) and wc_tracked:
            if entry is not None and entry.added:
                return  # avoid dropping copy information (maybe?)

        # this mean we are doing call for file we do not really care about the
        # data (eg: added or removed), however this should be a minor overhead
        # compared to the overall update process calling this.
        parentfiledata = None

        self._map.reset_state(
            filename,
            wc_tracked,
            p1_tracked,
            # the underlying reference might have changed, we will have to
            # check it.
            has_meaningful_mtime=False,
            parentfiledata=parentfiledata,
        )
        if (
            parentfiledata is not None
            and parentfiledata[2] > self._lastnormaltime

        self._map.reset_state(
            filename,
            wc_tracked,
            p1_tracked,
            p2_info=merged or clean_p2,
            has_meaningful_mtime=not possibly_dirty,
            parentfiledata=parentfiledata,
        )
        if (
            parentfiledata is not None
            and parentfiledata[2] > self._lastnormaltime

            else:
                self._map.reset_state(
                    f,
                    wc_tracked=True,
                    p1_tracked=True,
                )
        for f in to_drop:
            self._map.reset_state(f)

        self._dirty = True