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

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys 2007-05-23 16:55:48 -03:00 committed by Simon Hausmann
parent cebdf5af31
commit 7cb5cbefd2

View File

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