cleanup

Author: spoorcc

dfetch/project/archivesubproject.py

@@ -49,7 +49,8 @@
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
 from dfetch.manifest.version import Version
-from dfetch.project.subproject import SubProject, VcsDependency
+from dfetch.project.metadata import Dependency
+from dfetch.project.subproject import SubProject
 from dfetch.vcs.archive import (
     ARCHIVE_EXTENSIONS,
     ArchiveLocalRepo,
@@ -166,7 +167,7 @@ def wanted_version(self) -> Version:
             return Version(revision=self._project_entry.hash)
         return Version(revision=self.remote)
 
-    def _fetch_impl(self, version: Version) -> tuple[Version, list[VcsDependency]]:
+    def _fetch_impl(self, version: Version) -> tuple[Version, list[Dependency]]:
         """Download and extract the archive to the local destination.
 
         1. Download the archive to a temporary file.

dfetch/project/gitsubproject.py

@@ -6,7 +6,8 @@
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
 from dfetch.manifest.version import Version
-from dfetch.project.subproject import SubProject, VcsDependency
+from dfetch.project.metadata import Dependency
+from dfetch.project.subproject import SubProject
 from dfetch.util.util import LICENSE_GLOBS, safe_rm
 from dfetch.vcs.git import GitLocalRepo, GitRemote, get_git_version
 
@@ -56,7 +57,7 @@ def list_tool_info() -> None:
             )
             SubProject._log_tool("git", "<not found in PATH>")
 
-    def _fetch_impl(self, version: Version) -> tuple[Version, list[VcsDependency]]:
+    def _fetch_impl(self, version: Version) -> tuple[Version, list[Dependency]]:
         """Get the revision of the remote and place it at the local path."""
         rev_or_branch_or_tag = self._determine_what_to_fetch(version)
 
@@ -83,7 +84,7 @@ def _fetch_impl(self, version: Version) -> tuple[Version, list[VcsDependency]]:
                 f" ({submodule.url} @ {Version(tag=submodule.tag, branch=submodule.branch, revision=submodule.sha)})",
             )
             vcs_deps.append(
-                VcsDependency(
+                Dependency(
                     remote_url=submodule.url,
                     destination=submodule.path,
                     branch=submodule.branch,

dfetch/project/subproject.py

@@ -4,7 +4,6 @@
 import pathlib
 from abc import ABC, abstractmethod
 from collections.abc import Callable, Sequence
-from typing import NamedTuple
 
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
@@ -18,28 +17,6 @@
 logger = get_logger(__name__)
 
 
-class VcsDependency(NamedTuple):
-    """Information about a vcs dependency."""
-
-    destination: str
-    remote_url: str
-    branch: str
-    tag: str
-    revision: str
-    source_type: str
-
-    def to_dependency(self) -> Dependency:
-        """Convert this vcs dependency to a Dependency object."""
-        return Dependency(
-            destination=self.destination,
-            remote_url=self.remote_url,
-            branch=self.branch,
-            tag=self.tag,
-            revision=self.revision,
-            source_type=self.source_type,
-        )
-
-
 class SubProject(ABC):
     """Abstract SubProject object.
 
@@ -168,7 +145,7 @@ def update(
                 skiplist=[self.__metadata.FILENAME] + post_fetch_ignored,
             ),
             patch_=applied_patches,
-            dependencies=[dependency.to_dependency() for dependency in dependency],
+            dependencies=list(dependency),
         )
 
         logger.debug(f"Writing repo metadata to: {self.__metadata.path}")
@@ -416,7 +393,7 @@ def _are_there_local_changes(self, files_to_ignore: Sequence[str]) -> bool:
         )
 
     @abstractmethod
-    def _fetch_impl(self, version: Version) -> tuple[Version, list[VcsDependency]]:
+    def _fetch_impl(self, version: Version) -> tuple[Version, list[Dependency]]:
         """Fetch the given version of the subproject, should be implemented by the child class."""
 
     @abstractmethod

dfetch/project/svnsubproject.py

@@ -7,7 +7,8 @@
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
 from dfetch.manifest.version import Version
-from dfetch.project.subproject import SubProject, VcsDependency
+from dfetch.project.metadata import Dependency
+from dfetch.project.subproject import SubProject
 from dfetch.util.util import (
     find_matching_files,
     find_non_matching_files,
@@ -107,7 +108,7 @@ def _remove_ignored_files(self) -> None:
             if not (file_or_dir.is_file() and is_license_file(file_or_dir.name)):
                 safe_rm(file_or_dir)
 
-    def _fetch_impl(self, version: Version) -> tuple[Version, list[VcsDependency]]:
+    def _fetch_impl(self, version: Version) -> tuple[Version, list[Dependency]]:
         """Get the revision of the remote and place it at the local path."""
         branch, branch_path, revision = self._determine_what_to_fetch(version)
         rev_arg = f"--revision {revision}" if revision else ""

dfetch/vcs/git.py

@@ -12,7 +12,7 @@
 
 from dfetch.log import get_logger
 from dfetch.util.cmdline import SubprocessCommandError, run_on_cmdline
-from dfetch.util.util import in_directory, safe_rm, strip_glob_prefix
+from dfetch.util.util import in_directory, is_license_file, safe_rm, strip_glob_prefix
 from dfetch.vcs.patch import Patch, PatchType
 
 logger = get_logger(__name__)
@@ -263,10 +263,7 @@ def _configure_sparse_checkout(
 
         with open(".git/info/sparse-checkout", "a", encoding="utf-8") as f:
             patterns = list(keeps or [])
-            src_pattern = f"/{src or '*'}"
-
-            if src_pattern not in patterns:
-                patterns.append(src_pattern)
+            patterns.append(f"/{src or '*'}")
 
             if ignore:
                 patterns += self._determine_ignore_paths(src, ignore)
@@ -297,11 +294,7 @@ def checkout_version(  # pylint: disable=too-many-arguments
             run_on_cmdline(logger, ["git", "checkout", "-b", "dfetch-local-branch"])
 
             if src or ignore:
-                self._configure_sparse_checkout(
-                    src,
-                    (must_keeps or []) + [f"/{src or '*'}"],
-                    ignore,
-                )
+                self._configure_sparse_checkout(src, must_keeps or [], ignore)
 
             run_on_cmdline(
                 logger,
@@ -342,7 +335,12 @@ def _apply_src_and_ignore(
             self._move_src_folder_up(remote, src)
 
         for ignore_path in ignore or []:
-            safe_rm(glob.glob(ignore_path))
+            paths = [
+                p
+                for p in glob.glob(ignore_path)
+                if not (os.path.isfile(p) and is_license_file(os.path.basename(p)))
+            ]
+            safe_rm(paths, within=".")
 
         return [s for s in submodules if os.path.exists(s.path)]
 

tests/test_subproject.py

@@ -10,13 +10,14 @@
 
 from dfetch.manifest.project import ProjectEntry
 from dfetch.manifest.version import Version
-from dfetch.project.subproject import SubProject, VcsDependency
+from dfetch.project.metadata import Dependency
+from dfetch.project.subproject import SubProject
 
 
 class ConcreteSubProject(SubProject):
     _wanted_version: Version
 
-    def _fetch_impl(self, version: Version) -> tuple[Version, list[VcsDependency]]:
+    def _fetch_impl(self, version: Version) -> tuple[Version, list[Dependency]]:
         return Version(), []
 
     def _latest_revision_on_branch(self, branch):