Split super project

Author: spoorcc

dfetch/commands/check.py

@@ -35,7 +35,7 @@
 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
+from dfetch.project import create_super_project
 from dfetch.reporting.check.code_climate_reporter import CodeClimateReporter
 from dfetch.reporting.check.jenkins_reporter import JenkinsReporter
 from dfetch.reporting.check.reporter import CheckReporter
@@ -90,14 +90,14 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, args: argparse.Namespace) -> None:
         """Perform the check."""
-        superproject = SuperProject.create()
+        superproject = create_super_project()
         reporters = self._get_reporters(args, superproject.manifest)
 
         with in_directory(superproject.root_directory):
             exceptions: list[str] = []
             for project in superproject.manifest.selected_projects(args.projects):
                 with catch_runtime_exceptions(exceptions) as exceptions:
-                    dfetch.project.make(project).check_for_update(
+                    dfetch.project.create_sub_project(project).check_for_update(
                         reporters,
                         files_to_ignore=superproject.ignored_files(project.destination),
                     )

dfetch/commands/diff.py

@@ -59,8 +59,9 @@
 
 import dfetch.commands.command
 from dfetch.log import get_logger
+from dfetch.project import create_super_project
 from dfetch.project.metadata import Metadata
-from dfetch.project.superproject import NoVcsSuperProject, RevisionRange, SuperProject
+from dfetch.project.superproject import NoVcsSuperProject, RevisionRange
 from dfetch.util.util import catch_runtime_exceptions, in_directory
 
 logger = get_logger(__name__)
@@ -96,7 +97,7 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, args: argparse.Namespace) -> None:
         """Perform the diff."""
-        superproject = SuperProject.create()
+        superproject = create_super_project()
         old_rev, new_rev = self._parse_revs(args.revs)
 
         if isinstance(superproject, NoVcsSuperProject):

dfetch/commands/environment.py

@@ -5,7 +5,7 @@
 
 import dfetch.commands.command
 from dfetch.log import get_logger
-from dfetch.project import SUPPORTED_PROJECT_TYPES
+from dfetch.project import SUPPORTED_SUBPROJECT_TYPES
 
 logger = get_logger(__name__)
 
@@ -26,5 +26,5 @@ def __call__(self, _: argparse.Namespace) -> None:
         logger.print_report_line(
             "platform", f"{platform.system()} {platform.release()}"
         )
-        for project_type in SUPPORTED_PROJECT_TYPES:
+        for project_type in SUPPORTED_SUBPROJECT_TYPES:
             project_type.list_tool_info()

dfetch/commands/format_patch.py

@@ -33,7 +33,7 @@
 import dfetch.manifest.project
 import dfetch.project
 from dfetch.log import get_logger
-from dfetch.project.superproject import SuperProject
+from dfetch.project import create_super_project
 from dfetch.util.util import catch_runtime_exceptions, in_directory
 from dfetch.vcs.patch import PatchAuthor, PatchInfo, add_prefix_to_patch
 
@@ -69,7 +69,7 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, args: argparse.Namespace) -> None:
         """Perform the format patch."""
-        superproject = SuperProject.create()
+        superproject = create_super_project()
 
         exceptions: list[str] = []
 
@@ -86,7 +86,7 @@ def __call__(self, args: argparse.Namespace) -> None:
         with in_directory(superproject.root_directory):
             for project in superproject.manifest.selected_projects(args.projects):
                 with catch_runtime_exceptions(exceptions) as exceptions:
-                    subproject = dfetch.project.make(project)
+                    subproject = dfetch.project.create_sub_project(project)
 
                     # Check if the project has a patch, maybe suggest creating one?
                     if not subproject.patch:

dfetch/commands/freeze.py

@@ -49,7 +49,7 @@
 from dfetch.log import get_logger
 from dfetch.manifest.manifest import Manifest
 from dfetch.manifest.project import ProjectEntry
-from dfetch.project.superproject import SuperProject
+from dfetch.project import create_super_project
 from dfetch.util.util import catch_runtime_exceptions, in_directory
 
 logger = get_logger(__name__)
@@ -70,15 +70,17 @@ def __call__(self, args: argparse.Namespace) -> None:
         """Perform the freeze."""
         del args  # unused
 
-        superproject = SuperProject.create()
+        superproject = create_super_project()
 
         exceptions: list[str] = []
         projects: list[ProjectEntry] = []
 
         with in_directory(superproject.root_directory):
             for project in superproject.manifest.projects:
                 with catch_runtime_exceptions(exceptions) as exceptions:
-                    on_disk_version = dfetch.project.make(project).on_disk_version()
+                    on_disk_version = dfetch.project.create_sub_project(
+                        project
+                    ).on_disk_version()
 
                     if project.version == on_disk_version:
                         logger.print_info_line(

dfetch/commands/import_.py

@@ -92,7 +92,7 @@
 from dfetch.manifest.manifest import Manifest
 from dfetch.manifest.project import ProjectEntry
 from dfetch.manifest.remote import Remote
-from dfetch.project.superproject import SuperProject
+from dfetch.project import determine_superproject_vcs
 
 logger = get_logger(__name__)
 
@@ -111,7 +111,7 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, _: argparse.Namespace) -> None:
         """Perform the import."""
-        projects = SuperProject.type_from_path(".").import_projects()
+        projects = determine_superproject_vcs(".").import_projects()
 
         if not projects:
             raise RuntimeError(f"No submodules found in {os.getcwd()}!")

dfetch/commands/report.py

@@ -12,9 +12,9 @@
 import dfetch.util.util
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
+from dfetch.project import create_super_project
 from dfetch.project.metadata import Metadata
 from dfetch.project.subproject import SubProject
-from dfetch.project.superproject import SuperProject
 from dfetch.reporting import REPORTERS, ReportTypes
 from dfetch.util.license import License, guess_license_in_file
 
@@ -63,7 +63,7 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, args: argparse.Namespace) -> None:
         """Generate the report."""
-        superproject = SuperProject.create()
+        superproject = create_super_project()
 
         with dfetch.util.util.in_directory(superproject.root_directory):
             reporter = REPORTERS[args.type](superproject.manifest)

dfetch/commands/update.py

@@ -36,7 +36,7 @@
 import dfetch.project
 from dfetch.commands.common import check_child_manifests
 from dfetch.log import get_logger
-from dfetch.project.superproject import SuperProject
+from dfetch.project import create_super_project
 from dfetch.util.util import catch_runtime_exceptions, in_directory
 
 logger = get_logger(__name__)
@@ -74,7 +74,7 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, args: argparse.Namespace) -> None:
         """Perform the update."""
-        superproject = SuperProject.create()
+        superproject = create_super_project()
 
         exceptions: list[str] = []
         destinations: list[str] = [
@@ -85,7 +85,7 @@ def __call__(self, args: argparse.Namespace) -> None:
             for project in superproject.manifest.selected_projects(args.projects):
                 with catch_runtime_exceptions(exceptions) as exceptions:
                     self._check_destination(project, destinations)
-                    dfetch.project.make(project).update(
+                    dfetch.project.create_sub_project(project).update(
                         force=args.force,
                         files_to_ignore=superproject.ignored_files(project.destination),
                     )

dfetch/commands/update_patch.py

@@ -40,13 +40,10 @@
 import dfetch.manifest.project
 import dfetch.project
 from dfetch.log import get_logger
+from dfetch.project import create_super_project
+from dfetch.project.gitsuperproject import GitSuperProject
 from dfetch.project.metadata import Metadata
-from dfetch.project.superproject import (
-    GitSuperProject,
-    NoVcsSuperProject,
-    RevisionRange,
-    SuperProject,
-)
+from dfetch.project.superproject import NoVcsSuperProject, RevisionRange
 from dfetch.util.util import catch_runtime_exceptions, in_directory
 
 logger = get_logger(__name__)
@@ -76,7 +73,7 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, args: argparse.Namespace) -> None:
         """Perform the update patch."""
-        superproject = SuperProject.create()
+        superproject = create_super_project()
 
         exceptions: list[str] = []
 
@@ -91,7 +88,7 @@ def __call__(self, args: argparse.Namespace) -> None:
         with in_directory(superproject.root_directory):
             for project in superproject.manifest.selected_projects(args.projects):
                 with catch_runtime_exceptions(exceptions) as exceptions:
-                    subproject = dfetch.project.make(project)
+                    subproject = dfetch.project.create_sub_project(project)
 
                     files_to_ignore = superproject.ignored_files(project.destination)
 

dfetch/project/__init__.py

@@ -1,22 +1,57 @@
 """All Project related items."""
 
+import os
+import pathlib
+from typing import Union
+
 import dfetch.manifest.project
+from dfetch.log import get_logger
+from dfetch.manifest.parse import find_manifest, parse
 from dfetch.project.gitsubproject import GitSubProject
+from dfetch.project.gitsuperproject import GitSuperProject
 from dfetch.project.subproject import SubProject
+from dfetch.project.superproject import NoVcsSuperProject, SuperProject
 from dfetch.project.svnsubproject import SvnSubProject
+from dfetch.project.svnsuperproject import SvnSuperProject
+from dfetch.util.util import resolve_absolute_path
+
+SUPPORTED_SUBPROJECT_TYPES = [GitSubProject, SvnSubProject]
+SUPPORTED_SUPERPROJECT_TYPES = [GitSuperProject, SvnSuperProject]
 
-SUPPORTED_PROJECT_TYPES = [GitSubProject, SvnSubProject]
+logger = get_logger(__name__)
 
 
-def make(project_entry: dfetch.manifest.project.ProjectEntry) -> SubProject:
+def create_sub_project(
+    project_entry: dfetch.manifest.project.ProjectEntry,
+) -> SubProject:
     """Create a new SubProject based on a project from the manifest."""
-    for project_type in SUPPORTED_PROJECT_TYPES:
+    for project_type in SUPPORTED_SUBPROJECT_TYPES:
         if project_type.NAME == project_entry.vcs:
             return project_type(project_entry)
 
-    for project_type in SUPPORTED_PROJECT_TYPES:
+    for project_type in SUPPORTED_SUBPROJECT_TYPES:
         project = project_type(project_entry)
 
         if project.check():
             return project
     raise RuntimeError("vcs type unsupported")
+
+
+def create_super_project() -> SuperProject:
+    """Create a SuperProject by looking for a manifest file."""
+    logger.debug("Looking for manifest")
+    manifest_path = find_manifest()
+
+    logger.debug(f"Using manifest {manifest_path}")
+    manifest = parse(manifest_path)
+    root_directory = resolve_absolute_path(os.path.dirname(manifest.path))
+    return determine_superproject_vcs(root_directory)(manifest, root_directory)
+
+
+def determine_superproject_vcs(path: Union[str, pathlib.Path]) -> type[SuperProject]:
+    """Determine correct VCS type of the superproject in the given path."""
+    for project_type in SUPPORTED_SUPERPROJECT_TYPES:
+        if project_type.check(path):
+            return project_type
+
+    return NoVcsSuperProject