Fixed the initial version import by getting the file index correct by correctly skipping deleted files.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py
index 8cb63f9540b6e5de030667df01e9f419f0102e39..54ddf73dacd45690cccf8cc2a4c12b83adab2b9c 100755 (executable)
--- a/contrib/fast-import/git-p4.py
+++ b/contrib/fast-import/git-p4.py
@@ -480,7 +480,7 @@ def findBranchParent(self, branchPrefix, files):
 
         return ""
 
 
         return ""
 

-    def commit(self, details, files, branch, branchPrefix, parent, merged = ""):
+    def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):

         epoch = details["time"]
         author = details["user"]
 
         epoch = details["time"]
         author = details["user"]
 


@@ -757,6 +757,7 @@ def run(self, args):
                     newestRevision = change
 
                 if info["action"] == "delete":
                     newestRevision = change
 
                 if info["action"] == "delete":

+                    fileCnt = fileCnt + 1

                     continue
 
                 for prop in [ "depotFile", "rev", "action", "type" ]:
                     continue
 
                 for prop in [ "depotFile", "rev", "action", "type" ]:


@@ -768,7 +769,7 @@ def run(self, args):
 
             try:
                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
 
             try:
                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)

-            except:
+            except IOError:

                 print self.gitError.read()
 
         else:
                 print self.gitError.read()
 
         else: