<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172029] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172029">172029</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-05 08:16:23 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the commit-log-editor after <a href="http://trac.webkit.org/projects/webkit/changeset/167243">r167243</a> and add more unit tests
https://bugs.webkit.org/show_bug.cgi?id=131727
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-08-05
Reviewed by Csaba Osztrogonác.
* Scripts/commit-log-editor:
(createCommitMessage):
(removeLongestCommonPrefixEndingInNewline):
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
(CommitMessageForThisCommitTest):
(CommitMessageForThisCommitTest.mock_changelog):
(CommitMessageForThisCommitTest.mock_checkout_for_test):
(CommitMessageForThisCommitTest.test_commit_message_for_unreviewed_changelogs_with_different_messages):
(test_commit_message_for_one_reviewed_changelog):
(test_commit_message_for_changelogs_with_same_messages):
(test_commit_message_for_changelogs_with_different_messages):
(test_commit_message_for_one_rollout_changelog):
(test_commit_message_for_rollout_changelogs_with_different_directories):
(setUp): Deleted.
(test_commit_message_for_this_commit): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscommitlogeditor">trunk/Tools/Scripts/commit-log-editor</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172028 => 172029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-05 15:15:58 UTC (rev 172028)
+++ trunk/Tools/ChangeLog 2014-08-05 15:16:23 UTC (rev 172029)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-08-05 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Fix the commit-log-editor after r167243 and add more unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=131727
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/commit-log-editor:
+ (createCommitMessage):
+ (removeLongestCommonPrefixEndingInNewline):
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ (CommitMessageForThisCommitTest):
+ (CommitMessageForThisCommitTest.mock_changelog):
+ (CommitMessageForThisCommitTest.mock_checkout_for_test):
+ (CommitMessageForThisCommitTest.test_commit_message_for_unreviewed_changelogs_with_different_messages):
+ (test_commit_message_for_one_reviewed_changelog):
+ (test_commit_message_for_changelogs_with_same_messages):
+ (test_commit_message_for_changelogs_with_different_messages):
+ (test_commit_message_for_one_rollout_changelog):
+ (test_commit_message_for_rollout_changelogs_with_different_directories):
+ (setUp): Deleted.
+ (test_commit_message_for_this_commit): Deleted.
+
</ins><span class="cx"> 2014-08-04 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] run-launcher --gtk is broken
</span></span></pre></div>
<a id="trunkToolsScriptscommitlogeditor"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/commit-log-editor (172028 => 172029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/commit-log-editor 2014-08-05 15:15:58 UTC (rev 172028)
+++ trunk/Tools/Scripts/commit-log-editor 2014-08-05 15:16:23 UTC (rev 172029)
</span><span class="lines">@@ -344,8 +344,11 @@
</span><span class="cx"> next if ($changeLogContents{$label} eq "\n");
</span><span class="cx"> if (keys %changeLogSort > 1) {
</span><span class="cx"> push @result, normalizeLineEndings("\n", $endl);
</span><del>- push @result, normalizeLineEndings("$label: ", $endl);
</del><ins>+ push @result, normalizeLineEndings("$label:\n", $endl);
</ins><span class="cx"> }
</span><ins>+ if (!$commonPrefix) {
+ push @result, normalizeLineEndings("\n", $endl);
+ }
</ins><span class="cx"> push @result, normalizeLineEndings($changeLogContents{$label}, $endl);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -399,7 +402,7 @@
</span><span class="cx"> foreach my $key (keys %{$hashOfStrings}) {
</span><span class="cx"> $hashOfStrings->{$key} = substr($hashOfStrings->{$key}, $lastNewline);
</span><span class="cx"> }
</span><del>- return substr($prefix, 0, $lastNewline + 1);
</del><ins>+ return substr($prefix, 0, $lastNewline);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isCommitLogEditor($)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (172028 => 172029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2014-08-05 15:15:58 UTC (rev 172028)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2014-08-05 15:16:23 UTC (rev 172029)
</span><span class="lines">@@ -79,22 +79,57 @@
</span><span class="cx"> Filler change.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-class CommitMessageForThisCommitTest(unittest.TestCase):
- expected_commit_message = u"""Unreviewed build fix to un-break webkit-patch land.
</del><ins>+_changelog3 = u"""2014-07-17 David Kilzer <ddkilzer@apple.com>
</ins><span class="cx">
</span><ins>+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
</ins><span class="cx">
</span><del>-Tools:
-Move commit_message_for_this_commit from scm to checkout
-https://bugs.webkit.org/show_bug.cgi?id=36629
</del><ins>+ Reviewed by Darin Adler.
</ins><span class="cx">
</span><del>-* Scripts/webkitpy/common/checkout/api.py: import scm.CommitMessage
</del><ins>+ * WebKit.xcodeproj/project.pbxproj: Remove references to unused
+ WebKit.xcconfig file.
+"""
</ins><span class="cx">
</span><del>-LayoutTests:
-Second part of this complicated change by me, Tor Arne Vestb\u00f8!
</del><ins>+_changelog4 = u"""2014-07-17 David Kilzer <ddkilzer@apple.com>
</ins><span class="cx">
</span><del>-* Path/To/Complicated/File: Added.
</del><ins>+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ * Path/To/Complicated/File: Added.
</ins><span class="cx"> """
</span><span class="cx">
</span><ins>+_changelog5 = u"""2014-07-17 David Kilzer <ddkilzer@apple.com>
+
+ SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
+ <http://webkit.org/b/135006>
+
+ Reviewed by Darin Adler.
+
+ Filler change.
+
+ * Path/To/Complicated/File: Added.
+"""
+
+_changelog6 = u"""2014-06-23 Daniel Bates <dabates@apple.com>
+
+ Rolling out r170340 and r170339.
+
+ Changeset r170339 broke the Apple Windows Debug and Release builds.
+
+ Reverted changesets:
+
+ "[Win] Build fix after r134209"
+ http://trac.webkit.org/changeset/170340
+
+ "[Win] Clean up and refactor WinLauncher"
+ https://bugs.webkit.org/show_bug.cgi?id=134209
+ http://trac.webkit.org/changeset/170339
+"""
+
+
+class CommitMessageForThisCommitTest(unittest.TestCase):
</ins><span class="cx"> def setUp(self):
</span><span class="cx"> # FIXME: This should not need to touch the filesystem, however
</span><span class="cx"> # ChangeLog is difficult to mock at current.
</span><span class="lines">@@ -110,8 +145,8 @@
</span><span class="cx"> # treat a bare .svn directory being part of an svn checkout.
</span><span class="cx"> self.filesystem.maybe_make_directory(".svn")
</span><span class="cx">
</span><del>- self.changelogs = map(self.filesystem.abspath, (self.filesystem.join("Tools", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
- for path, contents in zip(self.changelogs, (_changelog1, _changelog2)):
</del><ins>+ def mock_changelog(self, changelogs):
+ for path, contents in zip(self.changelog_paths, changelogs):
</ins><span class="cx"> self.filesystem.maybe_make_directory(self.filesystem.dirname(path))
</span><span class="cx"> self.filesystem.write_text_file(path, contents)
</span><span class="cx">
</span><span class="lines">@@ -119,7 +154,7 @@
</span><span class="cx"> self.filesystem.rmtree(self.temp_dir)
</span><span class="cx"> self.filesystem.chdir(self.old_cwd)
</span><span class="cx">
</span><del>- def test_commit_message_for_this_commit(self):
</del><ins>+ def mock_checkout_for_test(self):
</ins><span class="cx"> executive = Executive()
</span><span class="cx">
</span><span class="cx"> def mock_run(*args, **kwargs):
</span><span class="lines">@@ -139,13 +174,164 @@
</span><span class="cx"> real_checkout = Checkout(real_scm)
</span><span class="cx"> checkout = Checkout(mock_scm)
</span><span class="cx"> checkout.script_path = real_checkout.script_path
</span><del>- checkout.modified_changelogs = lambda git_commit, changed_files=None: self.changelogs
</del><ins>+ checkout.modified_changelogs = lambda git_commit, changed_files=None: self.changelog_paths
+
+ return checkout
+
+ def test_commit_message_for_unreviewed_changelogs_with_different_messages(self):
+ expected_commit_message = u"""Unreviewed build fix to un-break webkit-patch land.
+
+Tools:
+
+Move commit_message_for_this_commit from scm to checkout
+https://bugs.webkit.org/show_bug.cgi?id=36629
+
+* Scripts/webkitpy/common/checkout/api.py: import scm.CommitMessage
+
+LayoutTests:
+
+Second part of this complicated change by me, Tor Arne Vestb\u00f8!
+
+* Path/To/Complicated/File: Added.
+"""
+
+ self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Tools", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
+
+ self.mock_changelog((_changelog1, _changelog2))
+ checkout = self.mock_checkout_for_test()
</ins><span class="cx"> commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
</span><span class="cx"> # Throw away the first line - a warning about unknown VCS root.
</span><span class="cx"> commit_message.message_lines = commit_message.message_lines[1:]
</span><del>- self.assertMultiLineEqual(commit_message.message(), self.expected_commit_message)
</del><ins>+ self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
</ins><span class="cx">
</span><ins>+ 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
+<http://webkit.org/b/135006>
</ins><span class="cx">
</span><ins>+Patch by David Kilzer <ddkilzer@apple.com> on 2014-07-17
+Reviewed by Darin Adler.
+
+* WebKit.xcodeproj/project.pbxproj: Remove references to unused
+WebKit.xcconfig file.
+"""
+
+ self.changelog_paths = map(self.filesystem.abspath, [self.filesystem.join("Source/WebKit", "ChangeLog")])
+
+ self.mock_changelog([_changelog3])
+ checkout = self.mock_checkout_for_test()
+ commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
+ # Throw away the first line - a warning about unknown VCS root.
+ commit_message.message_lines = commit_message.message_lines[1:]
+ self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
+
+ def test_commit_message_for_changelogs_with_same_messages(self):
+ 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 <ddkilzer@apple.com> on 2014-07-17
+Reviewed by Darin Adler.
+
+Source/WebKit:
+
+* WebKit.xcodeproj/project.pbxproj: Remove references to unused
+WebKit.xcconfig file.
+
+LayoutTests:
+
+* Path/To/Complicated/File: Added.
+"""
+
+ self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKit", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
+
+ self.mock_changelog((_changelog3, _changelog4))
+ checkout = self.mock_checkout_for_test()
+ commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
+ # Throw away the first line - a warning about unknown VCS root.
+ commit_message.message_lines = commit_message.message_lines[1:]
+ self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
+
+ def test_commit_message_for_changelogs_with_different_messages(self):
+ 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 <ddkilzer@apple.com> on 2014-07-17
+Reviewed by Darin Adler.
+
+Source/WebKit:
+
+* WebKit.xcodeproj/project.pbxproj: Remove references to unused
+WebKit.xcconfig file.
+
+LayoutTests:
+
+Filler change.
+
+* Path/To/Complicated/File: Added.
+"""
+
+ self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKit", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
+
+ self.mock_changelog((_changelog3, _changelog5))
+ checkout = self.mock_checkout_for_test()
+ commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
+ # Throw away the first line - a warning about unknown VCS root.
+ commit_message.message_lines = commit_message.message_lines[1:]
+ 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.
+
+Changeset r170339 broke the Apple Windows Debug and Release builds.
+
+Reverted changesets:
+
+"[Win] Build fix after r134209"
+http://trac.webkit.org/changeset/170340
+
+"[Win] Clean up and refactor WinLauncher"
+https://bugs.webkit.org/show_bug.cgi?id=134209
+http://trac.webkit.org/changeset/170339
+
+Patch by Daniel Bates <dabates@apple.com> on 2014-06-23
+"""
+
+ self.changelog_paths = map(self.filesystem.abspath, [self.filesystem.join("Tools", "ChangeLog")])
+
+ self.mock_changelog([_changelog6])
+ checkout = self.mock_checkout_for_test()
+ commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
+ # Throw away the first line - a warning about unknown VCS root.
+ commit_message.message_lines = commit_message.message_lines[1:]
+ self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
+
+ def test_commit_message_for_rollout_changelogs_with_different_directories(self):
+ expected_commit_message = u"""Rolling out r170340 and r170339.
+
+Changeset r170339 broke the Apple Windows Debug and Release builds.
+
+Reverted changesets:
+
+"[Win] Build fix after r134209"
+http://trac.webkit.org/changeset/170340
+
+"[Win] Clean up and refactor WinLauncher"
+https://bugs.webkit.org/show_bug.cgi?id=134209
+http://trac.webkit.org/changeset/170339
+
+Patch by Daniel Bates <dabates@apple.com> on 2014-06-23
+"""
+
+ self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Tools", "ChangeLog"), self.filesystem.join("Source/WebCore", "ChangeLog")))
+
+ self.mock_changelog((_changelog6, _changelog6))
+ checkout = self.mock_checkout_for_test()
+ commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
+ # Throw away the first line - a warning about unknown VCS root.
+ commit_message.message_lines = commit_message.message_lines[1:]
+ self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
+
</ins><span class="cx"> class CheckoutTest(unittest.TestCase):
</span><span class="cx"> def _make_checkout(self):
</span><span class="cx"> return Checkout(scm=MockSCM(), filesystem=MockFileSystem(), executive=MockExecutive())
</span><span class="lines">@@ -221,7 +407,7 @@
</span><span class="cx">
</span><span class="cx"> def test_bug_id_for_this_commit(self):
</span><span class="cx"> checkout = self._make_checkout()
</span><del>- checkout.commit_message_for_this_commit = lambda git_commit, changed_files=None: CommitMessage(ChangeLogEntry(_changelog1entry1).contents().splitlines())
</del><ins>+ checkout.commit_message_for_this_commit = lambda git_commit, changed_files=None, return_stderr=False: CommitMessage(ChangeLogEntry(_changelog1entry1).contents().splitlines())
</ins><span class="cx"> self.assertEqual(checkout.bug_id_for_this_commit(git_commit=None), 36629)
</span><span class="cx">
</span><span class="cx"> def test_modified_changelogs(self):
</span></span></pre>
</div>
</div>
</body>
</html>