mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
rename apply() to applyCommit(); apply is a python builtin
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
parent
cebdf5af31
commit
7cb5cbefd2
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user