comparison mercurial/dirstatemap.py @ 47896:d5b54917eb92

dirstatemap: temporarily return early in `reset_state`

We are about to migrate `addfile` to the new `DirstateItem__init__` and having
these early return will the new series of patches to be clearer.

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

47895:22c39f8acf78

        # (maybe new information should be in directly passed to this function)
        self.copymap.pop(filename, None)

        if not (p1_tracked or p2_tracked or wc_tracked):
            self.dropfile(filename)
        elif merged:
            # XXX might be merged and removed ?
            entry = self.get(filename)
            if entry is not None and entry.tracked:
                # XXX mostly replicate dirstate.other parent.  We should get
                # the higher layer to pass us more reliable data where `merged`
                # actually mean merged. Dropping the else clause will show
                # failure in `test-graft.t`
                self.addfile(filename, merged=True)
            else:
                self.addfile(filename, from_p2=True)
        elif not (p1_tracked or p2_tracked) and wc_tracked:
            self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
        elif (p1_tracked or p2_tracked) and not wc_tracked:
            # XXX might be merged and removed ?
            old_entry = self._map.get(filename)
            self._dirs_decr(filename, old_entry=old_entry, remove_variant=True)
            self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
            self.nonnormalset.add(filename)
        elif clean_p2 and wc_tracked:
            if p1_tracked or self.get(filename) is not None:
                # XXX the `self.get` call is catching some case in
                # `test-merge-remove.t` where the file is tracked in p1, the
                # p1_tracked argument is False.
                #
                # In addition, this seems to be a case where the file is marked
                # as merged without actually being the result of a merge
                # action. So thing are not ideal here.
                self.addfile(filename, merged=True)
            else:
                self.addfile(filename, from_p2=True)
        elif not p1_tracked and p2_tracked and wc_tracked:
            self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
        elif possibly_dirty:
            self.addfile(filename, possibly_dirty=possibly_dirty)
        elif wc_tracked:
            # this is a "normal" file
            if parentfiledata is None:
                msg = b'failed to pass parentfiledata for a normal file: %s'
                msg %= filename
                raise error.ProgrammingError(msg)
            mode, size, mtime = parentfiledata
            self.addfile(filename, mode=mode, size=size, mtime=mtime)
            self.nonnormalset.discard(filename)
        else:
            assert False, 'unreachable'

    def set_untracked(self, f):
        """Mark a file as no longer tracked in the dirstate map"""

47896:d5b54917eb92

        # (maybe new information should be in directly passed to this function)
        self.copymap.pop(filename, None)

        if not (p1_tracked or p2_tracked or wc_tracked):
            self.dropfile(filename)
            return
        elif merged:
            # XXX might be merged and removed ?
            entry = self.get(filename)
            if entry is not None and entry.tracked:
                # XXX mostly replicate dirstate.other parent.  We should get
                # the higher layer to pass us more reliable data where `merged`
                # actually mean merged. Dropping the else clause will show
                # failure in `test-graft.t`
                self.addfile(filename, merged=True)
                return
            else:
                self.addfile(filename, from_p2=True)
                return
        elif not (p1_tracked or p2_tracked) and wc_tracked:
            self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
            return
        elif (p1_tracked or p2_tracked) and not wc_tracked:
            # XXX might be merged and removed ?
            old_entry = self._map.get(filename)
            self._dirs_decr(filename, old_entry=old_entry, remove_variant=True)
            self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
            self.nonnormalset.add(filename)
            return
        elif clean_p2 and wc_tracked:
            if p1_tracked or self.get(filename) is not None:
                # XXX the `self.get` call is catching some case in
                # `test-merge-remove.t` where the file is tracked in p1, the
                # p1_tracked argument is False.
                #
                # In addition, this seems to be a case where the file is marked
                # as merged without actually being the result of a merge
                # action. So thing are not ideal here.
                self.addfile(filename, merged=True)
                return
            else:
                self.addfile(filename, from_p2=True)
                return
        elif not p1_tracked and p2_tracked and wc_tracked:
            self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
            return
        elif possibly_dirty:
            self.addfile(filename, possibly_dirty=possibly_dirty)
            return
        elif wc_tracked:
            # this is a "normal" file
            if parentfiledata is None:
                msg = b'failed to pass parentfiledata for a normal file: %s'
                msg %= filename
                raise error.ProgrammingError(msg)
            mode, size, mtime = parentfiledata
            self.addfile(filename, mode=mode, size=size, mtime=mtime)
            self.nonnormalset.discard(filename)
            return
        else:
            assert False, 'unreachable'

    def set_untracked(self, f):
        """Mark a file as no longer tracked in the dirstate map"""