* Scripts/make-js-test-wrappers: Don't create a wrapper if there's a disabled

        wrapper already in the directory.
        * Scripts/svn-apply: Handle additions and deletions properly -- I've been noticing
        these haven't been working at all.
        * Scripts/svn-unapply: Ditto.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 18d4cf65f4cb712854617093e6fe0442f1770636..e4f0cbbca019538e3d3e0cd2231c42168e95095e 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-04  Darin Adler  <darin@apple.com>
+
+        * Scripts/make-js-test-wrappers: Don't create a wrapper if there's a disabled
+        wrapper already in the directory.
+        * Scripts/svn-apply: Handle additions and deletions properly -- I've been noticing
+        these haven't been working at all.
+        * Scripts/svn-unapply: Ditto.
+
 2006-02-03  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Justin.

diff --git a/WebKitTools/Scripts/make-js-test-wrappers b/WebKitTools/Scripts/make-js-test-wrappers
index 98828df2038653d1ff23cf18abc10a6080f1c093..b053c17e07d6f70c522263da9c5dddfbf235b600 100755 (executable)
--- a/WebKitTools/Scripts/make-js-test-wrappers
+++ b/WebKitTools/Scripts/make-js-test-wrappers
@@ -69,9 +69,11 @@ for my $tfile (@templates) {
 
     for my $file (@files) {
         chomp $file;
-        if ($file =~ /js-test-.*\.js/) {
-            next;
-        }
+        next if $file =~ /js-test-.*\.js/;
+
+        my $html = $file;
+        $html =~ s:resources/(.*)\.js:$1.html:;
+        next if -f "$html-disabled";
 
         system("grep -q 'successfullyParsed =' $file");
         if ($? != 0) {
@@ -79,8 +81,6 @@ for my $tfile (@templates) {
             `echo "var successfullyParsed = true;" >> "${file}"`;
         }
         
-        my $html = $file;
-        $html =~ s:resources/(.*)\.js:$1.html:;
         print "    ${html}\n";
         open HTML, ">$html";
         my $output = ($file =~ /-n\.js/) ? $templateNegative : $template;

diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 5cd4a30d8aa8188a02f785986d7564cb6e78d9fc..98d9cf0a875effdb97b834c85d526ac1fd63cd69 100755 (executable)
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -115,12 +115,13 @@ sub patch
     $patch =~ m|^Index: ((([^/\n]*/)*)([^/\n]+))| or die "Failed to find Index: in \"$patch\"\n";
     my ($fullpath, $prefix, $base) = ($1, $2, $4);
 
-    my $previousRevision = 0;
-        if($patch =~ /\n--- .+\(revision (\d+)\)\n/) { 
-            $previousRevision = $1;
-        }
+    my $deletion = 0;
+    my $addition = 0;
+
+    $addition = 1 if $patch =~ /\n--- .+\(revision 0\)\n/;
+    $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/;
 
-    if ($previousRevision != 0 || $patch !~ /\ndiff -N/) {
+    if (!$addition && !$deletion) {
         # Standard patch, patch tool can handle this.
         open PATCH, "| patch -p0" or die "Failed to patch $fullpath\n";
         print PATCH $patch;
@@ -131,7 +132,7 @@ sub patch
         # Change directory down into the directory in question.
         chdirAddingDirectoriesIfNeeded($prefix);
 
-        if ($patch =~ /\n@@ .* \+0,0 @@/) {
+        if ($deletion) {
             # Deletion.
             system "svn", "rm", $base;
         } else {

diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply
index df5cbc3ff2da317765aa70fa6ec179b6839f281c..3085570b367acd6ac460c6e0868cc8b32a03f4e3 100755 (executable)
--- a/WebKitTools/Scripts/svn-unapply
+++ b/WebKitTools/Scripts/svn-unapply
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -82,12 +82,13 @@ sub patch
     my ($patch) = @_;
     return if !$patch;
 
-    my $previousRevision = 0;
-        if($patch =~ /\n--- .+\(revision (\d+)\)\n/) { 
-            $previousRevision = $1;
-        }
+    my $deletion = 0;
+    my $addition = 0;
+
+    $addition = 1 if $patch =~ /\n--- .+\(revision 0\)\n/;
+    $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/;
 
-    if ($previousRevision != 0 || $patch !~ /\ndiff -N/) {
+    if (!$addition && !$deletion) {
         # Standard patch, patch tool can handle this.
         open PATCH, "| patch -p0 -R" or die;
         print PATCH $patch;
@@ -103,7 +104,7 @@ sub patch
             chdir $prefix or die "Failed to chdir to $prefix";
         }
 
-        if ($patch =~ /\n@@ .* \+0,0 @@/) {
+        if ($deletion) {
             # Reverse a deletion.
             system "svn", "add", "$base";
             my $file = $patch;