Changeset 286076 in webkit

Timestamp:

Nov 19, 2021, 2:00:09 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitcorepy] Indicate to user the default option
​https://bugs.webkit.org/show_bug.cgi?id=233342
<rdar://problem/85573383>

Reviewed by Ryan Haddad.

• Tools/Scripts/libraries/webkitcorepy/setup.py: Bump version.
• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/init.py: Ditto.
• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py:

(Terminal.choose): Surround the default option with square brackets.

• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py:

(TerminalTests.test_choose_triple):

• Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Ditto.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:

(Setup.github): We should construct a user owned mirror by default.

• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:

(TestLand.test_default):
(TestLand.test_canonicalize):
(TestLand.test_svn):
(TestLandGitHub):

• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:

(TestSetup.test_github):

Canonical link: ​https://commits.webkit.org/244463@main

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py (modified) (5 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-18  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitcorepy] Indicate to user the default option
+        https://bugs.webkit.org/show_bug.cgi?id=233342
+        <rdar://problem/85573383>
+
+        Reviewed by Ryan Haddad.
+
+        * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py:
+        (Terminal.choose): Surround the default option with square brackets.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py:
+        (TerminalTests.test_choose_triple):
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+        (Setup.github): We should construct a user owned mirror by default.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
+        (TestLand.test_default):
+        (TestLand.test_canonicalize):
+        (TestLand.test_svn):
+        (TestLandGitHub):
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+        (TestSetup.test_github):
+
 2021-11-19  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/setup.py

@@ -31 +31 @@
 setup(
     name='webkitcorepy',
-    version='0.12.1',
+    version='0.12.2',
     description='Library containing various Python support classes and functions.',
     long_description=readme(),

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -45 +45 @@
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 12, 1)
+version = Version(0, 12, 2)
 
 from webkitcorepy.autoinstall import Package, AutoInstall

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py

@@ -46 +46 @@
         while response is None:
             if numbered:
-                numbered_options = ['{}) {}'.format(i + 1, options[i]) for i in range(len(options))]
+                numbered_options = [
+                    ('{}) [{}]' if options[i] == default else '{}) {}').format( i + 1, options[i])
+                    for i in range(len(options))
+                ]
                 response = cls.input('{}:\n    {}\n: '.format(prompt, '\n    '.join(numbered_options)))
             else:
-                response = cls.input('{} ({}): '.format(prompt, '/'.join(options)))
+                response = cls.input('{} ({}): '.format(prompt, '/'.join([
+                    '[{}]'.format(option) if option == default else option for option in options
+                ])))
 
             if numbered and response.isdigit():

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py

@@ -86 +86 @@
         with mocks.Terminal.input('huh'), OutputCapture() as captured:
             self.assertEqual('No', Terminal.choose('Continue', options=('Yes', 'No', 'Maybe'), default='No'))
-        self.assertEqual(captured.stdout.getvalue(), 'Continue (Yes/No/Maybe): \n')
+        self.assertEqual(captured.stdout.getvalue(), 'Continue (Yes/[No]/Maybe): \n')
 
     def test_choose_number(self):

trunk/Tools/Scripts/libraries/webkitscmpy/setup.py

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='3.0.2',
+    version='3.0.3',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -47 +47 @@
     )
 
-version = Version(3, 0, 2)
+version = Version(3, 0, 3)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py

@@ -59 +59 @@
         if repository.owner == username or args.defaults or Terminal.choose(
             "Create a private fork of '{}' belonging to '{}'".format(repository.name, username),
-            default='No',
+            default='Yes',
         ) == 'No':
             log.warning("Continuing without forking '{}'".format(repository.name))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py

@@ -113 +113 @@
             captured.stdout.getvalue(),
             'Landed a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd!\n'
-            "Delete branch 'eng/example'? (Yes/No): \n",
+            "Delete branch 'eng/example'? ([Yes]/No): \n",
         )
 
@@ -151 +151 @@
             '1 commit successfully canonicalized!\n'
             'Landed https://commits.webkit.org/6@main (a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd)!\n'
-            "Delete branch 'eng/example'? (Yes/No): \n",
+            "Delete branch 'eng/example'? ([Yes]/No): \n",
         )
 
@@ -192 +192 @@
             captured.stdout.getvalue(),
             'Landed a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd!\n'
-            "Delete branch 'eng/example'? (Yes/No): \n",
+            "Delete branch 'eng/example'? ([Yes]/No): \n",
         )
 
@@ -314 +314 @@
         self.assertEqual(
             captured.stdout.getvalue(),
-            "Set 'Ricky Reviewer' as your reviewer? (Yes/No): \n"
+            "Set 'Ricky Reviewer' as your reviewer? ([Yes]/No): \n"
             'Landed a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd!\n'
-            "Delete branch 'eng/example'? (Yes/No): \n",
+            "Delete branch 'eng/example'? ([Yes]/No): \n",
         )
 
@@ -443 +443 @@
         self.assertEqual(
             captured.stdout.getvalue(),
-            "Set 'Ricky Reviewer' as your reviewer? (Yes/No): \n"
+            "Set 'Ricky Reviewer' as your reviewer? ([Yes]/No): \n"
             'Landed a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd!\n'
-            "Delete branch 'eng/example'? (Yes/No): \n",
-        )
+            "Delete branch 'eng/example'? ([Yes]/No): \n",
+        )

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py

@@ -52 +52 @@
             ))
 
-        self.assertEqual(captured.stdout.getvalue(), "Create a private fork of 'WebKit' belonging to 'username' (Yes/No): \n")
+        self.assertEqual(captured.stdout.getvalue(), "Create a private fork of 'WebKit' belonging to 'username' ([Yes]/No): \n")
         self.assertEqual(captured.stderr.getvalue(), '')
         self.assertEqual(
@@ -115 +115 @@
         self.assertEqual(
             captured.stdout.getvalue(),
-            '''Set 'tapple@webkit.org' as the git user email (Yes/No): 
+            '''Set 'tapple@webkit.org' as the git user email ([Yes]/No): 
 Git user email: 
-Set 'Tim Apple' as the git user name (Yes/No): 
+Set 'Tim Apple' as the git user name ([Yes]/No): 
 Git user name: 
-Auto-color status, diff, and branch? (Yes/No): 
+Auto-color status, diff, and branch? ([Yes]/No): 
 Pick a commit message editor:
     {}
 : 
 http based remotes will prompt for your password when pushing,
-would you like to convert to a ssh remote? (Yes/No): 
-Create a private fork of 'WebKit' belonging to 'username' (Yes/No): 
-'''.format('\n    '.join(['{}) {}'.format(count + 1, programs[count]) for count in range(len(programs))])))
+would you like to convert to a ssh remote? ([Yes]/No): 
+Create a private fork of 'WebKit' belonging to 'username' ([Yes]/No): 
+'''.format('\n    '.join([
+            '{}) {}'.format(
+                count + 1, programs[count] if count else '[{}]'.format(programs[count]),
+            ) for count in range(len(programs))])))
         self.assertEqual(captured.stderr.getvalue(), '')