WebKitTools:

        Reviewed by Hyatt.

        Make svn-apply and svn-unapply work with added files in git-diff formatted patches.

        * Scripts/svn-apply:
        (gitdiff2svndiff): Ignore lines beginning with "new file".
        * Scripts/svn-unapply:
        (gitdiff2svndiff): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25816 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eb6afbfa17618ef187ebb8da778ad782803b873c..2f5700a69647badac33d747e3b8dbe59139ee808 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-01  David Kilzer  <ddkilzer@webkit.org>
+
+        Reviewed by Hyatt.
+
+        Make svn-apply and svn-unapply work with added files in git-diff formatted patches.
+
+        * Scripts/svn-apply:
+        (gitdiff2svndiff): Ignore lines beginning with "new file".
+        * Scripts/svn-unapply:
+        (gitdiff2svndiff): Ditto.
+
 2007-09-30  George Staikos  <staikos@kde.org>
 
         Qt build fix (Mac OS X specific)

diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 16a541c191e8b234ee15af41acead2820e9088d8..e89924915edc0975eb9e9ee2f166a9ecc58cd181 100755 (executable)
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -269,6 +269,8 @@ sub gitdiff2svndiff($)
     $_ = shift @_;
     if (m#^diff --git a/(.+) b/(.+)#) {
         return "Index: $1";
+    } elsif (m/^new file.*/) {
+        return "";
     } elsif (m#^index [0-9a-f]{7}\.\.[0-9a-f]{7} [0-9]{6}#) {
         return "===================================================================";
     } elsif (m#^--- a/(.+)#) {

diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply
index 18db52066669ed38c14f8a2cb6e19725a64eb52b..d56bf6c55949b0c902a033ebe2d41ff76cf84829 100755 (executable)
--- a/WebKitTools/Scripts/svn-unapply
+++ b/WebKitTools/Scripts/svn-unapply
@@ -203,6 +203,8 @@ sub gitdiff2svndiff($)
     $_ = shift @_;
     if (m#^diff --git a/(.+) b/(.+)#) {
         return "Index: $1";
+    } elsif (m/^new file.*/) {
+        return "";
     } elsif (m#^index [0-9a-f]{7}\.\.[0-9a-f]{7} [0-9]{6}#) {
         return "===================================================================";
     } elsif (m#^--- a/(.+)#) {