p4cmd 2.11.0__tar.gz → 2.11.2__tar.gz

{p4cmd-2.11.0 → p4cmd-2.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p4cmd
-Version: 2.11.0
+Version: 2.11.2
 Summary: Simple P4 python module
 Home-page: https://github.com/nielsvaes/p4cmd
 Author: Niels Vaes

{p4cmd-2.11.0 → p4cmd-2.11.2}/p4cmd/__init__.py

@@ -1,4 +1,4 @@
-VERSION = "2.11.0"
+VERSION = "2.11.2"
 
 from .p4cmd import P4Client
 from .p4file import P4File

{p4cmd-2.11.0 → p4cmd-2.11.2}/p4cmd/p4cmd.py

@@ -635,10 +635,25 @@ class P4Client(object):
         info_dicts = self.run_cmd("sync", args=initial_arg_list, file_list=file_list)
 
         if verify:
+            # Files p4 itself deleted on this sync are EXPECTED to be absent from
+            # disk — don't warn for them. Normalize paths so platform-specific
+            # quirks (slash direction, case on Windows) don't cause false misses.
+            def _norm(p):
+                return os.path.normcase(os.path.normpath(p))
+
+            deleted_locals = {
+                _norm(self.__get_dict_value(d, "clientFile"))
+                for d in info_dicts
+                if self.__get_dict_value(d, "action") == "deleted"
+                and self.__get_dict_value(d, "clientFile") is not None
+            }
+
             local_file_paths = self.get_local_paths(file_list)
             for local_file_path in local_file_paths:
                 if local_file_path is None:
                     continue
+                if _norm(local_file_path) in deleted_locals:
+                    continue
                 if not os.path.isfile(local_file_path):
                     _log.warning(f"File didn't exist after syncing, try force syncing it instead: {local_file_path}")
 

{p4cmd-2.11.0 → p4cmd-2.11.2}/p4cmd/p4file.py

@@ -81,8 +81,6 @@ class P4File:
         return not (self._raw_data and "is not under client's root" in self._raw_data)
 
     def needs_syncing(self):
-        if self.is_deleted() or self.is_moved_deleted():
-            return False
         if self.is_open_for_add() or self.is_open_for_edit():
             return False
         if self._head_revision is None:

{p4cmd-2.11.0 → p4cmd-2.11.2}/p4cmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p4cmd
-Version: 2.11.0
+Version: 2.11.2
 Summary: Simple P4 python module
 Home-page: https://github.com/nielsvaes/p4cmd
 Author: Niels Vaes

{p4cmd-2.11.0 → p4cmd-2.11.2}/tests/test_p4client.py

@@ -791,3 +791,39 @@ def test_silent_kwarg_default_no_warning(tmp_path):
                 P4Client(str(tmp_path), user="u", client="c", server="s")
     assert not any(issubclass(w.category, DeprecationWarning) and "silent" in str(w.message)
                    for w in caught), f"unexpected silent warning: {[str(w.message) for w in caught]}"
+
+
+# ---------------------------------------------------------------------------
+# sync_files verify — must not warn on files p4 itself deleted
+# ---------------------------------------------------------------------------
+
+def test_sync_files_no_warning_when_p4_deleted_file(p4client, caplog):
+    """If p4 sync reports action=deleted for a file, the post-sync verify
+    must not warn that the file is missing — its absence is expected."""
+    deleted_path = "C:/workspace/path/to/file.txt"
+    sync_result = [
+        {b"action": b"deleted", b"clientFile": deleted_path.encode(), b"code": b"stat"}
+    ]
+    with patch.object(p4client, "run_cmd", return_value=sync_result):
+        with patch.object(p4client, "get_local_paths", return_value=[deleted_path]):
+            with patch("p4cmd.p4cmd.os.path.isfile", return_value=False):
+                with caplog.at_level("WARNING", logger="p4cmd.p4cmd"):
+                    p4client.sync_files([deleted_path])
+    assert "didn't exist after syncing" not in caplog.text, (
+        f"unexpected verify warning: {caplog.text}"
+    )
+
+
+def test_sync_files_warns_when_file_missing_unexpectedly(p4client, caplog):
+    """Regression guard: when p4 did NOT delete the file but it's still missing
+    on disk, the existing 'try force syncing' warning must still fire."""
+    path = "C:/workspace/path/to/file.txt"
+    sync_result = [
+        {b"action": b"updated", b"clientFile": path.encode(), b"code": b"stat"}
+    ]
+    with patch.object(p4client, "run_cmd", return_value=sync_result):
+        with patch.object(p4client, "get_local_paths", return_value=[path]):
+            with patch("p4cmd.p4cmd.os.path.isfile", return_value=False):
+                with caplog.at_level("WARNING", logger="p4cmd.p4cmd"):
+                    p4client.sync_files([path])
+    assert "didn't exist after syncing" in caplog.text

{p4cmd-2.11.0 → p4cmd-2.11.2}/tests/test_p4file.py

@@ -283,6 +283,26 @@ def test_needs_syncing_up_to_date_returns_false():
     assert f.needs_syncing() is False
 
 
+def test_needs_syncing_deleted_at_head_with_old_have_returns_true():
+    # File deleted at head but user still has an older revision on disk —
+    # syncing will remove it. Previously the is_deleted() early-return
+    # masked this case, leaving orphaned files in the workspace.
+    f = P4File()
+    f.have_revision = "5"
+    f.head_revision = "6"
+    f.head_action = "delete"
+    assert f.needs_syncing() is True
+
+
+def test_needs_syncing_moved_deleted_with_old_have_returns_true():
+    # Same case for move/delete at head.
+    f = P4File()
+    f.have_revision = "5"
+    f.head_revision = "6"
+    f.head_action = "move/delete"
+    assert f.needs_syncing() is True
+
+
 # ---------------------------------------------------------------------------
 # get_status
 # ---------------------------------------------------------------------------