From 4d011718a6d3111cf4f9ec25105f220ac2eda315 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Tue, 25 Jul 2023 22:41:53 +0300 Subject: [PATCH] out: str: don't try to relpath paths outside of the repo This is not very useful overall, but also results in a ValueError from relpath on windows if your repo and output are on different drives. --- dvc/output.py | 3 +++ tests/unit/output/test_local.py | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dvc/output.py b/dvc/output.py index 06924a224..5dfd17e00 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -488,6 +488,9 @@ class Output: ): return str(self.def_path) + if not self.fs.path.isin(self.fs_path, self.repo.root_dir): + return self.fs_path + cur_dir = self.fs.path.getcwd() if self.fs.path.isin(cur_dir, self.repo.root_dir): return self.fs.path.relpath(self.fs_path, cur_dir) diff --git a/tests/unit/output/test_local.py b/tests/unit/output/test_local.py index d2f041c2f..a37e5e313 100644 --- a/tests/unit/output/test_local.py +++ b/tests/unit/output/test_local.py @@ -2,7 +2,6 @@ import os from dvc.output import Output from dvc.stage import Stage -from dvc.utils import relpath from dvc_data.hashfile.hash_info import HashInfo from dvc_data.hashfile.meta import Meta @@ -11,7 +10,7 @@ def test_str_workdir_outside_repo(tmp_dir, erepo_dir): stage = Stage(erepo_dir.dvc) output = Output(stage, "path", cache=False) - assert relpath("path", erepo_dir.dvc.root_dir) == str(output) + assert os.path.abspath("path") == str(output) def test_str_workdir_inside_repo(dvc):