feat: allow for a divergence between the git repo root and the uv workspace root

Author: frenata

bough/analyzer.py

@@ -39,10 +39,12 @@ class BoughAnalyzer:
 
     def __init__(
         self,
+        repo_root: Path,
         workspace_root: Path,
         config: "BoughConfig",
         packages: dict[str, Package] | None = None,
     ) -> None:
+        self.repo_root = repo_root
         self.workspace_root = workspace_root
         logger.debug(f"Initializing analyzer for workspace: {workspace_root}")
         self.config = config
@@ -54,10 +56,12 @@ def __init__(
         logger.debug(f"Discovered {len(self.packages)} packages")
 
     @classmethod
-    def from_workspace(cls, workspace_root: Path, config_path: Path) -> "BoughAnalyzer":
+    def from_workspace(
+        cls, repo_root: Path, workspace_root: Path, config_path: Path
+    ) -> "BoughAnalyzer":
         """Create analyzer by discovering packages from workspace."""
         config = load_config(config_path)
-        return cls(workspace_root, config)
+        return cls(repo_root, workspace_root, config)
 
     def _discover_packages(self) -> None:
         root_pyproject = self.workspace_root / "pyproject.toml"
@@ -159,8 +163,9 @@ def _find_direct_packages(
         changed_files: set[str],
     ) -> set[str]:
         directly_affected = set()
+        strip_prefix = self.workspace_root.relative_to(self.repo_root)
         for file_path in changed_files:
-            file_path_obj = Path(file_path)
+            file_path_obj = Path(file_path).relative_to(strip_prefix)
 
             if self._matches_patterns(file_path, self.config.ignore):
                 logger.debug(f"Ignoring file {file_path} (matches ignore patterns)")
@@ -210,7 +215,7 @@ def find_affected(
         """Return the affected packages and files."""
         logger.debug(f"Analyzing changes from {base_commit} to HEAD")
 
-        files = find_changed_files(self.workspace_root, base_commit)
+        files = find_changed_files(self.repo_root, base_commit)
         all_affected = self._find_transitive_packages(self._find_direct_packages(files))
 
         if selection != "buildable":

bough/cli.py

@@ -23,6 +23,12 @@ def main() -> None:
         default=Path.cwd(),
         help="Path to workspace root (default: current directory)",
     )
+    default_parser.add_argument(
+        "--repo",
+        type=Path,
+        default=Path.cwd(),
+        help="Path to git repository root (default: current directory)",
+    )
     default_parser.add_argument(
         "--verbose",
         "-v",
@@ -74,7 +80,7 @@ def main() -> None:
     config_path = args.config or args.workspace / ".bough.yaml"
 
     try:
-        analyzer = BoughAnalyzer.from_workspace(args.workspace, config_path)
+        analyzer = BoughAnalyzer.from_workspace(args.repo, args.workspace, config_path)
 
         if args.command == "graph":
             output = fmt.dependency_graph(analyzer)