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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.3.0
+Version: 0.3.2
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT
@@ -233,8 +233,8 @@ commit any files that need attention.
 
 ## Usage
 
-git-p4son provides eight commands: `init`, `sync`, `new`, `update`, `review`, `list-changes`, `alias`,
-and `completion`.
+git-p4son provides nine commands: `init`, `sync`, `sync-split`, `new`, `update`, `review`, `list-changes`,
+`alias`, and `completion`.
 
 To see help for any command, use `-h`:
 
@@ -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,16 +296,73 @@ 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)
 from `.git-p4son/hooks/post-sync/`.
 
+### Sync-Split Command
+
+Sync forward from the last synced changelist, splitting selected users' changelists into their own commits:
+
+```sh
+git p4son sync-split [changelist] [--user NAME ...] [--dry-run]
+```
+
+Syncing straight to the latest changelist lumps your own submitted changelists together with everyone
+else's in a single commit. `sync-split` resolves the sequence for you: it looks up the last synced
+changelist in the git log, asks Perforce which changelists the selected users submitted since then, and
+syncs the changelist submitted immediately before each of those first. The result is a git history where
+every changelist those users submitted is a commit containing nothing but their own change.
+
+By default the selected user is you (the current p4 user), which covers the common case of reviewing your
+own submits one at a time. Repeat `--user` to split out several people's changelists in the same run.
+
+It is equivalent to working out the numbers by hand and running
+`git p4son sync <before-theirs> <theirs> ... head`, and it delegates to `sync` once the sequence is
+resolved, so [pre-sync and post-sync hooks](#hooks), writable-file merging, and the clean-workspace checks
+all behave exactly as they do for `sync`.
+
+**Arguments:**
+- `changelist` (optional): Changelist number to sync up to, or `head` for the latest. Omit to sync to the
+  latest changelist affecting the workspace.
+
+**Options:**
+- `-u, --user NAME`: Perforce user whose changelists to split into their own commits. Repeat the flag to
+  select several users. Defaults to the current p4 user (from `p4 info`).
+- `-n, --dry-run`: Print the resolved sync sequence without syncing.
+
+**Examples:**
+```sh
+git p4son sync-split                  # sync to latest, your own changelists split out
+git p4son sync-split head             # same, explicit
+git p4son sync-split 12345            # stop at changelist 12345
+git p4son sync-split --dry-run        # show the sequence that would be synced
+git p4son sync-split -u alice         # split out alice's changelists instead of yours
+git p4son sync-split -u alice -u bob  # split out both alice's and bob's changelists
+```
+
+For example, with the last sync at CL 100 and your own changelists at 102 and 105, `sync-split` resolves
+to `git p4son sync 101 102 104 105 106`, producing five commits where CL 102 and CL 105 each hold only
+your change.
+
+`sync-split` only moves forward: it requires a previous sync to start from, and refuses a target older
+than the last synced changelist (use `git p4son sync --force` for that).
+
 ### New Command
 
 Create a new Perforce changelist and add changed files to it. Description will contain an enumerated list of git commits since the base branch.
@@ -553,11 +617,48 @@ 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/hooks/post-sync/`.
 
+### Example hooks
+
+The [`examples/hooks/`](examples/hooks/) directory holds ready-made hooks. Nothing installs them for you:
+symlink or copy the one you want into the matching hook directory in your workspace. Symlinking keeps the hook
+up to date with the clone it points at, and on macOS and Linux the executable bit comes from the file in the
+clone, so no `chmod` is needed.
+
+#### block-while-running (pre-sync)
+
+Aborts the sync while a named process is running, so a sync cannot swap out assets that a running editor still
+has loaded:
+
+```sh
+ln -s /path/to/git-p4son/examples/hooks/pre-sync/block-while-running.py .git-p4son/hooks/pre-sync/
+```
+
+Which processes block a sync is read from your workspace's own `.git-p4son/config.toml`, so a symlinked hook
+stays per-project:
+
+```toml
+[hooks.block-while-running]
+processes = ["UnrealEditor", "UnrealLightmass"]
+```
+
+Names are matched with any `.exe` suffix stripped and case ignored, so a single entry covers
+`UnrealEditor.exe` on Windows and `UnrealEditor` on macOS. Without that table the hook checks nothing and the
+sync proceeds; a table that is present but malformed aborts the sync rather than silently skipping the check.
+
+Set `GIT_P4SON_SKIP_PROCESS_CHECK=1` to run one sync without the check.
+
 ## Shell Completions
 
 Tab completion is available for bash, zsh, and PowerShell, including commands, flags, and dynamic alias names.

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

@@ -210,8 +210,8 @@ commit any files that need attention.
 
 ## Usage
 
-git-p4son provides eight commands: `init`, `sync`, `new`, `update`, `review`, `list-changes`, `alias`,
-and `completion`.
+git-p4son provides nine commands: `init`, `sync`, `sync-split`, `new`, `update`, `review`, `list-changes`,
+`alias`, and `completion`.
 
 To see help for any command, use `-h`:
 
@@ -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,16 +273,73 @@ 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)
 from `.git-p4son/hooks/post-sync/`.
 
+### Sync-Split Command
+
+Sync forward from the last synced changelist, splitting selected users' changelists into their own commits:
+
+```sh
+git p4son sync-split [changelist] [--user NAME ...] [--dry-run]
+```
+
+Syncing straight to the latest changelist lumps your own submitted changelists together with everyone
+else's in a single commit. `sync-split` resolves the sequence for you: it looks up the last synced
+changelist in the git log, asks Perforce which changelists the selected users submitted since then, and
+syncs the changelist submitted immediately before each of those first. The result is a git history where
+every changelist those users submitted is a commit containing nothing but their own change.
+
+By default the selected user is you (the current p4 user), which covers the common case of reviewing your
+own submits one at a time. Repeat `--user` to split out several people's changelists in the same run.
+
+It is equivalent to working out the numbers by hand and running
+`git p4son sync <before-theirs> <theirs> ... head`, and it delegates to `sync` once the sequence is
+resolved, so [pre-sync and post-sync hooks](#hooks), writable-file merging, and the clean-workspace checks
+all behave exactly as they do for `sync`.
+
+**Arguments:**
+- `changelist` (optional): Changelist number to sync up to, or `head` for the latest. Omit to sync to the
+  latest changelist affecting the workspace.
+
+**Options:**
+- `-u, --user NAME`: Perforce user whose changelists to split into their own commits. Repeat the flag to
+  select several users. Defaults to the current p4 user (from `p4 info`).
+- `-n, --dry-run`: Print the resolved sync sequence without syncing.
+
+**Examples:**
+```sh
+git p4son sync-split                  # sync to latest, your own changelists split out
+git p4son sync-split head             # same, explicit
+git p4son sync-split 12345            # stop at changelist 12345
+git p4son sync-split --dry-run        # show the sequence that would be synced
+git p4son sync-split -u alice         # split out alice's changelists instead of yours
+git p4son sync-split -u alice -u bob  # split out both alice's and bob's changelists
+```
+
+For example, with the last sync at CL 100 and your own changelists at 102 and 105, `sync-split` resolves
+to `git p4son sync 101 102 104 105 106`, producing five commits where CL 102 and CL 105 each hold only
+your change.
+
+`sync-split` only moves forward: it requires a previous sync to start from, and refuses a target older
+than the last synced changelist (use `git p4son sync --force` for that).
+
 ### New Command
 
 Create a new Perforce changelist and add changed files to it. Description will contain an enumerated list of git commits since the base branch.
@@ -530,11 +594,48 @@ 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/hooks/post-sync/`.
 
+### Example hooks
+
+The [`examples/hooks/`](examples/hooks/) directory holds ready-made hooks. Nothing installs them for you:
+symlink or copy the one you want into the matching hook directory in your workspace. Symlinking keeps the hook
+up to date with the clone it points at, and on macOS and Linux the executable bit comes from the file in the
+clone, so no `chmod` is needed.
+
+#### block-while-running (pre-sync)
+
+Aborts the sync while a named process is running, so a sync cannot swap out assets that a running editor still
+has loaded:
+
+```sh
+ln -s /path/to/git-p4son/examples/hooks/pre-sync/block-while-running.py .git-p4son/hooks/pre-sync/
+```
+
+Which processes block a sync is read from your workspace's own `.git-p4son/config.toml`, so a symlinked hook
+stays per-project:
+
+```toml
+[hooks.block-while-running]
+processes = ["UnrealEditor", "UnrealLightmass"]
+```
+
+Names are matched with any `.exe` suffix stripped and case ignored, so a single entry covers
+`UnrealEditor.exe` on Windows and `UnrealEditor` on macOS. Without that table the hook checks nothing and the
+sync proceeds; a table that is present but malformed aborts the sync rather than silently skipping the check.
+
+Set `GIT_P4SON_SKIP_PROCESS_CHECK=1` to run one sync without the check.
+
 ## Shell Completions
 
 Tab completion is available for bash, zsh, and PowerShell, including commands, flags, and dynamic alias names.

{git_p4son-0.3.0 → git_p4son-0.3.2}/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.2"
 __author__ = "Andreas Andersson"
 __email__ = "andreas@neoboid.com"

{git_p4son-0.3.0 → git_p4son-0.3.2}/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.2}/git_p4son/cli.py

@@ -9,6 +9,7 @@ import time
 from importlib.resources import files
 from . import __version__
 from .sync import sync_command
+from .sync_split import sync_split_command
 from .new import new_command
 from .update import update_command
 from .list_changes import list_changes_command
@@ -31,8 +32,14 @@ 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 sync-split          # Sync to latest, your own changelists split out
+  git-p4son sync-split 12345    # Same, but stop at changelist 12345
+  git-p4son sync-split -u alice -u bob  # Split out alice's and bob's changelists
   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
   git-p4son new -m "Fix bug" --no-alias # Create changelist without saving an alias
@@ -78,10 +85,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',
@@ -89,6 +100,38 @@ Examples:
         help='Allow syncing to changelists older than the current one.'
     )
 
+    # Sync-split subcommand
+    sync_split_parser = subparsers.add_parser(
+        'sync-split',
+        help='Sync forward, splitting a user\'s changelists into own commits',
+        description='Sync from the last synced changelist up to a target '
+        'changelist (the latest by default), syncing the changelist submitted '
+        'just before each of the selected users\' submits first so that every '
+        'changelist they submitted lands in a git commit of its own.'
+    )
+    sync_split_parser.add_argument(
+        'changelist',
+        nargs='?',
+        default=None,
+        metavar='CHANGELIST',
+        help='Changelist number to sync up to, or "head" for the latest. '
+             'Omit to sync to the latest changelist affecting the workspace'
+    )
+    sync_split_parser.add_argument(
+        '-u', '--user',
+        action='append',
+        default=None,
+        metavar='NAME',
+        help='Perforce user whose changelists to split into their own '
+             'commits. Repeat to select several users. '
+             'Defaults to the current p4 user'
+    )
+    sync_split_parser.add_argument(
+        '-n', '--dry-run',
+        action='store_true',
+        help='Print the resolved sync sequence without syncing'
+    )
+
     # New subcommand
     new_parser = subparsers.add_parser(
         'new',
@@ -422,6 +465,8 @@ def run_command(args: argparse.Namespace) -> int:
 
     if args.command == 'sync':
         return sync_command(args)
+    elif args.command == 'sync-split':
+        return sync_split_command(args)
     elif args.command == 'new':
         return new_command(args)
     elif args.command == 'update':

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

@@ -106,11 +106,20 @@ 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 == 'sync-split' and positional_count == 0:
+        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.2}/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.2}/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.2}/git_p4son/perforce.py

@@ -204,6 +204,33 @@ def get_latest_changelist(depot_root: str, workspace_dir: str) -> int:
     return int(fields['change'])
 
 
+@dataclass
+class P4Change:
+    """A submitted changelist affecting the depot root."""
+
+    change: int
+    user: str
+
+
+def get_submitted_changes(depot_root: str, start: int, end: int,
+                          workspace_dir: str) -> list[P4Change]:
+    """List changelists submitted to the depot root in [start, end], oldest first."""
+    res = run(['p4', '-ztag', 'changes', '-s', 'submitted',
+               f'{depot_root}/...@{start},@{end}'], cwd=workspace_dir)
+    records = parse_ztag_multi_output(res.stdout)
+    changes = [P4Change(change=int(r['change']), user=r.get('user', ''))
+               for r in records if 'change' in r]
+    return sorted(changes, key=lambda c: c.change)
+
+
+def get_p4_user(workspace_dir: str) -> str | None:
+    """Get the Perforce user name of the current connection."""
+    res = run(['p4', '-ztag', 'info'], cwd=workspace_dir)
+    fields = parse_ztag_output(res.stdout)
+    user = fields.get('userName')
+    return user or None
+
+
 # --- file operations ---
 
 def get_changelist_for_file(filename: str, workspace_dir: str) -> tuple[str, str] | None: