mercurial/pure/parsers.py

47512:769037a279ec

        XXX This "state" is a bit obscure and mostly a direct expression of the
        dirstatev1 format. It would make sense to ultimately deprecate it in
        favor of the more "semantic" attributes.
        """
        return self._state

    def v1_state(self):
        """return a "state" suitable for v1 serialization"""
        return self._state

47513:10e740292dff

        XXX This "state" is a bit obscure and mostly a direct expression of the
        dirstatev1 format. It would make sense to ultimately deprecate it in
        favor of the more "semantic" attributes.
        """
        return self._state

    @property
    def merged(self):
        """True if the file has been merged

        Should only be set if a merge is in progress in the dirstate
        """
        return self._state == b'm'

    def v1_state(self):
        """return a "state" suitable for v1 serialization"""
        return self._state