comparison mercurial/pure/parsers.py @ 48113:e2da3ec94169

dirstate-item: point out that `merged` is set only with p1_tracked

This is currently True, and we will use this fact to simplify the API in the
next commit.  However, we add this assertion first to validate that this is
True in the whole test-suite.

48112:fabf687df0ff

    ):
        if merged and (clean_p1 or clean_p2):
            msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
            raise error.ProgrammingError(msg)

        self._wc_tracked = wc_tracked
        self._p1_tracked = p1_tracked
        self._p2_tracked = p2_tracked
        self._merged = merged
        self._clean_p1 = clean_p1

48113:e2da3ec94169

    ):
        if merged and (clean_p1 or clean_p2):
            msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
            raise error.ProgrammingError(msg)

        assert not (merged and not p1_tracked)
        self._wc_tracked = wc_tracked
        self._p1_tracked = p1_tracked
        self._p2_tracked = p2_tracked
        self._merged = merged
        self._clean_p1 = clean_p1