From: Simon Hausmann <hausmann@kde.org>
Date: Tue, 20 Mar 2007 20:13:49 +0000 (+0100)
Subject: Fixed the initial version import by getting the file index correct by correctly skipp... 
X-Git-Tag: v1.5.3-rc0~65^2^2~169
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c715706b15426c7b106677868ce48e4bd78b94d6;p=git.git

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 8cb63f954..54ddf73da 100755
--- a/contrib/fast-import/git-p4.py
+++ b/contrib/fast-import/git-p4.py
@@ -480,7 +480,7 @@ class GitSync(Command):
 
         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"]
 
@@ -757,6 +757,7 @@ class GitSync(Command):
                     newestRevision = change
 
                 if info["action"] == "delete":
+                    fileCnt = fileCnt + 1
                     continue
 
                 for prop in [ "depotFile", "rev", "action", "type" ]:
@@ -768,7 +769,7 @@ class GitSync(Command):
 
             try:
                 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
-            except:
+            except IOError:
                 print self.gitError.read()
 
         else: