Changeset 166646 in webkit

Timestamp:

Apr 2, 2014 8:10:02 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[webkitpy] Avoid multiple "Preparing rollout for bug" log messages
​https://bugs.webkit.org/show_bug.cgi?id=131106

Patch by Eva Balazsfalvi <​evab.u-szeged@partner.samsung.com> 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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/download_unittest.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-02  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
+
+        [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  <k.wolanski@samsung.com>
 

trunk/Tools/Scripts/webkitpy/tool/commands/download.py

@@ -404 +404 @@
         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 = {
@@ -422 +413 @@
             "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
 

trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

@@ -290 +290 @@
 
     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
@@ -321 +320 @@
 Preparing rollout for bug 50000.
 Unable to parse bug number from diff.
-Preparing rollout for bug 50000.
 Updating working directory
 MOCK create_bug
@@ -346 +344 @@
     def test_create_rollout_resolved(self):
         expected_logs = """Preparing rollout for bug 50004.
-Preparing rollout for bug 50004.
 Updating working directory
 MOCK create_bug
@@ -371 +368 @@
     def test_rollout(self):
         expected_logs = """Preparing rollout for bug 50000.
-Preparing rollout for bug 50000.
 Updating working directory
 MOCK: user.open_url: file://...