From: Simon Hausmann <simon@lst.de>
Date: Mon, 9 Apr 2007 10:43:40 +0000 (+0200)
Subject: Allow for convenient rebasing after git-p4 submit
X-Git-Tag: v1.5.3-rc0~65^2^2~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80b5910fac79b22ccc8eabb2262562c913d5603c;p=git.git

Allow for convenient rebasing after git-p4 submit

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 72fa48af0..4fbfaf11b 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -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