Changeset 53404 in webkit

Timestamp:

Jan 18, 2010 6:05:03 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-18 Adam Barth <​abarth@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/upload.py (modified) (1 diff)
• Scripts/webkitpy/commands/upload_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-18  Adam Barth  <abarth@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@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/commands/upload.py

@@ -135 +135 @@
     steps = [
         steps.UpdateChangeLogsWithReviewer,
+        steps.ObsoletePatches,
         steps.PostDiffForCommit,
     ]

trunk/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py

@@ -58 +58 @@
 
     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):