Added experimental but super-fast --apply-as-patch option to git-p4 submit

Signed-off-by: Simon Hausmann <hausmann@kde.org>

diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py
index 54ddf73dacd45690cccf8cc2a4c12b83adab2b9c..2009dce23b0697754226079a1d84554118fc71f2 100755 (executable)
--- a/contrib/fast-import/git-p4.py
+++ b/contrib/fast-import/git-p4.py
@@ -115,7 +115,8 @@ def __init__(self):
                 optparse.make_option("--master", dest="master"),
                 optparse.make_option("--log-substitutions", dest="substFile"),
                 optparse.make_option("--noninteractive", action="store_false"),
                 optparse.make_option("--master", dest="master"),
                 optparse.make_option("--log-substitutions", dest="substFile"),
                 optparse.make_option("--noninteractive", action="store_false"),

-                optparse.make_option("--dry-run", action="store_true")
+                optparse.make_option("--dry-run", action="store_true"),
+                optparse.make_option("--apply-as-patch", action="store_true", dest="applyAsPatch")

         ]
         self.description = "Submit changes from git to the perforce depot."
         self.firstTime = True
         ]
         self.description = "Submit changes from git to the perforce depot."
         self.firstTime = True


@@ -126,6 +127,7 @@ def __init__(self):
         self.firstTime = True
         self.origin = "origin"
         self.master = ""
         self.firstTime = True
         self.origin = "origin"
         self.master = ""

+        self.applyAsPatch = False

 
         self.logSubstitutions = {}
         self.logSubstitutions["<enter description here>"] = "%log%"
 
         self.logSubstitutions = {}
         self.logSubstitutions["<enter description here>"] = "%log%"


@@ -146,8 +148,9 @@ def start(self):
 
         self.config["commits"] = commits
 
 
         self.config["commits"] = commits
 

-        print "Creating temporary p4-sync branch from %s ..." % self.origin
-        system("git checkout -f -b p4-sync %s" % self.origin)
+        if not self.applyAsPatch:
+            print "Creating temporary p4-sync branch from %s ..." % self.origin
+            system("git checkout -f -b p4-sync %s" % self.origin)

 
     def prepareLogMessage(self, template, message):
         result = ""
 
     def prepareLogMessage(self, template, message):
         result = ""


@@ -193,8 +196,11 @@ def apply(self, id):
             else:
                 die("unknown modifier %s for %s" % (modifier, path))
 
             else:
                 die("unknown modifier %s for %s" % (modifier, path))
 

-        system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
-        system("git cherry-pick --no-commit \"%s\"" % id)
+        if self.applyAsPatch:
+            system("git-diff-tree -p \"%s^\" \"%s\" | patch -p1" % (id, id))
+        else:
+            system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
+            system("git cherry-pick --no-commit \"%s\"" % id)

 
         for f in filesToAdd:
             system("p4 add %s" % f)
 
         for f in filesToAdd:
             system("p4 add %s" % f)


@@ -305,12 +311,13 @@ def run(self, args):
                 print "No changes found to apply between %s and current HEAD" % self.origin
             else:
                 print "All changes applied!"
                 print "No changes found to apply between %s and current HEAD" % self.origin
             else:
                 print "All changes applied!"

-                print "Deleting temporary p4-sync branch and going back to %s" % self.master
-                system("git checkout %s" % self.master)
-                system("git branch -D p4-sync")
-                print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
-                system("p4 edit ... >/dev/null")
-                system("p4 revert ... >/dev/null")
+                if not self.applyAsPatch:
+                    print "Deleting temporary p4-sync branch and going back to %s" % self.master
+                    system("git checkout %s" % self.master)
+                    system("git branch -D p4-sync")
+                    print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
+                    system("p4 edit ... >/dev/null")
+                    system("p4 revert ... >/dev/null")

             os.remove(self.configFile)
 
         return True
             os.remove(self.configFile)
 
         return True