git-p4son 0.2.6__tar.gz → 0.2.8__tar.gz

{git_p4son-0.2.6 → git_p4son-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.2.6
+Version: 0.2.8
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT

{git_p4son-0.2.6 → git_p4son-0.2.8}/git_p4son/__init__.py

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

{git_p4son-0.2.6 → git_p4son-0.2.8}/git_p4son/perforce.py

@@ -177,26 +177,55 @@ 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.
+
+        # add -> edit: the file is new to the depot, so it must stay as add.
+        # This happens when a file is added in one commit and modified in the next.
+        if current_action == 'add' and p4_action == 'edit':
+            if current_cl != changelist:
+                run(['p4', 'reopen', '-c', changelist, filename],
+                    cwd=workspace_dir, dry_run=dry_run)
+            return
+
+        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.6 → git_p4son-0.2.8}/git_p4son.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.2.6
+Version: 0.2.8
 Summary: Utility for keeping a Perforce workspace and local git repo in sync
 Author-email: Andreas Andersson <andreas@neoboid.com>
 License-Expression: MIT

{git_p4son-0.2.6 → git_p4son-0.2.8}/pyproject.toml

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

{git_p4son-0.2.6 → git_p4son-0.2.8}/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,102 @@ 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 -> edit (keep as add, file is new to depot) ---
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('100', 'add'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_add_to_edit_same_cl_keeps_add(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')
+        mock_run.assert_not_called()
+
+    @mock.patch('git_p4son.perforce.get_changelist_for_file', return_value=('200', 'add'))
+    @mock.patch('git_p4son.perforce.run')
+    def test_add_to_edit_different_cl_reopens(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')
+        mock_run.assert_called_once_with(
+            ['p4', 'reopen', '-c', '100', 'file.txt'],
+            cwd='/ws', dry_run=False,
+        )
+
+    # --- 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')