X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Ffast-import%2Fgit-p4;h=fb13469ce2a4c1b1645caf1103d9623a0aafcd02;hb=51a2640afdd12475642728dc3576966abe0dba6d;hp=3202a819cad3dee9daf9d209ff1d5402a1d1f3de;hpb=8b72ca0f76213eb375840e6b9069b260d97f8286;p=git.git

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3202a819c..fb13469ce 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -244,7 +244,33 @@ class P4Submit(Command):
             else:
                 die("unknown modifier %s for %s" % (modifier, path))
 
-        system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
+        diffcmd = "git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\"" % (id, id)
+        patchcmd = diffcmd + " | patch -p1"
+
+        if os.system(patchcmd + " --dry-run --silent") != 0:
+            print "Unfortunately applying the change failed!"
+            print "What do you want to do?"
+            response = "x"
+            while response != "s" and response != "a" and response != "w":
+                response = raw_input("[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) ")
+            if response == "s":
+                print "Skipping! Good luck with the next patches..."
+                return
+            elif response == "a":
+                os.system(patchcmd)
+                if len(filesToAdd) > 0:
+                    print "You may also want to call p4 add on the following files:"
+                    print " ".join(filesToAdd)
+                if len(filesToDelete):
+                    print "The following files should be scheduled for deletion with p4 delete:"
+                    print " ".join(filesToDelete)
+                die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
+            elif response == "w":
+                system(diffcmd + " > patch.txt")
+                print "Patch saved to patch.txt in %s !" % self.clientPath
+                die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
+
+        system(patchcmd)
 
         for f in filesToAdd:
             system("p4 add %s" % f)
@@ -277,7 +303,7 @@ class P4Submit(Command):
             firstIteration = True
             while response == "e":
                 if not firstIteration:
-                    response = raw_input("Do you want to submit this change (y/e/n)? ")
+                    response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o  ")
                 firstIteration = False
                 if response == "e":
                     [handle, fileName] = tempfile.mkstemp()
@@ -335,16 +361,16 @@ class P4Submit(Command):
             print "Internal error: cannot locate perforce depot path from existing branches"
             sys.exit(128)
 
-        clientPath = p4Where(depotPath)
+        self.clientPath = p4Where(depotPath)
 
-        if len(clientPath) == 0:
+        if len(self.clientPath) == 0:
             print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
             sys.exit(128)
 
-        print "Perforce checkout for depot path %s located at %s" % (depotPath, clientPath)
+        print "Perforce checkout for depot path %s located at %s" % (depotPath, self.clientPath)
         oldWorkingDirectory = os.getcwd()
-        os.chdir(clientPath)
-        response = raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath)
+        os.chdir(self.clientPath)
+        response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
         if response == "y" or response == "yes":
             system("p4 sync ...")
 
@@ -387,7 +413,7 @@ class P4Submit(Command):
                 print "No changes found to apply between %s and current HEAD" % self.origin
             else:
                 print "All changes applied!"
-                response = raw_input("Do you want to sync from Perforce now using git-p4 rebase (y/n)? ")
+                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":
                     os.chdir(oldWorkingDirectory)
                     rebase = P4Rebase()
@@ -907,7 +933,10 @@ class P4Sync(Command):
 
         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 
-        self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import")
+        importProcess = popen2.Popen3("git fast-import", capturestderr = True)
+        self.gitOutput = importProcess.fromchild
+        self.gitStream = importProcess.tochild
+        self.gitError = importProcess.childerr
 
         if len(self.revision) > 0:
             print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision)
@@ -1028,6 +1057,7 @@ class P4Sync(Command):
         self.gitStream.close()
         self.gitOutput.close()
         self.gitError.close()
+        importProcess.wait()
 
         os.popen("git repo-config p4.depotpath %s" % self.globalPrefix).read()
         if len(self.initialTag) > 0:
@@ -1096,7 +1126,6 @@ class P4Clone(P4Sync):
         system("git init")
         if not P4Sync.run(self, [depotPath]):
             return False
-        os.wait()
         if self.branch != "master":
             system("git branch master p4")
             system("git checkout -f")