mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 00:46:19 +02:00
Code

Allow for convenient rebasing after git-p4 submit 

Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-04-09 12:43:40 +02:00
parent 7243b350b3
commit 80b5910fac
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,6 +352,7 @@ class P4Submit(Command):
sys.exit(128)
print "Perforce checkout for depot path %s located at %s" % (depotPath, clientPath)
oldWorkingDirectory = os.getcwd()
os.chdir(clientPath)
response = raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath)
if response == "y" or response == "yes":
@ -403,6 +404,11 @@ class P4Submit(Command):
print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
system("p4 edit ... >/dev/null")
system("p4 revert ... >/dev/null")
response = raw_input("Do you want to sync from Perforce now using git-p4 rebase (y/n)? ")
if response == "y" or response == "yes":
os.chdir(oldWorkingDirectory)
rebase = P4Rebase()
rebase.run([])
os.remove(self.configFile)
return True