git p4: remove unused P4Submit interactive setting
The code is unused. Delete. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
a0327c0edc
commit
c47178d4f0
12
git-p4.py
12
git-p4.py
@ -844,7 +844,6 @@ class P4Submit(Command, P4UserMap):
|
|||||||
]
|
]
|
||||||
self.description = "Submit changes from git to the perforce depot."
|
self.description = "Submit changes from git to the perforce depot."
|
||||||
self.usage += " [name of git branch to submit into perforce depot]"
|
self.usage += " [name of git branch to submit into perforce depot]"
|
||||||
self.interactive = True
|
|
||||||
self.origin = ""
|
self.origin = ""
|
||||||
self.detectRenames = False
|
self.detectRenames = False
|
||||||
self.preserveUser = gitConfig("git-p4.preserveUser").lower() == "true"
|
self.preserveUser = gitConfig("git-p4.preserveUser").lower() == "true"
|
||||||
@ -1209,7 +1208,6 @@ class P4Submit(Command, P4UserMap):
|
|||||||
|
|
||||||
template = self.prepareSubmitTemplate()
|
template = self.prepareSubmitTemplate()
|
||||||
|
|
||||||
if self.interactive:
|
|
||||||
submitTemplate = self.prepareLogMessage(template, logMessage)
|
submitTemplate = self.prepareLogMessage(template, logMessage)
|
||||||
|
|
||||||
if self.preserveUser:
|
if self.preserveUser:
|
||||||
@ -1281,14 +1279,6 @@ class P4Submit(Command, P4UserMap):
|
|||||||
os.remove(f)
|
os.remove(f)
|
||||||
|
|
||||||
os.remove(fileName)
|
os.remove(fileName)
|
||||||
else:
|
|
||||||
fileName = "submit.txt"
|
|
||||||
file = open(fileName, "w+")
|
|
||||||
file.write(self.prepareLogMessage(template, logMessage))
|
|
||||||
file.close()
|
|
||||||
print ("Perforce submit template written as %s. "
|
|
||||||
+ "Please review/edit and then use p4 submit -i < %s to submit directly!"
|
|
||||||
% (fileName, fileName))
|
|
||||||
|
|
||||||
# Export git tags as p4 labels. Create a p4 label and then tag
|
# Export git tags as p4 labels. Create a p4 label and then tag
|
||||||
# with that.
|
# with that.
|
||||||
@ -1437,8 +1427,6 @@ class P4Submit(Command, P4UserMap):
|
|||||||
commit = commits[0]
|
commit = commits[0]
|
||||||
commits = commits[1:]
|
commits = commits[1:]
|
||||||
self.applyCommit(commit)
|
self.applyCommit(commit)
|
||||||
if not self.interactive:
|
|
||||||
break
|
|
||||||
|
|
||||||
if len(commits) == 0:
|
if len(commits) == 0:
|
||||||
print "All changes applied!"
|
print "All changes applied!"
|
||||||
|
Reference in New Issue
Block a user