[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[eric at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 9c164496642cec185d114c91a7e9e7761b26b0c7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 14:05:03 2010 +0000

    2010-01-18  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            webkit-patch land-safely should obsolete old patches
            https://bugs.webkit.org/show_bug.cgi?id=33788
    
            When posting a commit-queue+ patch with land-safely, we should
            obsolete the old patches on the bug.  They're really confusing
            because the main use case is to address reviewer feedback on a
            previous patch.
    
            * Scripts/webkitpy/commands/upload.py:
            * Scripts/webkitpy/commands/upload_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 24bd1cc..9b0ae0d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,20 @@
 2010-01-18  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        webkit-patch land-safely should obsolete old patches
+        https://bugs.webkit.org/show_bug.cgi?id=33788
+
+        When posting a commit-queue+ patch with land-safely, we should
+        obsolete the old patches on the bug.  They're really confusing
+        because the main use case is to address reviewer feedback on a
+        previous patch.
+
+        * Scripts/webkitpy/commands/upload.py:
+        * Scripts/webkitpy/commands/upload_unittest.py:
+
+2010-01-18  Adam Barth  <abarth at webkit.org>
+
         Reviewed by David Levin.
 
         webkit-patch should authenticate more often
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload.py b/WebKitTools/Scripts/webkitpy/commands/upload.py
index 0f84b95..8d23d8b 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload.py
@@ -134,6 +134,7 @@ class LandSafely(AbstractPatchUploadingCommand):
     argument_names = "[BUGID]"
     steps = [
         steps.UpdateChangeLogsWithReviewer,
+        steps.ObsoletePatches,
         steps.PostDiffForCommit,
     ]
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py b/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
index b0d41ee..12313d0 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
@@ -57,7 +57,8 @@ class UploadCommandsTest(CommandsTest):
         self.assert_execute_outputs(Post(), [42], expected_stderr=expected_stderr)
 
     def test_post(self):
-        self.assert_execute_outputs(LandSafely(), [42])
+        expected_stderr = "Obsoleting 2 old patches on bug 42\n"
+        self.assert_execute_outputs(LandSafely(), [42], expected_stderr=expected_stderr)
 
     def test_prepare_diff_with_arg(self):
         self.assert_execute_outputs(Prepare(), [42])

-- 
WebKit Debian packaging