Changeset 167243 in webkit

Timestamp:

Apr 14, 2014 5:24:23 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fix commit-log-editor bug revealed by r165447
​https://bugs.webkit.org/show_bug.cgi?id=130676

Patch by Jozsef Berta <​jberta.u-szeged@partner.samsung.com> on 2014-04-14
Reviewed by Csaba Osztrogonác.

• Scripts/commit-log-editor:

(createCommitMessage): Omitting empty Source/JavaScriptCore:... blocks.
Add \n before the first block too, because the longest common prefix now ends with only one newline.
(removeLongestCommonPrefixEndingInNewline): The longest common prefix ends with only one newline,
now the last block of the common prefix isn't duplicated below. Changing the function name accordingly.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-14  Jozsef Berta  <jberta.u-szeged@partner.samsung.com>
+
+        Fix commit-log-editor bug revealed by r165447
+        https://bugs.webkit.org/show_bug.cgi?id=130676
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/commit-log-editor:
+        (createCommitMessage): Omitting empty Source/JavaScriptCore:... blocks.
+        Add \n before the first block too, because the longest common prefix now ends with only one newline.
+        (removeLongestCommonPrefixEndingInNewline): The longest common prefix ends with only one newline,
+        now the last block of the common prefix isn't duplicated below. Changing the function name accordingly.
+
 2014-04-13  Darin Adler  <darin@apple.com>
 

trunk/Tools/Scripts/commit-log-editor

@@ -43 +43 @@
 sub normalizeLineEndings($$);
 sub patchAuthorshipString($$$);
-sub removeLongestCommonPrefixEndingInDoubleNewline(\%);
+sub removeLongestCommonPrefixEndingInNewline(\%);
 sub isCommitLogEditor($);
 
@@ -297 +297 @@
     }
 
-    my $commonPrefix = removeLongestCommonPrefixEndingInDoubleNewline(%changeLogContents);
-
-    my $first = 1;
+    my $commonPrefix = removeLongestCommonPrefixEndingInNewline(%changeLogContents);
+
     my @result;
     push @result, normalizeLineEndings($commonPrefix, $endl);
     for my $sortKey (sort keys %changeLogSort) {
         my $label = $changeLogSort{$sortKey};
+        next if ($changeLogContents{$label} eq "\n");
         if (keys %changeLogSort > 1) {
-            push @result, normalizeLineEndings("\n", $endl) if !$first;
-            $first = 0;
+            push @result, normalizeLineEndings("\n", $endl);
             push @result, normalizeLineEndings("$label: ", $endl);
         }
@@ -336 +335 @@
 }
 
-sub removeLongestCommonPrefixEndingInDoubleNewline(\%)
+sub removeLongestCommonPrefixEndingInNewline(\%)
 {
     my ($hashOfStrings) = @_;
@@ -356 +355 @@
     return "" unless $prefixLength;
 
-    my $lastDoubleNewline = rindex($prefix, "\n\n");
-    return "" unless $lastDoubleNewline > 0;
+    my $lastNewline = rindex($prefix, "\n");
+    return "" unless $lastNewline > 0;
 
     foreach my $key (keys %{$hashOfStrings}) {
-        $hashOfStrings->{$key} = substr($hashOfStrings->{$key}, $lastDoubleNewline);
-    }
-    return substr($prefix, 0, $lastDoubleNewline + 2);
+        $hashOfStrings->{$key} = substr($hashOfStrings->{$key}, $lastNewline);
+    }
+    return substr($prefix, 0, $lastNewline + 1);
 }