Changeset 64153 in webkit

Timestamp:

Jul 27, 2010 1:23:47 PM (14 years ago)

Author:

ojan@chromium.org

Message:

2010-07-27 Ojan Vafai <​ojan@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/steps/abstractstep.py (modified) (2 diffs)
• Scripts/webkitpy/tool/steps/options.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-27  Ojan Vafai  <ojan@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@theolliviers.com>
 

trunk/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py

@@ -36 +36 @@
     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
@@ -77 +73 @@
             # We need this option here because cached_lookup uses it.  :(
             Options.git_commit,
-            # FIXME: Get rid of these.
-            Options.no_squash,
-            Options.squash,
         ]
 

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

@@ -47 +47 @@
     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.")
@@ -57 +55 @@
     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.")