Ensure diff mode works

Author: jlowin

src/copychat/cli.py

@@ -5,7 +5,7 @@
 import pyperclip
 from enum import Enum
 
-from .core import scan_directory, DiffMode
+from .core import scan_directory, DiffMode, get_file_content
 from .format import (
     estimate_tokens,
     format_files as format_files_xml,
@@ -38,6 +38,8 @@ def parse_source(source: str) -> tuple[SourceType, str]:
 def diff_mode_callback(value: str) -> DiffMode:
     """Convert string value to DiffMode enum."""
     try:
+        if isinstance(value, DiffMode):
+            return value
         return DiffMode(value)
     except ValueError:
         valid_values = [mode.value for mode in DiffMode]
@@ -94,8 +96,8 @@ def main(
         "-x",
         help="Glob patterns to exclude",
     ),
-    diff_mode: DiffMode = typer.Option(
-        DiffMode.FULL.value,
+    diff_mode: str = typer.Option(
+        "full",  # Pass the string value instead of enum
         "--diff-mode",
         "-d",
         help="How to handle git diffs",
@@ -127,7 +129,8 @@ def main(
 
         # Handle file vs directory source
         if source_dir.is_file():
-            all_files = {source_dir: None}  # Use None as placeholder for git info
+            content = get_file_content(source_dir, diff_mode)
+            all_files = {source_dir: content} if content is not None else {}
         else:
             # For directories, scan all paths
             if not paths:
@@ -138,11 +141,13 @@ def main(
             for path in paths:
                 target = source_dir / path if source_dir != Path(".") else Path(path)
                 if target.is_file():
-                    all_files[target] = None
+                    content = get_file_content(target, diff_mode)
+                    if content is not None:
+                        all_files[target] = content
                 else:
                     files = scan_directory(
                         target,
-                        include=include,
+                        include=include.split(",") if include else None,
                         exclude_patterns=exclude,
                         diff_mode=diff_mode,
                     )
@@ -152,8 +157,10 @@ def main(
             error_console.print("[yellow]No matching files found[/]")
             raise typer.Exit(1)
 
-        # Format files
-        result = format_files_xml(list(all_files.keys()))
+        # Format files - pass both paths and content
+        result = format_files_xml(
+            [(path, content) for path, content in all_files.items()]
+        )
 
         # Handle outputs
         if outfile:

src/copychat/core.py

@@ -54,13 +54,26 @@ def get_gitignore_spec(
 def get_git_diff(path: Path) -> str:
     """Get git diff for the given path."""
     try:
+        # First check if file is tracked by git
         result = subprocess.run(
-            ["git", "diff", str(path)],
+            ["git", "ls-files", "--error-unmatch", str(path)],
             capture_output=True,
             text=True,
-            check=True,
+            check=False,  # Don't raise error for untracked files
         )
-        return result.stdout
+        if result.returncode != 0:
+            return ""  # File is not tracked by git
+
+        # Get the diff for tracked files
+        result = subprocess.run(
+            ["git", "diff", "--exit-code", str(path)],
+            capture_output=True,
+            text=True,
+            check=False,  # Don't raise error for no changes
+        )
+        # exit-code 0 means no changes, 1 means changes present
+        return result.stdout if result.returncode == 1 else ""
+
     except subprocess.CalledProcessError:
         return ""
 
@@ -70,32 +83,36 @@ def get_file_content(path: Path, diff_mode: DiffMode) -> Optional[str]:
     if not path.is_file():
         return None
 
-    if diff_mode == DiffMode.FULL:
-        return path.read_text()
-
+    # Get content and diff
+    content = path.read_text()
     diff = get_git_diff(path)
-    if not diff and diff_mode in (DiffMode.CHANGED_WITH_DIFF, DiffMode.DIFF_ONLY):
-        return None
 
-    if diff_mode == DiffMode.DIFF_ONLY:
-        return diff
-
-    content = path.read_text()
-    return f"{content}\n\n# Git Diff:\n{diff}" if diff else content
+    # Handle different modes
+    if diff_mode == DiffMode.FULL:
+        return content
+    elif diff_mode == DiffMode.FULL_WITH_DIFF:
+        return f"{content}\n\n# Git Diff:\n{diff}" if diff else content
+    elif diff_mode == DiffMode.CHANGED_WITH_DIFF:
+        return f"{content}\n\n# Git Diff:\n{diff}" if diff else None
+    elif diff_mode == DiffMode.DIFF_ONLY:
+        return diff if diff else None
+    else:
+        return None  # Shouldn't reach here, but makes mypy happy
 
 
 def scan_directory(
     path: Path,
     include: Optional[list[str]] = None,
     exclude_patterns: Optional[list[str]] = None,
     diff_mode: DiffMode = DiffMode.FULL,
-) -> dict[Path, Optional[str]]:
+) -> dict[Path, str]:
     """Scan directory for files to process."""
     if path.is_file():
         # For single files, just check if it matches filters
         if include and path.suffix.lstrip(".") not in include:
             return {}
-        return {path: None}
+        content = get_file_content(path, diff_mode)
+        return {path: content} if content is not None else {}
 
     # Convert to absolute path first
     abs_path = path.absolute()
@@ -131,6 +148,7 @@ def scan_directory(
         if ext not in include_set:
             continue
 
+        # Get content based on diff mode
         content = get_file_content(file_path, diff_mode)
         if content is not None:
             result[file_path] = content

src/copychat/format.py

@@ -46,12 +46,13 @@ def guess_language(file_path: Path) -> Optional[str]:
     return language_map.get(ext)
 
 
-def format_file(
-    file_path: Path, root_path: Path, add_line_numbers: bool = False
-) -> str:
-    """Format a single file as XML-style markdown with line numbers."""
+def format_file(file_path: Path, root_path: Path, content: Optional[str] = None) -> str:
+    """Format a single file as XML-style markdown."""
     try:
-        content = file_path.read_text()
+        # Use provided content or read from file
+        if content is None:
+            content = file_path.read_text()
+
         # Use string paths for comparison to handle symlinks and different path formats
         file_str = str(file_path.absolute())
         root_str = str(root_path)
@@ -67,13 +68,6 @@ def format_file(
 
         attrs_str = " ".join(tag_attrs)
 
-        # Add line numbers to content
-        if add_line_numbers:
-            numbered_lines = []
-            for i, line in enumerate(content.splitlines(), 1):
-                numbered_lines.append(f"{i}| {line}")
-            content = "\n".join(numbered_lines)
-
         return f"""<file {attrs_str}>
 {content}
 </file>"""
@@ -110,21 +104,26 @@ def estimate_tokens(text: str) -> int:
         return len(text) // 4  # Rough estimate: ~4 chars per token
 
 
-def format_files(files: list[Path]) -> str:
-    """Format files into markdown with XML-style tags."""
+def format_files(files: list[tuple[Path, str]]) -> str:
+    """Format files into markdown with XML-style tags.
+
+    Args:
+        files: List of (path, content) tuples to format
+    """
     if not files:
         return "<!-- No files found matching criteria -->\n"
 
     # Find common root path using os.path.commonpath
-    str_paths = [str(f.absolute()) for f in files]
+    paths = [f[0] for f in files]
+    str_paths = [str(f.absolute()) for f in paths]
     root_path = Path(commonpath(str_paths))
 
     # Create header
-    result = [create_header(files, root_path)]
+    result = [create_header(paths, root_path)]
 
     # Format each file
-    for file_path in files:
-        result.append(format_file(file_path, root_path))
+    for file_path, content in files:
+        result.append(format_file(file_path, root_path, content))
 
     final_result = "\n".join(result)
     char_count = len(final_result)