path-sync 0.7.6__tar.gz → 0.7.8__tar.gz

{path_sync-0.7.6 → path_sync-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: path-sync
-Version: 0.7.6
+Version: 0.7.8
 Summary: Sync files from a source repo to multiple destination repos
 Author-email: EspenAlbert <espen.albert1@gmail.com>
 License-Expression: MIT
@@ -98,8 +98,10 @@ By default, prompts before each git operation. See [Usage Scenarios](#usage-scen
 uvx path-sync validate-no-changes -b main
 ```
 
+In CI, when the workflow runs on `pull_request`, the comparison branch is the PR base. On `push` or locally, pass `-b` with the branch to compare against (e.g. `-b SDLC` for a branch based on SDLC).
+
 Options:
-- `-b, --branch` - Default branch to compare against (default: main)
+- `-b, --branch` - Branch to compare against (default: main). When `GITHUB_BASE_REF` is set (e.g. in GitHub Actions), it overrides the default so CI can use the PR base without passing `-b`. If you set `GITHUB_BASE_REF`, use a non-empty branch name.
 - `--skip-sections` - Comma-separated `path:section_id` pairs to skip (e.g., `justfile:coverage`)
 
 ## Usage Scenarios
@@ -376,7 +378,10 @@ jobs:
         with:
           fetch-depth: 0
       - uses: astral-sh/setup-uv@v5
-      - run: uvx path-sync validate-no-changes -b main
+      - name: Validate no changes to synced files
+        env:
+          GITHUB_BASE_REF: ${{ github.base_ref || 'main' }}
+        run: uvx path-sync validate-no-changes
 ```
 
 **Validation skips automatically when:**

{path_sync-0.7.6 → path_sync-0.7.8}/README.md

@@ -80,8 +80,10 @@ By default, prompts before each git operation. See [Usage Scenarios](#usage-scen
 uvx path-sync validate-no-changes -b main
 ```
 
+In CI, when the workflow runs on `pull_request`, the comparison branch is the PR base. On `push` or locally, pass `-b` with the branch to compare against (e.g. `-b SDLC` for a branch based on SDLC).
+
 Options:
-- `-b, --branch` - Default branch to compare against (default: main)
+- `-b, --branch` - Branch to compare against (default: main). When `GITHUB_BASE_REF` is set (e.g. in GitHub Actions), it overrides the default so CI can use the PR base without passing `-b`. If you set `GITHUB_BASE_REF`, use a non-empty branch name.
 - `--skip-sections` - Comma-separated `path:section_id` pairs to skip (e.g., `justfile:coverage`)
 
 ## Usage Scenarios
@@ -358,7 +360,10 @@ jobs:
         with:
           fetch-depth: 0
       - uses: astral-sh/setup-uv@v5
-      - run: uvx path-sync validate-no-changes -b main
+      - name: Validate no changes to synced files
+        env:
+          GITHUB_BASE_REF: ${{ github.base_ref || 'main' }}
+        run: uvx path-sync validate-no-changes
 ```
 
 **Validation skips automatically when:**

{path_sync-0.7.6 → path_sync-0.7.8}/path_sync/__init__.py

@@ -5,7 +5,7 @@ from path_sync import dep_update
 from path_sync import validate_no_changes
 from path_sync import config
 
-VERSION = "0.7.6"
+VERSION = "0.7.8"
 __all__ = [
     "copy",
     "dep_update",

{path_sync-0.7.6 → path_sync-0.7.8}/path_sync/_internal/auto_merge.py

@@ -38,6 +38,8 @@ COMPLETED_CHECK_STATES: frozenset[str] = frozenset(FAILED_CHECK_STATES | {"SUCCE
 class CheckRun(BaseModel):
     name: str
     state: str
+    workflow: str = ""
+    link: str = ""
 
     @property
     def failed(self) -> bool:
@@ -83,7 +85,7 @@ def enable_auto_merge(repo_path: Path, pr_ref: str, config: AutoMergeConfig, des
 
 
 def get_pr_checks(repo_path: Path, pr_ref: str) -> list[CheckRun]:
-    cmd = ["gh", "pr", "checks", pr_ref, "--json", "name,state"]
+    cmd = ["gh", "pr", "checks", pr_ref, "--json", "name,state,workflow,link"]
     result = subprocess.run(cmd, cwd=repo_path, capture_output=True, text=True)
     if result.returncode != 0:
         logger.warning(f"Failed to get checks for {pr_ref}: {result.stderr.strip()}")

{path_sync-0.7.6 → path_sync-0.7.8}/path_sync/_internal/cmd_copy.py

@@ -607,8 +607,10 @@ def _push_and_pr(
     if not prompt_utils.prompt_confirm(f"Push {dest.name} to origin?", opts.no_prompt):
         return None
 
-    git_ops.push_branch(repo, copy_branch, force=True)
-    typer.echo(f"  Pushed: {copy_branch} (force)", err=True)
+    if git_ops.push_branch(repo, copy_branch, force=True):
+        typer.echo(f"  Pushed: {copy_branch} (force)", err=True)
+    else:
+        typer.echo(f"  Skipped push for {copy_branch}: content unchanged on remote", err=True)
 
     if opts.no_pr or not prompt_utils.prompt_confirm(f"Create PR for {dest.name}?", opts.no_prompt):
         return None

{path_sync-0.7.6 → path_sync-0.7.8}/path_sync/_internal/cmd_dep_update.py

@@ -201,9 +201,12 @@ def _create_prs(config: DepConfig, results: list[RepoResult], opts: DepUpdateOpt
             continue
 
         repo = git_ops.get_repo(result.repo_path)
-        git_ops.push_branch(repo, config.pr.branch, force=True)
-
         body = _build_pr_body(result.log_content, result.failures)
+
+        if not git_ops.push_branch(repo, config.pr.branch, force=True):
+            git_ops.update_pr_body(result.repo_path, config.pr.branch, body)
+            continue
+
         pr_url = git_ops.create_or_update_pr(
             result.repo_path,
             config.pr.branch,

{path_sync-0.7.6 → path_sync-0.7.8}/path_sync/_internal/cmd_validate.py

@@ -15,7 +15,13 @@ logger = logging.getLogger(__name__)
 
 @app.command("validate-no-changes")
 def validate_no_changes(
-    branch: str = typer.Option("main", "-b", "--branch", help="Default branch to compare against"),
+    branch: str = typer.Option(
+        "main",
+        "-b",
+        "--branch",
+        help="Branch to compare against (default: main; uses GITHUB_BASE_REF when set and -b not passed)",
+        envvar="GITHUB_BASE_REF",
+    ),
     skip_sections_opt: str = typer.Option(
         "",
         "--skip-sections",
@@ -36,9 +42,10 @@ def validate_no_changes(
         logger.info(f"On sync branch {current_branch}, validation skipped")
         return
     if current_branch == branch:
-        logger.info(f"On default branch {branch}, validation skipped")
+        logger.info(f"On base branch {branch}, validation skipped")
         return
 
+    logger.info(f"Validating changes against branch {branch}")
     skip_sections = parse_skip_sections(skip_sections_opt) if skip_sections_opt else None
     unauthorized = validate_no_unauthorized_changes(repo_root, branch, skip_sections)
 

{path_sync-0.7.6 → path_sync-0.7.8}/path_sync/_internal/git_ops.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import os
+import re
 import subprocess
 from contextlib import suppress
 from pathlib import Path
@@ -10,6 +11,20 @@ from git import GitCommandError, InvalidGitRepositoryError, NoSuchPathError, Rep
 
 logger = logging.getLogger(__name__)
 
+GH_PR_BODY_MAX_CHARS = 64536  # real limit is 65536, but we leave some buffer
+_TRUNCATION_NOTICE = "\n\n... (truncated, output too long for PR body)"
+_CODE_FENCE_RE = re.compile(r"^`{3,}", re.MULTILINE)
+
+
+def _truncate_body(body: str) -> str:
+    if len(body) <= GH_PR_BODY_MAX_CHARS:
+        return body
+    cut = GH_PR_BODY_MAX_CHARS - len(_TRUNCATION_NOTICE)
+    truncated = body[:cut]
+    fence_count = len(_CODE_FENCE_RE.findall(truncated))
+    suffix = "\n```" + _TRUNCATION_NOTICE if fence_count % 2 else _TRUNCATION_NOTICE
+    return truncated[: GH_PR_BODY_MAX_CHARS - len(suffix)] + suffix
+
 
 def _auth_url(url: str) -> str:
     """Inject GH_TOKEN into HTTPS URL for authentication."""
@@ -145,10 +160,24 @@ def _ensure_git_user(repo: Repo) -> None:
         repo.config_writer().set_value("user", "email", "path-sync[bot]@users.noreply.github.com").release()
 
 
-def push_branch(repo: Repo, branch: str, force: bool = True) -> None:
+def remote_branch_has_same_content(repo: Repo, branch: str) -> bool:
+    """Check if origin/{branch} has identical file content (tree) as local {branch}."""
+    with suppress(GitCommandError):
+        local_tree = repo.git.rev_parse(f"{branch}^{{tree}}")
+        remote_tree = repo.git.rev_parse(f"origin/{branch}^{{tree}}")
+        return local_tree == remote_tree
+    return False
+
+
+def push_branch(repo: Repo, branch: str, force: bool = True) -> bool:
+    """Push branch to origin. Returns False if skipped (content unchanged on remote)."""
+    if force and remote_branch_has_same_content(repo, branch):
+        logger.info(f"Skipping push for {branch}: content unchanged on remote")
+        return False
     logger.info(f"Pushing {branch}" + (" (force)" if force else ""))
     args = ["--force", "-u", "origin", branch] if force else ["-u", "origin", branch]
     repo.git.push(*args)
+    return True
 
 
 def _get_repo_full_name(repo_path: Path) -> str | None:
@@ -189,6 +218,7 @@ def update_pr_body(repo_path: Path, branch: str, body: str) -> bool:
     if not pr_number:
         return False
 
+    body = _truncate_body(body)
     cmd = [
         "gh",
         "api",
@@ -243,8 +273,9 @@ def create_or_update_pr(
     reviewers: list[str] | None = None,
     assignees: list[str] | None = None,
 ) -> str:
+    body = _truncate_body(body) if body else ""
     cmd = ["gh", "pr", "create", "--head", branch, "--title", title]
-    cmd.extend(["--body", body or ""])
+    cmd.extend(["--body", body])
     if labels:
         cmd.extend(["--label", ",".join(labels)])
     if reviewers:

{path_sync-0.7.6 → path_sync-0.7.8}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "path-sync"
-version = "0.7.6"
+version = "0.7.8"
 description = "Sync files from a source repo to multiple destination repos"
 requires-python = ">=3.13"
 license = "MIT"
@@ -68,12 +68,13 @@ target-version = "py313"
 # UP046: use type parameters on functions instead of TypeVar
 # UP047: use type parameters instead of `Generic[T]` subclass
 extend-ignore = ["E501", "UP006", "UP007", "UP035", "UP040", "UP046", "UP047"]
-extend-select = ["Q", "RUF100", "C90", "UP", "I", "T"]
+extend-select = ["Q", "RUF100", "C90", "UP", "I", "T", "FURB"]
 # === OK_EDIT: path-sync ruff ===
 
 # === DO_NOT_EDIT: path-sync pytest ===
 [tool.pytest.ini_options]
-addopts = "-s -vv --log-cli-level=INFO"
+addopts = "-s -vv --log-cli-level=INFO -m 'not manual'"
+markers = ["manual: test requires manual env setup (not run in CI)"]
 python_files = ["*_test.py", "test_*.py"]
 asyncio_mode = "auto"
 # === OK_EDIT: path-sync pytest ===
@@ -84,16 +85,34 @@ omit = ["*_test.py"]
 exclude_lines = ["no cov", "if __name__ == .__main__.:"]
 # === OK_EDIT: path-sync coverage ===
 
-# === DO_NOT_EDIT: path-sync dev ===
+# === DO_NOT_EDIT: path-sync vulture ===
+[tool.vulture]
+min_confidence = 80
+ignore_names = ["mock_*", "Mock*", "*_mock"]
+exclude = [".venv/", "*test.py"]
+# === OK_EDIT: path-sync vulture ===
+
+# === DO_NOT_EDIT: path-sync dev-lint ===
 [dependency-groups]
-dev = [
+dev-lint = [
   "pyright>=1.1",
+  "ruff>=0.14",
+  "vulture>=2.14",
+]
+# === OK_EDIT: path-sync dev-lint ===
+
+# === DO_NOT_EDIT: path-sync dev-test ===
+dev-test = [
   "pytest>=9.0",
   "pytest-asyncio>=0.24",
   "pytest-cov>=7.0",
+  "pytest-examples>=0.0.18",
   "pytest-regressions>=2.6",
-  "ruff>=0.14",
 ]
+# === OK_EDIT: path-sync dev-test ===
+
+# === DO_NOT_EDIT: path-sync dev ===
+dev = [{include-group = "dev-lint"}, {include-group = "dev-test"}]
 # === OK_EDIT: path-sync dev ===
 
 # === DO_NOT_EDIT: path-sync docs ===