comparison mercurial/vfs.py @ 33281:6af0f023d014

vfs: replace avoiding ambiguity in abstractvfs.rename with _avoidambig

This centralizes common logic to forcibly avoid file stat ambiguity
into _avoidambig(), which was introduced by previous patch.

33280:646352291f5b

        """
        srcpath = self.join(src)
        dstpath = self.join(dst)
        oldstat = checkambig and util.filestat.frompath(dstpath)
        if oldstat and oldstat.stat:
            def dorename(spath, dpath):
                ret = util.rename(spath, dpath)
                newstat = util.filestat.frompath(dpath)
                if newstat.isambig(oldstat):
                    # stat of renamed file is ambiguous to original one
                    return ret, newstat.avoidambig(dpath, oldstat)
                return ret, True
            ret, avoided = dorename(srcpath, dstpath)
            if not avoided:
                # simply copy to change owner of srcpath (see issue5418)
                util.copyfile(dstpath, srcpath)
                ret, avoided = dorename(srcpath, dstpath)
            return ret
        return util.rename(srcpath, dstpath)

    def readlink(self, path):
        return os.readlink(self.join(path))

33281:6af0f023d014

        """
        srcpath = self.join(src)
        dstpath = self.join(dst)
        oldstat = checkambig and util.filestat.frompath(dstpath)
        if oldstat and oldstat.stat:
            ret = util.rename(srcpath, dstpath)
            _avoidambig(dstpath, oldstat)
            return ret
        return util.rename(srcpath, dstpath)

    def readlink(self, path):
        return os.readlink(self.join(path))