Title: [105464] trunk/Tools
- Revision
- 105464
- Author
- [email protected]
- Date
- 2012-01-19 16:57:46 -0800 (Thu, 19 Jan 2012)
Log Message
webkit-patch cannot rollout patches without changelog/bug number
https://bugs.webkit.org/show_bug.cgi?id=75962
Reviewed by Adam Barth.
* Scripts/webkitpy/tool/commands/download.py:
(AbstractRolloutPrepCommand._prepare_state):
* Scripts/webkitpy/tool/commands/download_unittest.py:
(AbstractRolloutPrepCommandTest.test_prepare_state):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105463 => 105464)
--- trunk/Tools/ChangeLog 2012-01-20 00:44:41 UTC (rev 105463)
+++ trunk/Tools/ChangeLog 2012-01-20 00:57:46 UTC (rev 105464)
@@ -1,3 +1,15 @@
+2012-01-19 Eric Seidel <[email protected]>
+
+ webkit-patch cannot rollout patches without changelog/bug number
+ https://bugs.webkit.org/show_bug.cgi?id=75962
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/tool/commands/download.py:
+ (AbstractRolloutPrepCommand._prepare_state):
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ (AbstractRolloutPrepCommandTest.test_prepare_state):
+
2012-01-19 Alexey Proskuryakov <[email protected]>
[WK2] fast/url/degenerate-file-base.html fails
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download.py (105463 => 105464)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2012-01-20 00:44:41 UTC (rev 105463)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2012-01-20 00:57:46 UTC (rev 105464)
@@ -343,18 +343,20 @@
# We use the earliest revision for the bug info
earliest_revision = revision_list[0]
- commit_info = self._commit_info(earliest_revision)
- cc_list = sorted([party.bugzilla_email()
- for party in commit_info.responsible_parties()
- if party.bugzilla_email()])
- return {
+ state = {
"revision": earliest_revision,
"revision_list": revision_list,
- "bug_id": commit_info.bug_id(),
- # FIXME: We should used the list as the canonical representation.
- "bug_cc": ",".join(cc_list),
"reason": args[1],
}
+ commit_info = self._commit_info(earliest_revision)
+ if commit_info:
+ state["bug_id"] = 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)
+ return state
class PrepareRollout(AbstractRolloutPrepCommand):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py (105463 => 105464)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2012-01-20 00:44:41 UTC (rev 105463)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2012-01-20 00:57:46 UTC (rev 105464)
@@ -66,7 +66,12 @@
self.assertRaises(ScriptError, command._prepare_state, options=None, args=["125 r122 123", "Reason"], tool=None)
self.assertRaises(ScriptError, command._prepare_state, options=None, args=["125 foo 123", "Reason"], tool=None)
+ command._commit_info = lambda revision: None
+ state = command._prepare_state(None, ["124 123 125", "Reason"], None)
+ self.assertEqual(123, state["revision"])
+ self.assertEqual([123, 124, 125], state["revision_list"])
+
class DownloadCommandsTest(CommandsTest):
def _default_options(self):
options = MockOptions()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
