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