[PATCH v2 08/14] git-p4: use marshal format version 2 when sending to p4

From: Yang Zhao <yang.zhao@skyboxlabs.com>
Date: Dec 13, 2019, 23:52 UTC
Message-ID: <20191213235247.23660-10-yang.zhao@skyboxlabs.com>
In-Reply-To: <20191213235247.23660-1-yang.zhao@skyboxlabs.com>

p4 does not appear to understand marshal format version 3 and above. Version 2 was the latest supported by python-2.7.

Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Reviewed-by: Ben Keene <seraphire@gmail.com>
---
 git-p4.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-p4.py b/git-p4.py
index abcda60eee..c7170c9ae6 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1679,7 +1679,8 @@ def modifyChangelistUser(self, changelist, newUser):
         c = changes[0]
         if c['User'] == newUser: return   # nothing to do
         c['User'] = newUser
-        input = marshal.dumps(c)
+        # p4 does not understand format version 3 and above
+        input = marshal.dumps(c, 2)
 
         result = p4CmdList("change -f -i", stdin=input)
         for r in result:

-- 
2.21.0.windows.1