mercurial/dirstate.py

47740:28d5e05c139a

                # Discard "merged" markers when moving away from a merge state
                if s.merged:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source
                    self.normallookup(f)
                # Also fix up otherparent markers
                elif s.from_p2:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source

        entry = self._map.get(filename)
        if entry is None:
            self._add(filename)
            return True
        elif not entry.tracked:
            self.normallookup(filename)
            return True
        # XXX This is probably overkill for more case, but we need this to
        # fully replace the `normallookup` call with `set_tracked` one.
        # Consider smoothing this in the future.
        self.set_possibly_dirty(filename)

            # 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
            # "merged" or coming from other parent (-2) before
            # being removed, restore that state.
            entry = self._map.get(f)

        self._map.removefile(filename, in_merge=self.in_merge)

    def merge(self, f):
        '''Mark a file merged.'''
        if not self.in_merge:
            return self.normallookup(f)
        return self.otherparent(f)

    def drop(self, f):
        '''Drop a file from the dirstate'''
        if not self.pendingparentchange():

        if self._origpl is None:
            self._origpl = self._pl
        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

47741:9f19d9f2d191

                # Discard "merged" markers when moving away from a merge state
                if s.merged:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source
                    self._normallookup(f)
                # Also fix up otherparent markers
                elif s.from_p2:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source

        entry = self._map.get(filename)
        if entry is None:
            self._add(filename)
            return True
        elif not entry.tracked:
            self._normallookup(filename)
            return True
        # XXX This is probably overkill for more case, but we need this to
        # fully replace the `normallookup` call with `set_tracked` one.
        # Consider smoothing this in the future.
        self.set_possibly_dirty(filename)

            # modifications that happen within the same timeslot.
            self._lastnormaltime = mtime

    def normallookup(self, f):
        '''Mark a file normal, but possibly dirty.'''
        if self.pendingparentchange():
            util.nouideprecwarn(
                b"do not use `normallookup` inside of update/merge context."
                b" Use `update_file` or `update_file_p1`",
                b'6.0',
                stacklevel=2,
            )
        else:
            util.nouideprecwarn(
                b"do not use `normallookup` outside of update/merge context."
                b" Use `set_possibly_dirty` or `set_tracked`",
                b'6.0',
                stacklevel=2,
            )
        self._normallookup(f)

    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
            # "merged" or coming from other parent (-2) before
            # being removed, restore that state.
            entry = self._map.get(f)

        self._map.removefile(filename, in_merge=self.in_merge)

    def merge(self, f):
        '''Mark a file merged.'''
        if not self.in_merge:
            return self._normallookup(f)
        return self.otherparent(f)

    def drop(self, f):
        '''Drop a file from the dirstate'''
        if not self.pendingparentchange():

        if self._origpl is None:
            self._origpl = self._pl
        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