comparison mercurial/dirstate.py @ 47488:91520abe2b2c

dirstate: add an explicit `possibly_dirty` parameter to `_addpath`

This lets says what we mean instead of using magic value. The lower level can
then decide how to express that.

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

47487:1f571077222d

        state,
        mode,
        size=NONNORMAL,
        mtime=AMBIGUOUS_TIME,
        from_p2=False,
    ):
        oldstate = self[f]
        if state == b'a' or oldstate == b'r':
            scmutil.checkfilename(f)
            if self._map.hastrackeddir(f):

                    msg = _(b'file %r in dirstate clashes with %r')
                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
                    raise error.Abort(msg)
        if from_p2:
            size = FROM_P2
            mtime = AMBIGUOUS_TIME
        else:
            assert size != FROM_P2
            if size != NONNORMAL:
                size = size & _rangemask

                    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)
        self._map.copymap.pop(f, None)

    def otherparent(self, f):
        '''Mark as coming from the other parent, always dirty.'''
        if self._pl[1] == self._nodeconstants.nullid:

47488:91520abe2b2c

        state,
        mode,
        size=NONNORMAL,
        mtime=AMBIGUOUS_TIME,
        from_p2=False,
        possibly_dirty=False,
    ):
        oldstate = self[f]
        if state == b'a' or oldstate == b'r':
            scmutil.checkfilename(f)
            if self._map.hastrackeddir(f):

                    msg = _(b'file %r in dirstate clashes with %r')
                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
                    raise error.Abort(msg)
        if from_p2:
            size = FROM_P2
            mtime = AMBIGUOUS_TIME
        elif possibly_dirty:
            mtime = AMBIGUOUS_TIME
        else:
            assert size != FROM_P2
            if size != NONNORMAL:
                size = size & _rangemask

                    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):
        '''Mark as coming from the other parent, always dirty.'''
        if self._pl[1] == self._nodeconstants.nullid: