Changeset 52910 in webkit

Timestamp:

Jan 7, 2010 2:12:54 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-01-07 Adam Barth <​abarth@webkit.org>

Reviewed by Maciej Stachowiak.

Check style before uploading a patch
​https://bugs.webkit.org/show_bug.cgi?id=33314

• Scripts/webkitpy/commands/upload.py:
• Scripts/webkitpy/steps/checkstyle.py:
• Scripts/webkitpy/steps/options.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/upload.py (modified) (2 diffs)
• Scripts/webkitpy/steps/checkstyle.py (modified) (1 diff)
• Scripts/webkitpy/steps/options.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-07  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Check style before uploading a patch
+        https://bugs.webkit.org/show_bug.cgi?id=33314
+
+        * Scripts/webkitpy/commands/upload.py:
+        * Scripts/webkitpy/steps/checkstyle.py:
+        * Scripts/webkitpy/steps/options.py:
+
 2010-01-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/commands/upload.py

@@ -116 +116 @@
     show_in_main_help = True
     steps = [
+        steps.CheckStyle,
         steps.ConfirmDiff,
         steps.ObsoletePatches,
@@ -151 +152 @@
     show_in_main_help = True
     steps = [
+        steps.CheckStyle,
         steps.PromptForBugOrTitle,
         steps.CreateBug,

trunk/WebKitTools/Scripts/webkitpy/steps/checkstyle.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from webkitpy.executive import ScriptError
 from webkitpy.steps.abstractstep import AbstractStep
+from webkitpy.steps.options import Options
+from webkitpy.webkit_logging import error
 
 class CheckStyle(AbstractStep):
+    @classmethod
+    def options(cls):
+        return [
+            Options.non_interactive,
+            Options.check_style,
+        ]
+
     def run(self, state):
-        self._run_script("check-webkit-style")
+        if not self._options.check_style:
+            return
+        try:
+            self._run_script("check-webkit-style")
+        except ScriptError, e:
+            if self._options.non_interactive:
+                # We need to re-raise the exception here to have the
+                # style-queue do the right thing.
+                raise e
+            if not self._tool.user.confirm("Are you sure you want to continue?"):
+                exit(1)

trunk/WebKitTools/Scripts/webkitpy/steps/options.py

@@ -34 +34 @@
     cc = make_option("--cc", action="store", type="string", dest="cc", help="Comma-separated list of email addresses to carbon-copy.")
     check_builders = make_option("--ignore-builders", action="store_false", dest="check_builders", default=True, help="Don't check to see if the build.webkit.org builders are green before landing.")
+    check_style = make_option("--ignore-style", action="store_false", dest="check_style", default=True, help="Don't check to see if the patch has proper style before uploading.")
     clean = make_option("--no-clean", action="store_false", dest="clean", default=True, help="Don't check if the working directory is clean before applying patches")
     close_bug = make_option("--no-close", action="store_false", dest="close_bug", default=True, help="Leave bug open after landing.")