[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 55d4f25036af2bf80a82d089f5fc1889209d98fc
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 26 02:25:31 2009 +0000

    2009-11-25  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            bugzilla-tool should have a mark-fixed command
            https://bugs.webkit.org/show_bug.cgi?id=31853
    
            Pretty simple stuff.
    
            * Scripts/modules/commands/upload.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5eb4427..ec342c0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-25  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        bugzilla-tool should have a mark-fixed command
+        https://bugs.webkit.org/show_bug.cgi?id=31853
+
+        Pretty simple stuff.
+
+        * Scripts/modules/commands/upload.py:
+
 2009-11-25  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/commands/upload.py b/WebKitTools/Scripts/modules/commands/upload.py
index cc52e33..d261ddc 100644
--- a/WebKitTools/Scripts/modules/commands/upload.py
+++ b/WebKitTools/Scripts/modules/commands/upload.py
@@ -170,6 +170,16 @@ class PostCommits(Command):
             tool.bugs.add_patch_to_bug(bug_id, diff_file, description, comment_text, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
 
 
+class MarkFixed(Command):
+    name = "mark-fixed"
+    show_in_main_help = False
+    def __init__(self):
+        Command.__init__(self, "Mark the specified bug as fixed", "BUG_ID REASON")
+
+    def execute(self, options, args, tool):
+        tool.bugs.close_bug_as_fixed(args[0], args[1])
+
+
 class CreateBug(Command):
     name = "create-bug"
     show_in_main_help = True

-- 
WebKit Debian packaging