@matheusbsbs / matheus-bagliano / commits / 7cb5cbefd2
Fork 0

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

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

Han-Wen Nienhuys committed May 23, 2007 at 16:55 UTC 7cb5cbefd2c8b4c24bc87c6e30906907f94726ad
1 file changed +2 -2
contrib/fast-import/git-p4
+2 -2
@@ -259,7 +259,7 @@ class P4Submit(Command):
259
260 return result
261
262 - def apply(self, id):
262 + def applyCommit(self, id):
263 if self.directSubmit:
264 print "Applying local change in working directory/index"
265 diff = self.diffStatus
@@ -494,7 +494,7 @@ class P4Submit(Command):
494 commit = commits[0]
495 commits = commits[1:]
496 self.config["commits"] = commits
497 - self.apply(commit)
497 + self.applyCommit(commit)
498 if not self.interactive:
499 break
500