* Scripts/cvs-apply: Improve handling of patches with CR characters in them.

        * Scripts/cvs-unapply: Ditto.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index be284e2aa7a4cc3aa5709c64fefbea8cb56a515b..7f358f111521484ad25c4e33fdc2bdee0c732ada 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-18  Darin Adler  <darin@apple.com>
+
+        * Scripts/cvs-apply: Improve handling of patches with CR characters in them.
+        * Scripts/cvs-unapply: Ditto.
+
 2005-06-17  Maciej Stachowiak  <mjs@apple.com>
 
         - added prepare-ChangeLog script which we use internally to make ChangeLogs, for

diff --git a/WebKitTools/Scripts/cvs-apply b/WebKitTools/Scripts/cvs-apply
index 064f9094ae90b071d9287773361830dbd0be59c6..f98059ae03b0d4473f3e2dbf5f83551ae833a0d0 100755 (executable)
--- a/WebKitTools/Scripts/cvs-apply
+++ b/WebKitTools/Scripts/cvs-apply
@@ -49,7 +49,9 @@ my $startDir = getcwd();
 my $indexPath;
 my $patch;
 while (<>) {
-    if (/^Index: (.*)/) {
+    s/\r//g;
+    chomp;
+    if (/^Index: (.+)/) {
         $indexPath = $1;
         if ($patch) {
             patch($patch);
@@ -63,6 +65,7 @@ while (<>) {
         s/^\+\+\+ \S+/+++ $indexPath/;
     }
     $patch .= $_;
+    $patch .= "\n";
 }
 patch($patch);
 

diff --git a/WebKitTools/Scripts/cvs-unapply b/WebKitTools/Scripts/cvs-unapply
index a4591708ffccf81da59673f7243bf8078ccd61f6..dac08920fc199184501bbd3bc05e0b6e724fc344 100755 (executable)
--- a/WebKitTools/Scripts/cvs-unapply
+++ b/WebKitTools/Scripts/cvs-unapply
@@ -49,6 +49,8 @@ my $startDir = getcwd();
 my $indexPath;
 my $patch;
 while (<>) {
+    s/\r//g;
+    chomp;
     if (/^Index: (.*)/) {
         $indexPath = $1;
         if ($patch) {
@@ -63,6 +65,7 @@ while (<>) {
         s/^\+\+\+ \S+/+++ $indexPath/;
     }
     $patch .= $_;
+    $patch .= "\n";
 }
 patch($patch);