check root .gitignore in '_ignored'

dvc/scm/git/__init__.py

@@ -18,7 +18,6 @@
 from dvc.utils import relpath
 from dvc.utils.fs import path_isin
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -133,15 +132,24 @@ def _get_gitignore(self, path):
 
         return entry, gitignore
 
-    @staticmethod
-    def _ignored(entry, gitignore_path):
-        if os.path.exists(gitignore_path):
-            with open(gitignore_path, "r") as fobj:
-                ignore_list = fobj.readlines()
-            return any(
-                filter(lambda x: x.strip() == entry.strip(), ignore_list)
-            )
-        return False
+    def _ignored(self, entry, gitignore_path):
+
+        # We want to check first if `entry` is already being ignored
+        # by the .gitignore file in the root dir.
+
+        entry = (
+            entry[1:] if entry[0] == "/" else entry
+        )  # make sure that joining the paths works
+        entry_path = os.path.join(os.path.dirname(gitignore_path), entry)
+        from git.exc import GitCommandError
+
+        try:
+            self.repo.git.check_ignore(entry_path)
+            return True
+        except GitCommandError:
+            # If none of the paths passed to `check_ignore` are ignored,
+            # GitPython annoyingly raises an Exception
+            return False
 
     def ignore(self, path):
         entry, gitignore = self._get_gitignore(path)

tests/func/test_scm.py

@@ -83,6 +83,14 @@ def test_ignore(tmp_dir, scm):
     assert _count_gitignore_entries(target) == 0
 
 
+def test_ignored(tmp_dir, scm):
+    tmp_dir.gen({"dir1": {"file1.jpg": "cont", "file2.txt": "cont"}})
+    tmp_dir.gen({".gitignore": "dir1/*.jpg"})
+
+    assert scm._ignored("file1.jpg", fspath(tmp_dir / "dir1" / ".gitignore"))
+    assert not scm._ignored("file2.txt", fspath(tmp_dir / "dir1" / ".gitignore"))
+
+
 def test_get_gitignore(tmp_dir, scm):
     tmp_dir.gen({"file1": "contents", "dir": {}})