comparison mercurial/dirstatemap.py @ 47894:226c7dbeea11

rust-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`.

The Rust dirstate map will need an overall once the durst settle anyway.

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

47893:0b35bc0b8636

                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 ?
                self[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

47894:226c7dbeea11

                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 ?
                self[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