[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit dba62b892b27620c9b400e08f71c3a8fa6ab0cb4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 24 02:31:27 2009 +0000

    2009-12-23  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            commit-queue should mention bug 30084 when rejecting patches until it can be fixed
            https://bugs.webkit.org/show_bug.cgi?id=32911
    
            * Scripts/modules/bugzilla.py: Make the message even more fancy.
            * Scripts/modules/bugzilla_unittest.py: Test our new fancy message.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eb924b2..023971e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-23  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue should mention bug 30084 when rejecting patches until it can be fixed
+        https://bugs.webkit.org/show_bug.cgi?id=32911
+
+        * Scripts/modules/bugzilla.py: Make the message even more fancy.
+        * Scripts/modules/bugzilla_unittest.py: Test our new fancy message.
+
 2009-12-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Not reviewed, adding myself to the reviewers list.
diff --git a/WebKitTools/Scripts/modules/bugzilla.py b/WebKitTools/Scripts/modules/bugzilla.py
index 9a467ed..6b63308 100644
--- a/WebKitTools/Scripts/modules/bugzilla.py
+++ b/WebKitTools/Scripts/modules/bugzilla.py
@@ -173,11 +173,16 @@ class Bugzilla(object):
         return "http://trac.webkit.org/browser/trunk/%s" % local_path
 
     def _flag_permission_rejection_message(self, setter_email, flag_name):
-        committer_list = "WebKitTools/Scripts/modules/committers.py"
-        contribution_guidlines_url = "http://webkit.org/coding/contributing.html"
+        committer_list = "WebKitTools/Scripts/modules/committers.py" # This could be computed from CommitterList.__file__
+        contribution_guidlines_url = "http://webkit.org/coding/contributing.html" # Should come from some webkit_config.py
+        queue_administrator = "eseidel at chromium.org" # This could be queried from the status_bot.
+        queue_name = "commit-queue" # This could be queried from the tool.
         rejection_message = "%s does not have %s permissions according to %s." % (setter_email, flag_name, self._view_source_link(committer_list))
-        rejection_message += "\n\n- If you have %s rights please correct the error in %s by adding yourself to the file (no review needed) and then set the %s flag again." % (flag_name, committer_list, flag_name)
         rejection_message += "\n\n- If you do not have %s rights please read %s for instructions on how to use bugzilla flags." % (flag_name, contribution_guidlines_url)
+        rejection_message += "\n\n- If you have %s rights please correct the error in %s by adding yourself to the file (no review needed)." % (flag_name, committer_list)
+        rejection_message += "  Due to bug 30084 the %s will require a restart after your change." % queue_name
+        rejection_message += "  Please contact %s to request a %s restart." % (queue_administrator, queue_name)
+        rejection_message += "  After restart the %s will correctly respect your %s rights." % (queue_name, flag_name)
         return rejection_message
 
     def _validate_setter_email(self, patch, result_key, lookup_function, rejection_function, reject_invalid_patches):
diff --git a/WebKitTools/Scripts/modules/bugzilla_unittest.py b/WebKitTools/Scripts/modules/bugzilla_unittest.py
index ca92722..325ece9 100644
--- a/WebKitTools/Scripts/modules/bugzilla_unittest.py
+++ b/WebKitTools/Scripts/modules/bugzilla_unittest.py
@@ -192,6 +192,15 @@ class BugzillaTest(unittest.TestCase):
         expected_stderr = "Adding ['adam at example.com'] to the CC list for bug 42\n"
         OutputCapture().assert_outputs(self, bugzilla.add_cc_to_bug, [42, ["adam at example.com"]], expected_stderr=expected_stderr)
 
+    def test_flag_permission_rejection_message(self):
+        bugzilla = Bugzilla()
+        expected_messsage="""foo at foo.com does not have review permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.
+
+- If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
+
+- If you have review rights please correct the error in WebKitTools/Scripts/modules/committers.py by adding yourself to the file (no review needed).  Due to bug 30084 the commit-queue will require a restart after your change.  Please contact eseidel at chromium.org to request a commit-queue restart.  After restart the commit-queue will correctly respect your review rights."""
+        self.assertEqual(bugzilla._flag_permission_rejection_message("foo at foo.com", "review"), expected_messsage)
+
 
 if __name__ == '__main__':
     unittest.main()

-- 
WebKit Debian packaging