comparison mercurial/dirstatemap.py @ 47893:0b35bc0b8636

dirstatemap: temporarily use `from_v1_data` in `addfile`

We are about to change the `__init__` for `DirstateItem`. To make the
transition easier, we move existing caller to `DirstateItem.from_v1_data`.

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

47892:32aa80a8d162

        assert state is not None
        assert size is not None
        assert mtime is not None
        old_entry = self.get(f)
        self._dirs_incr(f, old_entry)
        e = self._map[f] = DirstateItem(state, mode, size, mtime)
        if e.dm_nonnormal:
            self.nonnormalset.add(f)
        if e.dm_otherparent:
            self.otherparentset.add(f)

            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(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

47893:0b35bc0b8636

        assert state is not None
        assert size is not None
        assert mtime is not None
        old_entry = self.get(f)
        self._dirs_incr(f, old_entry)
        e = self._map[f] = DirstateItem.from_v1_data(state, mode, size, mtime)
        if e.dm_nonnormal:
            self.nonnormalset.add(f)
        if e.dm_otherparent:
            self.otherparentset.add(f)

            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