comparison mercurial/dirstate.py @ 47513:10e740292dff

dirstate-entry: add a `merged` property

Lets start to define and use more semantic property.

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

47512:769037a279ec

        return encoding.tolocal(self._branch)

    def setparents(self, p1, p2=None):
        """Set dirstate parents to p1 and p2.

        When moving from two parents to one, 'm' merged entries a
        adjusted to normal and previous copy records discarded and
        returned by the call.

        See localrepo.setparents()
        """

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

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

    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
            # in state 'm' (-1) or coming from other parent (-2) before
            # being removed, restore that state.
            entry = self._map.get(f)
            if entry is not None:
                if entry.state == b'r' and entry[2] in (NONNORMAL, FROM_P2):
                    source = self._map.copymap.get(f)

                    elif entry[2] == FROM_P2:
                        self.otherparent(f)
                    if source:
                        self.copy(source, f)
                    return
                if (
                    entry.state == b'm'
                    or entry.state == b'n'
                    and entry[2] == FROM_P2
                ):
                    return
        self._addpath(f, b'n', 0, possibly_dirty=True)
        self._map.copymap.pop(f, None)

    def otherparent(self, f):

                    # This can happen if we quickly do multiple commits.
                    # Force lookup, so we don't miss such a racy file change.
                    ladd(fn)
                elif listclean:
                    cadd(fn)
            elif state == b'm':
                madd(fn)
            elif state == b'a':
                aadd(fn)
            elif state == b'r':
                radd(fn)

47513:10e740292dff

        return encoding.tolocal(self._branch)

    def setparents(self, p1, p2=None):
        """Set dirstate parents to p1 and p2.

        When moving from two parents to one, "merged" entries a
        adjusted to normal and previous copy records discarded and
        returned by the call.

        See localrepo.setparents()
        """

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

                # 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

    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)
            if entry is not None:
                if entry.state == b'r' and entry[2] in (NONNORMAL, FROM_P2):
                    source = self._map.copymap.get(f)

                    elif entry[2] == FROM_P2:
                        self.otherparent(f)
                    if source:
                        self.copy(source, f)
                    return
                if entry.merged or entry.state == b'n' and entry[2] == FROM_P2:
                    return
        self._addpath(f, b'n', 0, possibly_dirty=True)
        self._map.copymap.pop(f, None)

    def otherparent(self, f):

                    # This can happen if we quickly do multiple commits.
                    # Force lookup, so we don't miss such a racy file change.
                    ladd(fn)
                elif listclean:
                    cadd(fn)
            elif t.merged:
                madd(fn)
            elif state == b'a':
                aadd(fn)
            elif state == b'r':
                radd(fn)