From: Pete Wyckoff <pw@padd•com>
To: Luke Diamand <luke@diamand•org>
Cc: git@vger•kernel.org
Subject: [PATCH 4/5] git-p4 stream: check apple file type
Date: Sat, 25 Jul 2009 10:24:51 -0400 [thread overview]
Message-ID: <20090725142451.GE3841@arf.padd.com> (raw)
In-Reply-To: <20090725142329.GA3841@arf.padd.com>
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 <pw@padd•com>
---
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
next prev parent reply other threads:[~2009-07-25 14:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-11 8:31 [PATCH/RFC v2] git-p4: stream from perforce to speed up clones Luke Diamand
2009-07-25 14:23 ` Pete Wyckoff
2009-07-25 14:23 ` [PATCH 1/5] git-p4 stream: remove unused function Pete Wyckoff
2009-07-25 14:24 ` [PATCH 2/5] git-p4 stream: do not pass branchPrefixes so much Pete Wyckoff
2009-07-25 14:24 ` [PATCH 3/5] git-p4 stream: show relative path in debug messages Pete Wyckoff
2009-07-25 14:24 ` Pete Wyckoff [this message]
2009-07-25 14:25 ` [PATCH 5/5] git-p4 stream: use existing p4CmdList with callback Pete Wyckoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090725142451.GE3841@arf.padd.com \
--to=pw@padd$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=luke@diamand$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox