p4cmd 2.9.0__tar.gz → 2.9.2__tar.gz

{p4cmd-2.9.0 → p4cmd-2.9.2}/PKG-INFO

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

{p4cmd-2.9.0 → p4cmd-2.9.2}/p4cmd/__init__.py

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

{p4cmd-2.9.0 → p4cmd-2.9.2}/p4cmd/p4cmd.py

@@ -605,6 +605,8 @@ class P4Client(object):
         if verify:
             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 not os.path.isfile(local_file_path):
                     logging.warning(f"File didn't exist after syncing, try force syncing it instead: {local_file_path}")
 
@@ -1160,7 +1162,11 @@ class P4Client(object):
             no_rev_paths.append("{}{}".format(path_without_ext, path_ext))
 
         info_dicts = self.run_cmd("where", file_list=no_rev_paths)
-        local_paths = [self.__get_dict_value(info, "path") for info in info_dicts]
+        local_paths = [
+            self.__get_dict_value(info, "path")
+            for info in info_dicts
+            if self.__get_dict_value(info, "path") is not None
+        ]
         return local_paths
 
     @validate_not_empty
@@ -1225,6 +1231,8 @@ class P4Client(object):
         :param changelist: *string* with cl description or *int* cl number
         :return:
         """
+        if changelist is None:
+            return "default"
         if isinstance(changelist, str):
             try:
                 return int(changelist)

{p4cmd-2.9.0 → p4cmd-2.9.2}/p4cmd.egg-info/PKG-INFO

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

{p4cmd-2.9.0 → p4cmd-2.9.2}/tests/test_p4client.py

@@ -109,6 +109,10 @@ def test_ensure_changelist_float(p4client):
     assert p4client._P4Client__ensure_changelist(1.5) == 1
 
 
+def test_ensure_changelist_none(p4client):
+    assert p4client._P4Client__ensure_changelist(None) == "default"
+
+
 def test_ensure_changelist_default_str(p4client):
     # "default" triggers get_or_make_changelist which returns "default"
     with patch.object(p4client, "get_or_make_changelist", return_value="default") as mock_gomc:
@@ -571,3 +575,16 @@ def test_get_depot_paths_missing_depot_file(p4client):
     with patch.object(p4client, "run_cmd", return_value=info_dicts):
         result = p4client.get_depot_paths(["C:/workspace/file.txt", "C:/workspace/other.txt"])
     assert result == ["//depot/project/file.txt"]
+
+
+def test_get_local_paths_missing_path(p4client):
+    """get_local_paths skips entries where path is missing (e.g. unmapped paths from p4 where)."""
+    info_dicts = [
+        {b"depotFile": b"//depot/project/file.txt", b"path": b"C:/workspace/file.txt"},
+        {b"depotFile": b"//depot/project/unmapped.txt"},  # no path key — unmapped
+    ]
+    with patch.object(p4client, "run_cmd", return_value=info_dicts):
+        result = p4client.get_local_paths(
+            ["//depot/project/file.txt", "//depot/project/unmapped.txt"]
+        )
+    assert result == ["C:/workspace/file.txt"]