Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index e284b195024cf3cbbe90655babe2e650d9629855..3ccef526eba4614e67ddaa72b0d551f39aec0cc0 100644 (file)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -14,16 +14,16 @@
 #       - don't hardcode the import to master
 #
 import os, string, sys, time
-import marshal
+import marshal, popen2
 
 if len(sys.argv) != 2:
-    sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]);
-    sys.stderr.write("\n    example:\n");
-    sys.stderr.write("    %s //depot/my/project/ -- to import everything\n");
-    sys.stderr.write("    %s //depot/my/project/@1,6 -- to import only from revision 1 to 6\n");
-    sys.stderr.write("\n");
-    sys.stderr.write("    (a ... is not needed in the path p4 specification, it's added implicitly)\n");
-    sys.stderr.write("\n");
+    print "usage: %s //depot/path[@revRange]" % sys.argv[0]
+    print "\n    example:"
+    print "    %s //depot/my/project/ -- to import everything"
+    print "    %s //depot/my/project/@1,6 -- to import only from revision 1 to 6"
+    print ""
+    print "    (a ... is not needed in the path p4 specification, it's added implicitly)"
+    print ""
     sys.exit(1)
 
 prefix = sys.argv[1]
@@ -51,54 +51,30 @@ def p4Cmd(cmd):
     return result
 
 def describe(change):
-    output = os.popen("p4 describe %s" % change).readlines()
+    describeOutput = p4Cmd("describe %s" % change)
 
-    firstLine = output[0]
+    author = describeOutput["user"]
+    epoch = describeOutput["time"]
 
-    splitted = firstLine.split(" ")
-    author = splitted[3]
-    author = author[:author.find("@")]
-    tm = time.strptime(splitted[5] + " " + splitted[6], "%Y/%m/%d %H:%M:%S ")
-    epoch = int(time.mktime(tm))
-
-    filesSection = 0
-    try:
-        filesSection = output.index("Affected files ...\n")
-    except ValueError:
-        sys.stderr.write("Change %s doesn't seem to affect any files. Weird.\n" % change)
-        return [], [], [], [], []
-
-    differencesSection = 0
-    try:
-        differencesSection = output.index("Differences ...\n")
-    except ValueError:
-        sys.stderr.write("Change %s doesn't seem to have a differences section. Weird.\n" % change)
-        return [], [], [], [], []
-
-    log = output[2:filesSection - 1]
-
-    lines = output[filesSection + 2:differencesSection - 1]
+    log = describeOutput["desc"]
 
     changed = []
     removed = []
 
-    for line in lines:
-        # chop off "... " and trailing newline
-        line = line[4:len(line) - 1]
+    i = 0
+    while describeOutput.has_key("depotFile%s" % i):
+        path = describeOutput["depotFile%s" % i]
+        rev = describeOutput["rev%s" % i]
+        action = describeOutput["action%s" % i]
+        path = path + "#" + rev
 
-        lastSpace = line.rfind(" ")
-        if lastSpace == -1:
-            sys.stderr.write("trouble parsing line %s, skipping!\n" % line)
-            continue
-
-        operation = line[lastSpace + 1:]
-        path = line[:lastSpace]
-
-        if operation == "delete":
+        if action == "delete":
             removed.append(path)
         else:
             changed.append(path)
 
+        i = i + 1
+
     return author, log, epoch, changed, removed
 
 def p4Stat(path):
@@ -147,23 +123,22 @@ def getUserMap():
 
 tz = - time.timezone / 36
 
+gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
+
 cnt = 1
 for change in changes:
     [ author, log, epoch, changedFiles, removedFiles ] = describe(change)
-    sys.stderr.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
+    sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
     cnt = cnt + 1
 
-    print "commit refs/heads/master"
+    gitStream.write("commit refs/heads/master\n")
     if author in users:
-        print "committer %s %s %s" % (users[author], epoch, tz)
+        gitStream.write("committer %s %s %s\n" % (users[author], epoch, tz))
     else:
-        print "committer %s <a@b> %s %s" % (author, epoch, tz)
-    print "data <<EOT"
-    for l in log:
-        print l[:len(l) - 1]
-    print "EOT"
-
-    print ""
+        gitStream.write("committer %s <a@b> %s %s\n" % (author, epoch, tz))
+    gitStream.write("data <<EOT\n")
+    gitStream.write(log)
+    gitStream.write("EOT\n\n")
 
     for f in changedFiles:
         if not f.startswith(prefix):
@@ -173,20 +148,22 @@ def getUserMap():
 
         [mode, fileSize] = p4Stat(f)
 
-        print "M %s inline %s" % (mode, stripRevision(relpath))
-        print "data %s" % fileSize
-        sys.stdout.flush();
-        os.system("p4 print -q \"%s\"" % f)
-        print ""
+        gitStream.write("M %s inline %s\n" % (mode, stripRevision(relpath)))
+        gitStream.write("data %s\n" % fileSize)
+        gitStream.write(os.popen("p4 print -q \"%s\"" % f).read())
+        gitStream.write("\n")
 
     for f in removedFiles:
         if not f.startswith(prefix):
             sys.stderr.write("\ndeleted files: ignoring path %s outside of %s in change %s\n" % (f, prefix, change))
             continue
         relpath = f[len(prefix):]
-        print "D %s" % stripRevision(relpath)
+        gitStream.write("D %s\n" % stripRevision(relpath))
 
-    print ""
+    gitStream.write("\n")
 
-sys.stderr.write("\n")
+gitStream.close()
+gitOutput.close()
+gitError.close()
 
+print ""