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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-p4son
-Version: 0.2.7
+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.7 → 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.7"
+__version__ = "0.2.8"
 __author__ = "Andreas Andersson"
 __email__ = "andreas@neoboid.com"

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

@@ -207,6 +207,15 @@ def _ensure_in_changelist(filename: str, p4_action: str, changelist: str,
         # 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':

{git_p4son-0.2.7 → 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.7
+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.7 → git_p4son-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "git-p4son"
-version = "0.2.7"
+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.7 → git_p4son-0.2.8}/tests/test_lib_edit.py

@@ -350,6 +350,28 @@ class TestActionMismatch(unittest.TestCase):
         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')