Added a little helper script to debug the output of the p4 python interface.

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 19f5f034763a348668811891a892b8480b8c8511..c44292473a82fd349b69176038eafdf8c177f4f6 100755 (executable)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -10,20 +10,41 @@
 #       - support p4 submit (hah!)
 #
 import os, string, sys, time
-import marshal, popen2
+import marshal, popen2, getopt
 
-if len(sys.argv) != 2:
+branch = "refs/heads/p4"
+prefix = previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
+if len(prefix) != 0:
+    prefix = prefix[:-1]
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=" ])
+except getopt.GetoptError:
+    print "fixme, syntax error"
+    sys.exit(1)
+
+for o, a in opts:
+    if o == "--branch":
+        branch = "refs/heads/" + a
+
+if len(args) == 0 and len(prefix) != 0:
+    print "[using previously specified depot path %s]" % prefix
+elif len(args) != 1:
     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/ -- to import the current head"
+    print "    %s //depot/my/project/@all -- 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)
+else:
+    if len(prefix) != 0 and prefix != args[0]:
+        print "previous import used depot path %s and now %s was specified. this doesn't work!" % (prefix, args[0])
+        sys.exit(1)
+    prefix = args[0]
 
-branch = "refs/heads/p4"
-prefix = sys.argv[1]
 changeRange = ""
 revision = ""
 users = {}
@@ -32,7 +53,9 @@
 if prefix.find("@") != -1:
     atIdx = prefix.index("@")
     changeRange = prefix[atIdx:]
-    if changeRange.find(",") == -1:
+    if changeRange == "@all":
+        changeRange = ""
+    elif changeRange.find(",") == -1:
         revision = changeRange
         changeRange = ""
     prefix = prefix[0:atIdx]
@@ -40,6 +63,8 @@
     hashIdx = prefix.index("#")
     revision = prefix[hashIdx:]
     prefix = prefix[0:hashIdx]
+elif len(previousDepotPath) == 0:
+    revision = "#head"
 
 if prefix.endswith("..."):
     prefix = prefix[:-3]
@@ -88,7 +113,7 @@ def commit(details):
     gitStream.write("EOT\n\n")
 
     if len(initialParent) > 0:
-        gitStream.write("merge %s\n" % initialParent)
+        gitStream.write("from %s\n" % initialParent)
         initialParent = ""
 
     fnum = 0
@@ -154,6 +179,9 @@ def getUserMap():
 sys.stderr.write("\n")
 
 tz = - time.timezone / 36
+tzsign = ("%s" % tz)[0]
+if tzsign != '+' and tzsign != '-':
+    tz = "+" + ("%s" % tz)
 
 if len(revision) > 0:
     print "Doing initial import of %s from revision %s" % (prefix, revision)
@@ -165,21 +193,25 @@ def getUserMap():
 
     fileCnt = 0
     for info in p4CmdList("files %s...%s" % (prefix, revision)):
+        change = int(info["change"])
+        if change > newestRevision:
+            newestRevision = change
+
         if info["action"] == "delete":
             continue
+
         for prop in [ "depotFile", "rev", "action", "type" ]:
             details["%s%s" % (prop, fileCnt)] = info[prop]
 
-        change = info["change"]
-        if change > newestRevision:
-            newestRevision = change
-
         fileCnt = fileCnt + 1
 
     details["change"] = newestRevision
 
     gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
-    commit(details)
+    try:
+        commit(details)
+    except:
+        print gitError.read()
 
     gitStream.close()
     gitOutput.close()
@@ -208,10 +240,18 @@ def getUserMap():
         sys.stdout.flush()
         cnt = cnt + 1
 
-        commit(description)
+        try:
+            commit(description)
+        except:
+            print gitError.read()
+            sys.exit(1)
 
     gitStream.close()
     gitOutput.close()
     gitError.close()
 
 print ""
+
+os.popen("git-repo-config p4.depotpath %s" % prefix).read()
+
+sys.exit(0)