[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3d1d61a2ec9b76aad41524a3e736dbe64527a83b
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 10:12:54 2010 +0000

    2010-01-07  Adam Barth  <abarth at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0927b7a..a411fb5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         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 at webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
         Add prepare and post to webkit-patch main help
         https://bugs.webkit.org/show_bug.cgi?id=33313
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload.py b/WebKitTools/Scripts/webkitpy/commands/upload.py
index 2fbfefe..524b00e 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload.py
@@ -115,6 +115,7 @@ class Post(AbstractPatchUploadingCommand):
     argument_names = "[BUGID]"
     show_in_main_help = True
     steps = [
+        steps.CheckStyle,
         steps.ConfirmDiff,
         steps.ObsoletePatches,
         steps.PostDiff,
@@ -150,6 +151,7 @@ class Upload(AbstractPatchUploadingCommand):
     argument_names = "[BUGID]"
     show_in_main_help = True
     steps = [
+        steps.CheckStyle,
         steps.PromptForBugOrTitle,
         steps.CreateBug,
         steps.PrepareChangeLog,
diff --git a/WebKitTools/Scripts/webkitpy/steps/checkstyle.py b/WebKitTools/Scripts/webkitpy/steps/checkstyle.py
index d235ac0..0e06585 100644
--- a/WebKitTools/Scripts/webkitpy/steps/checkstyle.py
+++ b/WebKitTools/Scripts/webkitpy/steps/checkstyle.py
@@ -26,8 +26,28 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # 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)
diff --git a/WebKitTools/Scripts/webkitpy/steps/options.py b/WebKitTools/Scripts/webkitpy/steps/options.py
index 1916ee9..8b28f27 100644
--- a/WebKitTools/Scripts/webkitpy/steps/options.py
+++ b/WebKitTools/Scripts/webkitpy/steps/options.py
@@ -33,6 +33,7 @@ class Options(object):
     build_style = make_option("--build-style", action="store", dest="build_style", default=None, help="Whether to build debug, release, or both.")
     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.")
     complete_rollout = make_option("--complete-rollout", action="store_true", dest="complete_rollout", help="Commit the revert and re-open the original bug.")

-- 
WebKit Debian packaging