Diff
Modified: trunk/Tools/ChangeLog (286075 => 286076)
--- trunk/Tools/ChangeLog 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/ChangeLog 2021-11-19 22:00:09 UTC (rev 286076)
@@ -1,3 +1,29 @@
+2021-11-18 Jonathan Bedard <jbed...@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 <beid...@apple.com>
More webpushd architecture work
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.12.1',
+ version='0.12.2',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -44,7 +44,7 @@
from webkitcorepy.editor import Editor
from webkitcorepy.file_lock import FileLock
-version = Version(0, 12, 1)
+version = Version(0, 12, 2)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -45,10 +45,15 @@
response = None
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():
index = int(response) - 1
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -85,7 +85,7 @@
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):
with mocks.Terminal.input('2'), OutputCapture() as captured:
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='3.0.2',
+ version='3.0.3',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(3, 0, 2)
+version = Version(3, 0, 3)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -58,7 +58,7 @@
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))
return 1
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -112,7 +112,7 @@
self.assertEqual(
captured.stdout.getvalue(),
'Landed a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd!\n'
- "Delete branch 'eng/example'? (Yes/No): \n",
+ "Delete branch 'eng/example'? ([Yes]/No): \n",
)
def test_canonicalize(self):
@@ -150,7 +150,7 @@
'Rewrite a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd (1/1) (--- seconds passed, remaining --- predicted)\n'
'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",
)
def test_no_svn_canonical_svn(self):
@@ -191,7 +191,7 @@
self.assertEqual(
captured.stdout.getvalue(),
'Landed a5fe8afe9bf7d07158fcd9e9732ff02a712db2fd!\n'
- "Delete branch 'eng/example'? (Yes/No): \n",
+ "Delete branch 'eng/example'? ([Yes]/No): \n",
)
@@ -313,9 +313,9 @@
self.assertEqual(captured.stderr.getvalue(), '')
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",
)
@@ -442,7 +442,7 @@
self.assertEqual(captured.stderr.getvalue(), '')
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",
)
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py (286075 => 286076)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py 2021-11-19 21:43:17 UTC (rev 286075)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py 2021-11-19 22:00:09 UTC (rev 286076)
@@ -51,7 +51,7 @@
path=self.path,
))
- 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(
captured.root.log.getvalue(),
@@ -114,18 +114,21 @@
programs = ['default'] + [p.name for p in Editor.programs()]
self.assertEqual(
captured.stdout.getvalue(),
- '''Set 'tap...@webkit.org' as the git user email (Yes/No):
+ '''Set 'tap...@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(), '')
self.assertEqual(
