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

Make git-p4 submit --direct safer by also creating a git commit

Browse Source 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-05-21 11:04:26 +02:00
parent cbf5efa61a
commit 7944f1425c
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,12 +10,6 @@
# TODO: * implement git-p4 rollback <perforce change number> for debugging # TODO: * implement git-p4 rollback <perforce change number> for debugging
# to roll back all p4 remote branches to a commit older or equal to # to roll back all p4 remote branches to a commit older or equal to
# the specified change. # the specified change.
# * for git-p4 submit --direct it would be nice to still create a
# git commit without updating HEAD before submitting to perforce.
# With the commit sha1 printed (or recoded in a .git/foo file?)
# it's possible to recover if anything goes wrong instead of potentially
# loosing a change entirely because it was never comitted to git and
# the p4 submit failed (or resulted in lots of conflicts, etc.)
# * Consider making --with-origin the default, assuming that the git # * Consider making --with-origin the default, assuming that the git
# protocol is always more efficient. (needs manual testing first :) # protocol is always more efficient. (needs manual testing first :)
# #
@ -328,9 +322,17 @@ class P4Submit(Command):
print submitTemplate print submitTemplate
raw_input("Press return to continue...") raw_input("Press return to continue...")
else: else:
pipe = os.popen("p4 submit -i", "wb") if self.directSubmit:
pipe.write(submitTemplate) print "Submitting to git first"
pipe.close() os.chdir(self.oldWorkingDirectory)
pipe = os.popen("git commit -a -F -", "wb")
pipe.write(submitTemplate)
pipe.close()
os.chdir(self.clientPath)
pipe = os.popen("p4 submit -i", "wb")
pipe.write(submitTemplate)
pipe.close()
elif response == "s": elif response == "s":
for f in editedFiles: for f in editedFiles:
system("p4 revert \"%s\"" % f); system("p4 revert \"%s\"" % f);
@ -382,7 +384,7 @@ class P4Submit(Command):
sys.exit(128) sys.exit(128)
print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath) print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
oldWorkingDirectory = os.getcwd() self.oldWorkingDirectory = os.getcwd()
if self.directSubmit: if self.directSubmit:
self.diffStatus = mypopen("git diff -r --name-status HEAD").readlines() self.diffStatus = mypopen("git diff -r --name-status HEAD").readlines()
@ -442,16 +444,8 @@ class P4Submit(Command):
print "No changes found to apply between %s and current HEAD" % self.origin print "No changes found to apply between %s and current HEAD" % self.origin
else: else:
print "All changes applied!" print "All changes applied!"
response = "" os.chdir(self.oldWorkingDirectory)
os.chdir(oldWorkingDirectory) response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
if self.directSubmit:
response = raw_input("Do you want to DISCARD your git WORKING DIRECTORY CHANGES and sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
if response == "y" or response == "yes":
system("git reset --hard")
if len(response) == 0:
response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
if response == "y" or response == "yes": if response == "y" or response == "yes":
rebase = P4Rebase() rebase = P4Rebase()
rebase.run([]) rebase.run([])