Changeset 55780 in webkit

Timestamp:

Mar 10, 2010 7:47:30 AM (14 years ago)

Author:

Adam Roben

Message:

Make svn-create-patch and prepare-ChangeLog show better section headings for ObjC files

This makes the text at the end of each "@@" line in a diff actually
show the ObjC method or interface that contains the change, rather
than whatever the most-recently-defined C function was.

Fixes <​http://webkit.org/b/35970>.

Reviewed by John Sullivan.

• Scripts/svn-create-patch: Pass -F'^{[-+@]' to diff so that it will}

treat any lines starting with -, +, or @ as section heading lines.
This works well for ObjC files, and shouldn't affect other types of
files.

• Scripts/prepare-ChangeLog: Changed the options passed to diff to

match those used in svn-create-patch.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-10  Adam Roben  <aroben@apple.com>
+
+        Make svn-create-patch and prepare-ChangeLog show better section
+        headings for ObjC files
+
+        This makes the text at the end of each "@@" line in a diff actually
+        show the ObjC method or interface that contains the change, rather
+        than whatever the most-recently-defined C function was.
+
+        Fixes <http://webkit.org/b/35970>.
+
+        Reviewed by John Sullivan.
+
+        * Scripts/svn-create-patch: Pass -F'^[-+@]' to diff so that it will
+        treat any lines starting with -, +, or @ as section heading lines.
+        This works well for ObjC files, and shouldn't affect other types of
+        files.
+
+        * Scripts/prepare-ChangeLog: Changed the options passed to diff to
+        match those used in svn-create-patch.
+
 2010-03-10  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKitTools/Scripts/prepare-ChangeLog

@@ -1228 +1228 @@
     my $command;
     if ($isSVN) {
-        $command = "$SVN diff --diff-cmd diff -x -N $pathsString";
+        $command = "$SVN diff --diff-cmd diff -x -uaNpF'^[-+@]' $pathsString";
     } elsif ($isGit) {
         $command = "$GIT diff --no-ext-diff -U0 " . diffFromToString();

trunk/WebKitTools/Scripts/svn-create-patch

@@ -204 +204 @@
         manufacturePatchForAdditionWithHistory($fileData);
     }
-    open DIFF, "svn diff --diff-cmd diff -x -uaNp '$file' |" or die;
+    open DIFF, "svn diff --diff-cmd diff -x -uaNpF'^[-+@]' '$file' |" or die;
     while (<DIFF>) {
         $patch .= $_;