comparison mercurial/dirstate.py @ 48144:6f54afb094bd

dirstate: align the dirstate's API to the lower level ones

This conclude the refactoring of this API. We can now finalize the dirstate v2
on disk format.

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

48143:21542d4cb568

    def update_file(
        self,
        filename,
        wc_tracked,
        p1_tracked,
        p2_tracked=False,
        merged=False,
        clean_p1=False,
        clean_p2=False,
        possibly_dirty=False,
        parentfiledata=None,
    ):
        """update the information about a file in the dirstate

        note: the API is at an early stage and we might need to adjust it
        depending of what information ends up being relevant and useful to
        other processing.
        """
        if merged and (clean_p1 or clean_p2):
            msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
            raise error.ProgrammingError(msg)

        # note: I do not think we need to double check name clash here since we
        # are in a update/merge case that should already have taken care of
        # this. The test agrees

        self._dirty = True

        need_parent_file_data = (
            not (possibly_dirty or clean_p2 or merged)
            and wc_tracked
            and p1_tracked
        )

        # this mean we are doing call for file we do not really care about the
        # data (eg: added or removed), however this should be a minor overhead
        # compared to the overall update process calling this.

        self._map.reset_state(
            filename,
            wc_tracked,
            p1_tracked,
            p2_info=merged or clean_p2,
            has_meaningful_mtime=not possibly_dirty,
            parentfiledata=parentfiledata,
        )
        if (
            parentfiledata is not None

48144:6f54afb094bd

    def update_file(
        self,
        filename,
        wc_tracked,
        p1_tracked,
        p2_info=False,
        possibly_dirty=False,
        parentfiledata=None,
    ):
        """update the information about a file in the dirstate

        note: the API is at an early stage and we might need to adjust it
        depending of what information ends up being relevant and useful to
        other processing.
        """

        # note: I do not think we need to double check name clash here since we
        # are in a update/merge case that should already have taken care of
        # this. The test agrees

        self._dirty = True

        need_parent_file_data = (
            not possibly_dirty and not p2_info and wc_tracked and p1_tracked
        )

        # this mean we are doing call for file we do not really care about the
        # data (eg: added or removed), however this should be a minor overhead
        # compared to the overall update process calling this.

        self._map.reset_state(
            filename,
            wc_tracked,
            p1_tracked,
            p2_info=p2_info,
            has_meaningful_mtime=not possibly_dirty,
            parentfiledata=parentfiledata,
        )
        if (
            parentfiledata is not None