draft of branch warning

Author: JasperVanDenBosch

branches.toml

@@ -1 +1 @@
-branch-wise-lastmod = 2025-12-06T13:37:15.466566+00:00
+branch-wise-lastmod = 2025-12-06T13:57:12.846499+00:00

syrinx/branches.py

@@ -7,6 +7,7 @@
 from syrinx.exceptions import UnknownBranchError
 if TYPE_CHECKING:
     from syrinx.config import BuildMetaInfo
+    from syrinx.node import ContentNode
 logger = logging.getLogger(__name__)
 
 def read_branches(root_dir: str) -> Branches:
@@ -60,6 +61,8 @@ class Branches:
 
     def __init__(self, inner: Dict[str, datetime]) -> None:
         self.inner = inner
+        self.active = None
+        self.changed_files = set()
 
     def get_lastmodified(self, branch_name: str) -> datetime:
         """Get the last modified datetime for a specific branch.
@@ -87,6 +90,7 @@ def update(self, meta: BuildMetaInfo, root_dir: str) -> None:
         Uses git to determine the current branch name and records the build timestamp
         for that branch. If no branch is found, does nothing.
         Updates the internal branch dictionary and persists changes to branches.toml.
+        Also caches the list of changed files for use in warnIfModifiedNodeHasOutdatedBranch.
         
         Args:
             meta: BuildMetaInfo object containing timestamp and other build metadata
@@ -99,9 +103,20 @@ def update(self, meta: BuildMetaInfo, root_dir: str) -> None:
                 # Detached HEAD state, no branch name available
                 return
             branch_name = repo.active_branch.name
+            
+            # Cache changed files (both staged and unstaged, plus untracked)
+            try:
+                self.changed_files = set(repo.untracked_files)
+                self.changed_files.update(item.a_path for item in repo.index.diff(None) if item.a_path)
+                self.changed_files.update(item.a_path for item in repo.index.diff('HEAD') if item.a_path)
+            except (AttributeError, TypeError):
+                # Unable to get changed files (e.g., in tests with mocked repo)
+                self.changed_files = set()
+            
         except (InvalidGitRepositoryError, ValueError, TypeError):
             # Not a git repository or unable to determine branch
             return
+        self.active = branch_name
 
         # Update the branch with the current build timestamp
         self.inner[branch_name] = meta.timestamp
@@ -111,3 +126,35 @@ def update(self, meta: BuildMetaInfo, root_dir: str) -> None:
         # Write the updated branches to file if we have any entries
         if self.inner:
             write_branches(self.inner, root_dir)
+
+    def warnIfModifiedNodeHasOutdatedBranch(self, node: ContentNode, branch: str):
+        """Check if a modified node's file has uncommitted changes on a different branch.
+        
+        If the node's file has uncommitted changes and the specified branch doesn't
+        match the currently active branch, logs a warning.
+        Uses cached changed_files populated by update() for efficiency.
+        
+        Args:
+            node: The ContentNode to check
+            branch: The branch name specified in the node's LastModifiedBranch
+        """
+        # Only check if we have an active branch to compare against
+        if self.active is None:
+            return
+        
+        # If the branch matches the active branch, no warning needed
+        if branch == self.active:
+            return
+        
+        # Construct the file path relative to the repo root
+        # node.path is the directory path, node.name is the filename
+        file_path = join(node.path.lstrip('/'), node.name)
+        if file_path.startswith('./'):
+            file_path = file_path[2:]
+        
+        # Check if the file is in the cached changed files
+        if file_path in self.changed_files:
+            logger.warning(
+                f"File '{node.name}' at '{node.path}' has uncommitted changes "
+                f"but references LastModifiedBranch '{branch}' while currently on branch '{self.active}'"
+            )

syrinx/node.py

@@ -68,6 +68,8 @@ def lastModified(self) -> Optional[datetime]:
         # If not present, check for LastModifiedBranch entry
         if 'LastModifiedBranch' in self.front:
             branch_name = self.front['LastModifiedBranch']
+            # warn if modified, but on new branch
+            self.config.branches.warnIfModifiedNodeHasOutdatedBranch(self, branch_name)
             # Return datetime object directly from branches
             return self.config.branches.get_lastmodified(branch_name)