Changeset 56034 in webkit

Timestamp:

Mar 15, 2010 9:43:38 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-03-15 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Add webkit-patch post-rollout to upload rollouts to bugs.webkit.org for easy committing
​https://bugs.webkit.org/show_bug.cgi?id=36154

This new command is a mashup of prepare-rollout and post. This command
will be used by an experimental bot to post rollouts of patches that
break things to bugs.webkit.org where they can be landed with the
greatest of ease.

• Scripts/webkitpy/commands/download.py:
• Scripts/webkitpy/commands/download_unittest.py:
• Scripts/webkitpy/steps/init.py:
• Scripts/webkitpy/steps/postdiffforrevert.py: Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/download.py (modified) (3 diffs)
• Scripts/webkitpy/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/steps/__init__.py (modified) (1 diff)
• Scripts/webkitpy/steps/postdiffforrevert.py (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-15  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add webkit-patch post-rollout to upload rollouts to bugs.webkit.org for easy committing
+        https://bugs.webkit.org/show_bug.cgi?id=36154
+
+        This new command is a mashup of prepare-rollout and post.  This command
+        will be used by an experimental bot to post rollouts of patches that
+        break things to bugs.webkit.org where they can be landed with the
+        greatest of ease.
+
+        * Scripts/webkitpy/commands/download.py:
+        * Scripts/webkitpy/commands/download_unittest.py:
+        * Scripts/webkitpy/steps/__init__.py:
+        * Scripts/webkitpy/steps/postdiffforrevert.py: Added.
+
 2010-03-15  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/commands/download.py

@@ -249 +249 @@
 
     def _bug_id_for_revision(self, revision):
-        raise NotImplementedError("subclasses must implement")
+        bug_id = self._parse_bug_id_from_revision_diff(revision)
+        if bug_id:
+            log("Preparing rollout for bug %s." % bug_id)
+            return bug_id
+        log("Unable to parse bug number from diff.")
 
     def _prepare_state(self, options, args, tool):
@@ -274 +278 @@
     ]
 
-    def _bug_id_for_revision(self, revision):
-        bug_id = self._parse_bug_id_from_revision_diff(revision)
-        if bug_id:
-            return bug_id
-        log("Failed to parse bug number from diff.")
+
+class PostRollout(AbstractRolloutPrepCommand):
+    name = "post-rollout"
+    help_text = "Prepare a rollout of the given revision and upload it to the bug."
+    steps = [
+        steps.CleanWorkingDirectory,
+        steps.Update,
+        steps.RevertRevision,
+        steps.PrepareChangeLogForRevert,
+        # FIXME: If there's no bug number, we should make a new bug.
+        steps.PostDiffForRevert,
+    ]
 
 
@@ -302 +313 @@
         steps.ReopenBugAfterRollout,
     ]
-
-    def _bug_id_for_revision(self, revision):
-        bug_id = self._parse_bug_id_from_revision_diff(revision)
-        if bug_id:
-            log("Will re-open bug %s after rollout." % bug_id)
-            return bug_id
-        log("Failed to parse bug number from diff.  No bugs will be updated/reopened after the rollout.")

trunk/WebKitTools/Scripts/webkitpy/commands/download_unittest.py

@@ -118 +118 @@
 
     def test_prepare_rollout(self):
-        expected_stderr="Updating working directory\nRunning prepare-ChangeLog\n"
+        expected_stderr="Preparing rollout for bug 12345.\nUpdating working directory\nRunning prepare-ChangeLog\n"
+        self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
+
+    def test_post_rollout(self):
+        expected_stderr="Preparing rollout for bug 12345.\nUpdating working directory\nRunning prepare-ChangeLog\n"
         self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_rollout(self):
-        expected_stderr = "Will re-open bug 12345 after rollout.\nUpdating working directory\nRunning prepare-ChangeLog\nBuilding WebKit\n"
+        expected_stderr = "Preparing rollout for bug 12345.\nUpdating working directory\nRunning prepare-ChangeLog\nBuilding WebKit\n"
         self.assert_execute_outputs(Rollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 

trunk/WebKitTools/Scripts/webkitpy/steps/__init__.py

@@ -47 +47 @@
 from webkitpy.steps.postdiff import PostDiff
 from webkitpy.steps.postdiffforcommit import PostDiffForCommit
+from webkitpy.steps.postdiffforrevert import PostDiffForRevert
 from webkitpy.steps.preparechangelogforrevert import PrepareChangeLogForRevert
 from webkitpy.steps.preparechangelog import PrepareChangeLog