git-p4son 0.3.0__tar.gz → 0.3.1__tar.gz

{git_p4son-0.3.0 → git_p4son-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.3.0
+Version: 0.3.1
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT
@@ -266,6 +266,11 @@ The depot root determines which part of the Perforce workspace git-p4son syncs.
 workspace or just the directory's subtree where the git root is placed. The selection is saved in
 `.git-p4son/config.toml` and used by all subsequent commands.
 
+The saved root uses a `$(workspace)` placeholder for the workspace (client) name, e.g.
+`root = "//$(workspace)/Engine"`. git-p4son substitutes the live workspace name each time it runs, so renaming
+the Perforce workspace does not break the config. You can still store a concrete name (e.g. `//my-workspace/Engine`)
+by hand-editing `config.toml`; both forms work.
+
 The `.gitignore` is set up using this priority:
 - If `.gitignore` already exists, it is left as is
 - If `.p4ignore` exists, it is copied to `.gitignore` as a starting point
@@ -276,12 +281,14 @@ The `.gitignore` is set up using this priority:
 Sync local git repository with a Perforce workspace:
 
 ```sh
-git p4son sync [changelist] [--force]
+git p4son sync [changelist ...] [--force]
 ```
 
 **Arguments:**
-- `changelist` (optional): Changelist number, or `last-synced` to re-sync the last synced changelist. Omit to
-  sync to the latest changelist affecting the workspace.
+- `changelist` (optional): Changelist number, `last-synced` to re-sync the last synced changelist, or `head`
+  to sync to the latest changelist. Omit to sync to the latest changelist affecting the workspace. Several
+  strictly increasing changelist numbers may be given to sync each in sequence, producing one commit per
+  changelist. A trailing `head` may close out such a sequence to finish at the latest changelist.
 
 **Options:**
 - `-f, --force`: Allow syncing to changelists older than the current one.
@@ -289,11 +296,20 @@ git p4son sync [changelist] [--force]
 **Examples:**
 ```sh
 git p4son sync              # sync to latest
+git p4son sync head         # sync to latest (explicit)
 git p4son sync 12345
+git p4son sync 123 156 178  # sync each changelist in sequence, one commit each
+git p4son sync 123 156 head # sync 123, 156, then the latest changelist
 git p4son sync last-synced
 git p4son sync 12345 --force
 ```
 
+#### pre-sync hook
+
+Before `git-p4son sync` syncs any changelist, git-p4son runs [hooks](#hooks) from
+`.git-p4son/hooks/pre-sync/`. If any hook exits non-zero the sync is aborted. When a sequence of
+changelists is given, the pre-sync hooks run once, before the first sync.
+
 #### post-sync hook
 
 After a successful `git-p4son sync` that actually performs sync work, git-p4son runs [hooks](#hooks)
@@ -553,6 +569,13 @@ On Windows, `.ps1`, `.nu`, `.sh`, and `.py` files are run with `powershell.exe`,
 
 Non-executable or unrecognized hook files are skipped with a warning.
 
+### pre-sync hook
+
+Before `git-p4son sync` syncs any changelist, git-p4son runs executable hooks from
+`.git-p4son/hooks/pre-sync/`. If any hook exits with a non-zero code the sync is aborted before any
+changelist is synced. When a sequence of changelists is synced, the pre-sync hooks run only once,
+before the first sync.
+
 ### post-sync hook
 
 After a successful `git-p4son sync` that actually performs sync work, git-p4son runs executable hooks from

{git_p4son-0.3.0 → git_p4son-0.3.1}/README.md

@@ -243,6 +243,11 @@ The depot root determines which part of the Perforce workspace git-p4son syncs.
 workspace or just the directory's subtree where the git root is placed. The selection is saved in
 `.git-p4son/config.toml` and used by all subsequent commands.
 
+The saved root uses a `$(workspace)` placeholder for the workspace (client) name, e.g.
+`root = "//$(workspace)/Engine"`. git-p4son substitutes the live workspace name each time it runs, so renaming
+the Perforce workspace does not break the config. You can still store a concrete name (e.g. `//my-workspace/Engine`)
+by hand-editing `config.toml`; both forms work.
+
 The `.gitignore` is set up using this priority:
 - If `.gitignore` already exists, it is left as is
 - If `.p4ignore` exists, it is copied to `.gitignore` as a starting point
@@ -253,12 +258,14 @@ The `.gitignore` is set up using this priority:
 Sync local git repository with a Perforce workspace:
 
 ```sh
-git p4son sync [changelist] [--force]
+git p4son sync [changelist ...] [--force]
 ```
 
 **Arguments:**
-- `changelist` (optional): Changelist number, or `last-synced` to re-sync the last synced changelist. Omit to
-  sync to the latest changelist affecting the workspace.
+- `changelist` (optional): Changelist number, `last-synced` to re-sync the last synced changelist, or `head`
+  to sync to the latest changelist. Omit to sync to the latest changelist affecting the workspace. Several
+  strictly increasing changelist numbers may be given to sync each in sequence, producing one commit per
+  changelist. A trailing `head` may close out such a sequence to finish at the latest changelist.
 
 **Options:**
 - `-f, --force`: Allow syncing to changelists older than the current one.
@@ -266,11 +273,20 @@ git p4son sync [changelist] [--force]
 **Examples:**
 ```sh
 git p4son sync              # sync to latest
+git p4son sync head         # sync to latest (explicit)
 git p4son sync 12345
+git p4son sync 123 156 178  # sync each changelist in sequence, one commit each
+git p4son sync 123 156 head # sync 123, 156, then the latest changelist
 git p4son sync last-synced
 git p4son sync 12345 --force
 ```
 
+#### pre-sync hook
+
+Before `git-p4son sync` syncs any changelist, git-p4son runs [hooks](#hooks) from
+`.git-p4son/hooks/pre-sync/`. If any hook exits non-zero the sync is aborted. When a sequence of
+changelists is given, the pre-sync hooks run once, before the first sync.
+
 #### post-sync hook
 
 After a successful `git-p4son sync` that actually performs sync work, git-p4son runs [hooks](#hooks)
@@ -530,6 +546,13 @@ On Windows, `.ps1`, `.nu`, `.sh`, and `.py` files are run with `powershell.exe`,
 
 Non-executable or unrecognized hook files are skipped with a warning.
 
+### pre-sync hook
+
+Before `git-p4son sync` syncs any changelist, git-p4son runs executable hooks from
+`.git-p4son/hooks/pre-sync/`. If any hook exits with a non-zero code the sync is aborted before any
+changelist is synced. When a sequence of changelists is synced, the pre-sync hooks run only once,
+before the first sync.
+
 ### post-sync hook
 
 After a successful `git-p4son sync` that actually performs sync work, git-p4son runs executable hooks from

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/__init__.py

@@ -7,6 +7,6 @@ creating and updating changelists, and managing Swarm reviews.
 
 CONFIG_DIR = '.git-p4son'
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __author__ = "Andreas Andersson"
 __email__ = "andreas@neoboid.com"

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/changelist_store.py

@@ -11,7 +11,7 @@ from . import CONFIG_DIR
 from .log import log
 
 
-RESERVED_KEYWORDS = frozenset({'last-synced', 'branch'})
+RESERVED_KEYWORDS = frozenset({'last-synced', 'head', 'branch'})
 
 # Allowed characters: ASCII letters, digits, hyphen, underscore, dot.
 # Must not start or end with a dot, so "." and ".." are rejected and the

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/cli.py

@@ -31,7 +31,10 @@ def create_parser() -> argparse.ArgumentParser:
         epilog="""
 Examples:
   git-p4son sync                # Sync to the latest changelist
+  git-p4son sync head           # Sync to the latest changelist (explicit)
   git-p4son sync 12345          # Sync to changelist 12345
+  git-p4son sync 123 156 178    # Sync each changelist in sequence, one commit each
+  git-p4son sync 123 156 head   # Sync 123, 156, then the latest changelist
   git-p4son sync last-synced    # Re-sync the last synced changelist
   git-p4son new -m "Fix bug"    # Create changelist, alias defaults to branch name
   git-p4son new -m "Fix bug" --review  # Create changelist, create Swarm review
@@ -78,10 +81,14 @@ Examples:
     )
     sync_parser.add_argument(
         'changelist',
-        nargs='?',
-        default=None,
-        help='Changelist number to sync, or "last-synced" to re-sync the last synced changelist. '
-             'Omit to sync to the latest changelist affecting the workspace'
+        nargs='*',
+        default=[],
+        metavar='CHANGELIST',
+        help='Changelist number(s) to sync, "last-synced" to re-sync the last synced changelist, '
+             'or "head" to sync to the latest changelist. Give several strictly increasing '
+             'changelist numbers to sync each in sequence, one commit per changelist; "head" may '
+             'close out such a sequence as a trailing target. Omit to sync to the latest '
+             'changelist affecting the workspace'
     )
     sync_parser.add_argument(
         '-f', '--force',

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/complete.py

@@ -106,11 +106,16 @@ def _complete_positional(command, subcommand, positional_count,
     """Complete a positional argument."""
     aliases = _get_alias_names(workspace_dir)
 
-    if command == 'sync' and positional_count == 0:
-        candidates = [
-            ('last-synced', 'Re-sync last synced changelist'),
-        ]
-        return _filter(candidates, prefix)
+    if command == 'sync':
+        if positional_count == 0:
+            candidates = [
+                ('head', 'Sync to the latest changelist'),
+                ('last-synced', 'Re-sync last synced changelist'),
+            ]
+            return _filter(candidates, prefix)
+        # "head" may also close out a sequence of changelist numbers.
+        return _filter(
+            [('head', 'Sync to the latest changelist')], prefix)
 
     if command == 'update' and positional_count == 0:
         branch_candidates = _get_branch_candidates(prefix, workspace_dir)

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/config.py

@@ -12,6 +12,12 @@ from . import CONFIG_DIR
 
 _BARE_KEY_RE = re.compile(r'^[A-Za-z0-9_-]+$')
 
+# Placeholder allowed in a stored depot root, substituted with the live
+# Perforce client (workspace) name each time the root is used. Storing e.g.
+# root = "//$(workspace)/Engine" keeps the config working after the workspace
+# is renamed, at the cost of one client-name lookup per command.
+WORKSPACE_PLACEHOLDER = '$(workspace)'
+
 
 def config_path(workspace_dir: str) -> str:
     """Return the path to the config file."""
@@ -94,3 +100,8 @@ def get_depot_root(workspace_dir: str) -> str | None:
     """Get the depot root from config, or None if not configured."""
     config = load_config(workspace_dir)
     return config.get('depot', {}).get('root')
+
+
+def expand_depot_root(depot_root: str, workspace_name: str) -> str:
+    """Substitute the live workspace name for the $(workspace) placeholder."""
+    return depot_root.replace(WORKSPACE_PLACEHOLDER, workspace_name)

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/init.py

@@ -10,7 +10,12 @@ import os
 import shutil
 
 from .common import CommandError, run, run_with_output
-from .config import get_depot_root, save_config
+from .config import (
+    WORKSPACE_PLACEHOLDER,
+    expand_depot_root,
+    get_depot_root,
+    save_config,
+)
 from .log import log
 from .perforce import get_client_spec
 from .git import resolve_editor
@@ -26,31 +31,38 @@ def _validate_depot_root(depot_root: str, cwd: str) -> bool:
         return False
 
 
-def _compute_cwd_depot_root(client_name: str, cwd: str,
-                            p4_workspace_root: str) -> str | None:
-    """Compute depot root for cwd relative to workspace root.
+def _compute_cwd_depot_root(cwd: str, p4_workspace_root: str) -> str | None:
+    """Compute the depot root template for cwd relative to workspace root.
 
-    Returns None if cwd is the workspace root (identical to entire workspace).
+    Uses the $(workspace) placeholder in place of the client name so the stored
+    root survives a workspace rename. Returns None if cwd is the workspace root
+    (identical to the entire workspace).
     """
     rel = os.path.relpath(cwd, p4_workspace_root)
     if rel == '.':
         return None
     rel_posix = rel.replace(os.sep, '/')
-    return f'//{client_name}/{rel_posix}'
+    return f'//{WORKSPACE_PLACEHOLDER}/{rel_posix}'
 
 
 def _select_depot_root(client_name: str, cwd: str,
                        p4_workspace_root: str) -> str | None:
-    """Interactive prompt for depot root selection. Returns root or None to abort."""
-    entire_root = f'//{client_name}'
-    cwd_root = _compute_cwd_depot_root(client_name, cwd, p4_workspace_root)
+    """Interactive prompt for depot root selection.
+
+    Returns a depot root template (with the $(workspace) placeholder) to store,
+    or None to abort. Menu entries and validation use the resolved path.
+    """
+    entire_root = f'//{WORKSPACE_PLACEHOLDER}'
+    cwd_root = _compute_cwd_depot_root(cwd, p4_workspace_root)
 
     while True:
         print()
         print('Select the depot path that git-p4son should sync:')
-        print(f'  1. Entire workspace: {entire_root}/...')
+        print(f'  1. Entire workspace: '
+              f'{expand_depot_root(entire_root, client_name)}/...')
         if cwd_root:
-            print(f'  2. Current directory: {cwd_root}/...')
+            print(f'  2. Current directory: '
+                  f'{expand_depot_root(cwd_root, client_name)}/...')
             abort_num = '3'
         else:
             abort_num = '2'
@@ -72,10 +84,11 @@ def _select_depot_root(client_name: str, cwd: str,
             print(f'Invalid choice: {choice}')
             continue
 
-        if _validate_depot_root(depot_root, cwd):
+        resolved = expand_depot_root(depot_root, client_name)
+        if _validate_depot_root(resolved, cwd):
             return depot_root
 
-        log.error(f'Depot root {depot_root}/... is not valid')
+        log.error(f'Depot root {resolved}/... is not valid')
 
 
 def _configure_depot_root(client_name: str, cwd: str,
@@ -84,17 +97,18 @@ def _configure_depot_root(client_name: str, cwd: str,
     log.heading('Finding git-p4son depot root')
     depot_root = get_depot_root(cwd)
     if depot_root:
-        log.success(f'{depot_root}/...')
+        log.success(f'{expand_depot_root(depot_root, client_name)}/...')
     else:
         log.warning('no root configured')
 
     if depot_root:
         log.heading('Validating depot root')
-        if _validate_depot_root(depot_root, cwd):
+        resolved = expand_depot_root(depot_root, client_name)
+        if _validate_depot_root(resolved, cwd):
             log.success('all good')
             return True
         else:
-            log.error(f'{depot_root}/... is not valid')
+            log.error(f'{resolved}/... is not valid')
             depot_root = None
 
     if not depot_root:
@@ -104,7 +118,7 @@ def _configure_depot_root(client_name: str, cwd: str,
             log.error('aborting')
             return False
 
-    log.success(f'{depot_root}/...')
+    log.success(f'{expand_depot_root(depot_root, client_name)}/...')
     save_config(cwd, {'depot': {'root': depot_root}})
     return True
 

{git_p4son-0.3.0 → git_p4son-0.3.1}/git_p4son/sync.py

@@ -13,7 +13,7 @@ from dataclasses import dataclass, field
 from typing import IO
 
 from .common import RunError, prompt_choice, run_with_output
-from .config import get_depot_root
+from .config import WORKSPACE_PLACEHOLDER, expand_depot_root, get_depot_root
 from .state import dismiss_clobber_warning, is_clobber_warning_dismissed
 from .git import (
     add_all_files, commit, find_base_commits, get_blob_oids,
@@ -523,6 +523,37 @@ def _handle_clobber_warning(clobber: bool, workspace_dir: str) -> bool:
     return True
 
 
+def _run_pre_sync_hooks(workspace_dir: str, invocation_dir: str) -> bool:
+    """Run pre-sync hooks; return False when any hook fails, aborting the sync.
+
+    Runs once before any changelist is synced. All hooks run (they are
+    independent), then the sync is aborted if any returned a non-zero code.
+    """
+    results = run_hooks('pre-sync', workspace_dir, invocation_dir)
+    if any(result.returncode != 0 for result in results):
+        log.error('Aborting sync because a pre-sync hook failed')
+        return False
+    return True
+
+
+def _sync_pass(changelist: int, label: str, depot_root: str,
+               workspace_dir: str, pre_sync_head_commit: str, temp_root: str,
+               uses_crlf: bool, clobber: bool) -> WritableSyncFileSet:
+    """Run one sync pass: preview, prepare writable files, and p4 sync.
+
+    Returns the classified writable file set. p4 sync is skipped when the
+    preview is empty (nothing to sync).
+    """
+    preview = p4_sync_preview(changelist, depot_root, workspace_dir)
+    prep = prepare_writable_files(preview, workspace_dir, pre_sync_head_commit,
+                                  temp_root, uses_crlf=uses_crlf,
+                                  clobber=clobber)
+    if preview:
+        p4_sync(changelist, label, depot_root, workspace_dir,
+                expected_clobber=set(prep.ignored))
+    return prep
+
+
 def sync_command(args: argparse.Namespace) -> int:
     """Execute the sync command."""
     workspace_dir = args.workspace_dir
@@ -533,6 +564,17 @@ def sync_command(args: argparse.Namespace) -> int:
     if not depot_root:
         log.error('No depot root configured. Run "git p4son init" first.')
         return 1
+
+    # The client spec is queried once here: its name resolves a $(workspace)
+    # placeholder in the depot root, and its line-ending/clobber options feed
+    # the writable-file handling further down.
+    client_spec = get_client_spec(workspace_dir)
+    if WORKSPACE_PLACEHOLDER in depot_root and not client_spec:
+        log.error('Cannot resolve $(workspace) in depot root: not inside a '
+                  'Perforce workspace')
+        return 1
+    if client_spec:
+        depot_root = expand_depot_root(depot_root, client_spec.name)
     log.success(depot_root)
 
     log.heading('Checking git workspace')
@@ -578,7 +620,7 @@ def sync_command(args: argparse.Namespace) -> int:
     # the post-sync merge doesn't conflict on LF-vs-CRLF differences alone.
     # The clobber option changes whether git-ignored writable files survive
     # the sync, which the prepare summary needs to report accurately.
-    client_spec = get_client_spec(workspace_dir)
+    # (client_spec was fetched above to resolve the depot root.)
     uses_crlf = bool(client_spec and client_spec.uses_crlf)
     clobber = bool(client_spec and client_spec.clobber)
 
@@ -588,94 +630,131 @@ def sync_command(args: argparse.Namespace) -> int:
     # Temp root for staging HEAD/baseline file content between classification
     # and the post-sync merge. Cleaned up automatically on exit.
     with tempfile.TemporaryDirectory(prefix='git-p4son-sync-') as temp_root:
-        if args.changelist is not None \
-                and args.changelist.lower() == 'last-synced':
+        raw = args.changelist
+        lowered = [c.lower() for c in raw]
+
+        # "last-synced" is a keyword that only makes sense on its own.
+        if 'last-synced' in lowered:
+            if lowered != ['last-synced']:
+                log.error('The "last-synced" keyword cannot be combined with '
+                          'other changelists')
+                return 1
             if not last_sync:
                 log.error('No previous sync found, cannot use "last-synced"')
                 return 1
-            preview = p4_sync_preview(
-                last_sync.changelist, depot_root, workspace_dir)
-            if preview:
-                prep = prepare_writable_files(preview, workspace_dir,
-                                              pre_sync_head_commit, temp_root,
-                                              uses_crlf=uses_crlf, clobber=clobber)
-                p4_sync(last_sync.changelist, last_changelist_label,
-                        depot_root, workspace_dir,
-                        expected_clobber=set(prep.ignored))
+            if not _run_pre_sync_hooks(workspace_dir, invocation_dir):
+                return 1
+            _sync_pass(last_sync.changelist, last_changelist_label, depot_root,
+                       workspace_dir, pre_sync_head_commit, temp_root,
+                       uses_crlf, clobber)
             run_hooks('post-sync', workspace_dir, invocation_dir)
             return 0
 
-        # No argument means sync to latest
-        if args.changelist is None:
+        # "head" resolves to the latest changelist, the largest in an
+        # increasing sequence, so it may only appear as the final target.
+        if 'head' in lowered and lowered.index('head') != len(lowered) - 1:
+            log.error('The "head" keyword must come last')
+            return 1
+
+        # Resolve the ordered list of (changelist, label) targets to sync,
+        # replacing a trailing "head" with the concrete latest changelist so
+        # the increasing-order check below compares real numbers.
+        if not raw:
             log.heading('Finding latest changelist')
-            changelist = get_latest_changelist(depot_root, workspace_dir)
-            log.success(f'CL {changelist}')
-            changelist_label = 'latest'
+            latest = get_latest_changelist(depot_root, workspace_dir)
+            log.success(f'CL {latest}')
+            targets = [(latest, 'latest')]
         else:
-            changelist_label = 'specified'
-            try:
-                changelist = int(args.changelist)
-            except ValueError:
-                log.error(f'Invalid changelist number: {args.changelist}')
+            targets = []
+            for c in raw:
+                if c.lower() == 'head':
+                    log.heading('Finding latest changelist')
+                    latest = get_latest_changelist(depot_root, workspace_dir)
+                    log.success(f'CL {latest}')
+                    targets.append((latest, 'latest'))
+                else:
+                    try:
+                        targets.append((int(c), 'specified'))
+                    except ValueError:
+                        log.error(f'Invalid changelist number: {c}')
+                        return 1
+
+        # Targets are synced in the given order, so they must be strictly
+        # increasing: no syncing back and forth.
+        numbers = [cl for cl, _ in targets]
+        for prev, curr in zip(numbers, numbers[1:]):
+            if curr <= prev:
+                log.error('Changelists must be strictly increasing, '
+                          f'got {prev} then {curr}')
                 return 1
 
         last_changelist = last_sync.changelist if last_sync else None
-        if last_changelist == changelist:
-            log.info(f'Already at CL {last_changelist}, nothing to do.')
-            log.heading('Skipping post-sync hooks')
-            return 0
 
-        # Check if trying to sync to an older changelist
-        if last_sync and changelist < last_sync.changelist:
+        # Syncing to a changelist older than the current one needs --force.
+        # Targets are strictly increasing, so the smallest is numbers[0]; an
+        # equal-to-current changelist (dropped just below) is not "older".
+        if last_sync and numbers[0] < last_sync.changelist:
             if not args.force:
                 log.error(
-                    f'Cannot sync to CL {changelist} '
+                    f'Cannot sync to CL {numbers[0]} '
                     f'(currently at CL {last_sync.changelist}) without --force.')
                 return 1
-            else:
-                log.warning(
-                    f'Syncing to older CL {changelist} '
-                    f'(currently at CL {last_sync.changelist}) with --force')
+            log.warning(
+                f'Syncing to older CL {numbers[0]} '
+                f'(currently at CL {last_sync.changelist}) with --force')
+
+        # Drop a target equal to the last synced changelist: we are already
+        # there, so there is nothing to sync or commit for it. An explicitly
+        # requested *older* changelist is kept and synced as the user asked.
+        if last_changelist is not None and last_changelist in numbers:
+            log.info(f'Skipping CL {last_changelist} (already synced)')
+            targets = [(cl, lbl) for cl, lbl in targets
+                       if cl != last_changelist]
+
+        if not targets:
+            log.info('Already synced, nothing to do.')
+            log.heading('Skipping post-sync hooks')
+            return 0
+
+        # Pre-sync hooks run once, before syncing any changelist (including the
+        # catch-up pass), and abort the whole sync if any of them fail.
+        if not _run_pre_sync_hooks(workspace_dir, invocation_dir):
+            return 1
 
-        # First sync pass: to last_synced_cl
         all_changed: list[ChangedFile] = []
         all_ignored: list[str] = []
 
+        # Catch-up pass to the last synced changelist. This makes locally
+        # modified (writable) files read-only and stages their content so the
+        # post-sync merge can restore local changes; its result is folded into
+        # the first target commit.
         if last_changelist is not None:
-            preview = p4_sync_preview(
-                last_changelist, depot_root, workspace_dir)
-            prep = prepare_writable_files(preview, workspace_dir,
-                                          pre_sync_head_commit, temp_root,
-                                          uses_crlf=uses_crlf, clobber=clobber)
+            prep = _sync_pass(last_changelist, last_changelist_label,
+                              depot_root, workspace_dir, pre_sync_head_commit,
+                              temp_root, uses_crlf, clobber)
             all_changed.extend(prep.changed)
             all_ignored.extend(prep.ignored)
-            if preview:
-                p4_sync(last_changelist, last_changelist_label, depot_root,
-                        workspace_dir, expected_clobber=set(prep.ignored))
-
-        # Second sync pass: to target CL
-        preview = p4_sync_preview(changelist, depot_root, workspace_dir)
-        prep = prepare_writable_files(preview, workspace_dir,
-                                      pre_sync_head_commit, temp_root,
-                                      uses_crlf=uses_crlf, clobber=clobber)
-        all_changed.extend(prep.changed)
-        all_ignored.extend(prep.ignored)
-        if preview:
-            p4_sync(changelist, changelist_label, depot_root,
-                    workspace_dir, expected_clobber=set(prep.ignored))
-
-        # Commit (pure Perforce state)
-        log.heading('Committing git changes')
-        dirty_files = get_dirty_files(workspace_dir)
-        if dirty_files:
-            add_all_files(workspace_dir)
-
-        commit_msg = f'git-p4son: p4 sync {depot_root}/...@{changelist}'
-        commit(commit_msg, workspace_dir, allow_empty=True)
-        log.success(f'Committed {len(dirty_files)} files')
+
+        # Sync each target changelist in turn, committing pure Perforce state
+        # for each. Local changes are merged back once at the very end so the
+        # intermediate commits stay clean.
+        for changelist, changelist_label in targets:
+            prep = _sync_pass(changelist, changelist_label, depot_root,
+                              workspace_dir, pre_sync_head_commit, temp_root,
+                              uses_crlf, clobber)
+            all_changed.extend(prep.changed)
+            all_ignored.extend(prep.ignored)
+
+            log.heading(f'Committing git changes for CL {changelist}')
+            dirty_files = get_dirty_files(workspace_dir)
+            if dirty_files:
+                add_all_files(workspace_dir)
+            commit_msg = f'git-p4son: p4 sync {depot_root}/...@{changelist}'
+            commit(commit_msg, workspace_dir, allow_empty=True)
+            log.success(f'Committed {len(dirty_files)} files')
 
         # Post-commit: merge changed files back. Dedup by filepath in case
-        # the same file shows up in both sync passes.
+        # the same file shows up in multiple sync passes.
         by_path: dict[str, ChangedFile] = {}
         for cf in all_changed:
             by_path[cf.filepath] = cf