Changeset 57455 in webkit

Timestamp:

Apr 11, 2010 1:19:01 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-11 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Eric Seidel.

svn-apply errors out when removing directories in git
​https://bugs.webkit.org/show_bug.cgi?id=34871

• Scripts/svn-apply: (isDirectoryEmptyForRemoval): early break if the directory doesn't exist (scmRemove): have git ignore unmatched files

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-apply (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-11  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        svn-apply errors out when removing directories in git
+        https://bugs.webkit.org/show_bug.cgi?id=34871
+
+        * Scripts/svn-apply:
+        (isDirectoryEmptyForRemoval): early break if the directory doesn't exist
+        (scmRemove): have git ignore unmatched files
+
 2010-04-11  Daniel Bates  <dbates@rim.com>
 

trunk/WebKitTools/Scripts/svn-apply

@@ -311 +311 @@
 {
     my ($dir) = @_;
+    return 1 unless -d $dir;
     my $directoryIsEmpty = 1;
     opendir DIR, $dir or die "Could not open '$dir' to list files: $?";
@@ -482 +483 @@
         print $svnOutput if $svnOutput;
     } elsif (isGit()) {
-        system("git", "rm", "--force", $path) == 0 or die  "Failed to git rm --force $path.";
-    }
-}
+        # Git removes a directory if it becomes empty when the last file it contains is
+        # removed by `git rm`. In svn-apply this can happen when a directory is being
+        # removed in a patch, and all of the files inside of the directory are removed
+        # before attemping to remove the directory itself. In this case, Git will have 
+        # already deleted the directory and `git rm` would exit with an error claiming
+        # there was no file. The --ignore-unmatch switch gracefully handles this case.
+        system("git", "rm", "--force", "--ignore-unmatch", $path) == 0 or die "Failed to git rm --force --ignore-unmatch $path.";
+    }
+}