[webkit-changes] [109495] trunk/Tools

Thu, 01 Mar 2012 20:31:46 -0800

Title: [109495] trunk/Tools
Revision
109495
Author
[email protected]
Date
2012-03-01 20:31:38 -0800 (Thu, 01 Mar 2012)

Log Message

Unreviewed, rolling out r109317.
http://trac.webkit.org/changeset/109317

Let's try watchlists again now that we're using a pure git
working copy

* Scripts/webkitpy/tool/bot/stylequeuetask.py:
(StyleQueueTask.run):
* Scripts/webkitpy/tool/commands/queues_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (109494 => 109495)


--- trunk/Tools/ChangeLog	2012-03-02 04:26:40 UTC (rev 109494)
+++ trunk/Tools/ChangeLog	2012-03-02 04:31:38 UTC (rev 109495)
@@ -1,3 +1,15 @@
+2012-03-01  Adam Barth  <[email protected]>
+
+        Unreviewed, rolling out r109317.
+        http://trac.webkit.org/changeset/109317
+
+        Let's try watchlists again now that we're using a pure git
+        working copy
+
+        * Scripts/webkitpy/tool/bot/stylequeuetask.py:
+        (StyleQueueTask.run):
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2012-03-01  Dirk Pranke  <[email protected]>
 
         webkitpy: test_run_test_pause_before_testing is failing after r109482

Modified: trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py (109494 => 109495)


--- trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py	2012-03-02 04:26:40 UTC (rev 109494)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py	2012-03-02 04:31:38 UTC (rev 109495)
@@ -69,6 +69,7 @@
             return False
         if not self._apply():
             raise UnableToApplyPatch(self._patch)
+        self._apply_watch_list()
         if not self._check_style():
             return self.report_failure()
         return True

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (109494 => 109495)


--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py	2012-03-02 04:26:40 UTC (rev 109494)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py	2012-03-02 04:31:38 UTC (rev 109495)
@@ -448,6 +448,8 @@
 MOCK: update_status: style-queue Updated working directory
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
 MOCK: update_status: style-queue Applied patch
+MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-watchlist-local', 50000], cwd=/mock-checkout
+MOCK: update_status: style-queue Watchlist applied
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'check-style-local', '--non-interactive', '--quiet'], cwd=/mock-checkout
 MOCK: update_status: style-queue Style checked
 MOCK: update_status: style-queue Pass
@@ -469,6 +471,8 @@
 MOCK: update_status: style-queue Updated working directory
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
 MOCK: update_status: style-queue Applied patch
+MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-watchlist-local', 50000], cwd=/mock-checkout
+MOCK: update_status: style-queue Unabled to apply watchlist
 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'check-style-local', '--non-interactive', '--quiet'], cwd=/mock-checkout
 MOCK: update_status: style-queue Style checked
 MOCK: update_status: style-queue Pass

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to