comparison mercurial/dirstate.py @ 47917:1b3c753b62c6

dirstate: drop the `_normal` method

It only has one caller so lets inline it and cleans things up further.

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

47916:65e3d8028f2e

    @requires_no_parents_change
    def set_clean(self, filename, parentfiledata=None):
        """record that the current state of the file on disk is known to be clean"""
        self._dirty = True
        self._updatedfiles.add(filename)
        self._normal(filename, parentfiledata=parentfiledata)

    @requires_no_parents_change
    def set_possibly_dirty(self, filename):
        """record that the current state of the file on disk is unknown"""
        self._dirty = True

        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):
        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:
            # Remember the most recent modification timeslot for status(),
            # to make sure we won't miss future size-preserving file content
            # modifications that happen within the same timeslot.
            self._lastnormaltime = mtime

    def _normallookup(self, f):
        '''Mark a file normal, but possibly dirty.'''
        if self.in_merge:
            # if there is a merge going on and the file was either

47917:1b3c753b62c6

    @requires_no_parents_change
    def set_clean(self, filename, parentfiledata=None):
        """record that the current state of the file on disk is known to be clean"""
        self._dirty = True
        self._updatedfiles.add(filename)
        if parentfiledata:
            (mode, size, mtime) = parentfiledata
        else:
            (mode, size, mtime) = self._get_filedata(filename)
        self._addpath(filename, mode=mode, size=size, mtime=mtime)
        self._map.copymap.pop(filename, None)
        if filename in self._map.nonnormalset:
            self._map.nonnormalset.remove(filename)
        if mtime > self._lastnormaltime:
            # Remember the most recent modification timeslot for status(),
            # to make sure we won't miss future size-preserving file content
            # modifications that happen within the same timeslot.
            self._lastnormaltime = mtime

    @requires_no_parents_change
    def set_possibly_dirty(self, filename):
        """record that the current state of the file on disk is unknown"""
        self._dirty = True

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

    def _normallookup(self, f):
        '''Mark a file normal, but possibly dirty.'''
        if self.in_merge:
            # if there is a merge going on and the file was either