Modified: trunk/Tools/ChangeLog (293445 => 293446)
--- trunk/Tools/ChangeLog 2022-04-26 20:01:08 UTC (rev 293445)
+++ trunk/Tools/ChangeLog 2022-04-26 20:02:21 UTC (rev 293446)
@@ -1,3 +1,19 @@
+2022-04-26 Jonathan Bedard <jbed...@apple.com>
+
+ [webkit-patch] Use Commit-Queue when landing by default
+ https://bugs.webkit.org/show_bug.cgi?id=239777
+ <rdar://problem/92345543>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/tool/commands/download.py:
+ (LandUnsafe): Renamed from LandUnsafe.
+ (Land): Renamed to LandUnsafe.
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ * Scripts/webkitpy/tool/commands/upload.py:
+ (LandSafely):
+ (Land): Inherit from LandSafely.
+
2022-04-26 Wenson Hsieh <wenson_hs...@apple.com>
Adjust some image transcoding behaviors related to "Copy Cropped Image"
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download.py (293445 => 293446)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2022-04-26 20:01:08 UTC (rev 293445)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2022-04-26 20:02:21 UTC (rev 293446)
@@ -57,11 +57,11 @@
options.force_clean = True
-class Land(AbstractSequencedCommand):
- name = "land"
+class LandUnsafe(AbstractSequencedCommand):
+ name = "land-unsafe"
help_text = "Land the current working directory diff and updates the associated bug if any"
argument_names = "[BUGID]"
- show_in_main_help = True
+ show_in_main_help = False
steps = [
steps.AddSvnMimetypeForPng,
steps.UpdateChangeLogsWithReviewer,
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py (293445 => 293446)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2022-04-26 20:01:08 UTC (rev 293445)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2022-04-26 20:02:21 UTC (rev 293446)
@@ -133,7 +133,7 @@
mock_tool = MockTool()
mock_tool.scm().create_patch = Mock(return_value="Patch1\nMockPatch\n")
mock_tool.checkout().modified_changelogs = Mock(return_value=[])
- self.assert_execute_outputs(Land(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool)
+ self.assert_execute_outputs(LandUnsafe(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool)
# Make sure we're not calling expensive calls too often.
self.assertEqual(mock_tool.scm().create_patch.call_count, 0)
self.assertEqual(mock_tool.checkout().modified_changelogs.call_count, 1)
@@ -162,7 +162,7 @@
with self.mock_svn_remote():
mock_tool = MockTool()
mock_tool.buildbot.light_tree_on_fire()
- self.assert_execute_outputs(Land(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool)
+ self.assert_execute_outputs(LandUnsafe(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool)
def test_check_style(self):
expected_logs = """Processing 1 patch from 1 bug.
@@ -211,7 +211,7 @@
with self.mock_svn_remote():
options = self._default_options()
options.comment_bug = False
- self.assert_execute_outputs(Land(), [50000], options=options, expected_logs=expected_logs)
+ self.assert_execute_outputs(LandUnsafe(), [50000], options=options, expected_logs=expected_logs)
def test_land_no_close(self):
expected_logs = """Building WebKit
@@ -226,7 +226,7 @@
with self.mock_svn_remote():
options = self._default_options()
options.close_bug = False
- self.assert_execute_outputs(Land(), [50000], options=options, expected_logs=expected_logs)
+ self.assert_execute_outputs(LandUnsafe(), [50000], options=options, expected_logs=expected_logs)
def test_land_no_comment_no_close(self):
expected_logs = """Building WebKit
@@ -237,7 +237,7 @@
options = self._default_options()
options.comment_bug = False
options.close_bug = False
- self.assert_execute_outputs(Land(), [50000], options=options, expected_logs=expected_logs)
+ self.assert_execute_outputs(LandUnsafe(), [50000], options=options, expected_logs=expected_logs)
def test_create_revert(self):
expected_logs = """Preparing revert for bug 50000.
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/upload.py (293445 => 293446)
--- trunk/Tools/Scripts/webkitpy/tool/commands/upload.py 2022-04-26 20:01:08 UTC (rev 293445)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/upload.py 2022-04-26 20:02:21 UTC (rev 293446)
@@ -93,7 +93,7 @@
in bugs.webkit.org for BUGID (or the bug ID detected from the ChangeLog).
The command then uploads the current diff to the bug and marks it for
commit by the commit-queue."""
- show_in_main_help = True
+ show_in_main_help = False
steps = [
steps.UpdateChangeLogsWithReviewer,
steps.ValidateChangeLogs,
@@ -103,6 +103,11 @@
]
+class Land(LandSafely):
+ name = "land"
+ show_in_main_help = True
+
+
class Prepare(AbstractSequencedCommand):
name = "prepare"
help_text = "Creates a bug (or prompts for an existing bug) and prepares the ChangeLogs"
