Browse Source

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

Signed-off-by: Simon Hausmann <hausmann@kde.org>
maint
Simon Hausmann 18 years ago
parent
commit
3f2ddd47c7
  1. 16
      contrib/fast-import/p4-fast-export.py

16
contrib/fast-import/p4-fast-export.py

@ -14,6 +14,7 @@
# - don't hardcode the import to master # - don't hardcode the import to master
# #
import os, string, sys, time import os, string, sys, time
import marshal


if len(sys.argv) != 2: if len(sys.argv) != 2:
sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]); sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]);
@ -37,6 +38,18 @@ except ValueError:
if not prefix.endswith("/"): if not prefix.endswith("/"):
prefix += "/" 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): def describe(change):
output = os.popen("p4 describe %s" % change).readlines() 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): def p4Stat(path):
output = os.popen("p4 fstat -Ol \"%s\"" % path).readlines() output = os.popen("p4 fstat -Ol \"%s\"" % path).readlines()
fileSize = 0 fileSize = 0

Loading…
Cancel
Save