Changeset 48794 in webkit

Timestamp:

Sep 26, 2009 4:14:21 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/29764> mark-bug-fixed: add -oopen switch

Reviewed by Eric Seidel.

The -oopen switch uses the open(1) command on Mac OS X to

open the bug URL in the default web browser. If there are
similar mechanisms on other platforms, they may be added later.

• Scripts/mark-bug-fixed:

(MarkBugFixed.init): Added -oopen switch to list of parse

options.
(MarkBugFixed._determine_bug_id_and_svn_revision): Moved logging
code into main() and extracted prompting code into
_prompt_user_for_correctness().
(MarkBugFixed._open_bug_in_web_browser): Added.
(MarkBugFixed._prompt_user_for_correctness): Added.
(MarkBugFixed.main): Added logging code from
_determine_bug_id_and_svn_revision(). Added code to call
_open_bug_in_web_browser() if the switch is set. Added code to
call _prompt_user_for_correctness() when needed.

• Scripts/modules/bugzilla.py: (Bugzilla.short_bug_url_for_bug_id): Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/mark-bug-fixed (modified) (4 diffs)
• Scripts/modules/bugzilla.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-26  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/29764> mark-bug-fixed: add -o|--open switch
+
+        Reviewed by Eric Seidel.
+
+        The -o|--open switch uses the open(1) command on Mac OS X to
+        open the bug URL in the default web browser.  If there are
+        similar mechanisms on other platforms, they may be added later.
+
+        * Scripts/mark-bug-fixed:
+        (MarkBugFixed.__init__): Added -o|--open switch to list of parse
+        options.
+        (MarkBugFixed._determine_bug_id_and_svn_revision): Moved logging
+        code into main() and extracted prompting code into
+        _prompt_user_for_correctness().
+        (MarkBugFixed._open_bug_in_web_browser): Added.
+        (MarkBugFixed._prompt_user_for_correctness): Added.
+        (MarkBugFixed.main): Added logging code from
+        _determine_bug_id_and_svn_revision().  Added code to call
+        _open_bug_in_web_browser() if the switch is set.  Added code to
+        call _prompt_user_for_correctness() when needed.
+        * Scripts/modules/bugzilla.py:
+        (Bugzilla.short_bug_url_for_bug_id): Added.
+
 2009-09-26  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKitTools/Scripts/mark-bug-fixed

@@ -35 +35 @@
 from modules.comments import bug_comment_from_svn_revision
 from modules.logging import error, log
-from modules.scm import detect_scm_system
+from modules.scm import SCM, detect_scm_system
 
 
@@ -45 +45 @@
         self.option_parser.add_option("-b", "--bug-id", action="store", type="string", dest="bug_id", help="Specify bug id if no URL is provided in the commit log.")
         self.option_parser.add_option("-m", "--comment", action="store", type="string", dest="comment", help="Text to include in bug comment.")
+        self.option_parser.add_option("-o", "--open", action="store_true", default=False, dest="open_bug", help="Open bug in default web browser (Mac only).")
         self.option_parser.add_option("-u", "--update-only", action="store_true", default=False, dest="update_only", help="Add comment to the bug, but do not close it.")
 
@@ -79 +80 @@
                   % (" or ".join(not_found), "r%s" % svn_revision if svn_revision else "last commit"))
 
-        log("Bug: <http://webkit.org/b/%s> %s" % (bug_id, self.bugs.fetch_title_from_bug(bug_id)))
-        log("Revision: %s" % svn_revision)
+        return (bug_id, svn_revision)
+
+    def _open_bug_in_web_browser(self, bug_id):
+        if sys.platform == "darwin":
+            SCM.run_command(["open", self.bugs.short_bug_url_for_bug_id(bug_id)])
+            return
+        log("WARNING: -o|--open is only supported on Mac OS X.")
+
+    def _prompt_user_for_correctness(self, bug_id, svn_revision):
         answer = raw_input("Is this correct (y/N)? ")
         if not re.match("^\s*y(es)?", answer, re.IGNORECASE):
             exit(1)
-
-        return (bug_id, svn_revision)
 
     def main(self):
@@ -102 +108 @@
                 error("Invalid svn revision: '%s'" % svn_revision)
 
+        needs_prompt = False
         if not bug_id or not svn_revision:
+            needs_prompt = True
             (bug_id, svn_revision) = self._determine_bug_id_and_svn_revision(bug_id, svn_revision)
+
+        log("Bug: <%s> %s" % (self.bugs.short_bug_url_for_bug_id(bug_id), self.bugs.fetch_title_from_bug(bug_id)))
+        log("Revision: %s" % svn_revision)
+
+        if options.open_bug:
+            self._open_bug_in_web_browser(bug_id)
+
+        if needs_prompt:
+            self._prompt_user_for_correctness(bug_id, svn_revision)
 
         bug_comment = bug_comment_from_svn_revision(svn_revision)

trunk/WebKitTools/Scripts/modules/bugzilla.py

@@ -152 +152 @@
         content_type = "&ctype=xml" if xml else ""
         return "%sshow_bug.cgi?id=%s%s" % (self.bug_server_url, bug_id, content_type)
-    
+
+    def short_bug_url_for_bug_id(self, bug_id):
+        return "http://webkit.org/b/%s" % bug_id
+
     def attachment_url_for_id(self, attachment_id, action="view"):
         action_param = ""