comparison rust/hg-core/src/dirstate/entry.rs @ 48142:fb3b41d583c2

dirstate-item: introduce a `p2_info` property that combine two others

The `merged` and `from_p2` property are always used together so we can expose a
combined property instead.

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

48141:42ab0bcb6ded

    pub fn removed(&self) -> bool {
        self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED)
    }

    pub fn merged(&self) -> bool {
        self.flags
            .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
    }

48142:fb3b41d583c2

    pub fn removed(&self) -> bool {
        self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED)
    }

    pub fn p2_info(&self) -> bool {
        self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
    }

    pub fn merged(&self) -> bool {
        self.flags
            .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
    }