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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.2.10
+Version: 0.3.0
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT
@@ -156,41 +156,37 @@ cloning.
 
 These steps set up git-p4son in an existing Perforce workspace. You only need to do this once.
 
-1. **Enable clobber on your Perforce workspace.** Edit the workspace in
-   P4V to set the clobber flag, or run `p4 client` and change `noclobber` to `clobber` in the Options line.
-   See [Why clobber?](#why-clobber) for rationale.
-
-2. **Set a git editor** if you don't have one already. The `review` command opens an interactive rebase in your
+1. **Set a git editor** if you don't have one already. The `review` command opens an interactive rebase in your
    editor. If you haven't configured one, set it with:
    ```sh
    git config --global core.editor <editor>   # e.g. vim, nano, code --wait
    ```
 
-3. **Sync your workspace to a known changelist.** Pick a changelist to use as the starting point for your git
+2. **Sync your workspace to a known changelist.** Pick a changelist to use as the starting point for your git
    history:
    ```sh
    p4 sync //...@12345
    ```
 
-4. **Run `git p4son init`.** This can be anywhere inside your Perforce workspace — it doesn't have to be at the
+3. **Run `git p4son init`.** This can be anywhere inside your Perforce workspace - it doesn't have to be at the
    root:
    ```sh
    cd /path/to/your/workspace    # or a subdirectory of it
    git p4son init
    ```
-   The command verifies that you are inside a P4 workspace with clobber enabled, prompts you to select a depot
+   The command verifies that you are inside a P4 workspace, prompts you to select a depot
    root (entire workspace or current directory subtree), runs `git init`, sets up `.gitignore` (copying from
    `.p4ignore` if available), and creates an initial commit.
 
-5. **Review `.gitignore`.** Edit the file to ensure build artifacts and other unwanted files are excluded.
+4. **Review `.gitignore`.** Edit the file to ensure build artifacts and other unwanted files are excluded.
 
-6. **Add and commit all files manually the first time**
+5. **Add and commit all files manually the first time**
    ```sh
    git add .
    git commit -m "Initial submit all files"
    ```
 
-7. **Run `git p4son sync`** to get your first official sync commit
+6. **Run `git p4son sync`** to get your first official sync commit
    ```sh
    git p4son sync
    ```
@@ -199,19 +195,41 @@ These steps set up git-p4son in an existing Perforce workspace. You only need to
 From here, branch off `main` for local development. See the [Usage Example](#usage-example) for a typical
 workflow.
 
-### Why clobber?
+### How sync handles writable files
+
+When you switch branches with `git checkout`, git removes the read-only flag on every file it writes. This means
+that when you switch back to `main` for a sync, Perforce may report "Can't clobber writable file" errors. git-p4son
+handles these automatically by classifying each writable file:
+
+**writable-unchanged** - The file on disk is identical to the last sync (only the read-only flag was removed
+by git). This is the common case after switching branches. git-p4son detects this by comparing git blob IDs against
+the last sync commit that touched the file, restores the read-only flag, and lets the sync overwrite the file.
+
+**writable-changed** - The file on disk differs from the last sync. This happens when you manually edit a file
+on `main` and commit it to git without submitting to Perforce. git-p4son lets the sync overwrite the file and
+includes it in the sync commit (so the commit reflects pure Perforce state), then three-way merges your local
+changes on top of the new Perforce content - similar to a `git rebase`. If the merge is clean, the result appears
+as an unstaged change. If there are conflicts, standard conflict markers are inserted for you to resolve.
 
-When you switch branches with `git checkout`, git overwrites the files that differ between the source and target branch.
-In doing so, it always removes the read-only flag - this is just how git works.
+**added both locally and in Perforce** - A file you committed to git is also being added by Perforce (p4 has never
+synced it to your workspace). There is no common baseline, so git-p4son merges the two versions against an empty
+base: identical content merges cleanly, otherwise the file gets a single conflict block containing both full
+versions for you to resolve.
 
-Now imagine one of those files has also been modified in Perforce. The next time `p4 sync` runs, Perforce will complain
-that a file was changed outside its control. At that point you have two options: either force-sync the individual file
-with `p4 sync -f //path/to/file`, or enable the `clobber` flag on your workspace so that Perforce silently overwrites
-writable files.
+**binary files** - Binary files that have local changes cannot be three-way merged. git-p4son restores your local
+version to disk after the sync commit so it shows up in `git status` for you to handle manually.
 
-This is not specific to git-p4son - any workflow that combines git and Perforce in the same workspace will run into it.
-And in practice it is harmless: your local changes live on feature branches in git, so when you rebase onto `main` after
-a sync, your changes are reapplied on top of the latest Perforce state.
+**added locally, deleted upstream** - A file with local changes in git was deleted in Perforce. git-p4son lets the
+delete stand and warns you - your version remains available in git history.
+
+**deleted locally, added upstream** - A file you deleted from git was modified in Perforce. The Perforce version is
+kept in the sync commit. You can delete it again if you want.
+
+**ignored** - Files ignored by `.gitignore` are skipped with a warning. These are outside git's domain and should
+be managed manually or via Perforce directly.
+
+After syncing, git-p4son prints a summary of how each writable file was handled, and instructs you to review and
+commit any files that need attention.
 
 ## Usage
 
@@ -241,7 +259,7 @@ Initialize a git repository inside a Perforce workspace:
 git p4son init
 ```
 
-This command checks preconditions (Perforce workspace, clobber flag), configures the depot root, runs `git init`,
+This command checks preconditions (Perforce workspace), configures the depot root, runs `git init`,
 sets up `.gitignore`, and creates an initial commit.
 
 The depot root determines which part of the Perforce workspace git-p4son syncs. You can choose to sync the entire
@@ -266,7 +284,7 @@ git p4son sync [changelist] [--force]
   sync to the latest changelist affecting the workspace.
 
 **Options:**
-- `-f, --force`: Force sync encountered writable files and allow syncing to older changelists.
+- `-f, --force`: Allow syncing to changelists older than the current one.
 
 **Examples:**
 ```sh
@@ -317,7 +335,11 @@ git p4son new -m "New feature" --review -b main
 
 ### Update Command
 
-Update an existing Perforce changelist description by replacing the enumerated commit list with the current commits since the base branch. By default also opens changed files for edit.
+Update an existing Perforce changelist description. Commits since the base branch replace their existing
+entries in the enumerated commit list (matched by subject) and new ones are appended; entries outside the
+range are kept and the list is renumbered. So `update -b main` rebuilds the whole list without duplicating
+it, while `update -b HEAD~3` only refreshes the last three entries. By default also opens changed files for
+edit.
 
 ```sh
 git p4son update [changelist] [--base-branch BASE_BRANCH] [--dry-run] [--no-desc] [--no-edit] [--shelve]
@@ -464,16 +486,21 @@ git p4son alias delete myfeature
 
 #### alias clean
 
-Interactively review and delete changelist aliases:
+Clean up changelist aliases:
 
 ```sh
 git p4son alias clean
 ```
 
-This command iterates through each alias, displays it, and prompts for action:
+The command lists all aliases and asks how to proceed:
+- `a` (all): Delete all aliases
+- `i` (interactive): Review each alias one by one
+- `q` (quit): Exit without deleting anything
+
+In interactive mode, each alias is displayed in turn with a prompt:
 - `y` (yes): Delete this alias
 - `n` (no): Keep this alias
-- `a` (all): Delete this and all remaining aliases
+- `a` (all): Delete this and all remaining aliases (handy for keeping the first few and sweeping the rest)
 - `q` (quit): Stop and keep remaining aliases
 
 **Examples:**

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

@@ -133,41 +133,37 @@ cloning.
 
 These steps set up git-p4son in an existing Perforce workspace. You only need to do this once.
 
-1. **Enable clobber on your Perforce workspace.** Edit the workspace in
-   P4V to set the clobber flag, or run `p4 client` and change `noclobber` to `clobber` in the Options line.
-   See [Why clobber?](#why-clobber) for rationale.
-
-2. **Set a git editor** if you don't have one already. The `review` command opens an interactive rebase in your
+1. **Set a git editor** if you don't have one already. The `review` command opens an interactive rebase in your
    editor. If you haven't configured one, set it with:
    ```sh
    git config --global core.editor <editor>   # e.g. vim, nano, code --wait
    ```
 
-3. **Sync your workspace to a known changelist.** Pick a changelist to use as the starting point for your git
+2. **Sync your workspace to a known changelist.** Pick a changelist to use as the starting point for your git
    history:
    ```sh
    p4 sync //...@12345
    ```
 
-4. **Run `git p4son init`.** This can be anywhere inside your Perforce workspace — it doesn't have to be at the
+3. **Run `git p4son init`.** This can be anywhere inside your Perforce workspace - it doesn't have to be at the
    root:
    ```sh
    cd /path/to/your/workspace    # or a subdirectory of it
    git p4son init
    ```
-   The command verifies that you are inside a P4 workspace with clobber enabled, prompts you to select a depot
+   The command verifies that you are inside a P4 workspace, prompts you to select a depot
    root (entire workspace or current directory subtree), runs `git init`, sets up `.gitignore` (copying from
    `.p4ignore` if available), and creates an initial commit.
 
-5. **Review `.gitignore`.** Edit the file to ensure build artifacts and other unwanted files are excluded.
+4. **Review `.gitignore`.** Edit the file to ensure build artifacts and other unwanted files are excluded.
 
-6. **Add and commit all files manually the first time**
+5. **Add and commit all files manually the first time**
    ```sh
    git add .
    git commit -m "Initial submit all files"
    ```
 
-7. **Run `git p4son sync`** to get your first official sync commit
+6. **Run `git p4son sync`** to get your first official sync commit
    ```sh
    git p4son sync
    ```
@@ -176,19 +172,41 @@ These steps set up git-p4son in an existing Perforce workspace. You only need to
 From here, branch off `main` for local development. See the [Usage Example](#usage-example) for a typical
 workflow.
 
-### Why clobber?
+### How sync handles writable files
+
+When you switch branches with `git checkout`, git removes the read-only flag on every file it writes. This means
+that when you switch back to `main` for a sync, Perforce may report "Can't clobber writable file" errors. git-p4son
+handles these automatically by classifying each writable file:
+
+**writable-unchanged** - The file on disk is identical to the last sync (only the read-only flag was removed
+by git). This is the common case after switching branches. git-p4son detects this by comparing git blob IDs against
+the last sync commit that touched the file, restores the read-only flag, and lets the sync overwrite the file.
+
+**writable-changed** - The file on disk differs from the last sync. This happens when you manually edit a file
+on `main` and commit it to git without submitting to Perforce. git-p4son lets the sync overwrite the file and
+includes it in the sync commit (so the commit reflects pure Perforce state), then three-way merges your local
+changes on top of the new Perforce content - similar to a `git rebase`. If the merge is clean, the result appears
+as an unstaged change. If there are conflicts, standard conflict markers are inserted for you to resolve.
 
-When you switch branches with `git checkout`, git overwrites the files that differ between the source and target branch.
-In doing so, it always removes the read-only flag - this is just how git works.
+**added both locally and in Perforce** - A file you committed to git is also being added by Perforce (p4 has never
+synced it to your workspace). There is no common baseline, so git-p4son merges the two versions against an empty
+base: identical content merges cleanly, otherwise the file gets a single conflict block containing both full
+versions for you to resolve.
 
-Now imagine one of those files has also been modified in Perforce. The next time `p4 sync` runs, Perforce will complain
-that a file was changed outside its control. At that point you have two options: either force-sync the individual file
-with `p4 sync -f //path/to/file`, or enable the `clobber` flag on your workspace so that Perforce silently overwrites
-writable files.
+**binary files** - Binary files that have local changes cannot be three-way merged. git-p4son restores your local
+version to disk after the sync commit so it shows up in `git status` for you to handle manually.
 
-This is not specific to git-p4son - any workflow that combines git and Perforce in the same workspace will run into it.
-And in practice it is harmless: your local changes live on feature branches in git, so when you rebase onto `main` after
-a sync, your changes are reapplied on top of the latest Perforce state.
+**added locally, deleted upstream** - A file with local changes in git was deleted in Perforce. git-p4son lets the
+delete stand and warns you - your version remains available in git history.
+
+**deleted locally, added upstream** - A file you deleted from git was modified in Perforce. The Perforce version is
+kept in the sync commit. You can delete it again if you want.
+
+**ignored** - Files ignored by `.gitignore` are skipped with a warning. These are outside git's domain and should
+be managed manually or via Perforce directly.
+
+After syncing, git-p4son prints a summary of how each writable file was handled, and instructs you to review and
+commit any files that need attention.
 
 ## Usage
 
@@ -218,7 +236,7 @@ Initialize a git repository inside a Perforce workspace:
 git p4son init
 ```
 
-This command checks preconditions (Perforce workspace, clobber flag), configures the depot root, runs `git init`,
+This command checks preconditions (Perforce workspace), configures the depot root, runs `git init`,
 sets up `.gitignore`, and creates an initial commit.
 
 The depot root determines which part of the Perforce workspace git-p4son syncs. You can choose to sync the entire
@@ -243,7 +261,7 @@ git p4son sync [changelist] [--force]
   sync to the latest changelist affecting the workspace.
 
 **Options:**
-- `-f, --force`: Force sync encountered writable files and allow syncing to older changelists.
+- `-f, --force`: Allow syncing to changelists older than the current one.
 
 **Examples:**
 ```sh
@@ -294,7 +312,11 @@ git p4son new -m "New feature" --review -b main
 
 ### Update Command
 
-Update an existing Perforce changelist description by replacing the enumerated commit list with the current commits since the base branch. By default also opens changed files for edit.
+Update an existing Perforce changelist description. Commits since the base branch replace their existing
+entries in the enumerated commit list (matched by subject) and new ones are appended; entries outside the
+range are kept and the list is renumbered. So `update -b main` rebuilds the whole list without duplicating
+it, while `update -b HEAD~3` only refreshes the last three entries. By default also opens changed files for
+edit.
 
 ```sh
 git p4son update [changelist] [--base-branch BASE_BRANCH] [--dry-run] [--no-desc] [--no-edit] [--shelve]
@@ -441,16 +463,21 @@ git p4son alias delete myfeature
 
 #### alias clean
 
-Interactively review and delete changelist aliases:
+Clean up changelist aliases:
 
 ```sh
 git p4son alias clean
 ```
 
-This command iterates through each alias, displays it, and prompts for action:
+The command lists all aliases and asks how to proceed:
+- `a` (all): Delete all aliases
+- `i` (interactive): Review each alias one by one
+- `q` (quit): Exit without deleting anything
+
+In interactive mode, each alias is displayed in turn with a prompt:
 - `y` (yes): Delete this alias
 - `n` (no): Keep this alias
-- `a` (all): Delete this and all remaining aliases
+- `a` (all): Delete this and all remaining aliases (handy for keeping the first few and sweeping the rest)
 - `q` (quit): Stop and keep remaining aliases
 
 **Examples:**

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

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

{git_p4son-0.2.10 → git_p4son-0.3.0}/git_p4son/alias.py

@@ -8,6 +8,7 @@ from .changelist_store import (
     list_changelist_aliases,
     delete_changelist_alias,
 )
+from .common import prompt_choice
 from .log import log
 
 
@@ -54,43 +55,27 @@ def alias_delete_command(args: argparse.Namespace) -> int:
     return 0
 
 
-def _prompt_delete(prompt: str) -> str | None:
-    """Prompt until a valid y/n/a/q response is given. Returns None on EOF."""
-    while True:
-        try:
-            response = input(prompt).strip().lower()
-        except EOFError:
-            print()
-            return None
-
-        if response in ('y', 'yes'):
-            return 'yes'
-        elif response in ('n', 'no'):
-            return 'no'
-        elif response in ('a', 'all'):
-            return 'all'
-        elif response in ('q', 'quit'):
-            return 'quit'
-        else:
-            print('Please enter y, n, a, or q')
+def _clean_all(aliases: list[tuple[str, str]], workspace_dir: str) -> None:
+    """Delete every alias without further prompting."""
+    for name, _changelist in aliases:
+        if delete_changelist_alias(name, workspace_dir):
+            log.success(f'Deleted "{name}"')
 
 
-def alias_clean_command(args: argparse.Namespace) -> int:
-    """Execute the 'alias clean' command with interactive prompts."""
-    workspace_dir = args.workspace_dir
-
-    aliases = list_changelist_aliases(workspace_dir)
-    if not aliases:
-        log.success('No changelist aliases to clean')
-        return 0
+def _clean_interactive(aliases: list[tuple[str, str]],
+                       workspace_dir: str) -> None:
+    """Review each alias in turn with yes/no/all/quit prompts.
 
+    The all option lets the user keep the first aliases and sweep the rest:
+    answer no until the last one worth keeping, then a deletes the
+    remainder without further prompts."""
     response = None
     for name, changelist in aliases:
         log.heading(f'{name} -> CL {changelist}')
 
         if response != 'all':
-            response = _prompt_delete(
-                'Delete? [y]es / [n]o / [a]ll / [q]uit: ')
+            response = prompt_choice(
+                'Delete?', ['yes', 'no', 'all', 'quit'])
 
         if response is None or response == 'quit':
             log.info('Aborting')
@@ -102,6 +87,30 @@ def alias_clean_command(args: argparse.Namespace) -> int:
         if delete_changelist_alias(name, workspace_dir):
             log.success('Deleted')
 
+
+def alias_clean_command(args: argparse.Namespace) -> int:
+    """Execute the 'alias clean' command."""
+    workspace_dir = args.workspace_dir
+
+    aliases = list_changelist_aliases(workspace_dir)
+    if not aliases:
+        log.success('No changelist aliases to clean')
+        return 0
+
+    log.info(f'Found {len(aliases)}')
+    for name, changelist in aliases:
+        log.info(f'{name} -> {changelist}')
+
+    mode = prompt_choice('Delete?', ['all', 'interactive', 'quit'])
+    if mode is None or mode == 'quit':
+        log.info('Aborting')
+        return 0
+
+    if mode == 'all':
+        _clean_all(aliases, workspace_dir)
+    else:
+        _clean_interactive(aliases, workspace_dir)
+
     return 0
 
 

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

@@ -19,6 +19,13 @@ RESERVED_KEYWORDS = frozenset({'last-synced', 'branch'})
 # (Windows disallows trailing dots).
 _ALIAS_NAME_RE = re.compile(r'^[A-Za-z0-9_-]([A-Za-z0-9._-]*[A-Za-z0-9_-])?$')
 
+# Windows device names; opening such a path hits the device namespace
+# instead of creating a file, on any drive and regardless of extension.
+_WINDOWS_RESERVED_NAMES = frozenset(
+    {'con', 'prn', 'aux', 'nul'}
+    | {f'com{i}' for i in range(1, 10)}
+    | {f'lpt{i}' for i in range(1, 10)})
+
 
 def validate_alias_name(name: str) -> str | None:
     """Return an error message if alias name is invalid, else None."""
@@ -30,6 +37,15 @@ def validate_alias_name(name: str) -> str | None:
         return (
             f'Invalid alias name "{name}": must contain only letters, digits, '
             'hyphens, underscores, and dots, and must not start or end with a dot')
+    if name.isdigit():
+        # Digit strings are always interpreted as changelist numbers, so
+        # such an alias could be created but never referenced.
+        return (
+            f'Invalid alias name "{name}": an all-digit name would be '
+            'indistinguishable from a changelist number')
+    if name.split('.', 1)[0].lower() in _WINDOWS_RESERVED_NAMES:
+        return (
+            f'Invalid alias name "{name}": reserved device name on Windows')
     return None
 
 
@@ -38,6 +54,18 @@ def _changelists_dir(workspace_dir: str) -> str:
     return os.path.join(workspace_dir, CONFIG_DIR, 'changelists')
 
 
+def _alias_path(name: str, workspace_dir: str) -> str | None:
+    """Validate name and return its store path, or None if invalid.
+
+    Validating on every lookup, not just on save, keeps raw user input
+    (e.g. "../../somefile") from escaping the store directory."""
+    error = validate_alias_name(name)
+    if error:
+        log.error(error)
+        return None
+    return os.path.join(_changelists_dir(workspace_dir), name)
+
+
 def alias_exists(name: str, workspace_dir: str) -> bool:
     """Check whether a changelist alias exists."""
     alias_path = os.path.join(_changelists_dir(workspace_dir), name)
@@ -46,13 +74,11 @@ def alias_exists(name: str, workspace_dir: str) -> bool:
 
 def save_changelist_alias(name: str, changelist: str, workspace_dir: str, force: bool = False) -> bool:
     """Save a changelist number under a named alias."""
-    error = validate_alias_name(name)
-    if error:
-        log.error(error)
+    alias_path = _alias_path(name, workspace_dir)
+    if alias_path is None:
         return False
 
     changelists_dir = _changelists_dir(workspace_dir)
-    alias_path = os.path.join(changelists_dir, name)
 
     if os.path.exists(alias_path) and not force:
         log.error(
@@ -71,7 +97,9 @@ def save_changelist_alias(name: str, changelist: str, workspace_dir: str, force:
 
 def load_changelist_alias(name: str, workspace_dir: str) -> str | None:
     """Load a changelist number from a named alias, or None if not found."""
-    alias_path = os.path.join(_changelists_dir(workspace_dir), name)
+    alias_path = _alias_path(name, workspace_dir)
+    if alias_path is None:
+        return None
 
     if not os.path.exists(alias_path):
         log.error(f'No changelist alias found: {name}')
@@ -108,7 +136,9 @@ def list_changelist_aliases(workspace_dir: str) -> list[tuple[str, str]]:
 
 def delete_changelist_alias(name: str, workspace_dir: str) -> bool:
     """Delete a changelist alias file."""
-    alias_path = os.path.join(_changelists_dir(workspace_dir), name)
+    alias_path = _alias_path(name, workspace_dir)
+    if alias_path is None:
+        return False
 
     if not os.path.exists(alias_path):
         log.error(f'No changelist alias found: {name}')

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

@@ -66,7 +66,7 @@ Examples:
         'init',
         help='Initialize a git repository inside a Perforce workspace',
         description='Set up a new git repository inside a Perforce workspace. '
-        'Checks preconditions (P4 workspace, clobber flag), initializes git, '
+        'Checks preconditions (P4 workspace), initializes git, '
         'sets up .gitignore, and creates an initial commit.'
     )
 
@@ -86,10 +86,7 @@ Examples:
     sync_parser.add_argument(
         '-f', '--force',
         action='store_true',
-        help='Force sync encountered writable files and allow syncing to older changelists. '
-             'When clobber is not enabled on your workspace, p4 will fail to sync files that '
-             'are read-only. git removes the readonly flag on touched files. Also allows '
-             'syncing to changelists older than the current one.'
+        help='Allow syncing to changelists older than the current one.'
     )
 
     # New subcommand
@@ -149,6 +146,7 @@ Examples:
     )
     new_parser.add_argument(
         '-s', '--sleep',
+        type=int,
         help='Sleep for the specified number of seconds after the command is done'
     )
 
@@ -156,9 +154,11 @@ Examples:
     update_parser = subparsers.add_parser(
         'update',
         help='Update an existing changelist description and open files for edit',
-        description='Update an existing Perforce changelist description by '
-        'replacing the enumerated commit list with the current commits '
-        'since the base branch. By default also opens changed files for edit.'
+        description='Update an existing Perforce changelist description: '
+        'commits since the base branch replace their existing entries in '
+        'the enumerated commit list and new ones are appended; entries '
+        'outside the range are kept. By default also opens changed files '
+        'for edit.'
     )
     update_parser.add_argument(
         'changelist',
@@ -194,6 +194,7 @@ Examples:
     )
     update_parser.add_argument(
         '-s', '--sleep',
+        type=int,
         help='Sleep for the specified number of seconds after the command is done'
     )
 
@@ -268,9 +269,9 @@ Examples:
     # alias clean
     alias_subparsers.add_parser(
         'clean',
-        help='Interactive cleanup of changelist aliases',
-        description='Interactively review and delete changelist aliases with '
-        'yes/no/all/quit prompts'
+        help='Clean up changelist aliases',
+        description='List all changelist aliases, then delete all of them '
+        'or review each one interactively with yes/no/all/quit prompts'
     )
 
     # Review subcommand
@@ -468,7 +469,7 @@ def main() -> int:
         exit_code = run_command(args)
 
         if exit_code == 0 and getattr(args, 'sleep', None) is not None:
-            seconds = int(args.sleep)
+            seconds = args.sleep
             log.heading(f'Sleeping for {seconds} seconds')
             time.sleep(seconds)
             log.success('awake again')