git-p4son 0.2.5__tar.gz → 0.2.7__tar.gz

{git_p4son-0.2.5 → git_p4son-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.2.5
+Version: 0.2.7
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT
@@ -418,12 +418,12 @@ git p4son alias list
 git p4son alias list
 ```
 
-#### alias set
+#### alias new
 
 Save a changelist number under a named alias:
 
 ```sh
-git p4son alias set <changelist> [alias] [--force]
+git p4son alias new <changelist> [alias] [--force]
 ```
 
 **Arguments:**
@@ -435,9 +435,9 @@ git p4son alias set <changelist> [alias] [--force]
 
 **Examples:**
 ```sh
-git p4son alias set 12345              # alias defaults to branch name
-git p4son alias set 12345 myfeature
-git p4son alias set 67890 myfeature -f
+git p4son alias new 12345              # alias defaults to branch name
+git p4son alias new 12345 myfeature
+git p4son alias new 67890 myfeature -f
 ```
 
 #### alias delete

{git_p4son-0.2.5 → git_p4son-0.2.7}/README.md

@@ -395,12 +395,12 @@ git p4son alias list
 git p4son alias list
 ```
 
-#### alias set
+#### alias new
 
 Save a changelist number under a named alias:
 
 ```sh
-git p4son alias set <changelist> [alias] [--force]
+git p4son alias new <changelist> [alias] [--force]
 ```
 
 **Arguments:**
@@ -412,9 +412,9 @@ git p4son alias set <changelist> [alias] [--force]
 
 **Examples:**
 ```sh
-git p4son alias set 12345              # alias defaults to branch name
-git p4son alias set 12345 myfeature
-git p4son alias set 67890 myfeature -f
+git p4son alias new 12345              # alias defaults to branch name
+git p4son alias new 12345 myfeature
+git p4son alias new 67890 myfeature -f
 ```
 
 #### alias delete

{git_p4son-0.2.5 → git_p4son-0.2.7}/git_p4son/__init__.py

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

{git_p4son-0.2.5 → git_p4son-0.2.7}/git_p4son/alias.py

@@ -19,17 +19,16 @@ def alias_list_command(args: argparse.Namespace) -> int:
     if not aliases:
         log.info('No aliases defined')
         return 0
+    log.info(f'Found {len(aliases)}')
 
     for name, changelist in aliases:
         log.info(f'{name} -> {changelist}')
 
-    log.success(f'{len(aliases)} listed')
-
     return 0
 
 
-def alias_set_command(args: argparse.Namespace) -> int:
-    """Execute the 'alias set' command."""
+def alias_new_command(args: argparse.Namespace) -> int:
+    """Execute the 'alias new' command."""
     workspace_dir = args.workspace_dir
 
     if not args.changelist.isdigit():
@@ -55,6 +54,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 alias_clean_command(args: argparse.Namespace) -> int:
     """Execute the 'alias clean' command with interactive prompts."""
     workspace_dir = args.workspace_dir
@@ -64,50 +84,24 @@ def alias_clean_command(args: argparse.Namespace) -> int:
         log.success('No changelist aliases to clean')
         return 0
 
-    delete_all = False
-    deleted_count = 0
-
+    response = None
     for name, changelist in aliases:
-        # Interactive output stays as print() — it's a prompt-response UI
-        print(f'{name} -> {changelist}')
+        log.heading(f'{name} -> CL {changelist}')
 
-        if delete_all:
-            delete_changelist_alias(name, workspace_dir)
-            deleted_count += 1
-            log.info('  Deleted')
-            continue
+        if response != 'all':
+            response = _prompt_delete(
+                'Delete? [y]es / [n]o / [a]ll / [q]uit: ')
 
-        quit = False
-        while True:
-            try:
-                response = input(
-                    'Delete? [y]es / [n]o / [a]ll / [q]uit: ').strip().lower()
-            except EOFError:
-                print()
-                return 0
-
-            if response in ('y', 'yes'):
-                delete_changelist_alias(name, workspace_dir)
-                deleted_count += 1
-                log.info('  Deleted')
-                break
-            elif response in ('n', 'no'):
-                break
-            elif response in ('a', 'all'):
-                delete_all = True
-                delete_changelist_alias(name, workspace_dir)
-                deleted_count += 1
-                log.info('  Deleted')
-                break
-            elif response in ('q', 'quit'):
-                quit = True
-                break
-            else:
-                print('Please enter y, n, a, or q')
-        if quit:
+        if response is None or response == 'quit':
+            log.info('Aborting')
             break
+        elif response == 'no':
+            log.info('Skipped')
+            continue
+
+        if delete_changelist_alias(name, workspace_dir):
+            log.success('Deleted')
 
-    log.success(f'Deleted {deleted_count} alias(es)')
     return 0
 
 
@@ -115,8 +109,8 @@ def alias_command(args: argparse.Namespace) -> int:
     """Dispatch alias subcommands."""
     if args.alias_action == 'list':
         return alias_list_command(args)
-    elif args.alias_action == 'set':
-        return alias_set_command(args)
+    elif args.alias_action == 'new':
+        return alias_new_command(args)
     elif args.alias_action == 'delete':
         return alias_delete_command(args)
     elif args.alias_action == 'clean':

{git_p4son-0.2.5 → git_p4son-0.2.7}/git_p4son/cli.py

@@ -227,25 +227,25 @@ Examples:
         description='List all changelist aliases stored in .git-p4son/changelists/'
     )
 
-    # alias set
-    alias_set_parser = alias_subparsers.add_parser(
-        'set',
+    # alias new
+    alias_new_parser = alias_subparsers.add_parser(
+        'new',
         help='Save a changelist number under a named alias',
         description='Save a changelist number under a named alias in '
         '.git-p4son/changelists/<alias>'
     )
-    alias_set_parser.add_argument(
+    alias_new_parser.add_argument(
         'changelist',
         help='Changelist number to save'
     )
-    alias_set_parser.add_argument(
+    alias_new_parser.add_argument(
         'alias',
         nargs='?',
         default='branch',
         help='Alias name to save the changelist number under. '
              'Defaults to the current branch name'
     )
-    alias_set_parser.add_argument(
+    alias_new_parser.add_argument(
         '-f', '--force',
         action='store_true',
         help='Overwrite an existing alias file'
@@ -396,7 +396,7 @@ def run_command(args: argparse.Namespace) -> int:
     elif args.command == 'update' and args.changelist == 'branch':
         branch_attr = 'changelist'
     elif (args.command == 'alias'
-          and args.alias_action in ('set', 'delete')
+          and args.alias_action in ('new', 'delete')
           and args.alias == 'branch'):
         branch_attr = 'alias'
 
@@ -468,7 +468,7 @@ def main() -> int:
             seconds = int(args.sleep)
             log.heading(f'Sleeping for {seconds} seconds')
             time.sleep(seconds)
-            log.ok('awake again')
+            log.success('awake again')
 
         return exit_code
     except KeyboardInterrupt:

{git_p4son-0.2.5 → git_p4son-0.2.7}/git_p4son/complete.py

@@ -128,7 +128,7 @@ def _complete_positional(command, subcommand, positional_count,
             branch_candidates = _get_branch_candidates(prefix, workspace_dir)
             return branch_candidates + _filter(aliases, prefix)
 
-        if subcommand == 'set' and positional_count == 1:
+        if subcommand == 'new' and positional_count == 1:
             branch_candidates = _get_branch_candidates(prefix, workspace_dir)
             return branch_candidates + _filter(aliases, prefix)
 

{git_p4son-0.2.5 → git_p4son-0.2.7}/git_p4son/perforce.py

@@ -177,26 +177,46 @@ def get_latest_changelist(depot_root: str, workspace_dir: str) -> int:
 
 # --- file operations ---
 
-def get_changelist_for_file(filename: str, workspace_dir: str) -> str | None:
-    """Return the changelist a file is opened in, or None if not opened."""
+def get_changelist_for_file(filename: str, workspace_dir: str) -> tuple[str, str] | None:
+    """Return (changelist, action) for an opened file, or None if not opened."""
     res = run(['p4', '-ztag', 'opened', filename], cwd=workspace_dir)
     fields = parse_ztag_output(res.stdout)
-    return fields.get('change')
+    change = fields.get('change')
+    if change is None:
+        return None
+    return (change, fields.get('action', ''))
 
 
 def _ensure_in_changelist(filename: str, p4_action: str, changelist: str,
                           workspace_dir: str, dry_run: bool) -> None:
-    """Ensure a file is opened in the given changelist.
+    """Ensure a file is opened with the correct action in the given changelist.
 
     If the file is not yet opened, run the specified p4 action (add, edit, delete).
-    If it's already opened in a different changelist, reopen it.
-    If it's already in the correct changelist, do nothing.
+    If it's already opened with a different action, revert and reopen.
+    If it's already opened with the correct action in a different changelist, reopen it.
+    If it's already in the correct changelist with the correct action, do nothing.
     """
-    current = get_changelist_for_file(filename, workspace_dir)
-    if current is None:
+    result = get_changelist_for_file(filename, workspace_dir)
+    if result is None:
+        run(['p4', p4_action, '-c', changelist, filename],
+            cwd=workspace_dir, dry_run=dry_run)
+        return
+
+    current_cl, current_action = result
+    if current_action != p4_action:
+        # Action mismatch - revert first, then reopen with correct action.
+        # p4 revert overwrites the file on disk with the depot version,
+        # so we need git restore afterwards to get the git content back.
+        run(['p4', 'revert', filename], cwd=workspace_dir, dry_run=dry_run)
+        # For add -> delete: the file never existed in the depot, so just revert.
+        if current_action == 'add' and p4_action == 'delete':
+            return
         run(['p4', p4_action, '-c', changelist, filename],
             cwd=workspace_dir, dry_run=dry_run)
-    elif current != changelist:
+        if p4_action != 'delete':
+            run(['git', 'restore', filename],
+                cwd=workspace_dir, dry_run=dry_run)
+    elif current_cl != changelist:
         run(['p4', 'reopen', '-c', changelist, filename],
             cwd=workspace_dir, dry_run=dry_run)
 

{git_p4son-0.2.5 → git_p4son-0.2.7}/git_p4son.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.2.5
+Version: 0.2.7
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT
@@ -418,12 +418,12 @@ git p4son alias list
 git p4son alias list
 ```
 
-#### alias set
+#### alias new
 
 Save a changelist number under a named alias:
 
 ```sh
-git p4son alias set <changelist> [alias] [--force]
+git p4son alias new <changelist> [alias] [--force]
 ```
 
 **Arguments:**
@@ -435,9 +435,9 @@ git p4son alias set <changelist> [alias] [--force]
 
 **Examples:**
 ```sh
-git p4son alias set 12345              # alias defaults to branch name
-git p4son alias set 12345 myfeature
-git p4son alias set 67890 myfeature -f
+git p4son alias new 12345              # alias defaults to branch name
+git p4son alias new 12345 myfeature
+git p4son alias new 67890 myfeature -f
 ```
 
 #### alias delete

{git_p4son-0.2.5 → git_p4son-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "git-p4son"
-version = "0.2.5"
+version = "0.2.7"
 description = "Utility for keeping a Perforce workspace and local git repo in sync"
 readme = "README.md"
 requires-python = ">=3.11"

{git_p4son-0.2.5 → git_p4son-0.2.7}/tests/test_complete.py

@@ -198,7 +198,7 @@ class TestComplete(unittest.TestCase):
         result = _complete(self.parser, ['alias', ''], workspace_dir='/ws')
         names = self._names(result)
         self.assertIn('list', names)
-        self.assertIn('set', names)
+        self.assertIn('new', names)
         self.assertIn('delete', names)
         self.assertIn('clean', names)
 
@@ -208,14 +208,14 @@ class TestComplete(unittest.TestCase):
         names = self._names(result)
         self.assertEqual(names, ['myalias'])
 
-    def test_alias_set_second_positional(self, _ws, _aliases):
-        result = _complete(self.parser, ['alias', 'set', '123', ''],
+    def test_alias_new_second_positional(self, _ws, _aliases):
+        result = _complete(self.parser, ['alias', 'new', '123', ''],
                            workspace_dir='/ws')
         names = self._names(result)
         self.assertEqual(names, ['myalias'])
 
-    def test_alias_set_flags(self, _ws, _aliases):
-        result = _complete(self.parser, ['alias', 'set', '-'],
+    def test_alias_new_flags(self, _ws, _aliases):
+        result = _complete(self.parser, ['alias', 'new', '-'],
                            workspace_dir='/ws')
         names = self._names(result)
         self.assertIn('-f', names)
@@ -283,20 +283,20 @@ class TestCompleteBranchAlias(unittest.TestCase):
         self.assertIn('branch', names)
         self.assertIn('myalias', names)
 
-    def test_alias_set_branch_keyword(self, _ws, _aliases, _branch):
-        result = _complete(self.parser, ['alias', 'set', '123', 'b'],
+    def test_alias_new_branch_keyword(self, _ws, _aliases, _branch):
+        result = _complete(self.parser, ['alias', 'new', '123', 'b'],
                            workspace_dir='/ws')
         names = self._names(result)
         self.assertIn('branch', names)
 
-    def test_alias_set_br_prefix(self, _ws, _aliases, _branch):
-        result = _complete(self.parser, ['alias', 'set', '123', 'br'],
+    def test_alias_new_br_prefix(self, _ws, _aliases, _branch):
+        result = _complete(self.parser, ['alias', 'new', '123', 'br'],
                            workspace_dir='/ws')
         names = self._names(result)
         self.assertIn('branch', names)
 
-    def test_alias_set_branch_expand(self, _ws, _aliases, _branch):
-        result = _complete(self.parser, ['alias', 'set', '123', 'branch'],
+    def test_alias_new_branch_expand(self, _ws, _aliases, _branch):
+        result = _complete(self.parser, ['alias', 'new', '123', 'branch'],
                            workspace_dir='/ws')
         names = self._names(result)
         self.assertIn('feat-cool', names)

{git_p4son-0.2.5 → git_p4son-0.2.7}/tests/test_lib_edit.py

@@ -33,7 +33,7 @@ class TestGetChangelistForFile(unittest.TestCase):
             '... type text',
         ])
         result = get_changelist_for_file('foo.txt', '/ws')
-        self.assertEqual(result, 'default')
+        self.assertEqual(result, ('default', 'edit'))
 
     @mock.patch('git_p4son.perforce.run')
     def test_file_in_numbered_changelist(self, mock_run):
@@ -44,7 +44,7 @@ class TestGetChangelistForFile(unittest.TestCase):
             '... type text',
         ])
         result = get_changelist_for_file('foo.txt', '/ws')
-        self.assertEqual(result, '12345')
+        self.assertEqual(result, ('12345', 'edit'))
 
     @mock.patch('git_p4son.perforce.run')
     def test_file_opened_for_add(self, mock_run):
@@ -54,7 +54,7 @@ class TestGetChangelistForFile(unittest.TestCase):
             '... change 12345',
         ])
         result = get_changelist_for_file('foo.txt', '/ws')
-        self.assertEqual(result, '12345')
+        self.assertEqual(result, ('12345', 'add'))
 
     @mock.patch('git_p4son.perforce.run')
     def test_file_opened_for_delete(self, mock_run):
@@ -64,7 +64,7 @@ class TestGetChangelistForFile(unittest.TestCase):
             '... change 12345',
         ])
         result = get_changelist_for_file('foo.txt', '/ws')
-        self.assertEqual(result, '12345')
+        self.assertEqual(result, ('12345', 'delete'))
 
     @mock.patch('git_p4son.perforce.run')
     def test_file_opened_for_move_add(self, mock_run):
@@ -74,7 +74,7 @@ class TestGetChangelistForFile(unittest.TestCase):
             '... change 12345',
         ])
         result = get_changelist_for_file('foo.txt', '/ws')
-        self.assertEqual(result, '12345')
+        self.assertEqual(result, ('12345', 'move/add'))
 
     @mock.patch('git_p4son.perforce.run')
     def test_add_in_default_changelist(self, mock_run):
@@ -84,7 +84,7 @@ class TestGetChangelistForFile(unittest.TestCase):
             '... change default',
         ])
         result = get_changelist_for_file('foo.txt', '/ws')
-        self.assertEqual(result, 'default')
+        self.assertEqual(result, ('default', 'add'))
 
 
 class TestFindCommonAncestor(unittest.TestCase):
@@ -157,7 +157,7 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
             cwd='/ws', dry_run=False,
         )
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='200')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('200', 'add'))
     @mock.patch('git_p4son.perforce.run')
     def test_reopens_added_file_in_different_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -169,7 +169,7 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
             cwd='/ws', dry_run=False,
         )
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='100')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'add'))
     @mock.patch('git_p4son.perforce.run')
     def test_skips_added_file_already_in_correct_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -191,7 +191,7 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
             cwd='/ws', dry_run=False,
         )
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='200')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('200', 'edit'))
     @mock.patch('git_p4son.perforce.run')
     def test_reopens_file_in_different_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -203,7 +203,7 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
             cwd='/ws', dry_run=False,
         )
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='100')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'edit'))
     @mock.patch('git_p4son.perforce.run')
     def test_skips_file_already_in_correct_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -225,7 +225,7 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
             cwd='/ws', dry_run=False,
         )
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='200')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('200', 'delete'))
     @mock.patch('git_p4son.perforce.run')
     def test_reopens_deleted_file_in_different_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -237,7 +237,7 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
             cwd='/ws', dry_run=False,
         )
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='100')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'delete'))
     @mock.patch('git_p4son.perforce.run')
     def test_skips_deleted_file_already_in_correct_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -260,7 +260,8 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
                          'p4', 'delete', '-c', '100', 'old.txt'])
         self.assertEqual(calls[1][0][0], ['p4', 'add', '-c', '100', 'new.txt'])
 
-    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value='200')
+    @mock.patch('git_p4son.perforce.get_changelist_for_file',
+                side_effect=[('200', 'delete'), ('200', 'add')])
     @mock.patch('git_p4son.perforce.run')
     def test_reopens_moved_files_in_different_changelist(self, mock_run, mock_check):
         mock_run.return_value = make_run_result()
@@ -288,6 +289,80 @@ class TestIncludeChangesInChangelist(unittest.TestCase):
         )
 
 
+class TestActionMismatch(unittest.TestCase):
+    """Tests for reopening files when the p4 action doesn't match the desired action."""
+
+    # --- edit -> delete ---
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'edit'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_edit_to_delete_same_cl(self, mock_run, mock_check):
+        mock_run.return_value = make_run_result()
+        changes = LocalChanges()
+        changes.dels = ['file.txt']
+        include_changes_in_changelist(changes, '100', '/ws')
+        calls = mock_run.call_args_list
+        self.assertEqual(len(calls), 2)
+        self.assertEqual(calls[0][0][0], ['p4', 'revert', 'file.txt'])
+        self.assertEqual(calls[1][0][0],
+                         ['p4', 'delete', '-c', '100', 'file.txt'])
+
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('200', 'edit'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_edit_to_delete_different_cl(self, mock_run, mock_check):
+        mock_run.return_value = make_run_result()
+        changes = LocalChanges()
+        changes.dels = ['file.txt']
+        include_changes_in_changelist(changes, '100', '/ws')
+        calls = mock_run.call_args_list
+        self.assertEqual(len(calls), 2)
+        self.assertEqual(calls[0][0][0], ['p4', 'revert', 'file.txt'])
+        self.assertEqual(calls[1][0][0],
+                         ['p4', 'delete', '-c', '100', 'file.txt'])
+
+    # --- delete -> edit ---
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'delete'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_delete_to_edit_same_cl(self, mock_run, mock_check):
+        mock_run.return_value = make_run_result()
+        changes = LocalChanges()
+        changes.mods = ['file.txt']
+        include_changes_in_changelist(changes, '100', '/ws')
+        calls = mock_run.call_args_list
+        self.assertEqual(len(calls), 3)
+        self.assertEqual(calls[0][0][0], ['p4', 'revert', 'file.txt'])
+        self.assertEqual(calls[1][0][0],
+                         ['p4', 'edit', '-c', '100', 'file.txt'])
+        self.assertEqual(calls[2][0][0],
+                         ['git', 'restore', 'file.txt'])
+
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('200', 'delete'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_delete_to_edit_different_cl(self, mock_run, mock_check):
+        mock_run.return_value = make_run_result()
+        changes = LocalChanges()
+        changes.mods = ['file.txt']
+        include_changes_in_changelist(changes, '100', '/ws')
+        calls = mock_run.call_args_list
+        self.assertEqual(len(calls), 3)
+        self.assertEqual(calls[0][0][0], ['p4', 'revert', 'file.txt'])
+        self.assertEqual(calls[1][0][0],
+                         ['p4', 'edit', '-c', '100', 'file.txt'])
+        self.assertEqual(calls[2][0][0],
+                         ['git', 'restore', 'file.txt'])
+
+    # --- add -> delete (revert only, no reopen) ---
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'add'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_add_to_delete_reverts_only(self, mock_run, mock_check):
+        mock_run.return_value = make_run_result()
+        changes = LocalChanges()
+        changes.dels = ['file.txt']
+        include_changes_in_changelist(changes, '100', '/ws')
+        calls = mock_run.call_args_list
+        self.assertEqual(len(calls), 1)
+        self.assertEqual(calls[0][0][0], ['p4', 'revert', 'file.txt'])
+
+
 class TestOpenChangesForEdit(unittest.TestCase):
     @mock.patch('git_p4son.lib.include_changes_in_changelist')
     @mock.patch('git_p4son.lib.get_local_changes')