From: Han-Wen Nienhuys <hanwen@google.com>
Date: Wed, 23 May 2007 19:55:48 +0000 (-0300)
Subject: rename apply() to applyCommit(); apply is a python builtin
X-Git-Tag: v1.5.3-rc0~65^2^2~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7cb5cbefd2c8b4c24bc87c6e30906907f94726ad

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

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index aba4752d4e..bd0ea54929 100755
--- 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