Handle wrong render ranges

Author: Tjaz Erzen

git_utils.py

@@ -247,7 +247,10 @@ def diff(repo_path: Union[str, os.PathLike], previous_frid: str = None) -> dict:
 
 def _get_commit(repo: Repo, frid: Optional[str]) -> str:
     if frid:
-        return _get_commit_with_frid(repo, frid)
+        commit_with_frid = _get_commit_with_frid(repo, frid)
+        if not commit_with_frid:
+            raise InvalidGitRepositoryError(f"No commit with frid {frid} found.")
+        return commit_with_frid
 
     base_folder_commit = _get_base_folder_commit(repo)
     initial_commit = _get_initial_commit(repo)
@@ -258,10 +261,25 @@ def _get_commit(repo: Repo, frid: Optional[str]) -> str:
 
 def _get_commit_with_frid(repo: Repo, frid: str) -> str:
     """Finds commit with given frid mentioned in the commit message."""
-    commit = _get_commit_with_message(repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format(frid))
-    if not commit:
-        raise InvalidGitRepositoryError(f"No commit with frid {frid} found.")
-    return commit
+    return _get_commit_with_message(repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format(frid))
+
+
+def has_commit_for_frid(repo_path: Union[str, os.PathLike], frid: str) -> bool:
+    """
+    Check if a commit exists for the given FRID in the repository.
+
+    Args:
+        repo_path (str | os.PathLike): Path to the git repository
+        frid (str): Functional requirement ID to check
+
+    Returns:
+        bool: True if the commit exists, False otherwise
+    """
+    repo = Repo(repo_path)
+    commit_with_frid = _get_commit_with_frid(repo, frid)
+    if not commit_with_frid:
+        return False
+    return True
 
 
 def _get_base_folder_commit(repo: Repo) -> str:

module_renderer.py

@@ -1,6 +1,7 @@
 import argparse
 import os
 
+import git_utils
 import plain_file
 import plain_modules
 import plain_spec
@@ -16,6 +17,12 @@
 from render_machine.states import States
 
 
+class MissingPreviousFridCommitsError(Exception):
+    """Raised when trying to render from a FRID but previous FRID commits are missing."""
+
+    pass
+
+
 class ModuleRenderer:
     def __init__(
         self,
@@ -35,6 +42,57 @@ def __init__(
         self.run_state = run_state
         self.event_bus = event_bus
 
+    def _validate_previous_frid_commits_exist(
+        self, module_name: str, plain_source: dict, render_range: list[str]
+    ) -> None:
+        """
+        Validate that all FRID commits before the render_range exist.
+
+        Args:
+            module_name: Name of the module being rendered
+            plain_source: The plain source tree
+            render_range: List of FRIDs to render
+
+        Raises:
+            MissingPreviousFridCommitsError: If any previous FRID commits are missing
+        """
+        # Get all FRIDs from the plain source
+        all_frids = list(plain_spec.get_frids(plain_source))
+        first_render_frid = render_range[0]
+
+        # Find all FRIDs before the first FRID in render_range
+        previous_frids = []
+        for frid in all_frids:
+            if frid == first_render_frid:
+                break
+            previous_frids.append(frid)
+
+        # If there are no previous FRIDs, nothing to validate
+        if not previous_frids:
+            return
+
+        # Check if commits exist for all previous FRIDs
+        build_folder_path = os.path.join(self.args.build_folder, module_name)
+        conformance_tests_path = os.path.join(self.args.conformance_tests_folder, module_name)
+
+        for prev_frid in previous_frids:
+            # Check in build folder
+            if not git_utils.has_commit_for_frid(build_folder_path, prev_frid):
+                raise MissingPreviousFridCommitsError(
+                    f"Cannot render from FRID {first_render_frid}: "
+                    f"Missing commit for previous FRID {prev_frid} in {build_folder_path}. "
+                    f"Please render all previous FRIDs first."
+                )
+
+            # Check in conformance tests folder (only if conformance tests are enabled)
+            if self.args.render_conformance_tests:
+                if not git_utils.has_commit_for_frid(conformance_tests_path, prev_frid):
+                    raise MissingPreviousFridCommitsError(
+                        f"Cannot render from FRID {first_render_frid}: "
+                        f"Missing commit for previous FRID {prev_frid} in {conformance_tests_path}. "
+                        f"Please render all previous FRIDs first."
+                    )
+
     def _build_render_context_for_module(
         self,
         module_name: str,
@@ -81,6 +139,10 @@ def _render_module(
         resources_list = []
         plain_spec.collect_linked_resources(plain_source, resources_list, None, True)
 
+        # Validate that all previous FRID commits exist before proceeding with render_range
+        if render_range is not None:
+            self._validate_previous_frid_commits_exist(module_name, plain_source, render_range)
+
         required_modules = []
         has_any_required_module_changed = False
         if not self.args.render_machine_graph and required_modules_list: