Reviewed by Darin.
[WebKit-https.git] / WebKitTools / Scripts / prepare-ChangeLog
index f0c152a..7d71afa 100755 (executable)
@@ -56,6 +56,7 @@ use warnings;
 use File::Basename;
 use File::Spec;
 use File::Temp;
+use FindBin;
 use Getopt::Long;
 
 sub canonicalizePath($);
@@ -329,7 +330,7 @@ foreach my $prefix (sort keys %files)
 if ($spewDiff && @changed_files)
   {
     print STDERR "  Running 'svn diff' to help you write the ChangeLog entries.\n";
-    open DIFF, "$SVN diff $changed_files_string |" or die "The svn diff failed: $!.\n";
+    open DIFF, "'$FindBin::Bin/svn-create-patch' $changed_files_string |" or die "The svn diff failed: $!.\n";
     while (<DIFF>) { print; }
     close DIFF;
   }
@@ -530,6 +531,10 @@ sub get_function_line_ranges_for_c($$)
   
                   $_ = $original;
                   s/^[^;{]*//;
+                } elsif (/\@end/) {
+                  $in_method_declaration = 0;
+                  $interface_name = "";
+                  $_ = $original;
                 } else {
                   next;
                 }
@@ -563,6 +568,10 @@ sub get_function_line_ranges_for_c($$)
               $in_method_declaration = 0;
               $_ = $original;
               s/^[^{]*//;
+            } elsif (/\@end/) {
+              $in_method_declaration = 0;
+              $interface_name = "";
+              $_ = $original;
             } else {
               next;
             }