add: fail loudly if there's no dir cache (iterative#9466)

syo093c · May 17, 2023 · 99daf5d · 99daf5d
1 parent 83ffb88
commit 99daf5d
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/dvc/output.py b/dvc/output.py
@@ -1222,10 +1222,12 @@ def unstage(self, path: str) -> Tuple["Meta", "Tree"]:
         assert isinstance(self.fs.path, Path)
         rel_key = tuple(self.fs.path.parts(self.fs.path.relpath(path, self.fs_path)))
 
-        if not self.hash_info:
-            tree = Tree()
+        if self.hash_info:
+            tree = self.get_dir_cache()
+            if tree is None:
+                raise DvcException(f"could not read {self.hash_info.value!r}")
         else:
-            tree = self.get_dir_cache() or Tree()
+            tree = Tree()
 
         trie = tree.as_trie()
         assert isinstance(trie, Trie)
@@ -1257,10 +1259,12 @@ def apply(
         append_only = True
         rel_key = tuple(self.fs.path.parts(self.fs.path.relpath(path, self.fs_path)))
 
-        if not self.hash_info:
-            tree = Tree()
+        if self.hash_info:
+            tree = self.get_dir_cache()
+            if tree is None:
+                raise DvcException(f"could not read {self.hash_info.value!r}")
         else:
-            tree = self.get_dir_cache() or Tree()
+            tree = Tree()
 
         trie = tree.as_trie()
         assert isinstance(trie, Trie)