Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 8df3d733929746672ffaaf22836e3cc80a743b2e..689349d551aa62d4ddc9dff40b238dc0c3086438 100644 (file)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -5,8 +5,7 @@
 # Author: Simon Hausmann <hausmann@kde.org>
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
 # Author: Simon Hausmann <hausmann@kde.org>
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #

-# TODO: - fix date parsing (how hard can it be?)
-#       - support integrations (at least p4i)
+# TODO:  - support integrations (at least p4i)

 #       - support incremental imports
 #       - create tags
 #       - instead of reading all files into a variable try to pipe from
 #       - support incremental imports
 #       - create tags
 #       - instead of reading all files into a variable try to pipe from


@@ -15,7 +14,7 @@
 #       - support p4 submit (hah!)
 #       - don't hardcode the import to master
 #
 #       - support p4 submit (hah!)
 #       - don't hardcode the import to master
 #

-import os, string, sys
+import os, string, sys, time

 
 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]);


@@ -44,22 +43,25 @@ def describe(change):
 
     firstLine = output[0]
 
 
     firstLine = output[0]
 

-    author = firstLine.split(" ")[3]
+    splitted = firstLine.split(" ")
+    author = splitted[3]

     author = author[:author.find("@")]
     author = author[:author.find("@")]

+    tm = time.strptime(splitted[5] + " " + splitted[6] + time.tzname[0], "%Y/%m/%d %H:%M:%S %Z")
+    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)
 
     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 [], [], [], []
+        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)
 
     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 [], [], [], []
+        return [], [], [], [], []

 
     log = output[2:filesSection - 1]
 
 
     log = output[2:filesSection - 1]
 


@@ -85,7 +87,7 @@ def describe(change):
         else:
             changed.append(path)
 
         else:
             changed.append(path)
 

-    return author, log, changed, removed
+    return author, log, epoch, changed, removed

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


@@ -124,9 +126,9 @@ def getUserMap():
 
 sys.stderr.write("\n")
 
 
 sys.stderr.write("\n")
 

-cnt = 0
+cnt = 1

 for change in changes:
 for change in changes:

-    [ author, log, changedFiles, removedFiles ] = describe(change)
+    [ author, log, epoch, changedFiles, removedFiles ] = describe(change)

     sys.stderr.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
     cnt = cnt + 1
 #    sys.stderr.write("%s\n" % log)
     sys.stderr.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
     cnt = cnt + 1
 #    sys.stderr.write("%s\n" % log)


@@ -135,9 +137,9 @@ def getUserMap():
 
     print "commit refs/heads/master"
     if author in users:
 
     print "commit refs/heads/master"
     if author in users:

-        print "committer %s 1 2" % users[author]
+        print "committer %s %s +0000" % (users[author], epoch)

     else:
     else:

-        print "committer %s <a@b> 1 2" % author
+        print "committer %s <a@b> %s +0000" % (author, epoch)

     print "data <<EOT"
     for l in log:
         print l[:len(l) - 1]
     print "data <<EOT"
     for l in log:
         print l[:len(l) - 1]


@@ -165,3 +167,5 @@ def getUserMap():
 
     print ""
 
 
     print ""
 

+sys.stderr.write("\n")
+