Title: [172339] trunk/Tools
- Revision
- 172339
- Author
- [email protected]
- Date
- 2014-08-08 01:09:08 -0700 (Fri, 08 Aug 2014)
Log Message
commit-log-message has extra blank line at the top of pre-populated message
https://bugs.webkit.org/show_bug.cgi?id=135744
Patch by Joseph Pecoraro <[email protected]> on 2014-08-08
Reviewed by Csaba Osztrogonác.
Do not add a blank leading line in single ChangeLog commit messages.
* Scripts/commit-log-editor:
(createCommitMessage):
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
(test_commit_message_for_one_reviewed_changelog):
(test_commit_message_for_one_rollout_changelog):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172338 => 172339)
--- trunk/Tools/ChangeLog 2014-08-08 07:46:15 UTC (rev 172338)
+++ trunk/Tools/ChangeLog 2014-08-08 08:09:08 UTC (rev 172339)
@@ -1,3 +1,18 @@
+2014-08-08 Joseph Pecoraro <[email protected]>
+
+ commit-log-message has extra blank line at the top of pre-populated message
+ https://bugs.webkit.org/show_bug.cgi?id=135744
+
+ Reviewed by Csaba Osztrogonác.
+
+ Do not add a blank leading line in single ChangeLog commit messages.
+
+ * Scripts/commit-log-editor:
+ (createCommitMessage):
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ (test_commit_message_for_one_reviewed_changelog):
+ (test_commit_message_for_one_rollout_changelog):
+
2014-08-07 Brent Fulgham <[email protected]>
[Win] Unreviewed gardening.
Modified: trunk/Tools/Scripts/commit-log-editor (172338 => 172339)
--- trunk/Tools/Scripts/commit-log-editor 2014-08-08 07:46:15 UTC (rev 172338)
+++ trunk/Tools/Scripts/commit-log-editor 2014-08-08 08:09:08 UTC (rev 172339)
@@ -346,9 +346,6 @@
push @result, normalizeLineEndings("\n", $endl);
push @result, normalizeLineEndings("$label:\n", $endl);
}
- if (!$commonPrefix) {
- push @result, normalizeLineEndings("\n", $endl);
- }
push @result, normalizeLineEndings($changeLogContents{$label}, $endl);
}
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (172338 => 172339)
--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2014-08-08 07:46:15 UTC (rev 172338)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2014-08-08 08:09:08 UTC (rev 172339)
@@ -205,8 +205,7 @@
self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
def test_commit_message_for_one_reviewed_changelog(self):
- expected_commit_message = u"""
-SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ expected_commit_message = u"""SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
<http://webkit.org/b/135006>
Patch by David Kilzer <[email protected]> on 2014-07-17
@@ -280,8 +279,7 @@
self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
def test_commit_message_for_one_rollout_changelog(self):
- expected_commit_message = u"""
-Rolling out r170340 and r170339.
+ expected_commit_message = u"""Rolling out r170340 and r170339.
Changeset r170339 broke the Apple Windows Debug and Release builds.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
