comparison mercurial/dirstate.py @ 47512:769037a279ec

dirstate-entry: add a `state` property (and use it)

This replace the [0] access. Ultimately is we should probably get ride of this
in its current form. However this is a good transitional solution to move away
for tuple indexing for now.

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

47511:eaae39894312

          n  normal
          m  needs merging
          r  marked for removal
          a  marked for addition
          ?  not tracked
        """
        return self._map.get(key, (b"?",))[0]

    def __contains__(self, key):
        return key in self._map

    def __iter__(self):

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

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

            # shadows
            for d in pathutil.finddirs(f):
                if self._map.hastrackeddir(d):
                    break
                entry = self._map.get(d)
                if entry is not None and entry[0] != b'r':
                    msg = _(b'file %r in dirstate clashes with %r')
                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
                    raise error.Abort(msg)
        if state == b'a':
            assert not possibly_dirty

            # 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[0] == b'r' and entry[2] in (NONNORMAL, FROM_P2):
                    source = self._map.copymap.get(f)
                    if entry[2] == NONNORMAL:
                        self.merge(f)
                    elif entry[2] == FROM_P2:
                        self.otherparent(f)
                    if source:
                        self.copy(source, f)
                    return
                if entry[0] == b'm' or entry[0] == 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):

        # timestamp of each entries in dirstate, because of 'now > mtime'
        delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite')
        if delaywrite > 0:
            # do we have any files to delay for?
            for f, e in pycompat.iteritems(self._map):
                if e[0] == b'n' and e[3] == now:
                    import time  # to avoid useless import

                    # rather than sleep n seconds, sleep until the next
                    # multiple of n seconds
                    clock = time.time()

            # opcode has fast paths when the value to be unpacked is a tuple or
            # a list, but falls back to creating a full-fledged iterator in
            # general. That is much slower than simply accessing and storing the
            # tuple members one by one.
            t = dget(fn)
            state = t[0]
            mode = t[1]
            size = t[2]
            time = t[3]

            if not st and state in b"nma":

47512:769037a279ec

          n  normal
          m  needs merging
          r  marked for removal
          a  marked for addition
          ?  not tracked

        XXX The "state" is a bit obscure to be in the "public" API. we should
        consider migrating all user of this to going through the dirstate entry
        instead.
        """
        entry = self._map.get(key)
        if entry is not None:
            return entry.state
        return b'?'

    def __contains__(self, key):
        return key in self._map

    def __iter__(self):

                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
                elif s.state == b'n' and s[2] == FROM_P2:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source
                    self.add(f)
        return copies

            # shadows
            for d in pathutil.finddirs(f):
                if self._map.hastrackeddir(d):
                    break
                entry = self._map.get(d)
                if entry is not None and entry.state != b'r':
                    msg = _(b'file %r in dirstate clashes with %r')
                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
                    raise error.Abort(msg)
        if state == b'a':
            assert not possibly_dirty

            # 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)
                    if entry[2] == NONNORMAL:
                        self.merge(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):

        # timestamp of each entries in dirstate, because of 'now > mtime'
        delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite')
        if delaywrite > 0:
            # do we have any files to delay for?
            for f, e in pycompat.iteritems(self._map):
                if e.state == b'n' and e[3] == now:
                    import time  # to avoid useless import

                    # rather than sleep n seconds, sleep until the next
                    # multiple of n seconds
                    clock = time.time()

            # opcode has fast paths when the value to be unpacked is a tuple or
            # a list, but falls back to creating a full-fledged iterator in
            # general. That is much slower than simply accessing and storing the
            # tuple members one by one.
            t = dget(fn)
            state = t.state
            mode = t[1]
            size = t[2]
            time = t[3]

            if not st and state in b"nma":