Title: [166646] trunk/Tools
- Revision
- 166646
- Author
- [email protected]
- Date
- 2014-04-02 08:10:02 -0700 (Wed, 02 Apr 2014)
Log Message
[webkitpy] Avoid multiple "Preparing rollout for bug" log messages
https://bugs.webkit.org/show_bug.cgi?id=131106
Patch by Eva Balazsfalvi <[email protected]> on 2014-04-02
Reviewed by Csaba Osztrogonác.
* Scripts/webkitpy/tool/commands/download.py:
(AbstractRolloutPrepCommand._prepare_state):
* Scripts/webkitpy/tool/commands/download_unittest.py:
(test_prepare_rollout):
(test_create_rollout):
(test_create_rollout_resolved):
(test_rollout):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (166645 => 166646)
--- trunk/Tools/ChangeLog 2014-04-02 14:52:23 UTC (rev 166645)
+++ trunk/Tools/ChangeLog 2014-04-02 15:10:02 UTC (rev 166646)
@@ -1,3 +1,18 @@
+2014-04-02 Eva Balazsfalvi <[email protected]>
+
+ [webkitpy] Avoid multiple "Preparing rollout for bug" log messages
+ https://bugs.webkit.org/show_bug.cgi?id=131106
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/tool/commands/download.py:
+ (AbstractRolloutPrepCommand._prepare_state):
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ (test_prepare_rollout):
+ (test_create_rollout):
+ (test_create_rollout_resolved):
+ (test_rollout):
+
2014-04-02 Krzysztof Wolanski <[email protected]>
[EFL] Add option to use separate web process for new window in MiniBrowser
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download.py (166645 => 166646)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2014-04-02 14:52:23 UTC (rev 166645)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2014-04-02 15:10:02 UTC (rev 166646)
@@ -403,15 +403,6 @@
raise ScriptError(message="Invalid svn revision number: " + revision)
revision_list.sort()
- # We use the earliest revision for the bug info
- for revision in revision_list:
- commit_info = self._commit_info(revision)
- if commit_info:
- description_list.append(commit_info.bug_description())
- bug_id_list.append(commit_info.bug_id())
- else:
- description_list.append(None)
- bug_id_list.append(None)
earliest_revision = revision_list[0]
state = {
"revision": earliest_revision,
@@ -421,14 +412,22 @@
"bug_id_list": bug_id_list,
"description_list": description_list,
}
- commit_info = self._commit_info(earliest_revision)
- if commit_info:
- state["bug_blocked"] = commit_info.bug_id()
- cc_list = sorted([party.bugzilla_email()
+ for revision in revision_list:
+ commit_info = self._commit_info(revision)
+ if commit_info:
+ # We use the earliest revision for the bug info
+ if revision == earliest_revision:
+ state["bug_blocked"] = commit_info.bug_id()
+ cc_list = sorted([party.bugzilla_email()
for party in commit_info.responsible_parties()
if party.bugzilla_email()])
- # FIXME: We should used the list as the canonical representation.
- state["bug_cc"] = ",".join(cc_list)
+ # FIXME: We should used the list as the canonical representation.
+ state["bug_cc"] = ",".join(cc_list)
+ description_list.append(commit_info.bug_description())
+ bug_id_list.append(commit_info.bug_id())
+ else:
+ description_list.append(None)
+ bug_id_list.append(None)
return state
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py (166645 => 166646)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2014-04-02 14:52:23 UTC (rev 166645)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2014-04-02 15:10:02 UTC (rev 166646)
@@ -289,12 +289,11 @@
self.assert_execute_outputs(LandFromURL(), ["https://bugs.webkit.org/show_bug.cgi?id=50000"], options=self._default_options(), expected_logs=expected_logs)
def test_prepare_rollout(self):
- expected_logs = "Preparing rollout for bug 50000.\nPreparing rollout for bug 50000.\nUpdating working directory\n"
+ expected_logs = "Preparing rollout for bug 50000.\nUpdating working directory\n"
self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_logs=expected_logs)
def test_create_rollout(self):
expected_logs = """Preparing rollout for bug 50000.
-Preparing rollout for bug 50000.
Updating working directory
MOCK create_bug
bug_title: REGRESSION(r852): Reason
@@ -320,7 +319,6 @@
expected_logs = """Preparing rollout for bug 50000.
Preparing rollout for bug 50000.
Unable to parse bug number from diff.
-Preparing rollout for bug 50000.
Updating working directory
MOCK create_bug
bug_title: REGRESSION(r852): Reason
@@ -345,7 +343,6 @@
def test_create_rollout_resolved(self):
expected_logs = """Preparing rollout for bug 50004.
-Preparing rollout for bug 50004.
Updating working directory
MOCK create_bug
bug_title: REGRESSION(r3001): Reason
@@ -370,7 +367,6 @@
def test_rollout(self):
expected_logs = """Preparing rollout for bug 50000.
-Preparing rollout for bug 50000.
Updating working directory
MOCK: user.open_url: file://...
Was that diff correct?
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
