Cleanup

Author: spoorcc

dfetch/project/gitsubproject.py

@@ -24,7 +24,6 @@ def __init__(self, project: ProjectEntry):
         """Create a Git subproject."""
         super().__init__(project)
         self._remote_repo = GitRemote(self.remote)
-        self._local_repo = GitLocalRepo(self.local_path)
 
     def check(self) -> bool:
         """Check if is GIT."""
@@ -70,15 +69,16 @@ def _fetch_impl(self, version: Version) -> Version:
             f"/{name.upper()}" for name in self.LICENSE_GLOBS
         ]
 
-        fetched_sha = self._local_repo.checkout_version(
+        local_repo = GitLocalRepo(self.local_path)
+        fetched_sha = local_repo.checkout_version(
             remote=self.remote,
             version=rev_or_branch_or_tag,
             src=self.source,
             must_keeps=license_globs,
             ignore=self.ignore,
         )
 
-        safe_rmtree(os.path.join(self.local_path, self._local_repo.METADATA_DIR))
+        safe_rmtree(os.path.join(self.local_path, local_repo.METADATA_DIR))
 
         return self._determine_fetched_version(version, fetched_sha)
 

dfetch/project/gitsuperproject.py

@@ -11,6 +11,7 @@
 from collections.abc import Sequence
 
 from dfetch.log import get_logger
+from dfetch.manifest.manifest import Manifest
 from dfetch.manifest.project import ProjectEntry
 from dfetch.project.gitsubproject import GitSubProject
 from dfetch.project.subproject import SubProject
@@ -25,6 +26,11 @@
 class GitSuperProject(SuperProject):
     """A git specific superproject."""
 
+    def __init__(self, manifest: Manifest, root_directory: pathlib.Path) -> None:
+        """Create a Git Super project."""
+        super().__init__(manifest, root_directory)
+        self._repo = GitLocalRepo(root_directory)
+
     @staticmethod
     def check(path: str | pathlib.Path) -> bool:
         """Check if this path is of the matching VCS."""
@@ -51,7 +57,7 @@ def has_local_changes_in_dir(self, path: str) -> bool:
 
     def get_username(self) -> str:
         """Get the username of the superproject VCS."""
-        username = GitLocalRepo(self.root_directory).get_username()
+        username = self._repo.get_username()
 
         if username:
             return username
@@ -60,15 +66,15 @@ def get_username(self) -> str:
 
     def get_useremail(self) -> str:
         """Get the user email of the superproject VCS."""
-        email = GitLocalRepo(self.root_directory).get_useremail()
+        email = self._repo.get_useremail()
 
         if email:
             return email
         return self._get_useremail_fallback()
 
     def get_file_revision(self, path: str | pathlib.Path) -> str:
         """Get the revision of the given file."""
-        return str(GitLocalRepo(self.root_directory).get_last_file_hash(str(path)))
+        return str(self._repo.get_last_file_hash(str(path)))
 
     @staticmethod
     def import_projects() -> Sequence[ProjectEntry]:
@@ -131,7 +137,7 @@ def diff(
         if diff_since_revision:
             combined_diff += [diff_since_revision]
 
-        untracked_files_patch = str(local_repo.untracked_files_patch(ignore))
+        untracked_files_patch = local_repo.untracked_files_patch(ignore)
         if untracked_files_patch:
             if reverse:
                 reversed_patch = reverse_patch(untracked_files_patch.encode("utf-8"))

dfetch/project/svnsubproject.py

@@ -28,7 +28,6 @@ def __init__(self, project: ProjectEntry):
         """Create a Svn subproject."""
         super().__init__(project)
         self._remote_repo = SvnRemote(self.remote)
-        self._repo = SvnRepo(self.local_path)
 
     def check(self) -> bool:
         """Check if is SVN."""
@@ -41,7 +40,7 @@ def revision_is_enough() -> bool:
 
     def _latest_revision_on_branch(self, branch: str) -> str:
         """Get the latest revision on a branch."""
-        if branch not in (self._repo.DEFAULT_BRANCH, "", " "):
+        if branch not in (SvnRepo.DEFAULT_BRANCH, "", " "):
             branch = f"branches/{branch}"
         return self._get_revision(branch)
 
@@ -86,11 +85,11 @@ def _determine_what_to_fetch(self, version: Version) -> tuple[str, str, str]:
             branch_path = ""
             branch = " "
         else:
-            branch = version.branch or self._repo.DEFAULT_BRANCH
+            branch = version.branch or SvnRepo.DEFAULT_BRANCH
             branch_path = (
                 f"branches/{branch}"
-                if branch != self._repo.DEFAULT_BRANCH
-                else self._repo.DEFAULT_BRANCH
+                if branch != SvnRepo.DEFAULT_BRANCH
+                else SvnRepo.DEFAULT_BRANCH
             )
 
         branch_path = urllib.parse.quote(branch_path)
@@ -180,7 +179,7 @@ def _get_revision(self, branch: str) -> str:
 
     def get_default_branch(self) -> str:
         """Get the default branch of this repository."""
-        return self._repo.DEFAULT_BRANCH
+        return SvnRepo.DEFAULT_BRANCH
 
     def create_formatted_patch_header(self, patch_info: PatchInfo) -> str:
         """Create a formatted patch header for the given patch info."""

dfetch/project/svnsuperproject.py

@@ -11,6 +11,7 @@
 from collections.abc import Sequence
 
 from dfetch.log import get_logger
+from dfetch.manifest.manifest import Manifest
 from dfetch.manifest.project import ProjectEntry
 from dfetch.project.subproject import SubProject
 from dfetch.project.superproject import RevisionRange, SuperProject
@@ -32,6 +33,11 @@
 class SvnSuperProject(SuperProject):
     """A SVN specific superproject."""
 
+    def __init__(self, manifest: Manifest, root_directory: pathlib.Path) -> None:
+        """Create a Svn Super project."""
+        super().__init__(manifest, root_directory)
+        self._repo = SvnRepo(root_directory)
+
     @staticmethod
     def check(path: str | pathlib.Path) -> bool:
         """Check if this path is of the matching VCS."""
@@ -58,7 +64,7 @@ def has_local_changes_in_dir(self, path: str) -> bool:
 
     def get_username(self) -> str:
         """Get the username of the superproject VCS."""
-        username = SvnRepo(self.root_directory).get_username()
+        username = self._repo.get_username()
 
         if username:
             return username
@@ -71,7 +77,7 @@ def get_useremail(self) -> str:
 
     def get_file_revision(self, path: str | pathlib.Path) -> str:
         """Get the revision of the given file."""
-        return str(SvnRepo(self.root_directory).get_last_changed_revision(str(path)))
+        return str(self._repo.get_last_changed_revision(str(path)))
 
     @staticmethod
     def import_projects() -> Sequence[ProjectEntry]: