p4cmd 2.10.0__tar.gz → 2.10.2__tar.gz

{p4cmd-2.10.0 → p4cmd-2.10.2}/PKG-INFO

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

{p4cmd-2.10.0 → p4cmd-2.10.2}/p4cmd/__init__.py

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

{p4cmd-2.10.0 → p4cmd-2.10.2}/p4cmd/p4cmd.py

@@ -138,7 +138,7 @@ class P4Client(object):
                     except ValueError as error:
                         output_dict = {
                             "command": command,
-                            "code": "error",
+                            "code": "raw",
                             "error": str(error),
                             "raw_output": subprocess.check_output(command, stderr=subprocess.STDOUT, shell=True, cwd=self.perforce_root)
                         }
@@ -1302,7 +1302,7 @@ class P4Client(object):
             if p4file.local_file_path is None:
                 data = self.__get_dict_value(file_dict, "data") or ""
                 if " - " in data:
-                    p4file.local_file_path = data.split(" - ")[0].strip()
+                    p4file.local_file_path = data.rsplit(" - ", 1)[0].strip()
             p4file.have_revision = self.__get_dict_value(file_dict, "haveRev")
             p4file.head_revision = self.__get_dict_value(file_dict, "headRev")
             p4file.last_submit_time = self.__get_dict_value(file_dict, "headTime")

{p4cmd-2.10.0 → p4cmd-2.10.2}/p4cmd.egg-info/PKG-INFO

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

{p4cmd-2.10.0 → p4cmd-2.10.2}/tests/test_p4client.py

@@ -212,6 +212,20 @@ def test_fstat_actionowner_field(p4client):
     assert any("charlie@testclient" in entry for entry in files[0].checked_out_by)
 
 
+def test_fstat_untracked_file_with_dash_in_name(p4client):
+    """fstat_to_p4_files correctly parses untracked file paths containing ' - '."""
+    fstat = [
+        {
+            b"code": b"error",
+            b"data": b"D:/p4/games/Animations/my_clip - Copy.pose - no such file(s).",
+        }
+    ]
+    with patch.object(p4client, "find_p4_client", return_value="testclient"):
+        files = p4client.fstat_to_p4_files(fstat)
+    assert len(files) == 1
+    assert files[0].local_file_path == "D:/p4/games/Animations/my_clip - Copy.pose"
+
+
 def test_fstat_invalid_revision_becomes_none(p4client):
     fstat = [
         make_fstat_dict(
@@ -653,6 +667,24 @@ def test_run_cmd_handles_string_key_error_dicts(p4client, caplog):
     assert "some error" in caplog.text
 
 
+def test_run_cmd_value_error_fallback_no_warning(p4client, caplog):
+    """run_cmd's ValueError fallback (e.g. `p4 set`) must not log spurious error warnings."""
+    with patch("subprocess.Popen") as mock_popen, \
+         patch("p4cmd.p4cmd.subprocess.check_output", return_value=b"P4USER=niels.vaes (set)\n"):
+        # Empty stdout triggers ValueError on marshal.load (unknown type code in this case
+        # would also work; here we use bytes that aren't valid marshal data).
+        import io as _io
+        buf = _io.BytesIO(b"\xff\xff\xff\xff")  # invalid marshal type code -> ValueError
+        mock_popen.return_value.__enter__ = lambda s: s
+        mock_popen.return_value.__exit__ = MagicMock(return_value=False)
+        mock_popen.return_value.stdout = buf
+        mock_popen.return_value.kill = MagicMock()
+        with caplog.at_level(logging.WARNING):
+            result = p4client.get_p4_setting("P4USER")
+    assert result == "niels.vaes"
+    assert caplog.records == []
+
+
 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 = [