[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ad5109f54cda435c3929673c236fcffd7f2f4796
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 20:23:47 2010 +0000

    2010-07-27  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            webkit-patch post-commits is broken: AttributeError: Values instance has no attribute 'no_squash'
            https://bugs.webkit.org/show_bug.cgi?id=42984
    
            squash and no_squash have been intentionally erroring for a couple weeks now.
            But post-commits was just broken. Just remove squash/no_squash.
    
            * Scripts/webkitpy/tool/steps/abstractstep.py:
            * Scripts/webkitpy/tool/steps/options.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64153 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 45d0b60..992d20d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-27  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        webkit-patch post-commits is broken: AttributeError: Values instance has no attribute 'no_squash'
+        https://bugs.webkit.org/show_bug.cgi?id=42984
+
+        squash and no_squash have been intentionally erroring for a couple weeks now.
+        But post-commits was just broken. Just remove squash/no_squash.
+
+        * Scripts/webkitpy/tool/steps/abstractstep.py:
+        * Scripts/webkitpy/tool/steps/options.py:
+
 2010-07-27  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix after introduction of EXECUTABLE_ALLOCATOR_DEMAND.
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py b/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py
index 8f0d153..9ceb2cb 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py
@@ -35,10 +35,6 @@ from webkitpy.tool.steps.options import Options
 class AbstractStep(object):
     def __init__(self, tool, options):
         self._tool = tool
-        if options.no_squash:
-            raise ScriptError('--no-squash has been removed. Use "--git-commit=HEAD.." or "-g HEAD.." to operate on the working copy.')
-        if options.squash:
-            raise ScriptError('--squash has been removed. It is now the default behavior if --git-commit is omitted.')
         self._options = options
         self._port = None
 
@@ -76,9 +72,6 @@ class AbstractStep(object):
         return [
             # We need this option here because cached_lookup uses it.  :(
             Options.git_commit,
-            # FIXME: Get rid of these.
-            Options.no_squash,
-            Options.squash,
         ]
 
     def run(self, state):
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/options.py b/WebKitTools/Scripts/webkitpy/tool/steps/options.py
index 9c73f5a..e7e3855 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/options.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/options.py
@@ -46,8 +46,6 @@ class Options(object):
     git_commit = make_option("-g", "--git-commit", action="store", dest="git_commit", help="Operate on a local commit. If a range, the commits are squashed into one. HEAD.. operates on working copy changes only.")
     local_commit = make_option("--local-commit", action="store_true", dest="local_commit", default=False, help="Make a local commit for each applied patch")
     non_interactive = make_option("--non-interactive", action="store_true", dest="non_interactive", default=False, help="Never prompt the user, fail as fast as possible.")
-    # FIXME: Remove --no-squash, once people have adjusted to using --git-commit.
-    no_squash = make_option("--no-squash", action="store_true", dest="no_squash", default=False, help="Obsolete. Use --git-commit=HEAD.. instead.")
     obsolete_patches = make_option("--no-obsolete", action="store_false", dest="obsolete_patches", default=True, help="Do not obsolete old patches before posting this one.")
     open_bug = make_option("--open-bug", action="store_true", dest="open_bug", default=False, help="Opens the associated bug in a browser.")
     parent_command = make_option("--parent-command", action="store", dest="parent_command", default=None, help="(Internal) The command that spawned this instance.")
@@ -56,7 +54,5 @@ class Options(object):
     request_commit = make_option("--request-commit", action="store_true", dest="request_commit", default=False, help="Mark the patch as needing auto-commit after review.")
     review = make_option("--no-review", action="store_false", dest="review", default=True, help="Do not mark the patch for review.")
     reviewer = make_option("-r", "--reviewer", action="store", type="string", dest="reviewer", help="Update ChangeLogs to say Reviewed by REVIEWER.")
-    # FIXME: Remove --squash, once people have adjusted to using --git-commit.
-    squash = make_option("-s", "--squash", action="store_true", dest="squash", default=False, help="Obsolete. This is now the default behavior.")
     test = make_option("--test", action="store_true", dest="test", default=False, help="Run run-webkit-tests before committing.")
     update = make_option("--no-update", action="store_false", dest="update", default=True, help="Don't update the working directory.")

-- 
WebKit Debian packaging