path-sync 0.7.2__tar.gz → 0.7.4__tar.gz

{path_sync-0.7.2 → path_sync-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: path-sync
-Version: 0.7.2
+Version: 0.7.4
 Summary: Sync files from a source repo to multiple destination repos
 Author-email: EspenAlbert <espen.albert1@gmail.com>
 License-Expression: MIT
@@ -43,6 +43,8 @@ Sync files from a source repo to multiple destination repos.
 - Files with headers are updated on each sync
 - Remove a header to opt-out (file becomes DEST-owned)
 - Orphaned files (removed from SRC) are deleted in DEST
+- Idempotent: PR body is left unchanged when already synced from an equal or newer source commit
+- Stale PRs auto-close when source and destination are already in sync (zero file changes)
 
 ## Installation
 
@@ -225,10 +227,24 @@ destinations:
 | `paths` | Files/globs to sync (see path options below) |
 | `destinations` | Target repos with sync settings |
 | `header_config` | Comment style per extension (has defaults) |
-| `pr_defaults` | PR title, labels, reviewers, assignees |
+| `pr_defaults` | PR title, body template, labels, reviewers, assignees |
 | `wrap_synced_files` | Wrap synced files in section markers (default: `false`) |
+| `keep_pr_on_no_changes` | Keep stale PR open instead of auto-closing when sync produces zero changes (default: `false`) |
+| `force_resync` | Ignore the "PR already synced from newer commit" check, always run the full sync (default: `false`) |
 | `verify` | Verification steps to run after syncing (see [Verify Steps](#verify-steps-in-copy)) |
 
+**`body_template` variables** (available in `pr_defaults.body_template`):
+
+| Variable | Description |
+|----------|-------------|
+| `{src_repo_name}` | Source repo name (derived from remote URL) |
+| `{src_repo_url}` | Source repo URL |
+| `{src_sha}` | Full SHA of the source commit |
+| `{src_sha_short}` | Short SHA (first 8 chars) of the source commit |
+| `{src_commit_ts}` | ISO 8601 timestamp of the source commit |
+| `{sync_log}` | Log of synced file operations |
+| `{dest_name}` | Destination name |
+
 **Path options**:
 
 | Field | Description |
@@ -301,6 +317,18 @@ Comment style is extension-aware:
 
 Remove this header to opt-out of future syncs for that file.
 
+## PR Body Metadata
+
+path-sync embeds a hidden HTML comment in PR bodies to track the source commit:
+
+```html
+<!-- path-sync: sha=abc1234 ts=2026-02-12T10:00:00+00:00 -->
+```
+
+This is primarily useful when syncing from a feature/PR branch instead of `main`. When a scheduled CI job runs against `main`, the source commit timestamp will be older than the PR branch sync. path-sync detects this and skips the PR body overwrite, preserving the newer sync state.
+
+If `copy` or `dep-update` finds zero file changes, any open PR for the sync branch is closed automatically (disable with `keep_pr_on_no_changes: true`). The timestamp check can be bypassed with `force_resync: true` (copy only). Existing PRs without metadata are always overwritten.
+
 ## GitHub Actions
 
 ### Source repo workflow
@@ -440,6 +468,7 @@ pr:
 | `updates` | Commands to run (in order) |
 | `verify.on_fail` | Default failure strategy: `skip`, `fail`, `warn` |
 | `verify.steps` | Verification commands with optional commit/on_fail |
+| `keep_pr_on_no_changes` | Keep stale PR open instead of auto-closing when no changes (default: `false`) |
 | `pr.auto_merge` | Enable GitHub auto-merge after PR creation |
 
 ### CLI Flags

{path_sync-0.7.2 → path_sync-0.7.4}/README.md

@@ -25,6 +25,8 @@ Sync files from a source repo to multiple destination repos.
 - Files with headers are updated on each sync
 - Remove a header to opt-out (file becomes DEST-owned)
 - Orphaned files (removed from SRC) are deleted in DEST
+- Idempotent: PR body is left unchanged when already synced from an equal or newer source commit
+- Stale PRs auto-close when source and destination are already in sync (zero file changes)
 
 ## Installation
 
@@ -207,10 +209,24 @@ destinations:
 | `paths` | Files/globs to sync (see path options below) |
 | `destinations` | Target repos with sync settings |
 | `header_config` | Comment style per extension (has defaults) |
-| `pr_defaults` | PR title, labels, reviewers, assignees |
+| `pr_defaults` | PR title, body template, labels, reviewers, assignees |
 | `wrap_synced_files` | Wrap synced files in section markers (default: `false`) |
+| `keep_pr_on_no_changes` | Keep stale PR open instead of auto-closing when sync produces zero changes (default: `false`) |
+| `force_resync` | Ignore the "PR already synced from newer commit" check, always run the full sync (default: `false`) |
 | `verify` | Verification steps to run after syncing (see [Verify Steps](#verify-steps-in-copy)) |
 
+**`body_template` variables** (available in `pr_defaults.body_template`):
+
+| Variable | Description |
+|----------|-------------|
+| `{src_repo_name}` | Source repo name (derived from remote URL) |
+| `{src_repo_url}` | Source repo URL |
+| `{src_sha}` | Full SHA of the source commit |
+| `{src_sha_short}` | Short SHA (first 8 chars) of the source commit |
+| `{src_commit_ts}` | ISO 8601 timestamp of the source commit |
+| `{sync_log}` | Log of synced file operations |
+| `{dest_name}` | Destination name |
+
 **Path options**:
 
 | Field | Description |
@@ -283,6 +299,18 @@ Comment style is extension-aware:
 
 Remove this header to opt-out of future syncs for that file.
 
+## PR Body Metadata
+
+path-sync embeds a hidden HTML comment in PR bodies to track the source commit:
+
+```html
+<!-- path-sync: sha=abc1234 ts=2026-02-12T10:00:00+00:00 -->
+```
+
+This is primarily useful when syncing from a feature/PR branch instead of `main`. When a scheduled CI job runs against `main`, the source commit timestamp will be older than the PR branch sync. path-sync detects this and skips the PR body overwrite, preserving the newer sync state.
+
+If `copy` or `dep-update` finds zero file changes, any open PR for the sync branch is closed automatically (disable with `keep_pr_on_no_changes: true`). The timestamp check can be bypassed with `force_resync: true` (copy only). Existing PRs without metadata are always overwritten.
+
 ## GitHub Actions
 
 ### Source repo workflow
@@ -422,6 +450,7 @@ pr:
 | `updates` | Commands to run (in order) |
 | `verify.on_fail` | Default failure strategy: `skip`, `fail`, `warn` |
 | `verify.steps` | Verification commands with optional commit/on_fail |
+| `keep_pr_on_no_changes` | Keep stale PR open instead of auto-closing when no changes (default: `false`) |
 | `pr.auto_merge` | Enable GitHub auto-merge after PR creation |
 
 ### CLI Flags

{path_sync-0.7.2 → path_sync-0.7.4}/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.2"
+VERSION = "0.7.4"
 __all__ = [
     "copy",
     "dep_update",

{path_sync-0.7.2 → path_sync-0.7.4}/path_sync/_internal/cmd_copy.py

@@ -20,6 +20,7 @@ from path_sync._internal.models import (
     SrcConfig,
     SyncMode,
     find_repo_root,
+    pr_already_synced,
     resolve_config_path,
 )
 from path_sync._internal.typer_app import app
@@ -194,6 +195,7 @@ def copy(
 def _run_copy(config: SrcConfig, src_root: Path, dest_filter: str, opts: CopyOptions) -> int:
     src_repo = git_ops.get_repo(src_root)
     current_sha = git_ops.get_current_sha(src_repo)
+    commit_ts = git_ops.get_commit_timestamp(src_repo)
     src_repo_url = git_ops.get_remote_url(src_repo, config.git_remote)
 
     destinations = config.destinations
@@ -205,7 +207,9 @@ def _run_copy(config: SrcConfig, src_root: Path, dest_filter: str, opts: CopyOpt
     pr_refs: list[PRRef] = []
     for dest in destinations:
         with capture_log(dest.name) as read_log:
-            changes, pr_ref = _sync_destination(config, dest, src_root, current_sha, src_repo_url, opts, read_log)
+            changes, pr_ref = _sync_destination(
+                config, dest, src_root, current_sha, commit_ts, src_repo_url, opts, read_log
+            )
         total_changes += changes
         if pr_ref:
             pr_refs.append(pr_ref)
@@ -216,11 +220,33 @@ def _run_copy(config: SrcConfig, src_root: Path, dest_filter: str, opts: CopyOpt
     return total_changes
 
 
+def _close_stale_pr(dest_root: Path, copy_branch: str, opts: CopyOptions, config: SrcConfig) -> None:
+    if opts.dry_run or opts.skip_commit or opts.no_pr or config.keep_pr_on_no_changes:
+        return
+    if git_ops.has_open_pr(dest_root, copy_branch):
+        git_ops.close_pr(dest_root, copy_branch, "Closing: source and destination are in sync, no changes needed")
+
+
+def _skip_already_synced(
+    dest_name: str, dest_root: Path, copy_branch: str, commit_ts: str, opts: CopyOptions, config: SrcConfig
+) -> bool:
+    if opts.skip_commit or opts.dry_run or opts.no_pr or config.force_resync:
+        return False
+    existing_body = git_ops.get_pr_body(dest_root, copy_branch)
+    if metadata := pr_already_synced(existing_body, commit_ts):
+        logger.info(
+            f"{dest_name}: open PR already synced from {metadata.sha[:8]} ({metadata.ts} >= {commit_ts}), skipping"
+        )
+        return True
+    return False
+
+
 def _sync_destination(
     config: SrcConfig,
     dest: Destination,
     src_root: Path,
     current_sha: str,
+    commit_ts: str,
     src_repo_url: str,
     opts: CopyOptions,
     read_log: Callable[[], str],
@@ -233,6 +259,9 @@ def _sync_destination(
     dest_repo = _ensure_dest_repo(dest, dest_root, opts.dry_run)
     copy_branch = dest.resolved_copy_branch(config.name)
 
+    if _skip_already_synced(dest.name, dest_root, copy_branch, commit_ts, opts, config):
+        return 0, None
+
     if not opts.no_checkout and prompt_utils.prompt_confirm(f"Switch {dest.name} to {copy_branch}?", opts.no_prompt):
         git_ops.prepare_copy_branch(
             repo=dest_repo,
@@ -245,6 +274,7 @@ def _sync_destination(
 
     if result.total == 0:
         logger.info(f"{dest.name}: No changes")
+        _close_stale_pr(dest_root, copy_branch, opts, config)
         return 0, None
 
     should_skip_commit = opts.skip_commit or opts.dry_run
@@ -268,7 +298,9 @@ def _sync_destination(
             logger.warning(f"{dest.name}: Verification skipped due to failure")
             return result.total, None
 
-    pr_ref = _push_and_pr(config, dest_repo, dest_root, dest, current_sha, src_repo_url, opts, read_log, verify_result)
+    pr_ref = _push_and_pr(
+        config, dest_repo, dest_root, dest, current_sha, commit_ts, src_repo_url, opts, read_log, verify_result
+    )
     return result.total, pr_ref
 
 
@@ -552,6 +584,7 @@ def _push_and_pr(
     dest_root: Path,
     dest: Destination,
     sha: str,
+    commit_ts: str,
     src_repo_url: str,
     opts: CopyOptions,
     read_log: Callable[[], str],
@@ -585,6 +618,7 @@ def _push_and_pr(
         src_sha=sha,
         sync_log=sync_log,
         dest_name=dest.name,
+        src_commit_ts=commit_ts,
     )
 
     if verify_result.failures:

{path_sync-0.7.2 → path_sync-0.7.4}/path_sync/_internal/cmd_dep_update.py

@@ -119,8 +119,16 @@ def _update_and_validate(
             logger.error(f"{dest.name}: Verification failed, stopping")
             raise typer.Exit(1)
 
-        if result.status != Status.NO_CHANGES:
-            results.append(result)
+        if result.status == Status.NO_CHANGES:
+            if (
+                not opts.dry_run
+                and not config.keep_pr_on_no_changes
+                and git_ops.has_open_pr(result.repo_path, config.pr.branch)
+            ):
+                git_ops.close_pr(result.repo_path, config.pr.branch, "Closing: no dependency changes needed")
+            continue
+
+        results.append(result)
 
     return results
 

{path_sync-0.7.2 → path_sync-0.7.4}/path_sync/_internal/git_ops.py

@@ -97,6 +97,10 @@ def get_current_sha(repo: Repo) -> str:
     return repo.head.commit.hexsha
 
 
+def get_commit_timestamp(repo: Repo) -> str:
+    return repo.head.commit.committed_datetime.isoformat()
+
+
 def get_remote_url(repo: Repo, remote_name: str = "origin") -> str:
     try:
         return repo.remote(remote_name).url
@@ -202,6 +206,33 @@ def update_pr_body(repo_path: Path, branch: str, body: str) -> bool:
     return True
 
 
+def get_pr_body(repo_path: Path, branch: str) -> str | None:
+    cmd = ["gh", "pr", "view", branch, "--json", "body,state", "-q", 'select(.state == "OPEN") | .body']
+    result = subprocess.run(cmd, cwd=repo_path, capture_output=True, text=True)
+    if result.returncode != 0:
+        return None
+    body = result.stdout.strip()
+    return body or None
+
+
+def has_open_pr(repo_path: Path, branch: str) -> bool:
+    cmd = ["gh", "pr", "view", branch, "--json", "state", "-q", ".state"]
+    result = subprocess.run(cmd, cwd=repo_path, capture_output=True, text=True)
+    if result.returncode != 0:
+        return False
+    return result.stdout.strip() == "OPEN"
+
+
+def close_pr(repo_path: Path, branch: str, comment: str) -> bool:
+    cmd = ["gh", "pr", "close", branch, "-c", comment]
+    result = subprocess.run(cmd, cwd=repo_path, capture_output=True, text=True)
+    if result.returncode != 0:
+        logger.warning(f"Failed to close PR for {branch}: {result.stderr}")
+        return False
+    logger.info(f"Closed PR for {branch}")
+    return True
+
+
 def create_or_update_pr(
     repo_path: Path,
     branch: str,

{path_sync-0.7.2 → path_sync-0.7.4}/path_sync/_internal/models.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import fnmatch
 import glob as glob_mod
+import re
 from enum import StrEnum
 from pathlib import Path
-from typing import ClassVar
+from typing import ClassVar, NamedTuple
 
 from pydantic import BaseModel, Field, model_validator
 
@@ -104,6 +105,29 @@ class PathMapping(BaseModel):
 
 HEADER_TEMPLATE = "path-sync copy -n {config_name}"
 
+SYNC_METADATA_PATTERN = re.compile(r"<!-- path-sync: sha=(?P<sha>[0-9a-f]+) ts=(?P<ts>[^\s]+) -->")
+
+
+class SyncMetadata(NamedTuple):
+    sha: str
+    ts: str
+
+
+def parse_sync_metadata(body: str) -> SyncMetadata | None:
+    if match := SYNC_METADATA_PATTERN.search(body):
+        return SyncMetadata(sha=match["sha"], ts=match["ts"])
+    return None
+
+
+def pr_already_synced(pr_body: str | None, commit_ts: str) -> SyncMetadata | None:
+    """Return metadata if pr_body was synced from a source commit >= commit_ts."""
+    if not pr_body:
+        return None
+    metadata = parse_sync_metadata(pr_body)
+    if metadata and metadata.ts >= commit_ts:
+        return metadata
+    return None
+
 
 class HeaderConfig(BaseModel):
     comment_prefixes: dict[str, str] = Field(default_factory=dict)
@@ -111,7 +135,8 @@ class HeaderConfig(BaseModel):
 
 
 DEFAULT_BODY_TEMPLATE = """\
-Synced from [{src_repo_name}]({src_repo_url}) @ `{src_sha_short}`
+<!-- path-sync: sha={src_sha_short} ts={src_commit_ts} -->
+Synced from [{src_repo_name}]({src_repo_url}) @ `{src_sha_short}` ({src_commit_ts})
 
 <details>
 <summary>Sync Log</summary>
@@ -143,6 +168,7 @@ class PRDefaults(PRFieldsBase):
         src_sha: str,
         sync_log: str,
         dest_name: str,
+        src_commit_ts: str = "",
     ) -> str:
         src_repo_name = src_repo_url.rstrip("/").rsplit("/", 1)[-1].removesuffix(".git")
         body = self.body_template.format(
@@ -152,6 +178,7 @@ class PRDefaults(PRFieldsBase):
             src_sha_short=src_sha[:8],
             sync_log=sync_log,
             dest_name=dest_name,
+            src_commit_ts=src_commit_ts,
         )
         if self.body_suffix:
             body = f"{body}\n---\n{self.body_suffix}"
@@ -194,6 +221,8 @@ class SrcConfig(BaseModel):
     verify: VerifyConfig | None = None
     wrap_synced_files: bool = False
     auto_merge: AutoMergeConfig | None = None
+    keep_pr_on_no_changes: bool = False
+    force_resync: bool = False
 
     @model_validator(mode="after")
     def _validate_include_groups(self) -> SrcConfig:

{path_sync-0.7.2 → path_sync-0.7.4}/path_sync/_internal/models_dep.py

@@ -37,6 +37,7 @@ class DepConfig(BaseModel):
     verify: VerifyConfig = Field(default_factory=VerifyConfig)
     pr: PRConfig
     auto_merge: AutoMergeConfig | None = None
+    keep_pr_on_no_changes: bool = False
 
     def load_destinations(self, repo_root: Path) -> list[Destination]:
         src_config_path = resolve_config_path(repo_root, self.from_config)

{path_sync-0.7.2 → path_sync-0.7.4}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "path-sync"
-version = "0.7.2"
+version = "0.7.4"
 description = "Sync files from a source repo to multiple destination repos"
 requires-python = ">=3.13"
 license = "MIT"