Changeset 52599 in webkit

Timestamp:

Dec 28, 2009 9:06:28 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-28 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

[bzt] Create an ASAD command for uploading a patch
​https://bugs.webkit.org/show_bug.cgi?id=32979

The create-review command goes through the whole process of preparing a
code review, including creating a bug, editing the ChangeLogs, and
uploading the patch. It is indeed the All Sing, All Dance upload
command.

• Scripts/modules/buildsteps.py:
• Scripts/modules/commands/upload.py:
• Scripts/modules/commands/upload_unittest.py:
• Scripts/modules/mock_bugzillatool.py:
• Scripts/modules/user.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/buildsteps.py (modified) (4 diffs)
• Scripts/modules/commands/upload.py (modified) (3 diffs)
• Scripts/modules/commands/upload_unittest.py (modified) (1 diff)
• Scripts/modules/mock_bugzillatool.py (modified) (1 diff)
• Scripts/modules/user.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-28  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Create an ASAD command for uploading a patch
+        https://bugs.webkit.org/show_bug.cgi?id=32979
+
+        The create-review command goes through the whole process of preparing a
+        code review, including creating a bug, editing the ChangeLogs, and
+        uploading the patch.  It is indeed the All Sing, All Dance upload
+        command.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/commands/upload.py:
+        * Scripts/modules/commands/upload_unittest.py:
+        * Scripts/modules/mock_bugzillatool.py:
+        * Scripts/modules/user.py:
+
 2009-12-28  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/buildsteps.py

@@ -60 +60 @@
     cc = make_option("--cc", action="store", type="string", dest="cc", help="Comma-separated list of email addresses to carbon-copy.")
     component = make_option("--component", action="store", type="string", dest="component", help="Component for the new bug.")
+    confirm = make_option("--no-confirm", action="store_false", dest="confirm", default=True, help="Skip confirmation steps.")
 
 
@@ -161 +162 @@
 
 
+class EditChangeLogStep(AbstractStep):
+    def run(self, state):
+        self._tool.user.edit(self._tool.scm().modified_changelogs())
+
+
 class ObsoletePatchesOnBugStep(AbstractStep):
     @classmethod
@@ -180 +186 @@
 
 
-class PostDiffToBugStep(AbstractStep):
+class AbstractDiffStep(AbstractStep):
+    def diff(self, state):
+        diff = state.get("diff")
+        if not diff:
+            diff = self._tool.scm().create_patch()
+            state["diff"] = diff
+        return diff
+
+
+class ConfirmDiffStep(AbstractDiffStep):
+    @classmethod
+    def options(cls):
+        return [
+            CommandOptions.confirm,
+        ]
+
+    def run(self, state):
+        if not self._options.confirm:
+            return
+        diff = self.diff(state)
+        self._tool.user.page(diff)
+        if not self._tool.user.confirm():
+            error("User declined to continue.")
+
+
+class PostDiffToBugStep(AbstractDiffStep):
     @classmethod
     def options(cls):
@@ -190 +221 @@
 
     def run(self, state):
-        diff = state.get("diff") or self._tool.scm().create_patch()
+        diff = self.diff(state)
         diff_file = StringIO.StringIO(diff) # add_patch_to_bug expects a file-like object
         description = self._options.description or "Patch"

trunk/WebKitTools/Scripts/modules/commands/upload.py

@@ -37 +37 @@
 
 from modules.bugzilla import parse_bug_id
-from modules.buildsteps import PrepareChangeLogStep, CommandOptions, ObsoletePatchesOnBugStep, PostDiffToBugStep, PromptForBugOrTitleStep, CreateBugStep
+from modules.buildsteps import PrepareChangeLogStep, EditChangeLogStep, ConfirmDiffStep, CommandOptions, ObsoletePatchesOnBugStep, PostDiffToBugStep, PromptForBugOrTitleStep, CreateBugStep
 from modules.commands.download import AbstractSequencedCommmand
 from modules.comments import bug_comment_from_svn_revision
@@ -73 +73 @@
     show_in_main_help = True
     steps = [
+        ConfirmDiffStep,
         ObsoletePatchesOnBugStep,
         PostDiffToBugStep,
@@ -98 +99 @@
         CreateBugStep,
         PrepareChangeLogStep,
+    ]
+
+    def _prepare_state(self, options, args, tool):
+        bug_id = args and args[0]
+        return { "bug_id" : bug_id }
+
+
+class CreateReview(AbstractSequencedCommmand):
+    name = "create-review"
+    help_text = "Adds a ChangeLog to the current diff and posts it to a (possibly new) bug"
+    argument_names = "[BUGID]"
+    steps = [
+        PromptForBugOrTitleStep,
+        CreateBugStep,
+        PrepareChangeLogStep,
+        EditChangeLogStep,
+        ConfirmDiffStep,
+        ObsoletePatchesOnBugStep,
+        PostDiffToBugStep,
     ]
 

trunk/WebKitTools/Scripts/modules/commands/upload_unittest.py

@@ -46 +46 @@
     def test_prepare_diff(self):
         self.assert_execute_outputs(PrepareDiff(), [])
+
+    def test_create_review(self):
+        expected_stderr = "Obsoleting 2 old patches on bug 42\n"
+        self.assert_execute_outputs(CreateReview(), [42], expected_stderr=expected_stderr)

trunk/WebKitTools/Scripts/modules/mock_bugzillatool.py

@@ -148 +148 @@
         return "Mock user response"
 
+    def edit(self, files):
+        pass
+
+    def page(self, message):
+        pass
+
+    def confirm(self):
+        return True
+
 
 class MockStatusBot(object):

trunk/WebKitTools/Scripts/modules/user.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
+import subprocess
+
 class User(object):
     def prompt(self, message):
         return raw_input(message)
+
+    def edit(self, files):
+        editor = os.environ.get("EDITOR") or "vi"
+        subprocess.call([editor] + files)
+
+    def page(self, message):
+        pager = os.environ.get("PAGER") or "less"
+        child_process = subprocess.Popen([pager], stdin=subprocess.PIPE)
+        child_process.communicate(input=message)
+
+    def confirm(self):
+        response = raw_input("\nContinue? [Y/n]: ")
+        return not response or response.lower() == "y"