prepare-ChangeLog: Fix some warning messages when using svn

<http://webkit.org/b/151914>

Reviewed by Daniel Bates.

* Scripts/prepare-ChangeLog:
(generateFunctionLists): Simplify logic so that we never call
normalizePath() with an undefined value.
(attributeCommand): Quote $subPath for the shell so that we
don't try to run "svn propget" on invalid paths.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3d7c3ff..fc6158f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2015-12-05  David Kilzer  <ddkilzer@apple.com>
+
+        prepare-ChangeLog: Fix some warning messages when using svn
+        <http://webkit.org/b/151914>
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/prepare-ChangeLog:
+        (generateFunctionLists): Simplify logic so that we never call
+        normalizePath() with an undefined value.
+        (attributeCommand): Quote $subPath for the shell so that we
+        don't try to run "svn propget" on invalid paths.
+
 2015-12-04  David Kilzer  <ddkilzer@apple.com>
 
         TestNetscapePlugIn: Fix remaining static analyzer warnings

diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog
index b33422b..ee1d817 100755 (executable)
--- a/Tools/Scripts/prepare-ChangeLog
+++ b/Tools/Scripts/prepare-ChangeLog
@@ -285,8 +285,7 @@ sub generateFunctionLists($$$$$)
         my $file;
         open DIFF, "-|", diffCommand($changedFiles, $gitCommit, $gitIndex, $mergeBase) or die "The diff failed: $!.\n";
         while (<DIFF>) {
-            $file = makeFilePathRelative($1) if $_ =~ diffHeaderFormat();
-            $file = normalizePath($file);
+            $file = normalizePath(makeFilePathRelative($1)) if $_ =~ diffHeaderFormat();
             if (defined $file) {
                 my ($before_start, $before_end) = extractLineRangeBeforeChange($_);
                 if ($before_start >= 1 && $before_end >= 1) {
@@ -1961,7 +1960,7 @@ sub attributeCommand($$)
                 $foundAttribute = 1;
                 next;
             }
-            my $command = SVN . " propget $attr $subPath";
+            my $command = SVN . " propget $attr '$subPath'";
             my $attrib = $attributeCache{$attr}{$subPath} || `$command`;
             chomp $attrib;
             if ($attrib eq "1") {