Changeset 46899 in webkit

Timestamp:

Aug 7, 2009 11:14:36 AM (15 years ago)

Author:

abarth@webkit.org

Message:

2009-08-07 Pierre d'Herbemont <​pdherbemont@apple.com>

Reviewed by Eric Seidel.

commit-log-editor does not produce a git commit log that is git friendly.
​https://bugs.webkit.org/show_bug.cgi?id=27754

We make sure we end up with:

• A first paragraph describing the bug. It is eventually prefixed by "WebKit: <line>" or "WebCore: <line>". This used to be "WebCore:\n\n<line>".
• The Reviewed By line.
• An eventual Patch By line if author and committer doesn't match.
• The rest of the commit.

• Scripts/commit-log-editor:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/commit-log-editor (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-07  Pierre d'Herbemont  <pdherbemont@apple.com>
+
+        Reviewed by Eric Seidel.
+
+        commit-log-editor does not produce a git commit log that is git friendly.
+        https://bugs.webkit.org/show_bug.cgi?id=27754
+
+        We make sure we end up with:
+        - A first paragraph describing the bug. It is eventually prefixed by
+        "WebKit: <line>" or "WebCore: <line>". This used to be
+        "WebCore:\n\n<line>".
+        - The Reviewed By line.
+        - An eventual Patch By line if author and committer doesn't match.
+        - The rest of the commit.
+
+        * Scripts/commit-log-editor:
+
 2009-08-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/commit-log-editor

@@ -134 +134 @@
     my $contents = "";
     my $blankLines = "";
+    my $reviewedByLine = "";
+    my $lineCount = 0;
+    my $date = "";
+    my $author = "";
+    my $email = "";
+    my $hasAuthorInfoToWrite = 0;
     while (<CHANGELOG>) {
         if (/^\S/) {
@@ -139 +145 @@
         }
         if (/\S/) {
-            $contents .= $blankLines if $contents;
+            my $previousLineWasBlank = 1 unless $blankLines eq "";
+            my $line = $_;
+            my $currentLineBlankLines = $blankLines;
             $blankLines = "";
-            $contents .= $_;
+
+            # Remove identation spaces
+            $line =~ s/^\s{8}//;
+
+            # Save the reviewed by line
+            if ($line =~ m/^Reviewed by .*/) {
+                $reviewedByLine = $line;
+                next;
+            }
+
+            # Grab the author and the date line
+            if ($line =~ m/^([0-9]{4}-[0-9]{2}-[0-9]{2})\s+(.*[^\s])\s+<(.*)>/ && $lineCount == 0) {
+                $date = $1;
+                $author = $2;
+                $email = $3;
+                $hasAuthorInfoToWrite = 1;
+                next;
+            }
+
+            $contents .= $currentLineBlankLines if $contents;
+
+            # Attempt to insert the "patch by" line, after the first blank line.
+            if ($previousLineWasBlank && $hasAuthorInfoToWrite && $lineCount > 0) {
+                my $authorAndCommitterAreSamePerson = $email eq $ENV{'EMAIL_ADDRESS'};
+                if (!$authorAndCommitterAreSamePerson) {
+                    $contents .= "Patch by $author <$email> on $date\n";
+                    $hasAuthorInfoToWrite = 0;
+                }
+            }
+
+            # Attempt to insert the "reviewed by" line, after the first blank line.
+            if ($previousLineWasBlank && $reviewedByLine && $lineCount > 0) {
+                $contents .= $reviewedByLine . "\n";
+                $reviewedByLine = "";
+            }
+
+
+            $lineCount++;
+            $contents .= $line;
         } else {
             $blankLines .= $_;
         }
+    }
+    if ($reviewedByLine) {
+        $contents .= "\n".$reviewedByLine;
     }
     close CHANGELOG;
@@ -192 +241 @@
             print NEWLOG normalizeLineEndings("\n", $endl) if !$first;
             $first = 0;
-            print NEWLOG normalizeLineEndings("$label:\n\n", $endl);
+            print NEWLOG normalizeLineEndings("$label: ", $endl);
         }
         print NEWLOG normalizeLineEndings($changeLogContents{$label}, $endl);