Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).

Signed-off-by: Simon Hausmann <hausmann@kde.org>

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 72a4fd70a5bc200c1758b4cb56e2dfa9a6523104..e284b195024cf3cbbe90655babe2e650d9629855 100644 (file)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -14,6 +14,7 @@
 #       - don't hardcode the import to master
 #
 import os, string, sys, time
 #       - don't hardcode the import to master
 #
 import os, string, sys, time

+import marshal

 
 if len(sys.argv) != 2:
     sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]);
 
 if len(sys.argv) != 2:
     sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]);


@@ -37,6 +38,18 @@
 if not prefix.endswith("/"):
     prefix += "/"
 
 if not prefix.endswith("/"):
     prefix += "/"
 

+def p4Cmd(cmd):
+    pipe = os.popen("p4 -G %s" % cmd, "rb")
+    result = {}
+    try:
+        while True:
+            entry = marshal.load(pipe)
+            result.update(entry)
+    except EOFError:
+        pass
+    pipe.close()
+    return result
+

 def describe(change):
     output = os.popen("p4 describe %s" % change).readlines()
 
 def describe(change):
     output = os.popen("p4 describe %s" % change).readlines()
 


@@ -88,9 +101,6 @@ def describe(change):
 
     return author, log, epoch, changed, removed
 
 
     return author, log, epoch, changed, removed
 

-def p4cat(path):
-    return os.popen("p4 print -q \"%s\"" % path).read()
-

 def p4Stat(path):
     output = os.popen("p4 fstat -Ol \"%s\"" % path).readlines()
     fileSize = 0
 def p4Stat(path):
     output = os.popen("p4 fstat -Ol \"%s\"" % path).readlines()
     fileSize = 0