undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the possibility of skipping patches during git-p4 submit

Browse Source 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-05-16 09:41:26 +02:00
parent 81f2373f89
commit d336c15835
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/fast-import/git-p4
View File

@ -230,11 +230,13 @@ class P4Submit(Command):
diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines() diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
filesToAdd = set() filesToAdd = set()
filesToDelete = set() filesToDelete = set()
editedFiles = set()
for line in diff: for line in diff:
modifier = line[0] modifier = line[0]
path = line[1:].strip() path = line[1:].strip()
if modifier == "M": if modifier == "M":
system("p4 edit %s" % path) system("p4 edit \"%s\"" % path)
editedFiles.add(path)
elif modifier == "A": elif modifier == "A":
filesToAdd.add(path) filesToAdd.add(path)
if path in filesToDelete: if path in filesToDelete:
@ -308,7 +310,7 @@ class P4Submit(Command):
firstIteration = True firstIteration = True
while response == "e": while response == "e":
if not firstIteration: if not firstIteration:
response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o ") response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
firstIteration = False firstIteration = False
if response == "e": if response == "e":
[handle, fileName] = tempfile.mkstemp() [handle, fileName] = tempfile.mkstemp()
@ -334,6 +336,15 @@ class P4Submit(Command):
pipe = os.popen("p4 submit -i", "wb") pipe = os.popen("p4 submit -i", "wb")
pipe.write(submitTemplate) pipe.write(submitTemplate)
pipe.close() pipe.close()
elif response == "s":
for f in editedFiles:
system("p4 revert \"%s\"" % f);
for f in filesToAdd:
system("p4 revert \"%s\"" % f);
system("rm %s" %f)
for f in filesToDelete:
system("p4 delete \"%s\"" % f);
return
else: else:
print "Not submitting!" print "Not submitting!"
self.interactive = False self.interactive = False