rename apply() to applyCommit(); apply is a python builtin

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index aba4752d4e2a2e8146139797b6baab7e44ea0d76..bd0ea549290616a4a076defb5bf2e417c0afae76 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -259,7 +259,7 @@ class P4Submit(Command):
 
         return result
 
-    def apply(self, id):
+    def applyCommit(self, id):
         if self.directSubmit:
             print "Applying local change in working directory/index"
             diff = self.diffStatus
@@ -494,7 +494,7 @@ class P4Submit(Command):
             commit = commits[0]
             commits = commits[1:]
             self.config["commits"] = commits
-            self.apply(commit)
+            self.applyCommit(commit)
             if not self.interactive:
                 break