Subject: [PATCH 4/5] git-p4 stream: check apple file type

From: Pete Wyckoff <[email-masked]>
Date: Sat, 25 Jul 2009 10:24:51 -0400

Move this check into the function so both callers do it.
And always reset the file contents in the main loop, as
we just ignored this apple file.

Signed-off-by: Pete Wyckoff <[email-masked]>
---
 contrib/fast-import/git-p4 |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3ab016b..af66026 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -954,6 +954,11 @@ class P4Sync(Command):
     # - helper for streamP4Files
 
     def streamOneP4File(self, file, contents):
+	if file["type"] == "apple":
+	    print "\nfile %s is a strange apple file that forks. Ignoring" % \
+	    	  file['depotFile']
+	    return
+
         relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
         if verbose:
             sys.stderr.write("%s\n" % relPath)
@@ -1049,12 +1054,6 @@ class P4Sync(Command):
 
                     if marshalled.has_key('depotFile') and have_file_info:
                         # start of a new file - output the old one first
-
-                        if file["type"] == "apple":
-                            print "\nfile %s is a strange apple file that forks. Ignoring" % file['path']
-                            continue
-
-
                         self.streamOneP4File(file, contents)
                         file = {}
                         contents = []
-- 
1.6.2.5