mercurial/pure/parsers.py

47965:f94cc63df859

        This is only True is the file is currently tracked.

        Should only be set if a merge is in progress in the dirstate
        """
        return self._wc_tracked and self._clean_p2

    @property
    def from_p2_removed(self):
        """True if the file has been removed, but was "from_p2" initially

47966:97e9f3fd9324

        This is only True is the file is currently tracked.

        Should only be set if a merge is in progress in the dirstate
        """
        if not self._wc_tracked:
            return False
        return self._clean_p2 or (not self._p1_tracked and self._p2_tracked)

    @property
    def from_p2_removed(self):
        """True if the file has been removed, but was "from_p2" initially