[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4aca7d3b8472c6aed1eea6a40ba9f472a078278f
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 17:14:45 2009 +0000

            <http://webkit.org/b/29712> mark-bug-fixed: add -m|--comment switch
    
            Reviewed by Adam Roben.
    
            * Scripts/mark-bug-fixed:
            (MarkBugFixed.__init__): Added -m|--comment switch to list of
            parse options.
            (MarkBugFixed.main): When specified, prepend comment from
            -m|--comment command-line switch to the bug comment.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6aff252..75fec80 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-24  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/29712> mark-bug-fixed: add -m|--comment switch
+
+        Reviewed by Adam Roben.
+
+        * Scripts/mark-bug-fixed:
+        (MarkBugFixed.__init__): Added -m|--comment switch to list of
+        parse options.
+        (MarkBugFixed.main): When specified, prepend comment from
+        -m|--comment command-line switch to the bug comment.
+
 2009-09-24  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Jan Alonzo.
diff --git a/WebKitTools/Scripts/mark-bug-fixed b/WebKitTools/Scripts/mark-bug-fixed
index 6893fb6..d3c3d92 100755
--- a/WebKitTools/Scripts/mark-bug-fixed
+++ b/WebKitTools/Scripts/mark-bug-fixed
@@ -42,7 +42,8 @@ class MarkBugFixedTool:
         self.bugs = Bugzilla()
         self.cached_scm = None
         self.option_parser = OptionParser(usage="usage: %prog [options] [rNNNNN]")
-        self.option_parser.add_option("-b", "--bug-id", dest="bug_id", help="Specify bug id if no URL is provided in the commit log.")
+        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.")
 
     def scm(self):
         # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
@@ -102,8 +103,12 @@ class MarkBugFixedTool:
         if not bug_id or not svn_revision:
             (bug_id, svn_revision) = self._determine_bug_id_and_svn_revision(bug_id, svn_revision)
 
+        bug_comment = bug_comment_from_svn_revision(svn_revision)
+        if options.comment:
+            bug_comment = "%s\n\n%s" % (options.comment, bug_comment)
+
         log("Updating Bug %s." % bug_id)
-        self.bugs.close_bug_as_fixed(bug_id, bug_comment_from_svn_revision(svn_revision))
+        self.bugs.close_bug_as_fixed(bug_id, bug_comment)
 
 
 def main():

-- 
WebKit Debian packaging