commit 25b4b50239f957490a31804d2b8b848b70769e16
author ddkilzer <ddkilzer@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sun Jun 25 23:28:14 2006 +0000
committer ddkilzer <ddkilzer@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sun Jun 25 23:28:14 2006 +0000
tree 162e3ebf52270f5a47864ae2ffb8b672988f8656
parent a4d27ab3f0d1c998a5cab275b5f8232a5473e61b

WebKitTools:

        Reviewed by Darin.

        * Scripts/svn-apply: Speed up isDirectoryEmptyForRemoval() by returning as soon as we find
        that the directory is not empty instead of reading in every single file and directory first,
        then checking the count.  Avoid warning in removeDirectoriesIfNeeded() if $svnOutput is not
        defined.



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

WebKitTools/Scripts/svn-apply

diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 9f6402a..d84d66b7 100755
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -138,7 +138,7 @@
     my $dir = ".";
     while (scalar @dirs) {
         $dir = File::Spec->catdir($dir, shift @dirs);
-        next if (exists $checkedDirectories{$dir});
+        next if exists $checkedDirectories{$dir};
         if (! -e $dir) {
             mkdir $dir or die "Failed to create required directory '$dir' for path '$path'\n";
             system "svn", "add", $dir;
@@ -192,23 +192,20 @@
 sub isDirectoryEmptyForRemoval($)
 {
     my ($dir) = @_;
+    my $directoryIsEmpty = 1;
     opendir DIR, $dir or die "Could not open '$dir' to list files: $?";
-    my @files = grep {
-        if (exists $removeDirectoryIgnoreList{$_}) {
-            0;
-        } elsif (! -d File::Spec->catdir($dir, $_)) {
-            1;
+    for (my $item = readdir DIR; $item && $directoryIsEmpty; $item = readdir DIR) {
+        next if exists $removeDirectoryIgnoreList{$item};
+        if (! -d File::Spec->catdir($dir, $item)) {
+            $directoryIsEmpty = 0;
         } else {
-            my $svnOutput = svnStatus(File::Spec->catdir($dir, $_));
-            if ($svnOutput && substr($svnOutput, 0, 1) eq "D") {
-                0;
-            } else {
-                1;
-            }
+            my $svnOutput = svnStatus(File::Spec->catdir($dir, $item));
+            next if $svnOutput && substr($svnOutput, 0, 1) eq "D";
+            $directoryIsEmpty = 0;
         }
-    } readdir DIR;
+    }
     closedir DIR;
-    return scalar(@files) == 0;
+    return $directoryIsEmpty;
 }
 
 sub patch($)
@@ -277,7 +274,7 @@
                 $svnOutput = $_;
             }
             close SVN;
-            print $svnOutput;
+            print $svnOutput if $svnOutput;
         }
     }
 }