[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 00482acd18c704ca86d2570ee864de00e8120bad
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 07:56:24 2009 +0000

    2009-11-26  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] Kill WebKitLandingScripts
            https://bugs.webkit.org/show_bug.cgi?id=31904
    
            Step 4: Kill run_webkit_script.
    
            * Scripts/modules/buildsteps.py:
            * Scripts/modules/commands/download.py:
            * Scripts/modules/webkitlandingscripts.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8d4a9a8..dc00718 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -5,6 +5,19 @@
         [bzt] Kill WebKitLandingScripts
         https://bugs.webkit.org/show_bug.cgi?id=31904
 
+        Step 4: Kill run_webkit_script.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/webkitlandingscripts.py:
+
+2009-11-26  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Kill WebKitLandingScripts
+        https://bugs.webkit.org/show_bug.cgi?id=31904
+
         Step 3: Kill build_webkit.
 
         * Scripts/modules/buildsteps.py:
diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index 9d5052e..13a5777 100644
--- a/WebKitTools/Scripts/modules/buildsteps.py
+++ b/WebKitTools/Scripts/modules/buildsteps.py
@@ -28,11 +28,18 @@
 
 import os
 
-from modules.logging import error
+from modules.logging import log, error
 from modules.webkitlandingscripts import WebKitLandingScripts
 from modules.webkitport import WebKitPort
 
 class BuildSteps:
+    def _run_script(cls, script_name, quiet=False, port=WebKitPort):
+        log("Running %s" % script_name)
+        WebKitLandingScripts.run_and_throw_if_fail(port.script_path(script_name), quiet)
+
+    def prepare_changelog(self):
+        self.run_script("prepare-ChangeLog")
+
     def clean_working_directory(self, scm, options, allow_local_commits=False):
         os.chdir(scm.checkout_root)
         if not allow_local_commits:
@@ -58,3 +65,7 @@ class BuildSteps:
     def build_webkit(self, quiet=False, port=WebKitPort):
         log("Building WebKit")
         WebKitLandingScripts.run_and_throw_if_fail(port.build_webkit_command(), quiet)
+
+    def check_style(self):
+        self._run_script("check-webkit-style")
+
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 9c152f0..d986e28 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -254,7 +254,7 @@ class CheckStyleSequence(LandingSequence):
 
     def build(self):
         # Instead of building, we check style.
-        WebKitLandingScripts.run_webkit_script("check-webkit-style")
+        self._tool.steps.check_style()
 
 
 class CheckStyle(AbstractPatchProcessingCommand):
@@ -359,14 +359,14 @@ class Rollout(Command):
         Command.__init__(self, "Revert the given revision in the working copy and optionally commit the revert and re-open the original bug", "REVISION [BUGID]", options=options)
 
     @staticmethod
-    def _create_changelogs_for_revert(scm, revision):
+    def _create_changelogs_for_revert(tool, revision):
         # First, discard the ChangeLog changes from the rollout.
-        changelog_paths = scm.modified_changelogs()
-        scm.revert_files(changelog_paths)
+        changelog_paths = tool.scm().modified_changelogs()
+        tool.scm().revert_files(changelog_paths)
 
         # Second, make new ChangeLog entries for this rollout.
         # This could move to prepare-ChangeLog by adding a --revert= option.
-        WebKitLandingScripts.run_webkit_script("prepare-ChangeLog")
+        tool.steps.prepare_changelog()
         for changelog_path in changelog_paths:
             ChangeLog(changelog_path).update_for_revert(revision)
 
@@ -395,7 +395,7 @@ class Rollout(Command):
         tool.steps.clean_working_directory(tool.scm(), options)
         tool.scm().update_webkit()
         tool.scm().apply_reverse_diff(revision)
-        self._create_changelogs_for_revert(tool.scm(), revision)
+        self._create_changelogs_for_revert(tool, revision)
 
         # FIXME: Fully automated rollout is not 100% idiot-proof yet, so for now just log with instructions on how to complete the rollout.
         # Once we trust rollout we will remove this option.
diff --git a/WebKitTools/Scripts/modules/webkitlandingscripts.py b/WebKitTools/Scripts/modules/webkitlandingscripts.py
index e0f3a12..2493593 100644
--- a/WebKitTools/Scripts/modules/webkitlandingscripts.py
+++ b/WebKitTools/Scripts/modules/webkitlandingscripts.py
@@ -113,11 +113,5 @@ class WebKitLandingScripts:
         if exit_code:
             raise ScriptError(script_args=args, exit_code=exit_code, output=child_output)
 
-    @classmethod
-    def run_webkit_script(cls, script_name, quiet=False, port=WebKitPort):
-        log("Running %s" % script_name)
-        cls.run_and_throw_if_fail(port.script_path(script_name), quiet)
-
-
 
 

-- 
WebKit Debian packaging