Changeset 290661 in webkit

Timestamp:

Mar 1, 2022, 11:07:21 AM (5 years ago)

Author:

Jonathan Bedard

Message:

[git-webkit] Gate information URL on initial setup
​https://bugs.webkit.org/show_bug.cgi?id=237325
<rdar://problem/89620175>

Reviewed by Aakash Jain.

• 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.main): Offer to open documentation URL if repository has not been setup.

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

(TestSetup.test_github):

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

Location:

trunk/Tools

Files:

• ChangeLog (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/setup_unittest.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2022-03-01  Jonathan Bedard  <jbedard@apple.com>
+
+        [git-webkit] Gate information URL on initial setup
+        https://bugs.webkit.org/show_bug.cgi?id=237325
+        <rdar://problem/89620175>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+        (Setup.main): Offer to open documentation URL if repository has not been setup.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+        (TestSetup.test_github):
+
 2022-03-01  J Pascoe  <j_pascoe@apple.com>
 

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

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='4.3.3',
+    version='4.3.4',
     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(4, 3, 3)
+version = Version(4, 3, 4)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

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

@@ -302 +302 @@
     @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):
+            if 'true' != repository.config().get('webkitscmpy.setup', ''):
+                info_url = 'https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options'
+                print('For detailed information about the options configured by this script, please see:\n{}'.format(info_url))
+                if not args.defaults and Terminal.choose("Would you like to open this URL in your browser?", default='Yes') == 'Yes':
+                    run(['open', info_url])
+                print('\n')
+
             result = cls.git(args, repository, **kwargs)
-            print('Setup failed' if result else 'Setup succeeded!')
+
+            if result:
+                print('Setup failed')
+            else:
+                print('Setup succeeded!')
+                run(
+                    [local.Git.executable(), 'config', 'webkitscmpy.setup', 'true'],
+                    capture_output=True,
+                    cwd=repository.root_path,
+                )
+
             return result
 

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

@@ -55 +55 @@
         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',
@@ -89 +87 @@
         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'
+            'For detailed information about the options configured by this script, please see:\n'
+            'https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options\n\n\n'
             'Setup succeeded!\n',
         )
@@ -112 +110 @@
         self.maxDiff = None
         with OutputCapture(level=logging.INFO) as captured, mocks.remote.GitHub() as remote, \
-            MockTerminal.input('n', 'committer@webkit.org', 'n', 'Committer', 'n', 'overwrite', 'disabled', '1', 'y', 'y'), \
+            MockTerminal.input('n', 'n', 'committer@webkit.org', 'n', 'Committer', 'n', 'overwrite', 'disabled', '1', 'y', 'y'), \
             mocks.local.Git(self.path, remote='https://{}.git'.format(remote.remote)) as repo, \
             wkmocks.Environment(EMAIL_ADDRESS=''):
@@ -132 +130 @@
         self.assertEqual(
             captured.stdout.getvalue(),
-            '''For detailed information about options this script is configuring see:
+            '''For detailed information about the options configured by this script, please see:
 https://github.com/WebKit/WebKit/wiki/Git-Config#Configuration-Options
+Would you like to open this URL in your browser? ([Yes]/No): 
+
+
 Set 'tapple@webkit.org' as the git user email for this repository ([Yes]/No): 
 Enter git user email for this repository: