From: Simon Hausmann <hausmann@kde.org>
Date: Sat, 10 Mar 2007 09:53:07 +0000 (+0100)
Subject: Minor code cleanups.
X-Git-Tag: v1.5.3-rc0~65^2^2~192
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=478764bc8261857e7eca2deac409e34c2778347a;p=git.git

Minor code cleanups.

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

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 3d2b42b63..bd2f03064 100755
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -340,6 +340,16 @@ def commit(details, files, branch, branchPrefix, parent):
 
     lastChange = int(details["change"])
 
+def extractFilesInCommitToBranch(files, branchPrefix):
+    newFiles = []
+
+    for file in files:
+        path = file["path"]
+        if path.startswith(branchPrefix):
+            newFiles.append(file)
+
+    return newFiles
+
 def getUserMap():
     users = {}
 
@@ -448,6 +458,8 @@ else:
                 knownBranches.add(branch)
                 branchPrefix = globalPrefix + branch + "/"
 
+                filesForCommit = extractFilesInCommitToBranch(files, branchPrefix)
+
                 parent = ""
                 ########### remove cnt!!!
                 if branch not in createdBranches and cnt > 2:
@@ -458,10 +470,11 @@ else:
 #                    elif len(parent) > 0:
 #                        print "%s branched off of %s" % (branch, parent)
 
+
                 branch = "refs/heads/" + branch
                 commit(description, files, branch, branchPrefix, parent)
         else:
-            commit(description, files, branch, globalPrefix, initialParent)
+            commit(description, filesForCommit, branch, globalPrefix, initialParent)
             initialParent = ""
 #        except:
 #            print gitError.read()