Part of the code is copyright by Trolltech ASA.

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index d0832e8c3d618a4f8d73053adefd62af14b3dae1..9adb88fadeed0ae1ff744294c2d8a58118b368a8 100755 (executable)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # p4-fast-export.py
 #
@@ -15,7 +15,8 @@
 import marshal, popen2, getopt, sha
 from sets import Set;
 
-cacheDebug = False
+dataCache = False
+commandCache = False
 
 silent = False
 knownBranches = Set()
@@ -30,7 +31,7 @@
 
 try:
     opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches", "changesfile=", "silent", "known-branches=",
-                                                   "cache-debug" ])
+                                                   "cache", "command-cache" ])
 except getopt.GetoptError:
     print "fixme, syntax error"
     sys.exit(1)
@@ -47,8 +48,11 @@
     elif o == "--known-branches":
         for branch in open(a).readlines():
             knownBranches.add(branch[:-1])
-    elif o == "--cache-debug":
-        cacheDebug = True
+    elif o == "--cache":
+        dataCache = True
+        commandCache = True
+    elif o == "--command-cache":
+        commandCache = True
 
 if len(args) == 0 and len(globalPrefix) != 0:
     if not silent:
@@ -103,12 +107,12 @@ def p4File(depotPath):
 
     data = 0
     try:
-        if not cacheDebug:
+        if not dataCache:
             raise
         data = open(cacheKey, "rb").read()
     except:
         data = os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
-        if cacheDebug:
+        if dataCache:
             open(cacheKey, "wb").write(data)
 
     return data
@@ -122,7 +126,7 @@ def p4CmdList(cmd):
     cached = True
     pipe = 0
     try:
-        if not cacheDebug:
+        if not commandCache:
             raise
         pipe = open(cacheKey, "rb")
     except:
@@ -138,7 +142,7 @@ def p4CmdList(cmd):
         pass
     pipe.close()
 
-    if not cached and cacheDebug:
+    if not cached and commandCache:
         pipe = open(cacheKey, "wb")
         for r in result:
             marshal.dump(r, pipe)
@@ -325,6 +329,10 @@ def commit(details, files, branch, branchPrefix, parent, merged = ""):
         relPath = path[len(branchPrefix):]
         action = file["action"]
 
+        if file["type"] == "apple":
+            print "\nfile %s is a strange apple file that forks. Ignoring!" % path
+            continue
+
         if action == "delete":
             gitStream.write("D %s\n" % relPath)
         else:
@@ -415,6 +423,7 @@ def changeIsBranchMerge(sourceBranch, destinationBranch, change):
     for fileName in sourceFiles.keys():
         integrations = []
         deleted = False
+        integrationCount = 0
         for integration in p4CmdList("integrated \"%s\"" % fileName):
             toFile = integration["fromFile"] # yes, it's true, it's fromFile
             if not toFile in destinationFiles:
@@ -424,10 +433,15 @@ def changeIsBranchMerge(sourceBranch, destinationBranch, change):
 #                print "file %s has been deleted in %s" % (fileName, toFile)
                 deleted = True
                 break
+            integrationCount += 1
+            if integration["how"] == "branch from":
+                continue
 
             if int(integration["change"]) == change:
                 integrations.append(integration)
                 continue
+            if int(integration["change"]) > change:
+                continue
 
             destRev = int(destFile["rev"])
 
@@ -453,7 +467,7 @@ def changeIsBranchMerge(sourceBranch, destinationBranch, change):
         if deleted:
             continue
 
-        if len(integrations) == 0:
+        if len(integrations) == 0 and integrationCount > 1:
             print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch)
             return False
 
@@ -594,7 +608,7 @@ def getUserMap():
                         merged = "refs/heads/" + merged
                     commit(description, files, branch, branchPrefix, parent, merged)
             else:
-                commit(description, filesForCommit, branch, globalPrefix, initialParent)
+                commit(description, files, branch, globalPrefix, initialParent)
                 initialParent = ""
         except IOError:
             print gitError.read()