repo: allow_missing: Compare hash_info.value instead of has_info.

Closes #9818
iterative · Aug 11, 2023 · f4bb83d · f4bb83d
1 parent a051b8b
commit f4bb83d
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/dvc/stage/__init__.py b/dvc/stage/__init__.py
@@ -314,7 +314,8 @@ def _changed_deps(
             if status:
                 if allow_missing and status[str(dep)] == "deleted":
                     if upstream and any(
-                        dep.fs_path == out.fs_path and dep.hash_info != out.hash_info
+                        dep.fs_path == out.fs_path
+                        and dep.hash_info.value != out.hash_info.value
                         for stage in upstream
                         for out in stage.outs
                     ):

diff --git a/tests/func/repro/test_repro_allow_missing.py b/tests/func/repro/test_repro_allow_missing.py
@@ -16,6 +16,59 @@ def test_repro_allow_missing(tmp_dir, dvc):
     assert not ret
 
 
+def test_repro_allow_missing_dry_with_dvc_2_file(tmp_dir, dvc):
+    """https://github.com/iterative/dvc/issues/9818"""
+
+    # A .dvc file in 2.X format
+    (tmp_dir / "data.dvc").dump(
+        {
+            "outs": [
+                {
+                    "md5": "14d187e749ee5614e105741c719fa185.dir",
+                    "size": 18999874,
+                    "nfiles": 183,
+                    "path": "data",
+                }
+            ]
+        }
+    )
+
+    (tmp_dir / "dvc.lock").dump(
+        {
+            "schema": "2.0",
+            "stages": {
+                "cat-data-foo": {
+                    "cmd": "cat data/foo > foo",
+                    "deps": [
+                        {
+                            # The file as dependency in 3.X format
+                            "path": "data",
+                            "hash": "md5",
+                            "md5": "14d187e749ee5614e105741c719fa185.dir",
+                            "size": 18999874,
+                            "nfiles": 183,
+                        }
+                    ],
+                    "outs": [
+                        {
+                            "path": "foo",
+                            "hash": "md5",
+                            "md5": "069f9d4b9c418b935f7bec4a094ba535",
+                            "size": 30,
+                        }
+                    ],
+                }
+            },
+        }
+    )
+    dvc.stage.add(
+        name="cat-data-foo", cmd="cat data/foo > foo", deps=["data"], outs=["foo"]
+    )
+
+    ret = dvc.reproduce(allow_missing=True, dry=True)
+    assert not ret
+
+
 def test_repro_allow_missing_and_pull(tmp_dir, dvc, mocker, local_remote):
     tmp_dir.gen("fixed", "fixed")
     dvc.stage.add(name="create-foo", cmd="echo foo > foo", deps=["fixed"], outs=["foo"])