Changeset 46538 in webkit

Timestamp:

Jul 29, 2009 4:35:09 AM (15 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/27119> bugzilla-tool: Add create-bug command

Reviewed by David Levin.

Implement "create-bug" command for bugzilla-tool.

• Scripts/bugzilla-tool: Added CreateBug class. (CreateBug.init): Added. (CreateBug.create_bug_from_commit): Added. (CreateBug.create_bug_from_patch): Added. (CreateBug.prompt_for_bug_title_and_comment): Added. (CreateBug.execute): Added. (BugzillaTool.init): Added create-bug command.
• Scripts/modules/bugzilla.py: (Bugzilla.prompt_for_component): Added. (Bugzilla.check_create_bug_response_returning_bug_id_on_success): Added. (Bugzilla.create_bug_with_patch): Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/bugzilla.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-29  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/27119> bugzilla-tool: Add create-bug command
+
+        Reviewed by David Levin.
+
+        Implement "create-bug" command for bugzilla-tool.
+
+        * Scripts/bugzilla-tool: Added CreateBug class.
+        (CreateBug.__init__): Added.
+        (CreateBug.create_bug_from_commit): Added.
+        (CreateBug.create_bug_from_patch): Added.
+        (CreateBug.prompt_for_bug_title_and_comment): Added.
+        (CreateBug.execute): Added.
+        (BugzillaTool.__init__): Added create-bug command.
+        * Scripts/modules/bugzilla.py:
+        (Bugzilla.prompt_for_component): Added.
+        (Bugzilla.check_create_bug_response_returning_bug_id_on_success): Added.
+        (Bugzilla.create_bug_with_patch): Added.
+
 2009-07-29  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -455 +455 @@
 
 
+class CreateBug(Command):
+    def __init__(self):
+        options = [
+            make_option("--cc", action="store", type="string", dest="cc", help="Comma-separated list of email addresses to carbon-copy."),
+            make_option("--component", action="store", type="string", dest="component", help="Component for the new bug."),
+            make_option("--no-prompt", action="store_false", dest="prompt", default=True, help="Do not prompt for bug title and comment; use commit log instead."),
+            make_option("--no-review", action="store_false", dest="review", default=True, help="Do not mark the patch for review."),
+        ]
+        Command.__init__(self, 'Create a bug from local changes or local commits.', '[COMMITISH]', options=options)
+
+    def create_bug_from_commit(self, options, args, tool):
+        commit_ids = tool.scm().commit_ids_from_range_arguments(args, cherry_pick=True)
+
+        if len(commit_ids) > 3:
+            error("Are you sure you want to create one bug with %s patches?" % len(commit_ids))
+
+        commit_id = commit_ids[0]
+
+        bug_title = ""
+        comment_text = ""
+        if options.prompt:
+            (bug_title, comment_text) = self.prompt_for_bug_title_and_comment()
+        else:
+            commit_message = tool.scm().commit_message_for_local_commit(commit_id)
+            bug_title = commit_message.description(lstrip=True, strip_url=True)
+            comment_text = commit_message.body(lstrip=True)
+            comment_text += "---\n"
+            comment_text += tool.scm().files_changed_summary_for_commit(commit_id)
+
+        diff = tool.scm().create_patch_from_local_commit(commit_id)
+        diff_file = StringIO.StringIO(diff) # create_bug_with_patch expects a file-like object
+        bug_id = tool.bugs.create_bug_with_patch(bug_title, comment_text, options.component, diff_file, "Patch v1", cc=options.cc, mark_for_review=options.review)
+
+        if bug_id and len(commit_ids) > 1:
+            options.bug_id = bug_id
+            options.obsolete_patches = False
+            # FIXME: We should pass through --no-comment switch as well.
+            PostCommitsAsPatchesToBug.execute(self, options, commit_ids[1:], tool)
+
+    def create_bug_from_patch(self, options, args, tool):
+        bug_title = ""
+        comment_text = ""
+        if options.prompt:
+            (bug_title, comment_text) = self.prompt_for_bug_title_and_comment()
+        else:
+            commit_message = commit_message_for_this_commit(tool.scm())
+            bug_title = commit_message.description(lstrip=True, strip_url=True)
+            comment_text = commit_message.body(lstrip=True)
+
+        diff = tool.scm().create_patch()
+        diff_file = StringIO.StringIO(diff) # create_bug_with_patch expects a file-like object
+        bug_id = tool.bugs.create_bug_with_patch(bug_title, comment_text, options.component, diff_file, "Patch v1", cc=options.cc, mark_for_review=options.review)
+
+    def prompt_for_bug_title_and_comment(self):
+        bug_title = raw_input("Bug title: ")
+        print("Bug comment (hit ^D on blank line to end):")
+        lines = sys.stdin.readlines()
+        sys.stdin.seek(0, os.SEEK_END)
+        comment_text = ''.join(lines)
+        return (bug_title, comment_text)
+
+    def execute(self, options, args, tool):
+        if len(args):
+            if (not tool.scm().supports_local_commits()):
+                error("Extra arguments not supported; patch is taken from working directory.")
+            self.create_bug_from_commit(options, args, tool)
+        else:
+            self.create_bug_from_patch(options, args, tool)
+
+
 class NonWrappingEpilogIndentedHelpFormatter(IndentedHelpFormatter):
     def __init__(self):
@@ -482 +552 @@
             { 'name' : 'patches-to-commit', 'object' : PatchesInCommitQueue() },
             { 'name' : 'reviewed-patches', 'object' : ReviewedPatchesOnBug() },
+            { 'name' : 'create-bug', 'object' : CreateBug() },
             { 'name' : 'apply-patches', 'object' : ApplyPatchesFromBug() },
             { 'name' : 'land-diff', 'object' : LandAndUpdateBug() },

trunk/WebKitTools/Scripts/modules/bugzilla.py

@@ -299 +299 @@
         self.browser.submit()
 
+    def prompt_for_component(self, components):
+        log("Please pick a component:")
+        i = 0
+        for name in components:
+            i += 1
+            log("%2d. %s" % (i, name))
+        result = int(raw_input("Enter a number: ")) - 1
+        return components[result]
+
+    def _check_create_bug_response(self, response_html):
+        match = re.search("<title>Bug (?P<bug_id>\d+) Submitted</title>", response_html)
+        if match:
+            return match.group('bug_id')
+
+        match = re.search('<div id="bugzilla-body">(?P<error_message>.+)<div id="footer">', response_html, re.DOTALL)
+        error_message = "FAIL"
+        if match:
+            text_lines = BeautifulSoup(match.group('error_message')).findAll(text=True)
+            error_message = "\n" + '\n'.join(["  " + line.strip() for line in text_lines if line.strip()])
+        error("Bug not created: %s" % error_message)
+
+    def create_bug_with_patch(self, bug_title, bug_description, component, patch_file_object, patch_description, cc, mark_for_review=False):
+        self.authenticate()
+
+        log('Creating bug with patch description "%s"' % patch_description)
+        if self.dryrun:
+            log(bug_description)
+            return
+
+        self.browser.open(self.bug_server_url + "enter_bug.cgi?product=WebKit")
+        self.browser.select_form(name="Create")
+        component_items = self.browser.find_control('component').items
+        component_names = map(lambda item: item.name, component_items)
+        if not component or component not in component_names:
+            component = self.prompt_for_component(component_names)
+        self.browser['component'] = [component]
+        self.browser['cc'] = cc
+        self.browser['short_desc'] = bug_title
+        if bug_description:
+            log(bug_description)
+            self.browser['comment'] = bug_description
+        self.browser['description'] = patch_description
+        self.browser['ispatch'] = ("1",)
+        self.browser['flag_type-1'] = ('?',) if mark_for_review else ('X',)
+        self.browser.add_file(patch_file_object, "text/plain", "%s.patch" % timestamp(), 'data')
+        response = self.browser.submit()
+
+        bug_id = self._check_create_bug_response(response.read())
+        log("Bug %s created." % bug_id)
+        log(self.bug_server_url + "show_bug.cgi?id=" + bug_id)
+        return bug_id
+
     def obsolete_attachment(self, attachment_id, comment_text = None):
         self.authenticate()