Changeset 80537 in webkit

Timestamp:

Mar 7, 2011 9:58:26 PM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-03-07 Ojan Vafai <​ojan@chromium.org>

Reviewed by Adam Barth.

add webkit-patch attach-to-bug for posting to bugzilla from the commandline
​https://bugs.webkit.org/show_bug.cgi?id=55749

• Scripts/webkitpy/tool/commands/upload.py:
• Scripts/webkitpy/tool/commands/upload_unittest.py:
• Scripts/webkitpy/tool/steps/init.py:
• Scripts/webkitpy/tool/steps/attachtobug.py: Added.
• Scripts/webkitpy/tool/steps/options.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/upload.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/upload_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/__init__.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/attachtobug.py (added)
• Scripts/webkitpy/tool/steps/options.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-07  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        add webkit-patch attach-to-bug for posting to bugzilla from the commandline
+        https://bugs.webkit.org/show_bug.cgi?id=55749
+
+        * Scripts/webkitpy/tool/commands/upload.py:
+        * Scripts/webkitpy/tool/commands/upload_unittest.py:
+        * Scripts/webkitpy/tool/steps/__init__.py:
+        * Scripts/webkitpy/tool/steps/attachtobug.py: Added.
+        * Scripts/webkitpy/tool/steps/options.py:
+
 2011-03-07  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Tools/Scripts/webkitpy/tool/commands/upload.py

@@ -174 +174 @@
 
 
+class AttachToBug(AbstractSequencedCommand):
+    name = "attach-to-bug"
+    help_text = "Attach the the file to the bug"
+    argument_names = "BUGID FILEPATH"
+    steps = [
+        steps.AttachToBug,
+    ]
+
+    def _prepare_state(self, options, args, tool):
+        state = {}
+        state["bug_id"] = args[0]
+        state["filepath"] = args[1]
+        return state
+
+
 class AbstractPatchUploadingCommand(AbstractSequencedCommand):
     def _bug_id(self, options, args, tool, state):

trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py

@@ -69 +69 @@
         self.assert_execute_outputs(Post(), [42], options=options, expected_stderr=expected_stderr)
 
+    def test_attach_to_bug(self):
+        options = MockOptions()
+        options.comment = "extra comment"
+        options.description = "file description"
+        expected_stderr = """MOCK add_attachment_to_bug: bug_id=42, description=file description filename=None
+-- Begin comment --
+extra comment
+-- End comment --
+"""
+        self.assert_execute_outputs(AttachToBug(), [42, "path/to/file.txt", "file description"], options=options, expected_stderr=expected_stderr)
+
+    def test_attach_to_bug_no_description_or_comment(self):
+        options = MockOptions()
+        options.comment = None
+        options.description = None
+        expected_stderr = """MOCK add_attachment_to_bug: bug_id=42, description=file.txt filename=None
+"""
+        self.assert_execute_outputs(AttachToBug(), [42, "path/to/file.txt"], options=options, expected_stderr=expected_stderr)
+
     def test_land_safely(self):
         expected_stderr = "Obsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n"

trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py

@@ -30 +30 @@
 from webkitpy.tool.steps.applypatch import ApplyPatch
 from webkitpy.tool.steps.applypatchwithlocalcommit import ApplyPatchWithLocalCommit
+from webkitpy.tool.steps.attachtobug import AttachToBug
 from webkitpy.tool.steps.build import Build
 from webkitpy.tool.steps.checkstyle import CheckStyle

trunk/Tools/Scripts/webkitpy/tool/steps/options.py

@@ -41 +41 @@
     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.")
-    description = make_option("-m", "--description", action="store", type="string", dest="description", help="Description string for the attachment (default: \"patch\")")
+    description = make_option("-m", "--description", action="store", type="string", dest="description", help="Description string for the attachment")
     email = make_option("--email", action="store", type="string", dest="email", help="Email address to use in ChangeLogs.")
     force_clean = make_option("--force-clean", action="store_true", dest="force_clean", default=False, help="Clean working directory before applying patches (removes local changes and commits)")