comparison mercurial/dirstatemap.py @ 48061:060cd909439f

dirstate: drop all logic around the "non-normal" sets

The dirstate has a lot of code to compute a set of all "non-normal" and
"from_other_parent" entries.

This is all used in one, unique, location, when `setparent` is called and moved
from a merge to a non merge. At that time, any "merge related" information has
to be dropped. This is mostly useful for command like `graft` or `shelve` that
move to a single-parent state -before- the commit. Otherwise the commit will
already have removed all traces of the merge information in the dirstate (e.g.
for a regular merges).

The bookkeeping for these sets is quite invasive. And it seems simpler to just
drop it and do the full computation in the single location where we actually
use it (since we have to do the computation at least once anyway).

This simplify the code a lot, and clarify why this kind of computation is
needed.

The possible drawback compared to the previous code are:
- if the operation happens in a loop, we will end up doing it multiple time,
- the C code to detect entry of interest have been dropped, for now. It will be
  re-introduced later, with a processing code directly in C for even faster
  operation.

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

48060:a660d8a53267

      - `set_possibly_dirty`

    - `copymap` maps destination filenames to their source filename.

    The dirstate also provides the following views onto the state:

    - `nonnormalset` is a set of the filenames that have state other
      than 'normal', or are normal but have an mtime of -1 ('normallookup').

    - `otherparentset` is a set of the filenames that are marked as coming
      from the second parent when the dirstate is currently being merged.

    - `filefoldmap` is a dict mapping normalized filenames to the denormalized
      form that they appear as in the dirstate.

    - `dirfoldmap` is a dict mapping normalized directory names to the

        self.setparents(self._nodeconstants.nullid, self._nodeconstants.nullid)
        util.clearcachedproperty(self, b"_dirs")
        util.clearcachedproperty(self, b"_alldirs")
        util.clearcachedproperty(self, b"filefoldmap")
        util.clearcachedproperty(self, b"dirfoldmap")
        util.clearcachedproperty(self, b"nonnormalset")
        util.clearcachedproperty(self, b"otherparentset")

    def items(self):
        return pycompat.iteritems(self._map)

    # forward for python2,3 compat

        entry = self[filename]
        mtime = mtime & rangemask
        size = size & rangemask
        entry.set_clean(mode, size, mtime)
        self.copymap.pop(filename, None)
        self.nonnormalset.discard(filename)

    def reset_state(
        self,
        filename,
        wc_tracked=False,

        self.copymap.pop(filename, None)

        if not (p1_tracked or p2_tracked or wc_tracked):
            old_entry = self._map.pop(filename, None)
            self._dirs_decr(filename, old_entry=old_entry)
            self.nonnormalset.discard(filename)
            self.copymap.pop(filename, None)
            return
        elif merged:
            # XXX might be merged and removed ?
            entry = self.get(filename)

            clean_p1=clean_p1,
            clean_p2=clean_p2,
            possibly_dirty=possibly_dirty,
            parentfiledata=parentfiledata,
        )
        if entry.dm_nonnormal:
            self.nonnormalset.add(filename)
        else:
            self.nonnormalset.discard(filename)
        if entry.dm_otherparent:
            self.otherparentset.add(filename)
        else:
            self.otherparentset.discard(filename)
        self._map[filename] = entry

    def set_tracked(self, filename):
        new = False
        entry = self.get(filename)

                clean_p2=False,
                possibly_dirty=False,
                parentfiledata=None,
            )
            self._map[filename] = entry
            if entry.dm_nonnormal:
                self.nonnormalset.add(filename)
            new = True
        elif not entry.tracked:
            self._dirs_incr(filename, entry)
            entry.set_tracked()
            new = True

        else:
            self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
            if not entry.merged:
                self.copymap.pop(f, None)
            if entry.added:
                self.nonnormalset.discard(f)
                self._map.pop(f, None)
            else:
                self.nonnormalset.add(f)
                if entry.from_p2:
                    self.otherparentset.add(f)
                entry.set_untracked()
            return True

    def nonnormalentries(self):
        '''Compute the nonnormal dirstate entries from the dmap'''
        try:
            return parsers.nonnormalotherparententries(self._map)
        except AttributeError:
            nonnorm = set()
            otherparent = set()
            for fname, e in pycompat.iteritems(self._map):
                if e.dm_nonnormal:
                    nonnorm.add(fname)
                if e.from_p2:
                    otherparent.add(fname)
            return nonnorm, otherparent

    @propertycache
    def filefoldmap(self):
        """Returns a dictionary mapping normalized case paths to their
        non-normalized versions.

    def setparents(self, p1, p2, fold_p2=False):
        self._parents = (p1, p2)
        self._dirtyparents = True
        copies = {}
        if fold_p2:
            candidatefiles = self.non_normal_or_other_parent_paths()

            for f in candidatefiles:
                s = self.get(f)
                if s is None:
                    continue

                # Discard "merged" markers when moving away from a merge state
                if s.merged or s.from_p2:
                    source = self.copymap.pop(f, None)
                    if source:
                        copies[f] = source

        st.write(
            parsers.pack_dirstate(self._map, self.copymap, self.parents(), now)
        )
        st.close()
        self._dirtyparents = False
        self.nonnormalset, self.otherparentset = self.nonnormalentries()

    @propertycache
    def nonnormalset(self):
        nonnorm, otherparents = self.nonnormalentries()
        self.otherparentset = otherparents
        return nonnorm

    @propertycache
    def otherparentset(self):
        nonnorm, otherparents = self.nonnormalentries()
        self.nonnormalset = nonnorm
        return otherparents

    def non_normal_or_other_parent_paths(self):
        return self.nonnormalset.union(self.otherparentset)

    @propertycache
    def identity(self):
        self._map
        return self.identity

                    filename, added=True, possibly_dirty=possibly_dirty
                )
            elif (p1_tracked or p2_tracked) and not wc_tracked:
                # XXX might be merged and removed ?
                self[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
                self.nonnormalset.add(filename)
            elif clean_p2 and wc_tracked:
                if p1_tracked or self.get(filename) is not None:
                    # XXX the `self.get` call is catching some case in
                    # `test-merge-remove.t` where the file is tracked in p1, the
                    # p1_tracked argument is False.

                    msg = b'failed to pass parentfiledata for a normal file: %s'
                    msg %= filename
                    raise error.ProgrammingError(msg)
                mode, size, mtime = parentfiledata
                self.addfile(filename, mode=mode, size=size, mtime=mtime)
                self.nonnormalset.discard(filename)
            else:
                assert False, 'unreachable'

        def set_tracked(self, filename):
            new = False

                return True

        def removefile(self, *args, **kwargs):
            return self._rustmap.removefile(*args, **kwargs)

        def nonnormalentries(self):
            return self._rustmap.nonnormalentries()

        def get(self, *args, **kwargs):
            return self._rustmap.get(*args, **kwargs)

        @property
        def copymap(self):

        def setparents(self, p1, p2, fold_p2=False):
            self._parents = (p1, p2)
            self._dirtyparents = True
            copies = {}
            if fold_p2:
                candidatefiles = self.non_normal_or_other_parent_paths()

                for f in candidatefiles:
                    s = self.get(f)
                    if s is None:
                        continue

                    # Discard "merged" markers when moving away from a merge state
                    if s.merged:
                        source = self.copymap.get(f)
                        if source:
                            copies[f] = source

        @propertycache
        def identity(self):
            self._rustmap
            return self.identity

        @property
        def nonnormalset(self):
            nonnorm = self._rustmap.non_normal_entries()
            return nonnorm

        @propertycache
        def otherparentset(self):
            otherparents = self._rustmap.other_parent_entries()
            return otherparents

        def non_normal_or_other_parent_paths(self):
            return self._rustmap.non_normal_or_other_parent_paths()

        @propertycache
        def dirfoldmap(self):
            f = {}
            normcase = util.normcase
            for name in self._rustmap.tracked_dirs():

48061:060cd909439f

      - `set_possibly_dirty`

    - `copymap` maps destination filenames to their source filename.

    The dirstate also provides the following views onto the state:

    - `filefoldmap` is a dict mapping normalized filenames to the denormalized
      form that they appear as in the dirstate.

    - `dirfoldmap` is a dict mapping normalized directory names to the

        self.setparents(self._nodeconstants.nullid, self._nodeconstants.nullid)
        util.clearcachedproperty(self, b"_dirs")
        util.clearcachedproperty(self, b"_alldirs")
        util.clearcachedproperty(self, b"filefoldmap")
        util.clearcachedproperty(self, b"dirfoldmap")

    def items(self):
        return pycompat.iteritems(self._map)

    # forward for python2,3 compat

        entry = self[filename]
        mtime = mtime & rangemask
        size = size & rangemask
        entry.set_clean(mode, size, mtime)
        self.copymap.pop(filename, None)

    def reset_state(
        self,
        filename,
        wc_tracked=False,

        self.copymap.pop(filename, None)

        if not (p1_tracked or p2_tracked or wc_tracked):
            old_entry = self._map.pop(filename, None)
            self._dirs_decr(filename, old_entry=old_entry)
            self.copymap.pop(filename, None)
            return
        elif merged:
            # XXX might be merged and removed ?
            entry = self.get(filename)

            clean_p1=clean_p1,
            clean_p2=clean_p2,
            possibly_dirty=possibly_dirty,
            parentfiledata=parentfiledata,
        )
        self._map[filename] = entry

    def set_tracked(self, filename):
        new = False
        entry = self.get(filename)

                clean_p2=False,
                possibly_dirty=False,
                parentfiledata=None,
            )
            self._map[filename] = entry
            new = True
        elif not entry.tracked:
            self._dirs_incr(filename, entry)
            entry.set_tracked()
            new = True

        else:
            self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
            if not entry.merged:
                self.copymap.pop(f, None)
            if entry.added:
                self._map.pop(f, None)
            else:
                entry.set_untracked()
            return True

    @propertycache
    def filefoldmap(self):
        """Returns a dictionary mapping normalized case paths to their
        non-normalized versions.

    def setparents(self, p1, p2, fold_p2=False):
        self._parents = (p1, p2)
        self._dirtyparents = True
        copies = {}
        if fold_p2:
            for f, s in pycompat.iteritems(self._map):
                # Discard "merged" markers when moving away from a merge state
                if s.merged or s.from_p2:
                    source = self.copymap.pop(f, None)
                    if source:
                        copies[f] = source

        st.write(
            parsers.pack_dirstate(self._map, self.copymap, self.parents(), now)
        )
        st.close()
        self._dirtyparents = False

    @propertycache
    def identity(self):
        self._map
        return self.identity

                    filename, added=True, possibly_dirty=possibly_dirty
                )
            elif (p1_tracked or p2_tracked) and not wc_tracked:
                # XXX might be merged and removed ?
                self[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
            elif clean_p2 and wc_tracked:
                if p1_tracked or self.get(filename) is not None:
                    # XXX the `self.get` call is catching some case in
                    # `test-merge-remove.t` where the file is tracked in p1, the
                    # p1_tracked argument is False.

                    msg = b'failed to pass parentfiledata for a normal file: %s'
                    msg %= filename
                    raise error.ProgrammingError(msg)
                mode, size, mtime = parentfiledata
                self.addfile(filename, mode=mode, size=size, mtime=mtime)
            else:
                assert False, 'unreachable'

        def set_tracked(self, filename):
            new = False

                return True

        def removefile(self, *args, **kwargs):
            return self._rustmap.removefile(*args, **kwargs)

        def get(self, *args, **kwargs):
            return self._rustmap.get(*args, **kwargs)

        @property
        def copymap(self):

        def setparents(self, p1, p2, fold_p2=False):
            self._parents = (p1, p2)
            self._dirtyparents = True
            copies = {}
            if fold_p2:
                # Collect into an intermediate list to avoid a `RuntimeError`
                # exception due to mutation during iteration.
                # TODO: move this the whole loop to Rust where `iter_mut`
                # enables in-place mutation of elements of a collection while
                # iterating it, without mutating the collection itself.
                candidatefiles = [
                    (f, s)
                    for f, s in self._rustmap.items()
                    if s.merged or s.from_p2
                ]
                for f, s in candidatefiles:
                    # Discard "merged" markers when moving away from a merge state
                    if s.merged:
                        source = self.copymap.get(f)
                        if source:
                            copies[f] = source

        @propertycache
        def identity(self):
            self._rustmap
            return self.identity

        @propertycache
        def dirfoldmap(self):
            f = {}
            normcase = util.normcase
            for name in self._rustmap.tracked_dirs():