Refactor for better testing

git_sync_filtered/__main__.py

@@ -2,172 +2,11 @@
 """
 git-sync-filtered - Sync filtered commits from private to public repo
 
-Uses git-filter-repo and GitPython.
-
 Usage:
     git-sync-filtered --private /path/to/private --public /path/to/public --keep src --keep docs
 """
 
-import shutil
-import tempfile
-from itertools import filterfalse
-from pathlib import Path
-
-import click
-import git
-from git_filter_repo import FilteringOptions, RepoFilter
-
-
-def read_paths_from_file(path: Path) -> list[str]:
-    lines = (line.strip() for line in path.read_text().splitlines())
-    return list(filterfalse(lambda line: line.startswith("#") or not line, lines))
-
-
-@click.command()
-@click.option("--private", required=True, help="Private repo path or URL")
-@click.option("--public", required=True, help="Public repo path or URL")
-@click.option("--keep", multiple=True, help="Paths to keep (can specify multiple)")
-@click.option(
-    "--keep-from-file",
-    type=click.Path(exists=True),
-    help="File containing paths to keep (one per line)",
-)
-@click.option("--sync-branch", default="upstream/sync", help="Sync branch name")
-@click.option("--main-branch", default="main", help="Main branch name")
-@click.option("--private-branch", default="main", help="Private branch to sync from")
-@click.option(
-    "--dry-run", is_flag=True, help="Show what would happen without making changes"
-)
-@click.option("--merge", is_flag=True, help="Merge into main branch after sync")
-@click.option("--force", is_flag=True, help="Force push")
-def main(
-    private,
-    public,
-    keep,
-    keep_from_file,
-    sync_branch,
-    main_branch,
-    private_branch,
-    dry_run,
-    merge,
-    force,
-):
-    """Sync filtered commits from private to public repository."""
-
-    # Collect all paths to keep
-    paths_to_keep = list(keep)
-
-    # Add paths from file if specified
-    if keep_from_file:
-        paths_to_keep.extend(read_paths_from_file(Path(keep_from_file)))
-
-    # Remove duplicates while preserving order
-    seen = set()
-    paths_to_keep = [x for x in paths_to_keep if not (x in seen or seen.add(x))]
-
-    if not paths_to_keep:
-        raise click.ClickException(
-            "At least one --keep path or --keep-from-file required"
-        )
-
-    click.echo("=== Git Filter Sync ===")
-    click.echo(f"Private:    {private}")
-    click.echo(f"Public:     {public}")
-    click.echo(f"Keep:       {paths_to_keep}")
-    click.echo(f"Sync to:    {sync_branch}")
-    click.echo()
-
-    # Create temp directory
-    work_dir = Path(tempfile.mkdtemp(prefix="git-sync-"))
-    click.echo(f"[git-sync] Working in: {work_dir}")
-
-    try:
-        # Clone private repo using GitPython
-        private_clone = work_dir / "private"
-        click.echo(f"[git-sync] Cloning private repo to {private_clone}...")
-        private_repo = git.Repo.clone_from(private, str(private_clone))
-
-        # Run filter-repo using the library
-        click.echo("[git-sync] Running git-filter-repo...")
-
-        # Change to the repo directory for filter-repo
-        import os
-
-        old_cwd = os.getcwd()
-        os.chdir(private_clone)
-
-        try:
-            # Build argv for filtering
-            argv = ["--force", "--partial"]
-            for path in paths_to_keep:
-                argv.extend(["--path", path])
-
-            # Parse arguments and run filter
-            filter_args = FilteringOptions.parse_args(argv, error_on_empty=False)
-            repo_filter = RepoFilter(filter_args)
-            repo_filter.run()
-
-        finally:
-            os.chdir(old_cwd)
-
-        # Set up public remote using GitPython
-        click.echo("[git-sync] Setting up public remote...")
-        if "public" not in private_repo.remotes:
-            private_repo.create_remote("public", public)
-        else:
-            private_repo.remote("public").set_url(public)
-
-        # Fetch from public
-        private_repo.remote("public").fetch()
-
-        # Push to sync branch using GitPython
-        if dry_run:
-            click.echo(f"[git-sync] DRY RUN - Would push to {sync_branch}")
-            click.echo()
-            click.echo("Commits that would be pushed:")
-            for commit in private_repo.iter_commits(private_branch):
-                click.echo(f"  {commit.hexsha[:8]} {commit.summary}")
-        else:
-            click.echo("[git-sync] Pushing to sync branch...")
-            refspec = f"refs/heads/{private_branch}:refs/heads/{sync_branch}"
-            private_repo.remote("public").push(refspec=refspec, force=force)
-
-        click.echo()
-        click.echo(f"=== Synced to {sync_branch} ===")
-
-        if merge and not dry_run:
-            click.echo(f"[git-sync] Merging into {main_branch}...")
-
-            # Checkout main
-            private_repo.heads[main_branch].checkout()
-
-            try:
-                # Merge sync branch into main
-                sync_head = private_repo.heads[sync_branch]
-                private_repo.index.merge_commit(
-                    sync_head, msg=f"Merge branch '{sync_branch}'"
-                )
-
-                # Push merged result
-                private_repo.remote("public").push(
-                    refspec=f"refs/heads/{main_branch}:refs/heads/{main_branch}"
-                )
-                click.echo(f"[git-sync] Merged and pushed to {main_branch}")
-            except git.GitCommandError:
-                click.echo("[git-sync] Merge conflict! Please resolve manually:")
-                click.echo(f"  cd {private_clone}")
-                click.echo(f"  git checkout {main_branch}")
-                click.echo(f"  git merge {sync_branch}")
-                click.echo("  # Fix conflicts")
-                click.echo(f"  git push public {main_branch}")
-
-        click.echo()
-        click.echo("Done!")
-
-    finally:
-        # Cleanup
-        shutil.rmtree(work_dir, ignore_errors=True)
-
+from git_sync_filtered.cli import main
 
 if __name__ == "__main__":
     main()

git_sync_filtered/cli.py

@@ -0,0 +1,77 @@
+import click
+
+from git_sync_filtered.sync import sync
+
+
+@click.command()
+@click.option("--private", required=True, help="Private repo path or URL")
+@click.option("--public", required=True, help="Public repo path or URL")
+@click.option("--keep", multiple=True, help="Paths to keep (can specify multiple)")
+@click.option(
+    "--keep-from-file",
+    type=click.Path(exists=True),
+    help="File containing paths to keep (one per line)",
+)
+@click.option("--sync-branch", default="upstream/sync", help="Sync branch name")
+@click.option("--main-branch", default="main", help="Main branch name")
+@click.option("--private-branch", default="main", help="Private branch to sync from")
+@click.option(
+    "--dry-run", is_flag=True, help="Show what would happen without making changes"
+)
+@click.option("--merge", is_flag=True, help="Merge into main branch after sync")
+@click.option("--force", is_flag=True, help="Force push")
+def main(
+    private,
+    public,
+    keep,
+    keep_from_file,
+    sync_branch,
+    main_branch,
+    private_branch,
+    dry_run,
+    merge,
+    force,
+):
+    """Sync filtered commits from private to public repository."""
+
+    try:
+        result = sync(
+            private=private,
+            public=public,
+            keep=keep,
+            keep_from_file=keep_from_file,
+            sync_branch=sync_branch,
+            main_branch=main_branch,
+            private_branch=private_branch,
+            dry_run=dry_run,
+            merge=merge,
+            force=force,
+        )
+    except ValueError as e:
+        raise click.ClickException(str(e))
+
+    click.echo("=== Git Filter Sync ===")
+    click.echo(f"Private:    {private}")
+    click.echo(f"Public:     {public}")
+    click.echo(f"Keep:       {result['paths_to_keep']}")
+    click.echo(f"Sync to:    {sync_branch}")
+    click.echo()
+
+    if dry_run:
+        click.echo(f"[git-sync] DRY RUN - Would push to {sync_branch}")
+        click.echo()
+        click.echo("Commits that would be pushed:")
+        for commit in result["dry_run_commits"]:
+            click.echo(commit)
+    else:
+        click.echo()
+        click.echo(f"=== Synced to {sync_branch} ===")
+
+    if merge and not dry_run:
+        if result["merge_success"]:
+            click.echo(f"[git-sync] Merged and pushed to {main_branch}")
+        else:
+            click.echo("[git-sync] Merge conflict! Please resolve manually:")
+
+    click.echo()
+    click.echo("Done!")

git_sync_filtered/sync.py

@@ -0,0 +1,128 @@
+import os
+from itertools import filterfalse
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from typing import Optional
+
+import git
+from git_filter_repo import FilteringOptions, RepoFilter
+
+
+def read_paths_from_file(path: Path) -> list[str]:
+    lines = (line.strip() for line in path.read_text().splitlines())
+    return list(filterfalse(lambda line: line.startswith("#") or not line, lines))
+
+
+def collect_paths_to_keep(
+    keep: tuple[str, ...], keep_from_file: Optional[str]
+) -> list[str]:
+    paths_to_keep = set(keep)
+
+    if keep_from_file:
+        paths_to_keep.update(read_paths_from_file(Path(keep_from_file)))
+
+    return sorted(list(paths_to_keep))
+
+
+def run_filter_repo(repo_path: str, paths_to_keep: list[str]) -> None:
+    old_cwd = os.getcwd()
+    os.chdir(repo_path)
+
+    try:
+        argv = ["--force", "--partial"]
+        for path in paths_to_keep:
+            argv.extend(["--path", path])
+
+        filter_args = FilteringOptions.parse_args(argv, error_on_empty=False)
+        repo_filter = RepoFilter(filter_args)
+        repo_filter.run()
+    finally:
+        os.chdir(old_cwd)
+
+
+def push_to_remote(
+    repo: git.Repo,
+    public_url: str,
+    sync_branch: str,
+    private_branch: str,
+    force: bool = False,
+    dry_run: bool = False,
+) -> list[str]:
+    if "public" not in repo.remotes:
+        repo.create_remote("public", public_url)
+    else:
+        repo.remote("public").set_url(public_url)
+
+    repo.remote("public").fetch()
+
+    if dry_run:
+        commits = []
+        for commit in repo.iter_commits(private_branch):
+            commits.append(f"  {commit.hexsha[:8]} {commit.summary}")
+        return commits
+    else:
+        refspec = f"refs/heads/{private_branch}:refs/heads/{sync_branch}"
+        repo.remote("public").push(refspec=refspec, force=force)
+        return []
+
+
+def merge_into_main(
+    repo: git.Repo,
+    main_branch: str,
+    sync_branch: str,
+) -> bool:
+    repo.heads[main_branch].checkout()
+
+    try:
+        sync_head = repo.heads[sync_branch]
+        repo.index.merge_commit(sync_head, msg=f"Merge branch '{sync_branch}'")
+
+        repo.remote("public").push(
+            refspec=f"refs/heads/{main_branch}:refs/heads/{main_branch}"
+        )
+        return True
+    except git.GitCommandError:
+        return False
+
+
+def sync(
+    private: str,
+    public: str,
+    keep: tuple[str, ...],
+    keep_from_file: Optional[str],
+    sync_branch: str,
+    main_branch: str,
+    private_branch: str,
+    dry_run: bool,
+    merge: bool,
+    force: bool,
+):
+    paths_to_keep = collect_paths_to_keep(keep, keep_from_file)
+
+    if not paths_to_keep:
+        raise ValueError("At least one --keep path or --keep-from-file required")
+
+    with TemporaryDirectory(prefix="git-sync-") as work_dir:
+        work_dir_path = Path(work_dir)
+        private_clone = work_dir_path / "private"
+        private_repo = git.Repo.clone_from(private, str(private_clone))
+
+        run_filter_repo(str(private_clone), paths_to_keep)
+
+        dry_run_commits = push_to_remote(
+            private_repo, public, sync_branch, private_branch, force, dry_run
+        )
+
+        if merge and not dry_run:
+            success = merge_into_main(private_repo, main_branch, sync_branch)
+            return {
+                "paths_to_keep": paths_to_keep,
+                "dry_run_commits": dry_run_commits,
+                "merge_success": success,
+            }
+
+        return {
+            "paths_to_keep": paths_to_keep,
+            "dry_run_commits": dry_run_commits,
+            "merge_success": None,
+        }