comparison mercurial/dirstate.py @ 47973:2e0ff3947b05

dirstate: extract the logic to check file/dirname collision when adding a file

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

47972:5a6c1ef4bcac

        from_p2=False,
        possibly_dirty=False,
    ):
        entry = self._map.get(f)
        if added or entry is not None and entry.removed:
            scmutil.checkfilename(f)
            if self._map.hastrackeddir(f):
                msg = _(b'directory %r already in dirstate')
                msg %= pycompat.bytestr(f)
                raise error.Abort(msg)
            # shadows
            for d in pathutil.finddirs(f):
                if self._map.hastrackeddir(d):
                    break
                entry = self._map.get(d)
                if entry is not None and not entry.removed:
                    msg = _(b'file %r in dirstate clashes with %r')
                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
                    raise error.Abort(msg)
        self._dirty = True
        self._updatedfiles.add(f)
        self._map.addfile(
            f,
            mode=mode,

            added=added,
            merged=merged,
            from_p2=from_p2,
            possibly_dirty=possibly_dirty,
        )

    def _get_filedata(self, filename):
        """returns"""
        s = os.lstat(self._join(filename))
        mode = s.st_mode

47973:2e0ff3947b05

        from_p2=False,
        possibly_dirty=False,
    ):
        entry = self._map.get(f)
        if added or entry is not None and entry.removed:
            self._check_new_tracked_filename(f)
        self._dirty = True
        self._updatedfiles.add(f)
        self._map.addfile(
            f,
            mode=mode,

            added=added,
            merged=merged,
            from_p2=from_p2,
            possibly_dirty=possibly_dirty,
        )

    def _check_new_tracked_filename(self, filename):
        scmutil.checkfilename(filename)
        if self._map.hastrackeddir(filename):
            msg = _(b'directory %r already in dirstate')
            msg %= pycompat.bytestr(filename)
            raise error.Abort(msg)
        # shadows
        for d in pathutil.finddirs(filename):
            if self._map.hastrackeddir(d):
                break
            entry = self._map.get(d)
            if entry is not None and not entry.removed:
                msg = _(b'file %r in dirstate clashes with %r')
                msg %= (pycompat.bytestr(d), pycompat.bytestr(filename))
                raise error.Abort(msg)

    def _get_filedata(self, filename):
        """returns"""
        s = os.lstat(self._join(filename))
        mode = s.st_mode