From 95922467461a41fa3b4dd4ef3836e067a78d96c1 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 30 Jul 2020 16:09:00 +0300 Subject: [PATCH] commit: make sure deps/outs exist (#4305) Fixes #4266 --- dvc/dependency/repo.py | 5 ++++- dvc/output/base.py | 12 ++++++++---- dvc/stage/__init__.py | 2 +- tests/func/test_commit.py | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dvc/dependency/repo.py b/dvc/dependency/repo.py index eb3c58b5c..7dffd2eca 100644 --- a/dvc/dependency/repo.py +++ b/dvc/dependency/repo.py @@ -67,7 +67,7 @@ class RepoDependency(LocalDependency): return self.repo.cache.local.tree.get_hash(path, tree=tree) return tree.get_file_hash(path) - def status(self): + def workspace_status(self): current_checksum = self._get_checksum(locked=True) updated_checksum = self._get_checksum(locked=False) @@ -76,6 +76,9 @@ class RepoDependency(LocalDependency): return {} + def status(self): + return self.workspace_status() + def save(self): pass diff --git a/dvc/output/base.py b/dvc/output/base.py index 242499fc5..f17e3df9e 100644 --- a/dvc/output/base.py +++ b/dvc/output/base.py @@ -199,10 +199,7 @@ class BaseOutput: return self.cache.changed_cache(self.checksum, filter_info=filter_info) - def status(self): - if self.checksum and self.use_cache and self.changed_cache(): - return {str(self): "not in cache"} - + def workspace_status(self): if not self.exists: return {str(self): "deleted"} @@ -214,6 +211,12 @@ class BaseOutput: return {} + def status(self): + if self.checksum and self.use_cache and self.changed_cache(): + return {str(self): "not in cache"} + + return self.workspace_status() + def changed(self): status = self.status() logger.debug(str(status)) @@ -280,6 +283,7 @@ class BaseOutput: self.info = self.save_info() def commit(self): + assert self.info if self.use_cache: self.cache.save(self.path_info, self.cache.tree, self.info) diff --git a/dvc/stage/__init__.py b/dvc/stage/__init__.py index 6316793bb..0048c94fb 100644 --- a/dvc/stage/__init__.py +++ b/dvc/stage/__init__.py @@ -396,7 +396,7 @@ class Stage(params.StageParams): @staticmethod def _changed_entries(entries): - return [str(entry) for entry in entries if entry.changed_checksum()] + return [str(entry) for entry in entries if entry.workspace_status()] def _changed_stage_entry(self): return f"'md5' of {self} changed." diff --git a/tests/func/test_commit.py b/tests/func/test_commit.py index 6c91abff3..958a29c53 100644 --- a/tests/func/test_commit.py +++ b/tests/func/test_commit.py @@ -2,7 +2,9 @@ from os import fspath import pytest +from dvc.dependency.base import DependencyDoesNotExistError from dvc.dvcfile import PIPELINE_FILE +from dvc.output.base import OutputDoesNotExistError from dvc.stage.exceptions import StageCommitError from dvc.utils.yaml import dump_yaml, load_yaml @@ -86,6 +88,24 @@ def test_commit_no_exec(tmp_dir, dvc): assert dvc.status(stage.path) == {} +def test_commit_no_exec_missing_dep(tmp_dir, dvc): + stage = dvc.run( + name="my", cmd="mycmd", deps=["dep"], outs=["out"], no_exec=True + ) + assert dvc.status(stage.path) + + with pytest.raises(DependencyDoesNotExistError): + dvc.commit(stage.path, force=True) + + +def test_commit_no_exec_missing_out(tmp_dir, dvc): + stage = dvc.run(name="my", cmd="mycmd", outs=["out"], no_exec=True) + assert dvc.status(stage.path) + + with pytest.raises(OutputDoesNotExistError): + dvc.commit(stage.path, force=True) + + def test_commit_pipeline_stage(tmp_dir, dvc, run_copy): tmp_dir.gen("foo", "foo") stage = run_copy("foo", "bar", no_commit=True, name="copy-foo-bar")