comparison mercurial/dirstate.py @ 47988:d459c6b84961

dirstate: inline the last two `_drop` usage

The function is small and having the associated code directly inline help use to cleanup the dirstate API.

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

47987:dd267f16042f

            # the underlying reference might have changed, we will have to
            # check it.
            possibly_dirty = True
        elif not (p1_tracked or wc_tracked):
            # the file is no longer relevant to anyone
            self._drop(filename)
        elif (not p1_tracked) and wc_tracked:
            if entry is not None and entry.added:
                return  # avoid dropping copy information (maybe?)
        elif p1_tracked and not wc_tracked:
            pass

                elif entry.merged or entry.from_p2:
                    return
        self._addpath(f, possibly_dirty=True)
        self._map.copymap.pop(f, None)

    def _drop(self, filename):
        """internal function to drop a file from the dirstate"""
        if self._map.dropfile(filename):
            self._dirty = True
            self._updatedfiles.add(filename)

    def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
        if exists is None:
            exists = os.path.lexists(os.path.join(self._root, path))
        if not exists:
            # Maybe a path component exists

        self._map.setparents(parent, self._nodeconstants.nullid)

        for f in to_lookup:
            self._normallookup(f)
        for f in to_drop:
            self._drop(f)

        self._dirty = True

    def identity(self):
        """Return identity of dirstate itself to detect changing in storage

47988:d459c6b84961

            # the underlying reference might have changed, we will have to
            # check it.
            possibly_dirty = True
        elif not (p1_tracked or wc_tracked):
            # the file is no longer relevant to anyone
            if self._map.dropfile(filename):
                self._dirty = True
                self._updatedfiles.add(filename)
        elif (not p1_tracked) and wc_tracked:
            if entry is not None and entry.added:
                return  # avoid dropping copy information (maybe?)
        elif p1_tracked and not wc_tracked:
            pass

                elif entry.merged or entry.from_p2:
                    return
        self._addpath(f, possibly_dirty=True)
        self._map.copymap.pop(f, None)

    def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
        if exists is None:
            exists = os.path.lexists(os.path.join(self._root, path))
        if not exists:
            # Maybe a path component exists

        self._map.setparents(parent, self._nodeconstants.nullid)

        for f in to_lookup:
            self._normallookup(f)
        for f in to_drop:
            if self._map.dropfile(f):
                self._updatedfiles.add(f)

        self._dirty = True

    def identity(self):
        """Return identity of dirstate itself to detect changing in storage