mercurial/dirstate.py

47690:a685c29ebf54

        p2_tracked=False,
        merged=False,
        clean_p1=False,
        clean_p2=False,
        possibly_dirty=False,
    ):
        """update the information about a file in the dirstate

        This is to be called when the direstates parent changes to keep track
        of what is the file situation in regards to the working copy and its parent.

            self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty)
            self._map.copymap.pop(filename, None)
        elif possibly_dirty:
            self._addpath(filename, possibly_dirty=possibly_dirty)
        elif wc_tracked:
            self.normal(filename)
        # XXX We need something for file that are dirty after an update
        else:
            assert False, 'unreachable'

    @requires_parents_change
    def update_parent_file_data(self, f, filedata):
        """update the information about the content of a file

        This function should be called within a `dirstate.parentchange` context.
        """
        self.normal(f, parentfiledata=filedata)

    def _addpath(
        self,
        f,
        mode=0,

47691:33beeb32f73a

        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

        This is to be called when the direstates parent changes to keep track
        of what is the file situation in regards to the working copy and its parent.

            self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty)
            self._map.copymap.pop(filename, None)
        elif possibly_dirty:
            self._addpath(filename, possibly_dirty=possibly_dirty)
        elif wc_tracked:
            self.normal(filename, parentfiledata=parentfiledata)
        # XXX We need something for file that are dirty after an update
        else:
            assert False, 'unreachable'

    def _addpath(
        self,
        f,
        mode=0,