Changeset 56835 in webkit

Timestamp:

Mar 31, 2010 3:45:57 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

path to committers.py in commit-queue rejection message is wrong
​https://bugs.webkit.org/show_bug.cgi?id=36865

This fix would have only been 3 lines long if we had

1. Had access to an SCM object or tool to give us the checkout root
2. Been able to depend on Python 2.6 Instead I've added a bunch of hack code, but at least now we should never have to update this string again as the location of committers.py is fully dynamically discovered. :p

• Scripts/webkitpy/common/net/bugzilla.py:
• Scripts/webkitpy/common/net/bugzilla_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/bugzilla.py (modified) (5 diffs)
• Scripts/webkitpy/common/net/bugzilla_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-31  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        path to committers.py in commit-queue rejection message is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=36865
+
+        This fix would have only been 3 lines long if we had
+        1. Had access to an SCM object or tool to give us the checkout root
+        2. Been able to depend on Python 2.6
+        Instead I've added a bunch of hack code, but at least now
+        we should never have to update this string again as the location
+        of committers.py is fully dynamically discovered. :p
+
+        * Scripts/webkitpy/common/net/bugzilla.py:
+        * Scripts/webkitpy/common/net/bugzilla_unittest.py:
+
 2010-03-31  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py

@@ -31 +31 @@
 # WebKit's Python module for interacting with Bugzilla
 
+import os.path
 import re
 import subprocess
@@ -38 +39 @@
 # Import WebKit-specific modules.
 from webkitpy.common.system.deprecated_logging import error, log
-from webkitpy.common.config.committers import CommitterList
+from webkitpy.common.config import committers
 from webkitpy.common.net.credentials import Credentials
 from webkitpy.common.system.user import User
@@ -278 +279 @@
         return "http://trac.webkit.org/browser/trunk/%s" % local_path
 
+    def _checkout_root(self):
+        # FIXME: This is a hack, we would have this from scm.checkout_root
+        # if we had any way to get to an scm object here.
+        components = __file__.split(os.sep)
+        tools_index = components.index("WebKitTools")
+        return os.sep.join(components[:tools_index])
+
+    def _relpath(self, path, start):
+        # FIXME: When we're allowed to use python 2.6 we can use the real os.path.relpath
+        path_components = os.path.realpath(path).split(os.sep)
+        start_components = os.path.realpath(start).split(os.sep)
+        if path_components[len(start_components) - 1].lower() != start_components[-1].lower():
+            raise "This os.path.relpath hack can't handle path=%s start=%s" % (path, start)
+        return os.sep.join(path_components[len(start_components):])
+
+    def _committers_py_path(self):
+        # extension can sometimes be .pyc, we always want .py
+        (path, extension) = os.path.splitext(committers.__file__)
+        path = self._relpath(path, self._checkout_root())
+        return ".".join([path, "py"])
+
     def _flag_permission_rejection_message(self, setter_email, flag_name):
-        # This could be computed from CommitterList.__file__
-        committer_list = "WebKitTools/Scripts/webkitpy/committers.py"
         # Should come from some webkit_config.py
         contribution_guidlines = "http://webkit.org/coding/contributing.html"
@@ -287 +307 @@
         # This could be queried from the tool.
         queue_name = "commit-queue"
+        committers_list = self._committers_py_path()
         message = "%s does not have %s permissions according to %s." % (
                         setter_email,
                         flag_name,
-                        self._view_source_url(committer_list))
+                        self._view_source_url(committers_list))
         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)
         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)
+                        flag_name, committers_list)
         message += "Due to bug 30084 the %s will require a restart after your change.  " % queue_name
         message += "Please contact %s to request a %s restart.  " % (
@@ -347 +368 @@
 class Bugzilla(object):
 
-    def __init__(self, dryrun=False, committers=CommitterList()):
+    def __init__(self, dryrun=False, committers=committers.CommitterList()):
         self.dryrun = dryrun
         self.authenticated = False

trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py

@@ -62 +62 @@
     def test_flag_permission_rejection_message(self):
         validator = CommitterValidator(bugzilla=None)
-        expected_messsage="""foo@foo.com does not have review permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py.
+        self.assertEqual(validator._committers_py_path(), "WebKitTools/Scripts/webkitpy/common/config/committers.py")
+        expected_messsage="""foo@foo.com does not have review permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/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/webkitpy/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@chromium.org to request a commit-queue restart.  After restart the commit-queue will correctly respect your review rights."""
+- If you have review rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/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@chromium.org to request a commit-queue restart.  After restart the commit-queue will correctly respect your review rights."""
         self.assertEqual(validator._flag_permission_rejection_message("foo@foo.com", "review"), expected_messsage)