checkout: move to objects (#6721)

Checkout operation is pretty much the opposite of staging, so it too belongs in objects.
This commit is contained in:
Ruslan Kuprieiev
2021-09-30 23:06:03 +03:00
committed by GitHub
parent 9a1d74048a
commit f46beb4958
4 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ class RepoDependency(Dependency):
return {self.PARAM_PATH: self.def_path, self.PARAM_REPO: self.def_repo}
def download(self, to, jobs=None):
from dvc.checkout import checkout
from dvc.objects.checkout import checkout
for odb, objs in self.get_used_objs().items():
self.repo.cloud.pull(objs, jobs=jobs, odb=odb)
+1 -1
View File
@@ -9,7 +9,6 @@ from funcy import collecting, project
from voluptuous import And, Any, Coerce, Length, Lower, Required, SetTo
from dvc import objects, prompt
from dvc.checkout import checkout
from dvc.exceptions import (
CheckoutError,
CollectCacheError,
@@ -17,6 +16,7 @@ from dvc.exceptions import (
MergeError,
RemoteCacheRequiredError,
)
from dvc.objects.checkout import checkout
from .fs import get_cloud_fs
from .fs.hdfs import HDFSFileSystem
+2 -1
View File
@@ -953,7 +953,8 @@ def test_add_with_cache_link_error(tmp_dir, dvc, mocker, capsys):
tmp_dir.gen("foo", "foo")
mocker.patch(
"dvc.checkout._do_link", side_effect=DvcException("link failed")
"dvc.objects.checkout._do_link",
side_effect=DvcException("link failed"),
)
dvc.add("foo")
err = capsys.readouterr()[1]