Diff
Modified: trunk/Tools/ChangeLog (290331 => 290332)
--- trunk/Tools/ChangeLog 2022-02-22 20:59:23 UTC (rev 290331)
+++ trunk/Tools/ChangeLog 2022-02-22 21:11:40 UTC (rev 290332)
@@ -1,3 +1,18 @@
+2022-02-22 Jonathan Bedard <[email protected]>
+
+ [git-webkit] Link to GitHub wiki
+ https://bugs.webkit.org/show_bug.cgi?id=237048
+ <rdar://problem/89307995>
+
+ Reviewed by Ryan Haddad.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+ (Setup.main): Add GitHub wiki link.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+ (TestSetup.test_github):
+
2022-02-22 Philippe Normand <[email protected]>
[GStreamer] Switch media player to playbin3
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (290331 => 290332)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-02-22 20:59:23 UTC (rev 290331)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-02-22 21:11:40 UTC (rev 290332)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='4.3.2',
+ version='4.3.3',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (290331 => 290332)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-02-22 20:59:23 UTC (rev 290331)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-02-22 21:11:40 UTC (rev 290332)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(4, 3, 2)
+version = Version(4, 3, 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 (290331 => 290332)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2022-02-22 20:59:23 UTC (rev 290331)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2022-02-22 21:11:40 UTC (rev 290332)
@@ -301,6 +301,9 @@
@classmethod
def main(cls, args, repository, **kwargs):
+ print('For detailed information about options this script is configuring see:')
+ print('https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options')
+
if isinstance(repository, local.Git):
result = cls.git(args, repository, **kwargs)
print('Setup failed' if result else 'Setup succeeded!')
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py (290331 => 290332)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py 2022-02-22 20:59:23 UTC (rev 290331)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py 2022-02-22 21:11:40 UTC (rev 290332)
@@ -52,7 +52,13 @@
path=self.path,
))
- self.assertEqual(captured.stdout.getvalue(), "Create a private fork of 'WebKit' belonging to 'username' ([Yes]/No): \nSetup succeeded!\n")
+ self.assertEqual(
+ captured.stdout.getvalue(),
+ 'For detailed information about options this script is configuring see:\n'
+ 'https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options\n'
+ "Create a private fork of 'WebKit' belonging to 'username' ([Yes]/No): \n"
+ 'Setup succeeded!\n',
+ )
self.assertEqual(captured.stderr.getvalue(), '')
self.assertEqual(
captured.root.log.getvalue(),
@@ -80,7 +86,12 @@
self.assertEqual('auto', config.get('color.branch', ''))
self.assertEqual('true', config.get('pull.rebase', ''))
- self.assertEqual(captured.stdout.getvalue(), 'Setup succeeded!\n')
+ self.assertEqual(
+ captured.stdout.getvalue(),
+ 'For detailed information about options this script is configuring see:\n'
+ 'https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options\n'
+ 'Setup succeeded!\n',
+ )
self.assertEqual(captured.stderr.getvalue(), '')
self.assertEqual(
captured.root.log.getvalue(),
@@ -120,7 +131,9 @@
programs = ['default'] + [p.name for p in Editor.programs()]
self.assertEqual(
captured.stdout.getvalue(),
- '''Set '[email protected]' as the git user email for this repository ([Yes]/No):
+ '''For detailed information about options this script is configuring see:
+https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options
+Set '[email protected]' as the git user email for this repository ([Yes]/No):
Enter git user email for this repository:
Set 'Tim Apple' as the git user name for this repository ([Yes]/No):
Enter git user name for this repository:
