Modified: trunk/Tools/ChangeLog (136554 => 136555)
--- trunk/Tools/ChangeLog 2012-12-04 21:10:03 UTC (rev 136554)
+++ trunk/Tools/ChangeLog 2012-12-04 21:10:38 UTC (rev 136555)
@@ -1,3 +1,17 @@
+2012-12-04 Adam Barth <aba...@webkit.org>
+
+ Remove obsolete code from webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=104029
+
+ Reviewed by Eric Seidel.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask.py:
+ (CommitQueueTask.run):
+ * Scripts/webkitpy/tool/steps/commit.py:
+ (Commit.options):
+ * Scripts/webkitpy/tool/steps/options.py:
+ (Options):
+
2012-12-04 Jochen Eisinger <joc...@chromium.org>
[chromium] move WebPreferences and methods for modifying them to the TestRunner library
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py (136554 => 136555)
--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py 2012-12-04 21:10:03 UTC (rev 136554)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py 2012-12-04 21:10:38 UTC (rev 136555)
@@ -88,7 +88,7 @@
# no one has set commit-queue- since we started working on the patch.)
if not self.validate():
return False
- # FIXME: We should understand why the land failure occured and retry if possible.
+ # FIXME: We should understand why the land failure occurred and retry if possible.
if not self._land():
return self.report_failure()
return True
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/commit.py (136554 => 136555)
--- trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2012-12-04 21:10:03 UTC (rev 136554)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2012-12-04 21:10:38 UTC (rev 136555)
@@ -40,12 +40,9 @@
class Commit(AbstractStep):
- # FIXME: This option exists only to make sure we don't break scripts which include --ignore-builders
- # You can safely delete this option any time after 11/01/11.
@classmethod
def options(cls):
return AbstractStep.options() + [
- Options.check_builders,
Options.non_interactive,
]
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/options.py (136554 => 136555)
--- trunk/Tools/Scripts/webkitpy/tool/steps/options.py 2012-12-04 21:10:03 UTC (rev 136554)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/options.py 2012-12-04 21:10:38 UTC (rev 136555)
@@ -33,7 +33,6 @@
build = make_option("--build", action="" dest="build", default=False, help="Build and run run-webkit-tests before committing.")
build_style = make_option("--build-style", action="" dest="build_style", default=None, help="Whether to build debug, release, or both.")
cc = make_option("--cc", action="" type="string", dest="cc", help="Comma-separated list of email addresses to carbon-copy.")
- check_builders = make_option("--ignore-builders", action="" dest="check_builders", default=True, help="DEPRECATED: Will be removed any time after 11/01/11.")
check_style = make_option("--ignore-style", action="" dest="check_style", default=True, help="Don't check to see if the patch has proper style before uploading.")
check_style_filter = make_option("--check-style-filter", action="" type="string", dest="check_style_filter", default=None, help="Filter style-checker rules (see check-webkit-style --help).")
clean = make_option("--no-clean", action="" dest="clean", default=True, help="Don't check if the working directory is clean before applying patches")