Reland of Use an explicit list of webkit-patch commands instead of using auto-discovery.

third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py

 # Copyright (c) 2010 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # A tool for automating dealing with bugzilla, posting patches, committing patches, etc.
 
 from optparse import make_option
 
 from webkitpy.common.host import Host
 from webkitpy.tool.multi_command_tool import MultiCommandTool
-from webkitpy.tool import commands
+
+from webkitpy.tool.commands.analyze_baselines import AnalyzeBaselines
+from webkitpy.tool.commands.commit_announcer import CommitAnnouncerCommand
+from webkitpy.tool.commands.flaky_tests import FlakyTests
+from webkitpy.tool.commands.layout_tests_server import LayoutTestsServer
+from webkitpy.tool.commands.pretty_diff import PrettyDiff
+from webkitpy.tool.commands.queries import CrashLog
+from webkitpy.tool.commands.queries import PrintBaselines
+from webkitpy.tool.commands.queries import PrintExpectations
+from webkitpy.tool.commands.rebaseline import AutoRebaseline
+from webkitpy.tool.commands.rebaseline import CopyExistingBaselinesInternal
+from webkitpy.tool.commands.rebaseline import OptimizeBaselines
+from webkitpy.tool.commands.rebaseline import Rebaseline
+from webkitpy.tool.commands.rebaseline import RebaselineExpectations
+from webkitpy.tool.commands.rebaseline import RebaselineJson
+from webkitpy.tool.commands.rebaseline import RebaselineTest
+from webkitpy.tool.commands.rebaseline_server import RebaselineServer
 
 
 class WebKitPatch(MultiCommandTool, Host):
     global_options = [
         make_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable all logging"),
         make_option("-d", "--directory", action="append", dest="patch_directories",
                     default=[], help="Directory to look at for changed files"),
     ]
 
     def __init__(self, path):
-        MultiCommandTool.__init__(self)
+        MultiCommandTool.__init__(self, commands=[
+            AnalyzeBaselines(),
+            AutoRebaseline(),
+            CommitAnnouncerCommand(),
+            CopyExistingBaselinesInternal(),
+            CrashLog(),
+            FlakyTests(),
+            LayoutTestsServer(),
+            OptimizeBaselines(),
+            PrettyDiff(),
+            PrintBaselines(),
+            PrintExpectations(),
+            Rebaseline(),
+            RebaselineExpectations(),
+            RebaselineJson(),
+            RebaselineServer(),
+            RebaselineTest(),
+        ])
         Host.__init__(self)
         self._path = path
 
     def path(self):
         return self._path
 
     def should_show_in_main_help(self, command):
         if not command.show_in_main_help:
             return False
         if command.requires_local_commits:
             return self.scm().supports_local_commits()
         return True
 
     # FIXME: This may be unnecessary since we pass global options to all commands during execute() as well.
     def handle_global_options(self, options):
         self.initialize_scm(options.patch_directories)
 
     def should_execute_command(self, command):
         if command.requires_local_commits and not self.scm().supports_local_commits():
             failure_reason = "%s requires local commits using %s in %s." % (
                 command.name, self.scm().display_name(), self.scm().checkout_root)
             return (False, failure_reason)
         return (True, None)