Browse Source

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

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
maint
Han-Wen Nienhuys 18 years ago committed by Simon Hausmann
parent
commit
7cb5cbefd2
  1. 4
      contrib/fast-import/git-p4

4
contrib/fast-import/git-p4

@ -259,7 +259,7 @@ class P4Submit(Command): @@ -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): @@ -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…
Cancel
Save