Subject: [PATCH 2/5] git-p4 stream: do not pass branchPrefixes so much

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

Just set it in self when commit starts and use it everywhere.
This makes the code a bit cleaner, but no functional change

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 70fa403..3a52254 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -953,11 +953,11 @@ class P4Sync(Command):
     # output one file from the P4 stream
     # - helper for streamP4Files
 
-    def streamOneP4File(self, file, contents, branchPrefixes):
+    def streamOneP4File(self, file, contents):
         if verbose:
             sys.stderr.write("%s\n" %  file["depotFile"])
 
-        relPath = self.stripRepoPath(file['depotFile'], branchPrefixes)
+        relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
 
         mode = "644"
         if isP4Exec(file["type"]):
@@ -993,16 +993,16 @@ class P4Sync(Command):
             self.gitStream.write(d)
         self.gitStream.write("\n")
 
-    def streamOneP4Deletion(self, file, branchPrefixes):
+    def streamOneP4Deletion(self, file):
         if verbose:
             sys.stderr.write("delete %s\n" %  file["path"])
 
-        relPath = self.stripRepoPath(file['path'], branchPrefixes)
+        relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
 
         self.gitStream.write("D %s\n" % relPath)
 
     # Stream directly from "p4 files" into "git fast-import"
-    def streamP4Files(self, files, branchPrefixes):
+    def streamP4Files(self, files):
         filesForCommit = []
         filesToRead = []
         filesToDelete = []
@@ -1026,7 +1026,7 @@ class P4Sync(Command):
 
         # deleted files...
         for f in filesToDelete:
-            self.streamOneP4Deletion(f, branchPrefixes)
+            self.streamOneP4Deletion(f)
 
         if len(filesToRead) > 0:
             stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode='w+b')
@@ -1058,7 +1058,7 @@ class P4Sync(Command):
                             continue

-                        self.streamOneP4File(file,contents,branchPrefixes)
+                        self.streamOneP4File(file, contents)
                         file = {}
                         contents = []
                         have_file_info = False
@@ -1078,7 +1078,7 @@ class P4Sync(Command):
             # do the last chunk
 
             if file.has_key('depotFile'):
-                self.streamOneP4File(file,contents,branchPrefixes)
+                self.streamOneP4File(file,contents)
 
             exitCode = p4.wait()
             if exitCode != 0:
@@ -1088,6 +1088,7 @@ class P4Sync(Command):
     def commit(self, details, files, branch, branchPrefixes, parent = ""):
         epoch = details["time"]
         author = details["user"]
+	self.branchPrefixes = branchPrefixes
 
         if self.verbose:
             print "commit into %s" % branch
@@ -1127,7 +1128,7 @@ class P4Sync(Command):
                 print "parent %s" % parent
             self.gitStream.write("from %s\n" % parent)
 
-        self.streamP4Files(new_files,branchPrefixes)
+        self.streamP4Files(new_files)
         self.gitStream.write("\n")
 
         change = int(details["change"])
-- 
1.6.2.5