comparison mercurial/dirstate.py @ 47985:7e65ca30fb91

dirstate: replace `_add` call in `setparent`

Same logic as the previous changeset, it get us closer to removed older API on
the dirstate.

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

47984:6255a0d33c45

                # Also fix up otherparent markers
                elif s.from_p2:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source
                    self._add(f)
        return copies

    def setbranch(self, branch):
        self.__class__._branch.set(self, encoding.fromlocal(branch))
        f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True)

47985:7e65ca30fb91

                # Also fix up otherparent markers
                elif s.from_p2:
                    source = self._map.copymap.get(f)
                    if source:
                        copies[f] = source
                    self._check_new_tracked_filename(f)
                    self._updatedfiles.add(f)
                    self._map.reset_state(
                        f,
                        p1_tracked=False,
                        wc_tracked=True,
                    )
        return copies

    def setbranch(self, branch):
        self.__class__._branch.set(self, encoding.fromlocal(branch))
        f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True)