[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8bcc857bd57f56aa3ad402e7a33eddca151a059b
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 28 17:35:14 2009 +0000

    2009-12-28  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] Add an edit-changelog command
            https://bugs.webkit.org/show_bug.cgi?id=32986
    
            This command makes it easier to edit ChangeLogs.  It's similar to
            prepare-ChangeLog -o, except it works with already existing ChangeLogs.
    
            * Scripts/modules/commands/upload.py:
            * Scripts/modules/commands/upload_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 08aa6e2..f378dc5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Eric Seidel.
 
+        [bzt] Add an edit-changelog command
+        https://bugs.webkit.org/show_bug.cgi?id=32986
+
+        This command makes it easier to edit ChangeLogs.  It's similar to
+        prepare-ChangeLog -o, except it works with already existing ChangeLogs.
+
+        * Scripts/modules/commands/upload.py:
+        * Scripts/modules/commands/upload_unittest.py:
+
+2009-12-28  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [bzt] Create an ASAD command for uploading a patch
         https://bugs.webkit.org/show_bug.cgi?id=32979
 
diff --git a/WebKitTools/Scripts/modules/commands/upload.py b/WebKitTools/Scripts/modules/commands/upload.py
index a8619c0..72cd3c9 100644
--- a/WebKitTools/Scripts/modules/commands/upload.py
+++ b/WebKitTools/Scripts/modules/commands/upload.py
@@ -124,6 +124,14 @@ class CreateReview(AbstractSequencedCommmand):
         return { "bug_id" : bug_id }
 
 
+class EditChangeLog(AbstractSequencedCommmand):
+    name = "edit-changelog"
+    help_text = "Opens modified ChangeLogs in $EDITOR"
+    steps = [
+        EditChangeLogStep,
+    ]
+
+
 class PostCommits(Command):
     name = "post-commits"
     show_in_main_help = True
diff --git a/WebKitTools/Scripts/modules/commands/upload_unittest.py b/WebKitTools/Scripts/modules/commands/upload_unittest.py
index 37f2d4d..77177be 100644
--- a/WebKitTools/Scripts/modules/commands/upload_unittest.py
+++ b/WebKitTools/Scripts/modules/commands/upload_unittest.py
@@ -49,3 +49,6 @@ class UploadCommandsTest(CommandsTest):
     def test_create_review(self):
         expected_stderr = "Obsoleting 2 old patches on bug 42\n"
         self.assert_execute_outputs(CreateReview(), [42], expected_stderr=expected_stderr)
+
+    def test_edit_changelog(self):
+        self.assert_execute_outputs(EditChangeLog(), [])

-- 
WebKit Debian packaging