Changeset 247503 in webkit

Timestamp:

Jul 16, 2019 9:16:06 PM (5 years ago)

Author:

Jonathan Bedard

Message:

svn-create-patch duplicates diffs when adding directories
​https://bugs.webkit.org/show_bug.cgi?id=199842

Reviewed by Dewei Zhu.

• Scripts/svn-create-patch:

(findKind): Add function which returns what 'kind' of file the provided path is.
(generateFileList): If the path is a directory and being added, don't add it.
Instead, rely on the fact that its children will be added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-create-patch (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-16  Jonathan Bedard  <jbedard@apple.com>
+
+        svn-create-patch duplicates diffs when adding directories
+        https://bugs.webkit.org/show_bug.cgi?id=199842
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/svn-create-patch:
+        (findKind): Add function which returns what 'kind' of file the provided path is.
+        (generateFileList): If the path is a directory and being added, don't add it.
+        Instead, rely on the fact that its children will be added.
+
 2019-07-16  Tim Horton  <timothy_horton@apple.com>
 

trunk/Tools/Scripts/svn-create-patch

@@ -52 +52 @@
 sub diffOptionsForFile($);
 sub findBaseUrl($);
+sub findKind($);
 sub findMimeType($;$);
 sub findModificationType($);
@@ -177 +178 @@
 }
 
+sub findKind($)
+{
+    my ($path) = @_;
+    my $kind;
+    my $escapedInfoPath = escapeSubversionPath($path);
+
+    print STDERR "Performing \"svn info '$escapedInfoPath'\"\n" if $verbose;
+
+    open INFO, "svn info '$escapedInfoPath' |" or die;
+    while (<INFO>) {
+        if (/^Node Kind: (.+?)[\r\n]*$/) {
+            $kind = $1;
+        }
+    }
+    close INFO;
+    return $kind;
+}
+
 sub findMimeType($;$)
 {
@@ -327 +346 @@
         if ($modificationType eq "deletion") {
             push @deletedFiles, $path;
+            next;
+        }
+
+        if (findKind($path) eq "directory") {
             next;
         }