comparison mercurial/dirstate.py @ 47589:f5c24c124e07

dirstate: introduce an internal `_add` method

We want to split current user of `dirstate.add` between `hg add`-like cases and
update of the dirstate coming from update/merge.

To do this we will introduce new API. The first step is to introduces an
internal function that these new API migh use (or not use) to distinct between
the migrated users and the others.

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

47588:eb611ecb435c

                # 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)

            self._addpath(f, from_p2=True)
        self._map.copymap.pop(f, None)

    def add(self, f):
        '''Mark a file added.'''
        self._addpath(f, added=True)
        self._map.copymap.pop(f, None)

    def remove(self, f):
        '''Mark a file removed.'''
        self._dirty = True
        self._updatedfiles.add(f)

47589:f5c24c124e07

                # 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)

            self._addpath(f, from_p2=True)
        self._map.copymap.pop(f, None)

    def add(self, f):
        '''Mark a file added.'''
        self._add(f)

    def _add(self, filename):
        """internal function to mark a file as added"""
        self._addpath(filename, added=True)
        self._map.copymap.pop(filename, None)

    def remove(self, f):
        '''Mark a file removed.'''
        self._dirty = True
        self._updatedfiles.add(f)