Changeset 148441 in webkit

Timestamp:

Apr 15, 2013, 8:39:40 AM (12 years ago)

Author:

zandobersek@gmail.com

Message:

Deprecate land-cowboy in favor of land-cowhand
​https://bugs.webkit.org/show_bug.cgi?id=104470

Patch by Zan Dobersek <​zandobersek@gmail.com> on 2013-04-15
Reviewed by Darin Adler.

Move the LandCowboy command implementation under the LandCowhand command and deprecate the former.

• Scripts/webkitpy/tool/commands/download.py:

(LandCowhand):
(LandCowboy):
(LandCowboy._prepare_state):

• Scripts/webkitpy/tool/commands/download_unittest.py:

(test_land_cowhand): Adjust the unit tests by testing both LandCowhand and LandCowboy,
also checking the deprecation message in the output of the latter.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/download_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-15  Zan Dobersek  <zandobersek@gmail.com>
+
+        Deprecate land-cowboy in favor of land-cowhand
+        https://bugs.webkit.org/show_bug.cgi?id=104470
+
+        Reviewed by Darin Adler.
+
+        Move the LandCowboy command implementation under the LandCowhand command and deprecate the former.
+
+        * Scripts/webkitpy/tool/commands/download.py:
+        (LandCowhand):
+        (LandCowboy):
+        (LandCowboy._prepare_state):
+        * Scripts/webkitpy/tool/commands/download_unittest.py:
+        (test_land_cowhand): Adjust the unit tests by testing both LandCowhand and LandCowboy,
+        also checking the deprecation message in the output of the latter.
+
 2013-04-15  Jonathan Liu  <net147@gmail.com>
 

trunk/Tools/Scripts/webkitpy/tool/commands/download.py

@@ -115 +115 @@
 
 
-class LandCowboy(AbstractSequencedCommand):
-    name = "land-cowboy"
+class LandCowhand(AbstractSequencedCommand):
+    # Gender-blind term for cowboy, see: http://en.wiktionary.org/wiki/cowhand
+    name = "land-cowhand"
     help_text = "Prepares a ChangeLog and lands the current working directory diff."
     steps = [
@@ -133 +134 @@
 
 
-class LandCowhand(LandCowboy):
-    # Gender-blind term for cowboy, see: http://en.wiktionary.org/wiki/cowhand
-    name = "land-cowhand"
+class LandCowboy(LandCowhand):
+    name = "land-cowboy"
+
+    def _prepare_state(self, options, args, tool):
+        _log.warning("land-cowboy is deprecated, use land-cowhand instead.")
+        LandCowhand._prepare_state(self, options, args, tool)
 
 

trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

@@ -156 +156 @@
         self.assertEqual(mock_tool.checkout().modified_changelogs.call_count, 1)
 
-    def test_land_cowboy(self):
+    def test_land_cowhand(self):
         expected_logs = """MOCK run_and_throw_if_fail: ['mock-prepare-ChangeLog', '--email=MOCK email', '--merge-base=None', 'MockFile1'], cwd=/mock-checkout
 MOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--git-commit', 'MOCK git commit', '--diff-files', 'MockFile1', '--filter', '-changelog'], cwd=/mock-checkout
@@ -181 +181 @@
 """
         mock_tool = MockTool(log_executive=True)
+        self.assert_execute_outputs(LandCowhand(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool)
+
+        expected_logs = "land-cowboy is deprecated, use land-cowhand instead.\n" + expected_logs
         self.assert_execute_outputs(LandCowboy(), [50000], options=self._default_options(), expected_logs=expected_logs, tool=mock_tool)