Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

1 files changed, 14 insertions, 5 deletions

diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py b/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py
index 1ad343d..abafe63 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py
@@ -28,6 +28,7 @@
 
 from webkitpy.common.system.deprecated_logging import log
 from webkitpy.common.config.ports import WebKitPort
+from webkitpy.tool.steps.options import Options
 
 
 class AbstractStep(object):
@@ -36,10 +37,13 @@ class AbstractStep(object):
         self._options = options
         self._port = None
 
-    def _run_script(self, script_name, quiet=False, port=WebKitPort):
+    def _run_script(self, script_name, args=None, quiet=False, port=WebKitPort):
         log("Running %s" % script_name)
+        command = [port.script_path(script_name)]
+        if args:
+            command.extend(args)
         # FIXME: This should use self.port()
-        self._tool.executive.run_and_throw_if_fail(port.script_path(script_name), quiet)
+        self._tool.executive.run_and_throw_if_fail(command, quiet)
 
     # FIXME: The port should live on the tool.
     def port(self):
@@ -49,8 +53,8 @@ class AbstractStep(object):
         return self._port
 
     _well_known_keys = {
-        "diff" : lambda self: self._tool.scm().create_patch(),
-        "changelogs" : lambda self: self._tool.checkout().modified_changelogs(),
+        "diff": lambda self: self._tool.scm().create_patch(self._options.git_commit, self._options.squash),
+        "changelogs": lambda self: self._tool.checkout().modified_changelogs(self._options.git_commit, self._options.squash),
     }
 
     def cached_lookup(self, state, key, promise=None):
@@ -63,7 +67,12 @@ class AbstractStep(object):
 
     @classmethod
     def options(cls):
-        return []
+        return [
+            # We need these options here because cached_lookup uses them.  :(
+            Options.git_commit,
+            Options.no_squash,
+            Options.squash,
+        ]
 
     def run(self, state):
         raise NotImplementedError, "subclasses must implement"