comparison mercurial/dirstate.py @ 47916:65e3d8028f2e

dirstate: drop the `_merge` method

It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.

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

47915:51cd60c0a345

                # XXX this should probably be dealt with a a lower level
                # (see `merged_removed` and `from_p2_removed`)
                if entry.merged_removed or entry.from_p2_removed:
                    source = self._map.copymap.get(f)
                    if entry.merged_removed:
                        self._merge(f)
                    elif entry.from_p2_removed:
                        self._otherparent(f)
                    if source is not None:
                        self.copy(source, f)
                    return

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

    def _merge(self, f):
        if not self.in_merge:
            return self._normallookup(f)
        return self._otherparent(f)

    def _drop(self, filename):
        """internal function to drop a file from the dirstate"""
        if self._map.dropfile(filename):
            self._dirty = True

47916:65e3d8028f2e

                # XXX this should probably be dealt with a a lower level
                # (see `merged_removed` and `from_p2_removed`)
                if entry.merged_removed or entry.from_p2_removed:
                    source = self._map.copymap.get(f)
                    if entry.merged_removed:
                        self._otherparent(f)
                    elif entry.from_p2_removed:
                        self._otherparent(f)
                    if source is not None:
                        self.copy(source, f)
                    return

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

    def _drop(self, filename):
        """internal function to drop a file from the dirstate"""
        if self._map.dropfile(filename):
            self._dirty = True