move ignored files to superproject

Author: spoorcc

dfetch/commands/check.py

@@ -32,7 +32,7 @@
 
 import dfetch.commands.command
 import dfetch.project
-from dfetch.commands.common import check_child_manifests, files_to_ignore
+from dfetch.commands.common import check_child_manifests
 from dfetch.log import get_logger
 from dfetch.manifest.manifest import Manifest
 from dfetch.project.superproject import SuperProject
@@ -98,7 +98,8 @@ def __call__(self, args: argparse.Namespace) -> None:
             for project in superproject.manifest.selected_projects(args.projects):
                 with catch_runtime_exceptions(exceptions) as exceptions:
                     dfetch.project.make(project).check_for_update(
-                        reporters, files_to_ignore=files_to_ignore(project.destination)
+                        reporters,
+                        files_to_ignore=superproject.ignored_files(project.destination),
                     )
 
                 if not args.no_recommendations and os.path.isdir(project.destination):

dfetch/commands/common.py

@@ -1,15 +1,12 @@
 """Module for common command operations."""
 
 import os
-from collections.abc import Sequence
 
 import yaml
 
 from dfetch.log import get_logger
 from dfetch.manifest.manifest import Manifest, get_childmanifests
 from dfetch.manifest.project import ProjectEntry
-from dfetch.vcs.git import GitLocalRepo
-from dfetch.vcs.svn import SvnRepo
 
 logger = get_logger(__name__)
 
@@ -66,14 +63,3 @@ def _make_recommendation(
     for line in recommendation_json.splitlines():
         logger.warning(line)
     logger.warning("")
-
-
-def files_to_ignore(path: str) -> Sequence[str]:
-    """Return a list of files that can be ignored in a given path."""
-    if GitLocalRepo().is_git():
-        ignore_list = GitLocalRepo.ignored_files(path)
-    elif SvnRepo().is_svn():
-        ignore_list = SvnRepo.ignored_files(path)
-    else:
-        ignore_list = []
-    return ignore_list

dfetch/commands/update.py

@@ -37,7 +37,7 @@
 import dfetch.manifest.validate
 import dfetch.project.git
 import dfetch.project.svn
-from dfetch.commands.common import check_child_manifests, files_to_ignore
+from dfetch.commands.common import check_child_manifests
 from dfetch.log import get_logger
 from dfetch.project.superproject import SuperProject
 from dfetch.util.util import catch_runtime_exceptions, in_directory
@@ -90,7 +90,7 @@ def __call__(self, args: argparse.Namespace) -> None:
                     self._check_destination(project, destinations)
                     dfetch.project.make(project).update(
                         force=args.force,
-                        files_to_ignore=files_to_ignore(project.destination),
+                        files_to_ignore=superproject.ignored_files(project.destination),
                     )
 
                     if not args.no_recommendations and os.path.isdir(

dfetch/project/superproject.py

@@ -9,6 +9,7 @@
 from __future__ import annotations
 
 import os
+from collections.abc import Sequence
 
 from dfetch.log import get_logger
 from dfetch.manifest.manifest import Manifest, find_manifest
@@ -59,3 +60,15 @@ def get_sub_project(self, project: ProjectEntry) -> SubProject | None:
             return SvnSubProject(project)
 
         return None
+
+    def ignored_files(self, path: str) -> Sequence[str]:
+        """Return a list of files that can be ignored in a given path."""
+        if not os.path.commonprefix((path, self.root_directory)) != self.root_directory:
+            raise RuntimeError(f"{path} not in superproject {self.root_directory}!")
+
+        if GitLocalRepo().is_git():
+            return GitLocalRepo.ignored_files(path)
+        if SvnRepo().is_svn():
+            return SvnRepo.ignored_files(path)
+
+        return []