mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
Simon Hausmann
2007-03-20 21:13:49 +01:00
parent 0828ab1403
commit c715706b15
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/fast-import/git-p4.py
View File

@ -480,7 +480,7 @@ class GitSync(Command):
return "" return ""
def commit(self, details, files, branch, branchPrefix, parent, merged = ""): def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):
epoch = details["time"] epoch = details["time"]
author = details["user"] author = details["user"]
@ -757,6 +757,7 @@ class GitSync(Command):
newestRevision = change newestRevision = change
if info["action"] == "delete": if info["action"] == "delete":
fileCnt = fileCnt + 1
continue continue
for prop in [ "depotFile", "rev", "action", "type" ]: for prop in [ "depotFile", "rev", "action", "type" ]:
@ -768,7 +769,7 @@ class GitSync(Command):
try: try:
self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix) self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
except: except IOError:
print self.gitError.read() print self.gitError.read()
else: else: