2009-11-27 Adam Barth <abarth@webkit.org>

        Reviewed by Eric Seidel.

        style-queue should only process each patch once
        https://bugs.webkit.org/show_bug.cgi?id=31939

        Actually address reviewer comments!

        * Scripts/bugzilla-tool:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b34fc760a86709b5ad2c53c5903f0ec082024a5..6dd2d6bd8c230e5d2f1cf197083087da2da5d7f8 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        style-queue should only process each patch once
+        https://bugs.webkit.org/show_bug.cgi?id=31939
+
+        Actually address reviewer comments!
+
+        * Scripts/bugzilla-tool:
+
 2009-11-27  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index ba32b3abf3b35821c212368959bffd4fa24e6c75..736f11c28574599b35d5daaa69d4eae3f5d4cadc 100755 (executable)
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -46,8 +46,8 @@ class BugzillaTool(MultiCommandTool):
 
         self.bugs = Bugzilla()
         self.buildbot = BuildBot()
-        self._cached_scm = None
-        self._cached_status = None
+        self._scm = None
+        self._status = None
         self.steps = BuildSteps()
 
     def dry_run_callback(self, option, opt, value, parser):
@@ -57,24 +57,24 @@ class BugzillaTool(MultiCommandTool):
     def scm(self):
         # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
         original_cwd = os.path.abspath(".")
-        if not self._cached_scm:
-            self._cached_scm = detect_scm_system(original_cwd)
+        if not self._scm:
+            self._scm = detect_scm_system(original_cwd)
 
-        if not self._cached_scm:
+        if not self._scm:
             script_directory = os.path.abspath(sys.path[0])
             webkit_directory = os.path.abspath(os.path.join(script_directory, "../.."))
-            self._cached_scm = detect_scm_system(webkit_directory)
-            if self._cached_scm:
+            self._scm = detect_scm_system(webkit_directory)
+            if self._scm:
                 log("The current directory (%s) is not a WebKit checkout, using %s" % (original_cwd, webkit_directory))
             else:
                 error("FATAL: Failed to determine the SCM system for either %s or %s" % (original_cwd, webkit_directory))
 
-        return self._cached_scm
+        return self._scm
 
     def status(self):
-        if not self._cached_status:
-            self._cached_status = StatusBot()
-        return self._cached_status
+        if not self._status:
+            self._status = StatusBot()
+        return self._status
 
     def path(self):
         return __file__