comparison mercurial/dirstate.py @ 47690:a685c29ebf54

dirstate: factor out the part retrieve "filedata" out of `normal`

We will need them elsewhere.

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

47689:f2aef39abc14

            merged=merged,
            from_p2=from_p2,
            possibly_dirty=possibly_dirty,
        )

    def normal(self, f, parentfiledata=None):
        """Mark a file normal and clean.

        parentfiledata: (mode, size, mtime) of the clean file

        file having been changed by an external process between the
        moment where the file was determined to be clean and now."""
        if parentfiledata:
            (mode, size, mtime) = parentfiledata
        else:
            s = os.lstat(self._join(f))
            mode = s.st_mode
            size = s.st_size
            mtime = s[stat.ST_MTIME]
        self._addpath(f, mode=mode, size=size, mtime=mtime)
        self._map.copymap.pop(f, None)
        if f in self._map.nonnormalset:
            self._map.nonnormalset.remove(f)
        if mtime > self._lastnormaltime:

47690:a685c29ebf54

            merged=merged,
            from_p2=from_p2,
            possibly_dirty=possibly_dirty,
        )

    def _get_filedata(self, filename):
        """returns"""
        s = os.lstat(self._join(filename))
        mode = s.st_mode
        size = s.st_size
        mtime = s[stat.ST_MTIME]
        return (mode, size, mtime)

    def normal(self, f, parentfiledata=None):
        """Mark a file normal and clean.

        parentfiledata: (mode, size, mtime) of the clean file

        file having been changed by an external process between the
        moment where the file was determined to be clean and now."""
        if parentfiledata:
            (mode, size, mtime) = parentfiledata
        else:
            (mode, size, mtime) = self._get_filedata(f)
        self._addpath(f, mode=mode, size=size, mtime=mtime)
        self._map.copymap.pop(f, None)
        if f in self._map.nonnormalset:
            self._map.nonnormalset.remove(f)
        if mtime > self._lastnormaltime: