cicada-mcp 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

cicada/git_helper.py

@@ -11,6 +11,7 @@ Author: Cursor(Auto)
 import subprocess
 from datetime import datetime
 from pathlib import Path
+from typing import Any
 
 import git
 
@@ -368,6 +369,11 @@ class GitHelper:
             # Parse porcelain format
             lines_data = []
             current_commit = {}
+            # Cache commit metadata by SHA to handle repeated commits
+            # Optimization: Pre-validate commits during caching to avoid validation in hot loop
+            commit_cache = {}
+            # Track which commits have all required fields (valid)
+            valid_commits = set()
 
             for line in result.stdout.split("\n"):
                 if not line:
@@ -377,11 +383,21 @@ class GitHelper:
                 if len(line) >= 40 and line[0:40].isalnum():
                     parts = line.split()
                     if len(parts) >= 3:
-                        current_commit = {
-                            "sha": parts[0][:8],
-                            "full_sha": parts[0],
-                            "line_number": int(parts[2]),
-                        }
+                        sha = parts[0]
+                        # Check if we've seen this commit before
+                        if sha in commit_cache:
+                            # Reuse cached metadata
+                            current_commit = {
+                                **commit_cache[sha],
+                                "line_number": int(parts[2]),
+                            }
+                        else:
+                            # New commit - initialize with SHA and line number
+                            current_commit = {
+                                "sha": sha[:8],
+                                "full_sha": sha,
+                                "line_number": int(parts[2]),
+                            }
                 # Author name
                 elif line.startswith("author "):
                     current_commit["author"] = line[7:]
@@ -396,11 +412,24 @@ class GitHelper:
                         current_commit["date"] = datetime.fromtimestamp(timestamp).isoformat()
                     except (ValueError, OSError):
                         current_commit["date"] = line[12:]
+                    # Cache this commit's metadata and validate (after we have all fields)
+                    if "author" in current_commit and "author_email" in current_commit:
+                        commit_cache[current_commit["full_sha"]] = {
+                            "sha": current_commit["sha"],
+                            "full_sha": current_commit["full_sha"],
+                            "author": current_commit["author"],
+                            "author_email": current_commit["author_email"],
+                            "date": current_commit["date"],
+                        }
+                        # Mark as valid to avoid per-line validation in hot loop
+                        valid_commits.add(current_commit["full_sha"])
                 # Actual code line (starts with tab)
                 elif line.startswith("\t"):
                     code_line = line[1:]  # Remove leading tab
-                    line_info = {**current_commit, "content": code_line}
-                    lines_data.append(line_info)
+                    # Use pre-validated commit check (optimized - no field iteration per line)
+                    if current_commit.get("full_sha") in valid_commits:
+                        line_info = {**current_commit, "content": code_line}
+                        lines_data.append(line_info)
 
             # Group consecutive lines by same author and commit
             if lines_data:
@@ -580,6 +609,104 @@ class GitHelper:
 
         return results
 
+    def get_file_history_filtered(
+        self,
+        file_path: str,
+        max_commits: int = 10,
+        since_date: datetime | None = None,
+        until_date: datetime | None = None,
+        author: str | None = None,
+        min_changes: int = 0,
+    ) -> list[dict]:
+        """
+        Get commit history for a file with advanced filtering options.
+
+        Args:
+            file_path: Relative path to file from repo root
+            max_commits: Maximum number of commits to return
+            since_date: Only include commits after this date
+            until_date: Only include commits before this date
+            author: Filter by author name (substring match, case-insensitive)
+            min_changes: Minimum number of lines changed (insertions + deletions)
+
+        Returns:
+            List of commit information dictionaries with keys:
+            - sha: Short commit SHA (8 chars)
+            - full_sha: Full commit SHA
+            - author: Author name
+            - author_email: Author email
+            - date: Commit date in ISO format
+            - message: Full commit message
+            - summary: First line of commit message
+            - insertions: Number of lines inserted (if min_changes > 0)
+            - deletions: Number of lines deleted (if min_changes > 0)
+        """
+        commits = []
+        author_lower = author.lower() if author else None
+
+        try:
+            # Get commits that touched this file
+            for commit in self.repo.iter_commits(paths=file_path):
+                # Apply date filters
+                commit_date = commit.committed_datetime.replace(tzinfo=None)
+                if since_date and commit_date < since_date:
+                    continue
+                if until_date and commit_date > until_date:
+                    continue
+
+                # Apply author filter
+                if author_lower and author_lower not in str(commit.author).lower():
+                    continue
+
+                # Apply min_changes filter if specified
+                if min_changes > 0:
+                    try:
+                        # Get stats for this specific file in this commit
+                        file_stats = commit.stats.files.get(file_path, {})
+                        insertions = int(file_stats.get("insertions", 0)) if file_stats else 0  # type: ignore
+                        deletions = int(file_stats.get("deletions", 0)) if file_stats else 0  # type: ignore
+                        total_changes = insertions + deletions
+
+                        if total_changes < min_changes:
+                            continue
+                    except Exception:
+                        # If we can't get stats, skip the filter
+                        pass
+
+                # Build commit info
+                commit_info: dict[str, Any] = {
+                    "sha": commit.hexsha[:8],
+                    "full_sha": commit.hexsha,
+                    "author": str(commit.author),
+                    "author_email": commit.author.email,
+                    "date": commit.committed_datetime.isoformat(),
+                    "message": commit.message.strip(),
+                    "summary": commit.summary,
+                }
+
+                # Add change stats if min_changes was specified
+                if min_changes > 0:
+                    try:
+                        file_stats = commit.stats.files.get(file_path, {})
+                        # Type: ignore - file_stats is dict with string keys, values can be int
+                        insertions = int(file_stats.get("insertions", 0)) if file_stats else 0  # type: ignore
+                        deletions = int(file_stats.get("deletions", 0)) if file_stats else 0  # type: ignore
+                        commit_info["insertions"] = insertions
+                        commit_info["deletions"] = deletions
+                    except Exception:
+                        commit_info["insertions"] = 0
+                        commit_info["deletions"] = 0
+
+                commits.append(commit_info)
+
+                if len(commits) >= max_commits:
+                    break
+
+        except Exception as e:
+            print(f"Error getting filtered history for {file_path}: {e}")
+
+        return commits
+
 
 def main():
     """Test git helper functions"""