comparison mercurial/dirstate.py @ 47527:c6b91a9c242a

dirstate: use a `merged` parameter to _addpath

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

47526:8bcae9bf9e8d

        state=None,
        mode=0,
        size=None,
        mtime=None,
        added=False,
        from_p2=False,
        possibly_dirty=False,
    ):
        entry = self._map.get(f)
        if added or entry is not None and entry.removed:

            state=state,
            mode=mode,
            size=size,
            mtime=mtime,
            added=added,
            from_p2=from_p2,
            possibly_dirty=possibly_dirty,
        )

    def normal(self, f, parentfiledata=None):

        if not self.in_merge:
            msg = _(b"setting %r to other parent only allowed in merges") % f
            raise error.Abort(msg)
        if f in self and self[f] == b'n':
            # merge-like
            self._addpath(f, b'm', 0, from_p2=True)
        else:
            # add-like
            self._addpath(f, b'n', 0, from_p2=True)
        self._map.copymap.pop(f, None)

47527:c6b91a9c242a

        state=None,
        mode=0,
        size=None,
        mtime=None,
        added=False,
        merged=False,
        from_p2=False,
        possibly_dirty=False,
    ):
        entry = self._map.get(f)
        if added or entry is not None and entry.removed:

            state=state,
            mode=mode,
            size=size,
            mtime=mtime,
            added=added,
            merged=merged,
            from_p2=from_p2,
            possibly_dirty=possibly_dirty,
        )

    def normal(self, f, parentfiledata=None):

        if not self.in_merge:
            msg = _(b"setting %r to other parent only allowed in merges") % f
            raise error.Abort(msg)
        if f in self and self[f] == b'n':
            # merge-like
            self._addpath(f, merged=True)
        else:
            # add-like
            self._addpath(f, b'n', 0, from_p2=True)
        self._map.copymap.pop(f, None)