[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 13:36:38 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4b7e07766edc82e80000ba2637f0d8156bac101c
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 13:32:55 2010 +0000

    2010-09-21  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            feeder-queue svn updates more often than needed
            https://bugs.webkit.org/show_bug.cgi?id=46171
    
            We don't need to poll SVN every time we feed the feeders.  Rather, we
            can count on the wrapper shell script to auto-update the queue.
    
            * Scripts/webkitpy/tool/commands/queues.py:
            * Scripts/webkitpy/tool/commands/queues_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ee76358..f805512 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-21  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        feeder-queue svn updates more often than needed
+        https://bugs.webkit.org/show_bug.cgi?id=46171
+
+        We don't need to poll SVN every time we feed the feeders.  Rather, we
+        can count on the wrapper shell script to auto-update the queue.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2010-09-21  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
index 9bbb6de..ff5b19f 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
@@ -169,7 +169,6 @@ class FeederQueue(AbstractQueue):
         return True
 
     def process_work_item(self, work_item):
-        self._update_checkout()
         for feeder in self.feeders:
             feeder.feed()
         time.sleep(self._sleep_duration)
@@ -181,13 +180,6 @@ class FeederQueue(AbstractQueue):
     def handle_unexpected_error(self, work_item, message):
         log(message)
 
-    def _update_checkout(self):
-        self.run_webkit_patch([
-            "update",
-            "--force-clean",
-            "--quiet",
-        ])
-
 
 class AbstractPatchQueue(AbstractQueue):
     def _update_status(self, message, patch=None, results_file=None):
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
index ff0b61a..606a8a3 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -119,8 +119,7 @@ class FeederQueueTest(QueuesTest):
             "begin_work_queue": self._default_begin_work_queue_stderr("feeder-queue", MockSCM.fake_checkout_root),
             "should_proceed_with_work_item": "",
             "next_work_item": "",
-            "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'update', '--force-clean', '--quiet']
-Warning, attachment 128 on bug 42 has invalid committer (non-committer at example.com)
+            "process_work_item": """Warning, attachment 128 on bug 42 has invalid committer (non-committer at example.com)
 Warning, attachment 128 on bug 42 has invalid committer (non-committer at example.com)
 MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Rejecting patch 128 from commit-queue.' and additional comment 'non-committer at example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py.
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list