from:"jbedard"

[webkit-changes] [286271] trunk/Tools

2021-11-29 Thread jbedard

Title: [286271] trunk/Tools








Revision 286271
Author jbed...@apple.com
Date 2021-11-29 16:02:13 -0800 (Mon, 29 Nov 2021)


Log Message
[webkitscmpy] Guard git-webkit with __name__
https://bugs.webkit.org/show_bug.cgi?id=233278

Reviewed by Stephanie Lewis and Dewei Zhu.

* Scripts/libraries/webkitscmpy/git-webkit:

Canonical link: https://commits.webkit.org/244632@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/git-webkit




Diff

Modified: trunk/Tools/ChangeLog (286270 => 286271)

--- trunk/Tools/ChangeLog	2021-11-29 23:58:33 UTC (rev 286270)
+++ trunk/Tools/ChangeLog	2021-11-30 00:02:13 UTC (rev 286271)
@@ -1,5 +1,14 @@
 2021-11-29  Jonathan Bedard  
 
+[webkitscmpy] Guard git-webkit with __name__
+https://bugs.webkit.org/show_bug.cgi?id=233278
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/git-webkit:
+
+2021-11-29  Jonathan Bedard  
+
 [webkitcorepy] Delete unused environment variables
 https://bugs.webkit.org/show_bug.cgi?id=233565
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/git-webkit (286270 => 286271)

--- trunk/Tools/Scripts/libraries/webkitscmpy/git-webkit	2021-11-29 23:58:33 UTC (rev 286270)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/git-webkit	2021-11-30 00:02:13 UTC (rev 286271)
@@ -27,4 +27,5 @@
 from webkitscmpy import program
 
 
-sys.exit(program.main())
+if '__main__' == __name__:
+sys.exit(program.main())






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [286263] trunk/Tools

2021-11-29 Thread jbedard

Title: [286263] trunk/Tools








Revision 286263
Author jbed...@apple.com
Date 2021-11-29 14:29:50 -0800 (Mon, 29 Nov 2021)


Log Message
[webkitcorepy] Delete unused environment variables
https://bugs.webkit.org/show_bug.cgi?id=233565


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/environment.py:
(Environment.__init__): Keep track of sure environment files.
(Environment.load): Ditto.
(Environment.secure): Delete all unused environment files, since they may contain credentials.
* Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py:
(TestEnvironment.test_secure):

Canonical link: https://commits.webkit.org/244626@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (286262 => 286263)

--- trunk/Tools/ChangeLog	2021-11-29 22:04:59 UTC (rev 286262)
+++ trunk/Tools/ChangeLog	2021-11-29 22:29:50 UTC (rev 286263)
@@ -1,3 +1,20 @@
+2021-11-29  Jonathan Bedard  
+
+[webkitcorepy] Delete unused environment variables
+https://bugs.webkit.org/show_bug.cgi?id=233565
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/environment.py:
+(Environment.__init__): Keep track of sure environment files.
+(Environment.load): Ditto.
+(Environment.secure): Delete all unused environment files, since they may contain credentials.
+* Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py:
+(TestEnvironment.test_secure):
+
 2021-11-29  Lauro Moura  
 
 [webkitcorepy] Environment: Sort values before comparing in unittest


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (286262 => 286263)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-29 22:04:59 UTC (rev 286262)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-29 22:29:50 UTC (rev 286263)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.12.2',
+version='0.12.3',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (286262 => 286263)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-29 22:04:59 UTC (rev 286262)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-29 22:29:50 UTC (rev 286263)
@@ -44,7 +44,7 @@
 from webkitcorepy.editor import Editor
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 12, 2)
+version = Version(0, 12, 3)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py (286262 => 286263)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py	2021-11-29 22:04:59 UTC (rev 286262)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py	2021-11-29 22:29:50 UTC (rev 286263)
@@ -38,6 +38,7 @@
 self._mapping = dict()
 self.path = path
 self._divider = divider
+self._paths = set()
 
 def load(self, *prefixes):
 if not self.path:
@@ -46,6 +47,7 @@
 prefix, key = file.split(self._divider, 1) if self._divider in file else (None, file)
 if prefix and prefix not in prefixes:
 continue
+self._paths.add(os.path.join(self.path, file))
 with open(os.path.join(self.path, file), 'r') as fl:
 self._mapping[key] = fl.read().rstrip('\n')
 return self
@@ -55,6 +57,19 @@
 return os.environ[key]
 return self._mapping.get(key)
 
+def secure(self, *extra_paths):
+'''Delete unused environment files in self.path along with the provided extra paths'''
+
+for file in os.listdir(self.path):
+path = os.path.join(self.path, file)
+if path not in self._paths:
+os.remove(path)
+for path in extra_paths:
+if os.path.isfile(path):
+os.remove(path)
+if os.path.exists(path):
+raise OSError("Failed to delete '{}' when securing credentials".format(path))
+
 def __getitem__(self, key):
 result = self.get(key)
 if not result:


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unitte

[webkit-changes] [286076] trunk/Tools

2021-11-19 Thread jbedard

Title: [286076] trunk/Tools








Revision 286076
Author jbed...@apple.com
Date 2021-11-19 14:00:09 -0800 (Fri, 19 Nov 2021)


Log Message
[webkitcorepy] Indicate to user the default option
https://bugs.webkit.org/show_bug.cgi?id=233342


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

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py




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  
+
+[webkitcorepy] Indicate to user the default option
+https://bugs.webkit.org/show_bug.cgi?id=233342
+
+
+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  
 
 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))]
+

[webkit-changes] [286074] trunk/Tools

2021-11-19 Thread jbedard

Title: [286074] trunk/Tools








Revision 286074
Author jbed...@apple.com
Date 2021-11-19 13:35:00 -0800 (Fri, 19 Nov 2021)


Log Message
[resultsdbpy] Move AuthedBlueprint to webkitflaskpy
https://bugs.webkit.org/show_bug.cgi?id=29


Reviewed by Ryan Haddad.

* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
* Scripts/libraries/resultsdbpy/resultsdbpy/controller/api_routes.py: Import
AuthedBlueprint from webkitflaskpy.
* Scripts/libraries/resultsdbpy/resultsdbpy/view/view_routes.py: Ditto.
* Scripts/libraries/resultsdbpy/setup.py: Bump version.
* Scripts/libraries/webkitflaskpy/setup.py: Ditto.
* Scripts/libraries/webkitflaskpy/webkitflaskpy/__init__.py: Bump Export object.
* Scripts/libraries/webkitflaskpy/webkitflaskpy/authed_blueprint.py: Renamed from
Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/authed_blueprint.py.

Canonical link: https://commits.webkit.org/244461@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/api_routes.py
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/view_routes.py
trunk/Tools/Scripts/libraries/resultsdbpy/setup.py
trunk/Tools/Scripts/libraries/webkitflaskpy/setup.py
trunk/Tools/Scripts/libraries/webkitflaskpy/webkitflaskpy/__init__.py


Added Paths

trunk/Tools/Scripts/libraries/webkitflaskpy/webkitflaskpy/authed_blueprint.py


Removed Paths

trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/authed_blueprint.py




Diff

Modified: trunk/Tools/ChangeLog (286073 => 286074)

--- trunk/Tools/ChangeLog	2021-11-19 21:20:53 UTC (rev 286073)
+++ trunk/Tools/ChangeLog	2021-11-19 21:35:00 UTC (rev 286074)
@@ -1,3 +1,21 @@
+2021-11-18  Jonathan Bedard  
+
+[resultsdbpy] Move AuthedBlueprint to webkitflaskpy
+https://bugs.webkit.org/show_bug.cgi?id=29
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
+* Scripts/libraries/resultsdbpy/resultsdbpy/controller/api_routes.py: Import
+AuthedBlueprint from webkitflaskpy.
+* Scripts/libraries/resultsdbpy/resultsdbpy/view/view_routes.py: Ditto.
+* Scripts/libraries/resultsdbpy/setup.py: Bump version.
+* Scripts/libraries/webkitflaskpy/setup.py: Ditto.
+* Scripts/libraries/webkitflaskpy/webkitflaskpy/__init__.py: Bump Export object.
+* Scripts/libraries/webkitflaskpy/webkitflaskpy/authed_blueprint.py: Renamed from
+Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/authed_blueprint.py.
+
 2021-11-19  Brent Fulgham  
 
 Add support for web app manifest icons in WebKit/UI Process layer


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py (286073 => 286074)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-11-19 21:20:53 UTC (rev 286073)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-11-19 21:35:00 UTC (rev 286074)
@@ -44,7 +44,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(3, 1, 4)
+version = Version(3, 1, 5)
 
 import webkitflaskpy
 


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/api_routes.py (286073 => 286074)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/api_routes.py	2021-11-19 21:20:53 UTC (rev 286073)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/api_routes.py	2021-11-19 21:35:00 UTC (rev 286074)
@@ -30,7 +30,7 @@
 from resultsdbpy.controller.suite_controller import SuiteController
 from resultsdbpy.controller.test_controller import TestController
 from resultsdbpy.controller.upload_controller import UploadController
-from resultsdbpy.flask_support.authed_blueprint import AuthedBlueprint
+from webkitflaskpy import AuthedBlueprint
 from werkzeug.exceptions import HTTPException
 
 


Deleted: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/authed_blueprint.py (286073 => 286074)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/authed_blueprint.py	2021-11-19 21:20:53 UTC (rev 286073)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/authed_blueprint.py	2021-11-19 21:35:00 UTC (rev 286074)
@@ -1,34 +0,0 @@
-# Copyright (C) 2019 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTW

[webkit-changes] [286028] trunk/Tools

2021-11-18 Thread jbedard

Title: [286028] trunk/Tools








Revision 286028
Author jbed...@apple.com
Date 2021-11-18 14:10:11 -0800 (Thu, 18 Nov 2021)


Log Message
Link Python packages to GitHub
https://bugs.webkit.org/show_bug.cgi?id=233318


Reviewed by Stephanie Lewis.

* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
* Scripts/libraries/resultsdbpy/setup.py: Bump version, link to GitHub.
* Scripts/libraries/webkitcorepy/setup.py: Bump version, link to GitHub.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version.
* Scripts/libraries/webkitflaskpy/setup.py: Bump version, link to GitHub.
* Scripts/libraries/webkitflaskpy/webkitflaskpy/__init__.py: Bump version.
* Scripts/libraries/webkitscmpy/setup.py: Bump version, link to GitHub.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.

Canonical link: https://commits.webkit.org/244416@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py
trunk/Tools/Scripts/libraries/resultsdbpy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitflaskpy/setup.py
trunk/Tools/Scripts/libraries/webkitflaskpy/webkitflaskpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py




Diff

Modified: trunk/Tools/ChangeLog (286027 => 286028)

--- trunk/Tools/ChangeLog	2021-11-18 21:57:15 UTC (rev 286027)
+++ trunk/Tools/ChangeLog	2021-11-18 22:10:11 UTC (rev 286028)
@@ -1,3 +1,20 @@
+2021-11-18  Jonathan Bedard  
+
+Link Python packages to GitHub
+https://bugs.webkit.org/show_bug.cgi?id=233318
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
+* Scripts/libraries/resultsdbpy/setup.py: Bump version, link to GitHub.
+* Scripts/libraries/webkitcorepy/setup.py: Bump version, link to GitHub.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version.
+* Scripts/libraries/webkitflaskpy/setup.py: Bump version, link to GitHub.
+* Scripts/libraries/webkitflaskpy/webkitflaskpy/__init__.py: Bump version.
+* Scripts/libraries/webkitscmpy/setup.py: Bump version, link to GitHub.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
+
 2021-10-26  Carlos Garcia Campos  
 
 [GTK][a11y] Add implementation of value interface when building with ATSPI


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py (286027 => 286028)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-11-18 21:57:15 UTC (rev 286027)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-11-18 22:10:11 UTC (rev 286028)
@@ -44,7 +44,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(3, 1, 3)
+version = Version(3, 1, 4)
 
 import webkitflaskpy
 


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/setup.py (286027 => 286028)

--- trunk/Tools/Scripts/libraries/resultsdbpy/setup.py	2021-11-18 21:57:15 UTC (rev 286027)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/setup.py	2021-11-18 22:10:11 UTC (rev 286028)
@@ -30,7 +30,7 @@
 
 setup(
 name='resultsdbpy',
-version='3.1.3',
+version='3.1.4',
 description='Library for visualizing, processing and storing test results.',
 long_description=readme(),
 classifiers=[
@@ -45,7 +45,7 @@
 'Topic :: Software Development :: Testing',
 ],
 keywords='database history results testing webkit',
-url='',
+url='',
 author='Jonathan Bedard',
 author_email='jbed...@apple.com',
 license='Modified BSD',


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (286027 => 286028)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-18 21:57:15 UTC (rev 286027)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-18 22:10:11 UTC (rev 286028)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.12.0',
+version='0.12.1',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[
@@ -43,7 +43,7 @@
 'Topic :: Software Development :: Libraries :: Python Modules',
 ],
 keywords='python unicode',
-url='',
+url='',
 author='Jonathan Bedard',
 author_email='jbed...@apple.com',
 license='Modified BSD',


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (286027 => 286028)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-18 21:57:15 UTC (rev 286027)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-18 22:10:11 UTC (rev 286028)
@@ -44,7 +44,7 @@
 from webkitcorepy.editor import Editor
 from webkitcorepy.file_l

[webkit-changes] [285900] trunk/Tools

2021-11-16 Thread jbedard

Title: [285900] trunk/Tools








Revision 285900
Author jbed...@apple.com
Date 2021-11-16 16:56:19 -0800 (Tue, 16 Nov 2021)


Log Message
[webkitscmpy] Load secrets in kubernetes
https://bugs.webkit.org/show_bug.cgi?id=233158


Reviewed by Dewei Zhu.

* Tools/Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version, export Environment.
* Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py:
(credentials): Use Environment instead of os.environ.
* Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py: Added.
(Environment):
(Environment.instance): Construct a shared Environmant intance.
(Environment.__init__):
(Environment.load): Load secrets in file directory.
(Environment.get): Check environment variable and then secret store.
(Environment.__getitem__):
(Environment.__setitem__):
(Environment.keys): Iterate through secret store and environment variables.
(Environment.values): Ditto.
(Environment.items): Ditto.
* Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py: Added.
(TestEnvironment):
(TestEnvironment.test_basic):
(TestEnvironment.test_scoped):
(TestEnvironment.test_list):

Canonical link: https://commits.webkit.org/244316@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py


Added Paths

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285899 => 285900)

--- trunk/Tools/ChangeLog	2021-11-17 00:31:49 UTC (rev 285899)
+++ trunk/Tools/ChangeLog	2021-11-17 00:56:19 UTC (rev 285900)
@@ -1,3 +1,32 @@
+2021-11-16  Jonathan Bedard  
+
+[webkitscmpy] Load secrets in kubernetes
+https://bugs.webkit.org/show_bug.cgi?id=233158
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version, export Environment.
+* Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py:
+(credentials): Use Environment instead of os.environ.
+* Scripts/libraries/webkitcorepy/webkitcorepy/environment.py: Added.
+(Environment):
+(Environment.instance): Construct a shared Environmant intance.
+(Environment.__init__):
+(Environment.load): Load secrets in file directory.
+(Environment.get): Check environment variable and then secret store.
+(Environment.__getitem__):
+(Environment.__setitem__):
+(Environment.keys): Iterate through secret store and environment variables.
+(Environment.values): Ditto.
+(Environment.items): Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py: Added.
+(TestEnvironment):
+(TestEnvironment.test_basic):
+(TestEnvironment.test_scoped):
+(TestEnvironment.test_list):
+
 2021-11-12  Jonathan Bedard  
 
 [git-webkit] Mark landed changes as merged


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (285899 => 285900)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-17 00:31:49 UTC (rev 285899)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-17 00:56:19 UTC (rev 285900)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.11.4',
+version='0.12.0',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (285899 => 285900)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-17 00:31:49 UTC (rev 285899)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-17 00:56:19 UTC (rev 285900)
@@ -36,6 +36,7 @@
 from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
 from webkitcorepy.task_pool import TaskPool
 from webkitcorepy.terminal import Terminal
+from webkitcorepy.environment import Environment
 from webkitcorepy.credentials import credentials
 from webkitcorepy.measure_time import MeasureTime
 from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
@@ -43,7 +44,7 @@
 from webkitcorepy.editor import Editor
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 11, 4)
+version = Version(0, 12, 0)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py (285899 => 285900)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py	2021-11-17 00:31:49 UTC (rev 285899)
+++ trunk/Tools/Script

[webkit-changes] [285890] trunk/Tools

2021-11-16 Thread jbedard

Title: [285890] trunk/Tools








Revision 285890
Author jbed...@apple.com
Date 2021-11-16 14:55:52 -0800 (Tue, 16 Nov 2021)


Log Message
[git-webkit] Mark landed changes as merged
https://bugs.webkit.org/show_bug.cgi?id=233056


Reviewed by Dewei Zhu.

For BitBucket and GitHub to recognize a pull-request as merged, the target
branch must be updated with the exact commit to be merged as the merge occurs.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
(Land.main): Update source branch when merging commits to target branch.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.update): Only delete values if they exist.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
(TestLand):
(TestLandGitHub):
(TestLandBitBucket):

Canonical link: https://commits.webkit.org/244312@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285889 => 285890)

--- trunk/Tools/ChangeLog	2021-11-16 22:53:58 UTC (rev 285889)
+++ trunk/Tools/ChangeLog	2021-11-16 22:55:52 UTC (rev 285890)
@@ -1,3 +1,25 @@
+2021-11-12  Jonathan Bedard  
+
+[git-webkit] Mark landed changes as merged
+https://bugs.webkit.org/show_bug.cgi?id=233056
+
+
+Reviewed by Dewei Zhu.
+
+For BitBucket and GitHub to recognize a pull-request as merged, the target
+branch must be updated with the exact commit to be merged as the merge occurs.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
+(Land.main): Update source branch when merging commits to target branch.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
+(BitBucket.PRGenerator.update): Only delete values if they exist.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
+(TestLand):
+(TestLandGitHub):
+(TestLandBitBucket):
+
 2021-11-16  Chris Dumez  
 
 Crash under WebKit::WebPageProxy::commitProvisionalPage()


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py (285889 => 285890)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py	2021-11-16 22:53:58 UTC (rev 285889)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py	2021-11-16 22:55:52 UTC (rev 285890)
@@ -27,9 +27,10 @@
 from .canonicalize import Canonicalize
 from .command import Command
 from .branch import Branch
+from .pull_request import PullRequest
 from argparse import Namespace
 from webkitcorepy import arguments, run, string_utils, Terminal
-from webkitscmpy import local, log
+from webkitscmpy import local, log, remote
 
 
 class Land(Command):
@@ -75,11 +76,12 @@
 sys.stderr.write("Cannot 'land' on a canonical SVN repository that is not configured as git-svn\n")
 return 1
 
-if not Branch.editable(repository.branch, repository=repository):
+source_branch = repository.branch
+if not Branch.editable(source_branch, repository=repository):
 sys.stderr.write("Can only 'land' editable branches\n")
 return 1
 branch_point = Branch.branch_point(repository)
-commits = list(repository.commits(begin=dict(hash=branch_point.hash), end=dict(branch=repository.branch)))
+commits = list(repository.commits(begin=dict(hash=branch_point.hash), end=dict(branch=source_branch)))
 if not commits:
 sys.stderr.write('Failed to find commits to land\n')
 return 1
@@ -87,11 +89,11 @@
 pull_request = None
 rmt = repository.remote()
 if rmt and rmt.pull_requests:
-candidates = list(rmt.pull_requests.find(opened=True, head=repository.branch))
+candidates = list(rmt.pull_requests.find(opened=True, head=source_branch))
 if len(candidates) == 1:
 pull_request = candidates[0]
 elif candidates:
-sys.stderr.write("Multiple pull-request match '{}'\n".format(repository.branch))
+sys.stderr.write("Multiple pull-request match '{}'\n".format(source_branch))
 
 if pull_request and args.review:
 if pull_request.blockers:
@@ -118,17 +120,17 @@
 '--env-filter', "GIT_AUTHOR_DATE='{date}';GIT_COMMITTER_DATE='{date}'".format(
 date='{} -{}'.format(int(time.time()), repository.gmtoffset())
 ), '--msg-filter', 'sed "s/NOBODY (OO*PP*S!*)/{}/g"'.format(string_utils

[webkit-changes] [285871] trunk

2021-11-16 Thread jbedard

Title: [285871] trunk








Revision 285871
Author jbed...@apple.com
Date 2021-11-16 09:47:29 -0800 (Tue, 16 Nov 2021)


Log Message
Add my GitHub username to contributors.json

Reviewed by Jonathan Bedard

* metadata/contributors.json:

Canonical link: https://commits.webkit.org/244297@main

Modified Paths

trunk/ChangeLog
trunk/metadata/contributors.json




Diff

Modified: trunk/ChangeLog (285870 => 285871)

--- trunk/ChangeLog	2021-11-16 17:39:10 UTC (rev 285870)
+++ trunk/ChangeLog	2021-11-16 17:47:29 UTC (rev 285871)
@@ -1,3 +1,11 @@
+2021-11-16  Alex Atwater  
+
+Add my GitHub username to contributors.json
+
+Reviewed by Jonathan Bedard
+
+* metadata/contributors.json:
+
 2021-11-15  Nikolas Zimmermann  
 
 Add my GitHub username to contributors.json


Modified: trunk/metadata/contributors.json (285870 => 285871)

--- trunk/metadata/contributors.json	2021-11-16 17:39:10 UTC (rev 285870)
+++ trunk/metadata/contributors.json	2021-11-16 17:47:29 UTC (rev 285871)
@@ -315,6 +315,14 @@
},
{
   "emails" : [
+ "alexandera...@apple.com"
+  ],
+  "expertise" : "Python, Services, Kubernetes",
+  "github" : "akath20",
+  "name" : "Alex Atwater"
+   },
+   {
+  "emails" : [
  "achristen...@apple.com",
  "achristen...@webkit.org",
  "alex.christen...@flexsim.com"
@@ -7038,4 +7046,4 @@
   ],
   "status" : "reviewer"
}
-]
+]
\ No newline at end of file






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [285779] trunk/Tools

2021-11-13 Thread jbedard

Title: [285779] trunk/Tools








Revision 285779
Author jbed...@apple.com
Date 2021-11-13 13:58:50 -0800 (Sat, 13 Nov 2021)


Log Message
Unreviewed, reverting r285772.

Ownership issues in some XCode installs

Reverted changeset:

"[webkitpy] Symlink daemons into simulator runtime root"
https://bugs.webkit.org/show_bug.cgi?id=233080
https://commits.webkit.org/r285772

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/api_tests/manager.py
trunk/Tools/Scripts/webkitpy/common/system/filesystem.py
trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
trunk/Tools/Scripts/webkitpy/port/darwin.py
trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py
trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285778 => 285779)

--- trunk/Tools/ChangeLog	2021-11-13 21:57:32 UTC (rev 285778)
+++ trunk/Tools/ChangeLog	2021-11-13 21:58:50 UTC (rev 285779)
@@ -1,3 +1,15 @@
+2021-11-13  Jonathan Bedard  
+
+Unreviewed, reverting r285772.
+
+Ownership issues in some XCode installs
+
+Reverted changeset:
+
+"[webkitpy] Symlink daemons into simulator runtime root"
+https://bugs.webkit.org/show_bug.cgi?id=233080
+https://commits.webkit.org/r285772
+
 2021-11-13  Tyler Wilcock  
 
 AX: Make accessibility/mac/header.html test async to fix it for isolated tree mode


Modified: trunk/Tools/Scripts/webkitpy/api_tests/manager.py (285778 => 285779)

--- trunk/Tools/Scripts/webkitpy/api_tests/manager.py	2021-11-13 21:57:32 UTC (rev 285778)
+++ trunk/Tools/Scripts/webkitpy/api_tests/manager.py	2021-11-13 21:58:50 UTC (rev 285779)
@@ -152,22 +152,6 @@
 def _initialize_devices(self):
 if 'simulator' in self._port.port_name:
 SimulatedDeviceManager.initialize_devices(DeviceRequest(self._port.DEVICE_TYPE, allow_incomplete_match=True), self.host, simulator_ui=False)
-
-# A Daemons executable path must be located within the runtime root.
-roots = {
-device.platform_device.runtime.root for device in SimulatedDeviceManager.INITIALIZED_DEVICES
-if device.platform_device.runtime and device.platform_device.runtime.root
-}
-fs = self._port.host.filesystem
-for root in roots:
-_log.debug("Linking Daemons into runtime root '{}'".format(root))
-for file in fs.files_under(self._port.path_to_daemons()):
-target = fs.join(root, 'usr', 'local', 'bin', 'webkit-testing', fs.basename(file))
-fs.maybe_make_directory(fs.dirname(target))
-if fs.isfile(target):
-fs.remove(target)
-fs.symlink(file, target)
-
 elif 'device' in self._port.port_name:
 raise RuntimeError('Running api tests on {} is not supported'.format(self._port.port_name))
 


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (285778 => 285779)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-11-13 21:57:32 UTC (rev 285778)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-11-13 21:58:50 UTC (rev 285779)
@@ -339,6 +339,3 @@
 self.copytree(source, destination)
 else:
 self.copyfile(source, destination)
-
-def symlink(self, *args, **kwargs):
-os.symlink(*args, **kwargs)


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py (285778 => 285779)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py	2021-11-13 21:57:32 UTC (rev 285778)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py	2021-11-13 21:58:50 UTC (rev 285779)
@@ -436,10 +436,7 @@
 def copy_from_base_host(self, source, destination):
 self.move(source, destination)
 
-def symlink(self, src, dst):
-self.move(src, dst)
 
-
 class WritableBinaryFileObject(object):
 def __init__(self, fs, path):
 self.fs = fs


Modified: trunk/Tools/Scripts/webkitpy/port/darwin.py (285778 => 285779)

--- trunk/Tools/Scripts/webkitpy/port/darwin.py	2021-11-13 21:57:32 UTC (rev 285778)
+++ trunk/Tools/Scripts/webkitpy/port/darwin.py	2021-11-13 21:58:50 UTC (rev 285779)
@@ -82,9 +82,6 @@
 def _path_to_webcore_library(self):
 return self._build_path('WebCore.framework/Versions/A/WebCore')
 
-def path_to_daemons(self):
-return self._build_path('WebKit.framework/Daemons')
-
 def show_results_html_file(self, results_filename):
 # We don't use self._run_script() because we don't want to wait for the script
 # to exit and we want the output to show up on stdout in case there are errors


Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (285778 => 285779)

--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2021-11-13 21:57:32 UTC (rev 285778)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2021-11-13 21:58:50 UTC (rev 2

[webkit-changes] [285772] trunk/Tools

2021-11-12 Thread jbedard

Title: [285772] trunk/Tools








Revision 285772
Author jbed...@apple.com
Date 2021-11-12 20:45:28 -0800 (Fri, 12 Nov 2021)


Log Message
[webkitpy] Symlink daemons into simulator runtime root
https://bugs.webkit.org/show_bug.cgi?id=233080


Reviewed by Brady Eidson.

* Scripts/webkitpy/api_tests/manager.py:
(Manager._initialize_devices): Symlink daemons in the WebKit.framework into
simulator runtime root.
* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.symlink):
* Scripts/webkitpy/common/system/filesystem_mock.py:
(MockFileSystem.symlink):
* Scripts/webkitpy/port/darwin.py:
(DarwinPort.path_to_daemons):
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager.Runtime.__init__): Add root.
(SimulatedDeviceManager._create_device_with_runtime): Pass runtime.
(SimulatedDevice.__init__): Link to runtime.
* Scripts/webkitpy/xcode/simulated_device_unittest.py:

Canonical link: https://commits.webkit.org/244216@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/api_tests/manager.py
trunk/Tools/Scripts/webkitpy/common/system/filesystem.py
trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
trunk/Tools/Scripts/webkitpy/port/darwin.py
trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py
trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285771 => 285772)

--- trunk/Tools/ChangeLog	2021-11-13 03:22:14 UTC (rev 285771)
+++ trunk/Tools/ChangeLog	2021-11-13 04:45:28 UTC (rev 285772)
@@ -1,3 +1,26 @@
+2021-11-12  Jonathan Bedard  
+
+[webkitpy] Symlink daemons into simulator runtime root
+https://bugs.webkit.org/show_bug.cgi?id=233080
+
+
+Reviewed by Brady Eidson.
+
+* Scripts/webkitpy/api_tests/manager.py:
+(Manager._initialize_devices): Symlink daemons in the WebKit.framework into
+simulator runtime root.
+* Scripts/webkitpy/common/system/filesystem.py:
+(FileSystem.symlink):
+* Scripts/webkitpy/common/system/filesystem_mock.py:
+(MockFileSystem.symlink):
+* Scripts/webkitpy/port/darwin.py:
+(DarwinPort.path_to_daemons):
+* Scripts/webkitpy/xcode/simulated_device.py:
+(SimulatedDeviceManager.Runtime.__init__): Add root.
+(SimulatedDeviceManager._create_device_with_runtime): Pass runtime.
+(SimulatedDevice.__init__): Link to runtime.
+* Scripts/webkitpy/xcode/simulated_device_unittest.py:
+
 2021-11-12  Darin Adler  
 
 Make sort-Xcode-project-file idempotent


Modified: trunk/Tools/Scripts/webkitpy/api_tests/manager.py (285771 => 285772)

--- trunk/Tools/Scripts/webkitpy/api_tests/manager.py	2021-11-13 03:22:14 UTC (rev 285771)
+++ trunk/Tools/Scripts/webkitpy/api_tests/manager.py	2021-11-13 04:45:28 UTC (rev 285772)
@@ -152,6 +152,22 @@
 def _initialize_devices(self):
 if 'simulator' in self._port.port_name:
 SimulatedDeviceManager.initialize_devices(DeviceRequest(self._port.DEVICE_TYPE, allow_incomplete_match=True), self.host, simulator_ui=False)
+
+# A Daemons executable path must be located within the runtime root.
+roots = {
+device.platform_device.runtime.root for device in SimulatedDeviceManager.INITIALIZED_DEVICES
+if device.platform_device.runtime and device.platform_device.runtime.root
+}
+fs = self._port.host.filesystem
+for root in roots:
+_log.debug("Linking Daemons into runtime root '{}'".format(root))
+for file in fs.files_under(self._port.path_to_daemons()):
+target = fs.join(root, 'usr', 'local', 'bin', 'webkit-testing', fs.basename(file))
+fs.maybe_make_directory(fs.dirname(target))
+if fs.isfile(target):
+fs.remove(target)
+fs.symlink(file, target)
+
 elif 'device' in self._port.port_name:
 raise RuntimeError('Running api tests on {} is not supported'.format(self._port.port_name))
 


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (285771 => 285772)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-11-13 03:22:14 UTC (rev 285771)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-11-13 04:45:28 UTC (rev 285772)
@@ -339,3 +339,6 @@
 self.copytree(source, destination)
 else:
 self.copyfile(source, destination)
+
+def symlink(self, *args, **kwargs):
+os.symlink(*args, **kwargs)


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py (285771 => 285772)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py	2021-11-13 03:22:14 UTC (rev 285771)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py	2021-11-13 04:45:28 UTC (rev 285772)
@@ -436,7 +436,10 @@
 def copy_from_base_host(self, source, destination):
 self.move(source, de

[webkit-changes] [285765] trunk/Tools

2021-11-12 Thread jbedard

Title: [285765] trunk/Tools








Revision 285765
Author jbed...@apple.com
Date 2021-11-12 17:16:24 -0800 (Fri, 12 Nov 2021)


Log Message
[git-webkit] Checkout pull-requests
https://bugs.webkit.org/show_bug.cgi?id=233042


Reviewed by Dewei Zhu.

In GitHub, pull-requests are somewhat difficult to checkout because they're
attached to a specific user's mirror of WebKit. Automate this process.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init.py__: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git): Add username:branch regex.
(Git.checkout): Allow checking out of branches by username:branch.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add `git checkout -B`.
(Git.checkout): `-B` will force checkout a branch, even if one already exists.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub): Embed error message in 404 response.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/checkout.py:
(Checkout.main): Allow direct checkout of pull-request instead of relying
exclusively on branches.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/clean.py:
(Clean.main): Add newline.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py:
(TestCheckout.test_no_pr_github):
(TestCheckout.test_no_pr_bitbucket):
(TestCheckout.test_pr_github):
(TestCheckout.test_pr_bitbucket):

Canonical link: https://commits.webkit.org/244211@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/checkout.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/clean.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285764 => 285765)

--- trunk/Tools/ChangeLog	2021-11-13 01:16:04 UTC (rev 285764)
+++ trunk/Tools/ChangeLog	2021-11-13 01:16:24 UTC (rev 285765)
@@ -1,3 +1,35 @@
+2021-11-12  Jonathan Bedard  
+
+[git-webkit] Checkout pull-requests
+https://bugs.webkit.org/show_bug.cgi?id=233042
+
+
+Reviewed by Dewei Zhu.
+
+In GitHub, pull-requests are somewhat difficult to checkout because they're
+attached to a specific user's mirror of WebKit. Automate this process.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init.py__: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git): Add username:branch regex.
+(Git.checkout): Allow checking out of branches by username:branch.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+(Git.__init__): Add `git checkout -B`.
+(Git.checkout): `-B` will force checkout a branch, even if one already exists.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub): Embed error message in 404 response.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/checkout.py:
+(Checkout.main): Allow direct checkout of pull-request instead of relying
+exclusively on branches.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/clean.py:
+(Clean.main): Add newline.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py:
+(TestCheckout.test_no_pr_github):
+(TestCheckout.test_no_pr_bitbucket):
+(TestCheckout.test_pr_github):
+(TestCheckout.test_pr_bitbucket):
+
 2021-11-12  Sihui Liu  
 
 Set default general storage directory to websiteDataDirectory


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (285764 => 285765)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-11-13 01:16:04 UTC (rev 285764)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-11-13 01:16:24 UTC (rev 285765)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='3.0.0',
+version='3.0.1',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285764 => 285765)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-13 01:16:04 UTC (rev 285764)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-13 01:16:24 UTC (rev 285765)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(3, 0, 0)
+version = Version(3, 0, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15,

[webkit-changes] [285733] trunk/Tools

2021-11-12 Thread jbedard

Title: [285733] trunk/Tools








Revision 285733
Author jbed...@apple.com
Date 2021-11-12 11:13:03 -0800 (Fri, 12 Nov 2021)


Log Message
[git-webkit] Open closed pull-request when running pr
https://bugs.webkit.org/show_bug.cgi?id=232765


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
(BitBucket.request): Ensure displayId is set when updating PR.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub.request): Make sure that new pull-requests are open.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.main): Open closed pull-requests.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.update): Only set head if user specifies head.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:

Canonical link: https://commits.webkit.org/244192@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285732 => 285733)

--- trunk/Tools/ChangeLog	2021-11-12 19:02:40 UTC (rev 285732)
+++ trunk/Tools/ChangeLog	2021-11-12 19:13:03 UTC (rev 285733)
@@ -1,3 +1,23 @@
+2021-11-05  Jonathan Bedard  
+
+[git-webkit] Open closed pull-request when running pr
+https://bugs.webkit.org/show_bug.cgi?id=232765
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
+(BitBucket.request): Ensure displayId is set when updating PR.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub.request): Make sure that new pull-requests are open.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.main): Open closed pull-requests.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+(GitHub.PRGenerator.update): Only set head if user specifies head.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+
 2021-11-12  Chris Dumez  
 
 Disable MathML when in Captive Portal Mode


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (285732 => 285733)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-12 19:02:40 UTC (rev 285732)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-11-12 19:13:03 UTC (rev 285733)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.11.3',
+version='0.11.4',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (285732 => 285733)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-12 19:02:40 UTC (rev 285732)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-11-12 19:13:03 UTC (rev 285733)
@@ -43,7 +43,7 @@
 from webkitcorepy.editor import Editor
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 11, 3)
+version = Version(0, 11, 4)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py (285732 => 285733)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py	2021-11-12 19:02:40 UTC (rev 285732)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py	2021-11-12 19:13:03 UTC (rev 285733)
@@ -221,8 +221,8 @@
 json['author'] = dict(user=dict(displayName='Tim Committer', emailAddress='commit...@webkit.org'))
 json['participants'] = [json['author']]
 json['id'] = 1 + max([0] + [pr.get('id', 0) for pr in self.pull_requests])
-json['fromRef']['displayId'] = json['fromRef']['id'].split('/')[-2:]
-json['toRef']['displayId'] = json['toRef']['id'].split('/')[-2:]
+json['fromRef']['displayId'] = '/'.join(json['fromRef']['id'].split('/')[-2:])
+json['toRef']['displayId'] = '/'.join(json['toRef']['id'].split('/')[-2:])
 json['state'] = 'OPEN'
 json['activities'] = []
 self.pull_requests.append(json)
@@ -240,6 +240,8 @@
 return mocks.Response.create404(url)

[webkit-changes] [285341] trunk/Tools

2021-11-05 Thread jbedard

Title: [285341] trunk/Tools








Revision 285341
Author jbed...@apple.com
Date 2021-11-05 09:10:33 -0700 (Fri, 05 Nov 2021)


Log Message
[ic-stats.py] Change shebang to Python 3
https://bugs.webkit.org/show_bug.cgi?id=232721


Reviewed by Alexey Proskuryakov.

* Scripts/ic-stats.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/ic-stats.py




Diff

Modified: trunk/Tools/ChangeLog (285340 => 285341)

--- trunk/Tools/ChangeLog	2021-11-05 08:23:38 UTC (rev 285340)
+++ trunk/Tools/ChangeLog	2021-11-05 16:10:33 UTC (rev 285341)
@@ -1,3 +1,13 @@
+2021-11-05  Jonathan Bedard  
+
+[ic-stats.py] Change shebang to Python 3
+https://bugs.webkit.org/show_bug.cgi?id=232721
+
+
+Reviewed by Alexey Proskuryakov.
+
+* Scripts/ic-stats.py:
+
 2021-11-05  Carlos Garcia Campos  
 
 [GTK][a11y] Embedded objects are not correctly handled by text interface with ATSPI


Modified: trunk/Tools/Scripts/ic-stats.py (285340 => 285341)

--- trunk/Tools/Scripts/ic-stats.py	2021-11-05 08:23:38 UTC (rev 285340)
+++ trunk/Tools/Scripts/ic-stats.py	2021-11-05 16:10:33 UTC (rev 285341)
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 # Copyright (C) 2019 Apple Inc. All rights reserved.
 #






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [285272] trunk/Tools

2021-11-04 Thread jbedard

Title: [285272] trunk/Tools








Revision 285272
Author jbed...@apple.com
Date 2021-11-04 11:44:52 -0700 (Thu, 04 Nov 2021)


Log Message
[git-webkit] Add land command
https://bugs.webkit.org/show_bug.cgi?id=231821


Reviewed by Dewei Zhu.

* Tools/Scripts/git-webkit: WebKit still uses Svn as it's canonical source of truth.
* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git._to_git_ref): Convert identifiers or revisions to git refs.
(Git.checkout): Use shared _to_git_ref function.
(Git.rebase): Support rebasing identifiers.
(Git.pull): Generalize computation of the gmtoffset.
(Git.diff_lines): Output diff between two refs.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add branch, push and diff commands.
(Git.filter_branch): Support sed.
(Git.pull): Mock `git pull`
(Git.move_branch): Mock `git rebase`.
(Git.push): Mock `git push`.
(Git.reset): Mock `git reset HEAD~#`.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
(main): Add land command.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py: Added.
(Land.parser):
(Land.main): Rebase the current branch against it's root, assign the reviewer, check for 'OOPS' messages,
rebase against target branch, update target branch ref, optionally canonicalize, push (or svn dcommit) and
update and close pull-request with information on the landed commit.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:
(ScmBase.gmtoffset): Add shared computation of GMT offset.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
(TestGit.test_commits): `git log` should exclude base ref.
(TestGit.test_commits_branch): Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py: Added.
(repository):
(TestLand):
(TestLandGitHub):
(TestLandBitBucket):

Canonical link: https://commits.webkit.org/243883@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py


Added Paths

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




Diff

Modified: trunk/Tools/ChangeLog (285271 => 285272)

--- trunk/Tools/ChangeLog	2021-11-04 18:15:20 UTC (rev 285271)
+++ trunk/Tools/ChangeLog	2021-11-04 18:44:52 UTC (rev 285272)
@@ -1,3 +1,45 @@
+2021-11-03  Jonathan Bedard  
+
+[git-webkit] Add land command
+https://bugs.webkit.org/show_bug.cgi?id=231821
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/git-webkit: WebKit still uses Svn as it's canonical source of truth.
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git._to_git_ref): Convert identifiers or revisions to git refs.
+(Git.checkout): Use shared _to_git_ref function.
+(Git.rebase): Support rebasing identifiers.
+(Git.pull): Generalize computation of the gmtoffset.
+(Git.diff_lines): Output diff between two refs.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+(Git.__init__): Add branch, push and diff commands.
+(Git.filter_branch): Support sed.
+(Git.pull): Mock `git pull`
+(Git.move_branch): Mock `git rebase`.
+(Git.push): Mock `git push`.
+(Git.reset): Mock `git reset HEAD~#`.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+(main): Add land command.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py: Added.
+(Land.parser):
+(Land.main): Rebase the current branch against it's root, assign the reviewer, check for 'oops' messages,
+rebase against target branch, update target branch ref, optionally canonicalize, push (or svn dcommit) and
+update and close pull-request with information on the landed commit.
+* Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:
+(ScmBase.gmtoffset): Add shared computation of GMT offset.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+(TestGit.test_commits): `git log` should exclude base ref.
+(TestGit.test_commits_branch): Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py: Added.
+(repos

[webkit-changes] [285271] trunk/Tools

2021-11-04 Thread jbedard

Title: [285271] trunk/Tools








Revision 285271
Author jbed...@apple.com
Date 2021-11-04 11:15:20 -0700 (Thu, 04 Nov 2021)


Log Message
[generate-webkit-css-docs] Change shebang to Python 3
https://bugs.webkit.org/show_bug.cgi?id=232714


Reviewed by Ryan Haddad.

* Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
* Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/generate-webkit-css-docs: Use Python 3 shebang.
* Tools/Scripts/libraries/resultsdbpy/setup.py: Bump version.

Canonical link: https://commits.webkit.org/243882@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/generate-webkit-css-docs
trunk/Tools/Scripts/libraries/resultsdbpy/setup.py




Diff

Modified: trunk/Tools/ChangeLog (285270 => 285271)

--- trunk/Tools/ChangeLog	2021-11-04 18:10:57 UTC (rev 285270)
+++ trunk/Tools/ChangeLog	2021-11-04 18:15:20 UTC (rev 285271)
@@ -1,5 +1,17 @@
 2021-11-04  Jonathan Bedard  
 
+[generate-webkit-css-docs] Change shebang to Python 3
+https://bugs.webkit.org/show_bug.cgi?id=232714
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
+* Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/generate-webkit-css-docs: Use Python 3 shebang.
+* Scripts/libraries/resultsdbpy/setup.py: Bump version.
+
+2021-11-04  Jonathan Bedard  
+
 [run-webkit-websocketserver] Replace `/usr/bin/python` with `/usr/bin/env python`
 https://bugs.webkit.org/show_bug.cgi?id=232713
 


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py (285270 => 285271)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-11-04 18:10:57 UTC (rev 285270)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-11-04 18:15:20 UTC (rev 285271)
@@ -44,7 +44,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(3, 1, 2)
+version = Version(3, 1, 3)
 
 import webkitflaskpy
 


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/generate-webkit-css-docs (285270 => 285271)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/generate-webkit-css-docs	2021-11-04 18:10:57 UTC (rev 285270)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/generate-webkit-css-docs	2021-11-04 18:15:20 UTC (rev 285271)
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright (C) 2019 Apple Inc. All rights reserved.
+#!/usr/bin/env python3
+# Copyright (C) 2019-2021 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/setup.py (285270 => 285271)

--- trunk/Tools/Scripts/libraries/resultsdbpy/setup.py	2021-11-04 18:10:57 UTC (rev 285270)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/setup.py	2021-11-04 18:15:20 UTC (rev 285271)
@@ -30,7 +30,7 @@
 
 setup(
 name='resultsdbpy',
-version='3.1.2',
+version='3.1.3',
 description='Library for visualizing, processing and storing test results.',
 long_description=readme(),
 classifiers=[






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [285270] trunk/Tools

2021-11-04 Thread jbedard

Title: [285270] trunk/Tools








Revision 285270
Author jbed...@apple.com
Date 2021-11-04 11:10:57 -0700 (Thu, 04 Nov 2021)


Log Message
[run-webkit-websocketserver] Replace `/usr/bin/python` with `/usr/bin/env python`
https://bugs.webkit.org/show_bug.cgi?id=232713


Reviewed by Ryan Haddad.

* Scripts/run-webkit-websocketserver:
(openWebSocketServer):
(closeWebSocketServer):

Canonical link: https://commits.webkit.org/243881@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-webkit-websocketserver




Diff

Modified: trunk/Tools/ChangeLog (285269 => 285270)

--- trunk/Tools/ChangeLog	2021-11-04 18:06:22 UTC (rev 285269)
+++ trunk/Tools/ChangeLog	2021-11-04 18:10:57 UTC (rev 285270)
@@ -1,3 +1,15 @@
+2021-11-04  Jonathan Bedard  
+
+[run-webkit-websocketserver] Replace `/usr/bin/python` with `/usr/bin/env python`
+https://bugs.webkit.org/show_bug.cgi?id=232713
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/run-webkit-websocketserver:
+(openWebSocketServer):
+(closeWebSocketServer):
+
 2021-11-04  Andres Gonzalez  
 
 Fix for crashes in layout tests in AX isolated tree mode.


Modified: trunk/Tools/Scripts/run-webkit-websocketserver (285269 => 285270)

--- trunk/Tools/Scripts/run-webkit-websocketserver	2021-11-04 18:06:22 UTC (rev 285269)
+++ trunk/Tools/Scripts/run-webkit-websocketserver	2021-11-04 18:10:57 UTC (rev 285270)
@@ -71,7 +71,7 @@
 "--root", "$webSocketHandlerDir",
 "--pidfile", "$webSocketServerPidFile"
 );
-system "/usr/bin/python", @args;
+system "/usr/bin/env python", @args;
 }
 
 sub closeWebSocketServer()
@@ -81,7 +81,7 @@
 "--server", "stop",
 "--pidfile", "$webSocketServerPidFile"
 );
-system "/usr/bin/python", @args;
+system "/usr/bin/env python", @args;
 unlink "$webSocketServerPidFile";
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [285175] trunk/Tools

2021-11-02 Thread jbedard

Title: [285175] trunk/Tools








Revision 285175
Author jbed...@apple.com
Date 2021-11-02 12:35:25 -0700 (Tue, 02 Nov 2021)


Log Message
[webkitscmpy] Reduce autoinstalls on import
https://bugs.webkit.org/show_bug.cgi?id=232574


Reviewed by Stephanie Lewis.

* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Remove whichcraft (webkitcorepy registers it).
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py: Remove unused webkitscmpy imports.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py: Remote unused webkitcorepy import.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py: Move whichcraft to function.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py: Move jinja2 to function.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py: Move fasteners, xmltodict import to functions.

Canonical link: https://commits.webkit.org/243809@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py




Diff

Modified: trunk/Tools/ChangeLog (285174 => 285175)

--- trunk/Tools/ChangeLog	2021-11-02 19:31:47 UTC (rev 285174)
+++ trunk/Tools/ChangeLog	2021-11-02 19:35:25 UTC (rev 285175)
@@ -1,3 +1,18 @@
+2021-11-02  Jonathan Bedard  
+
+[webkitscmpy] Reduce autoinstalls on import
+https://bugs.webkit.org/show_bug.cgi?id=232574
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Remove whichcraft (webkitcorepy registers it).
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py: Remove unused webkitscmpy imports.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py: Remote unused webkitcorepy import.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py: Move whichcraft to function.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py: Move jinja2 to function.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py: Move fasteners, xmltodict import to functions.
+
 2021-11-02  Kate Cheney  
 
 PCM: Safari on iOS and macOS are not sending ad click attribution reports for Private Click Measurement


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285174 => 285175)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-02 19:31:47 UTC (rev 285174)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-02 19:35:25 UTC (rev 285175)
@@ -51,7 +51,6 @@
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))
-AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))
 AutoInstall.register(Package('xmltodict', Version(0, 11, 0)))
 AutoInstall.register(Package('markupsafe', Version(1, 1, 1), pypi_name='MarkupSafe'))
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (285174 => 285175)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-11-02 19:31:47 UTC (rev 285174)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-11-02 19:35:25 UTC (rev 285175)
@@ -35,7 +35,7 @@
 
 from webkitcorepy import run, decorators, NestedFuzzyDict
 from webkitscmpy.local import Scm
-from webkitscmpy import remote, Commit, Contributor, log
+from webkitscmpy import remote
 from webkitscmpy import Commit, Contributor, log
 
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py (285174 => 285175)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py	2021-11-02 19:31:47 UTC (rev 285174)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py	2021-11-02 19:35:25 UTC (rev 285175)
@@ -25,7 +25,6 @@
 import re
 import six
 
-from webkitcorepy import run
 from webkitscmpy import ScmBase, Contributor
 
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py (285174 => 285175)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py	2021-11-02 19:31:47 UTC (rev 285174)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py	2021-11-02 19:35:25 UTC (rev 285175)
@@ -29,7 +29,6 @@
 
 from webkitcorepy import Terminal
 from webkitscmpy.commit import Commit
-from whichcraft import which
 
 
 class Command(object):
@@ -104,6 +103,8 @@
 
 @classmethod
 def pager(cls, args, repository, file=None, **kwargs):
+from whichcraft import which
+
 if not repository.path:
 sys.stderr.write("Cannot run '{}'

[webkit-changes] [285158] trunk/Tools

2021-11-02 Thread jbedard

Title: [285158] trunk/Tools








Revision 285158
Author jbed...@apple.com
Date 2021-11-02 08:11:06 -0700 (Tue, 02 Nov 2021)


Log Message
[webkitscmpy] Generalize pull-request title generation.
https://bugs.webkit.org/show_bug.cgi?id=232463


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.title_for): Compute pull-request title for a set of commits.
(PullRequest.main): Generalize pull-request title generation.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py




Diff

Modified: trunk/Tools/ChangeLog (285157 => 285158)

--- trunk/Tools/ChangeLog	2021-11-02 14:56:44 UTC (rev 285157)
+++ trunk/Tools/ChangeLog	2021-11-02 15:11:06 UTC (rev 285158)
@@ -1,3 +1,17 @@
+2021-11-02  Jonathan Bedard  
+
+[webkitscmpy] Generalize pull-request title generation.
+https://bugs.webkit.org/show_bug.cgi?id=232463
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.title_for): Compute pull-request title for a set of commits.
+(PullRequest.main): Generalize pull-request title generation.
+
 2021-11-02  Zixing Liu  
 
 [GTK][WPE] Support setting status code and getting HTTP method in custom URI scheme handlers


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (285157 => 285158)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-11-02 14:56:44 UTC (rev 285157)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-11-02 15:11:06 UTC (rev 285158)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.22',
+version='2.2.23',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285157 => 285158)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-02 14:56:44 UTC (rev 285157)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-02 15:11:06 UTC (rev 285158)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 22)
+version = Version(2, 2, 23)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py (285157 => 285158)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py	2021-11-02 14:56:44 UTC (rev 285157)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py	2021-11-02 15:11:06 UTC (rev 285158)
@@ -20,6 +20,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
 import sys
 
 from .command import Command
@@ -82,6 +83,14 @@
 return 0
 
 @classmethod
+def title_for(cls, commits):
+title = os.path.commonprefix([commit.message.splitlines()[0] for commit in commits])
+if not title:
+title = commits[0].message.splitlines()[0]
+title = title.rstrip().lstrip()
+return title[:-5].rstrip() if title.endswith('(Part') else title
+
+@classmethod
 def main(cls, args, repository, **kwargs):
 if not isinstance(repository, local.Git):
 sys.stderr.write("Can only '{}' on a native Git repository\n".format(cls.name))
@@ -121,26 +130,14 @@
 if not rmt.pull_requests:
 sys.stderr.write("'{}' cannot generate pull-requests\n".format(rmt.url))
 return 1
-user, _ = rmt.credentials(required=True) if isinstance(rmt, remote.GitHub) else (repository.config()['user.email'], None)
 candidates = list(rmt.pull_requests.find(opened=None, head=repository.branch))
 commits = list(repository.commits(begin=dict(hash=branch_point.hash), end=dict(branch=repository.branch)))
 
-title = commits[0].message.splitlines()[0]
-for commit in commits[1:]:
-title_candidate = commit.message.splitlines()[0]
-while title and not title_candidate.startswith(title):
-title = title[:-1]
-if not title:
-title = commits[0].message.splitlines()[0]
-title = title.rstrip().lstrip()
-if title.endswith('(Part'):
-title = title[:-5].rstrip()
-
 if candidates:

[webkit-changes] [285142] trunk/Tools

2021-11-01 Thread jbedard

Title: [285142] trunk/Tools








Revision 285142
Author jbed...@apple.com
Date 2021-11-01 16:13:43 -0700 (Mon, 01 Nov 2021)


Log Message
[webkitscmpy] Only respect the latest review
https://bugs.webkit.org/show_bug.cgi?id=231987


Reviewed by Dewei Zhu.

GitHub will report the entire history of a review, we should only
respect the latest review state.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.reviewers):
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
(TestNetworkPullRequestGitHub.test_approved_edits):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285141 => 285142)

--- trunk/Tools/ChangeLog	2021-11-01 23:05:46 UTC (rev 285141)
+++ trunk/Tools/ChangeLog	2021-11-01 23:13:43 UTC (rev 285142)
@@ -1,3 +1,21 @@
+2021-11-01  Jonathan Bedard  
+
+[webkitscmpy] Only respect the latest review
+https://bugs.webkit.org/show_bug.cgi?id=231987
+
+
+Reviewed by Dewei Zhu.
+
+GitHub will report the entire history of a review, we should only
+respect the latest review state.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+(GitHub.PRGenerator.reviewers):
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+(TestNetworkPullRequestGitHub.test_approved_edits):
+
 2021-11-01  Sam Sneddon  
 
 Improve LayoutTestFinder test coverage


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (285141 => 285142)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-11-01 23:05:46 UTC (rev 285141)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-11-01 23:13:43 UTC (rev 285142)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.21',
+version='2.2.22',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285141 => 285142)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-01 23:05:46 UTC (rev 285141)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-11-01 23:13:43 UTC (rev 285142)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 21)
+version = Version(2, 2, 22)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py (285141 => 285142)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py	2021-11-01 23:05:46 UTC (rev 285141)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py	2021-11-01 23:13:43 UTC (rev 285142)
@@ -206,13 +206,17 @@
 pull_request._reviewers = [self._contributor(user['login']) for user in response.get('users', [])]
 pull_request._approvers = []
 pull_request._blockers = []
+
+state_for = {}
+for review in self.repository.request('pulls/{}/reviews'.format(pull_request.number)):
+state_for[self._contributor(review['user']['login'])] = review.get('state')
+
 needs_status = Contributor.REVIEWER in self.repository.contributors.statuses
-for review in self.repository.request('pulls/{}/reviews'.format(pull_request.number)):
-contributor = self._contributor(review['user']['login'])
+for contributor, status in state_for.items():
 pull_request._reviewers.append(contributor)
-if review.get('state') == 'APPROVED' and (not needs_status or contributor.status == Contributor.REVIEWER):
+if status == 'APPROVED' and (not needs_status or contributor.status == Contributor.REVIEWER):
 pull_request._approvers.append(contributor)
-elif review.get('state') == 'CHANGES_REQUESTED':
+elif status == 'CHANGES_REQUESTED':
 pull_request._blockers.append(contributor)
 
 pull_request._reviewers = sorted(pull_request._reviewers)


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py (285141 => 285142)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/tes

[webkit-changes] [285131] trunk/Tools

2021-11-01 Thread jbedard

Title: [285131] trunk/Tools








Revision 285131
Author jbed...@apple.com
Date 2021-11-01 14:24:24 -0700 (Mon, 01 Nov 2021)


Log Message
webkitpy: Remove obsolete port name
https://bugs.webkit.org/show_bug.cgi?id=169302


Reviewed by Alex Christensen.

Removing a temporary workaround from r213654.

* Scripts/webkitpy/common/config/ports.py:
(DeprecatedPort.port): Remove mapping from 'ios' to 'ios-device.'

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/ports.py




Diff

Modified: trunk/Tools/ChangeLog (285130 => 285131)

--- trunk/Tools/ChangeLog	2021-11-01 21:04:45 UTC (rev 285130)
+++ trunk/Tools/ChangeLog	2021-11-01 21:24:24 UTC (rev 285131)
@@ -1,3 +1,16 @@
+2021-11-01  Jonathan Bedard  
+
+webkitpy: Remove obsolete port name
+https://bugs.webkit.org/show_bug.cgi?id=169302
+
+
+Reviewed by Alex Christensen.
+
+Removing a temporary workaround from r213654.
+
+* Scripts/webkitpy/common/config/ports.py:
+(DeprecatedPort.port): Remove mapping from 'ios' to 'ios-device.'
+
 2021-11-01  Fujii Hironori  
 
 TestWTF.WTF_CompactUniquePtrTuple.Subclassing is randomly failing on WinCairo tester bots


Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (285130 => 285131)

--- trunk/Tools/Scripts/webkitpy/common/config/ports.py	2021-11-01 21:04:45 UTC (rev 285130)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py	2021-11-01 21:24:24 UTC (rev 285131)
@@ -65,8 +65,6 @@
 "ftw": FTWPort,
 "gtk-wk2": GtkWK2Port,
 "ios-device": IOSPort,
-# FIXME: https://bugs.webkit.org/show_bug.cgi?id=169302
-"ios": IOSPort,
 "ios-simulator-wk2": IOSSimulatorWK2Port,
 "jsc-only": JscOnlyPort,
 "mac": MacPort,






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [285035] trunk/Tools

2021-10-29 Thread jbedard

Title: [285035] trunk/Tools








Revision 285035
Author jbed...@apple.com
Date 2021-10-29 09:50:16 -0700 (Fri, 29 Oct 2021)


Log Message
[webkitscmpy] Assign PR to author
https://bugs.webkit.org/show_bug.cgi?id=232348


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub.request): Add assignees.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.create): Assign created PR to it's author.
(GitHub.PRGenerator.update): Assign modified PR to it's editor.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py: Add assignees.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285034 => 285035)

--- trunk/Tools/ChangeLog	2021-10-29 16:48:20 UTC (rev 285034)
+++ trunk/Tools/ChangeLog	2021-10-29 16:50:16 UTC (rev 285035)
@@ -1,3 +1,20 @@
+2021-10-29  Jonathan Bedard  
+
+[webkitscmpy] Assign PR to author
+https://bugs.webkit.org/show_bug.cgi?id=232348
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub.request): Add assignees.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+(GitHub.PRGenerator.create): Assign created PR to it's author.
+(GitHub.PRGenerator.update): Assign modified PR to it's editor.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py: Add assignees.
+
 2021-10-29  Alex Christensen  
 
 Re-enable two AppPrivacyReport tests


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (285034 => 285035)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-29 16:48:20 UTC (rev 285034)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-29 16:50:16 UTC (rev 285035)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.20',
+version='2.2.21',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285034 => 285035)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-29 16:48:20 UTC (rev 285034)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-29 16:50:16 UTC (rev 285035)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 20)
+version = Version(2, 2, 21)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py (285034 => 285035)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py	2021-10-29 16:48:20 UTC (rev 285034)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py	2021-10-29 16:50:16 UTC (rev 285035)
@@ -411,6 +411,11 @@
 pr['user'] = dict(login=auth.username)
 pr['_links'] = dict(issue=dict(href=''.format(self.api_remote, pr['number'])))
 self.pull_requests.append(pr)
+if int(pr['number']) not in self.issues:
+self.issues[int(pr['number'])] = dict(
+comments=[],
+assignees=[],
+)
 return mocks.Response.fromJson(pr, url=""
 
 # Update specifically
@@ -444,6 +449,9 @@
 body=json.get('body', ''),
 ))
 return mocks.Response.fromJson(issue['comments'], url=""
+if method == 'POST' and stripped_url.split('/')[6] == 'assignees':
+self.issues[number]['assignees'] = {'login': name for name in json.get('assignees', [])}
+return mocks.Response.fromJson(issue['assignees'], url=""
 return mocks.Response.create404(url)
 
 return mocks.Response.create404(url)


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py (285034 => 285035)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py	2021-10-29 16:48:20 UTC (rev 285034)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py	2021-10-29 16:50:16 UTC (rev 285035)
@@ -104,8 +104,19

[webkit-changes] [285029] trunk/Tools

2021-10-29 Thread jbedard

Title: [285029] trunk/Tools








Revision 285029
Author jbed...@apple.com
Date 2021-10-29 08:44:26 -0700 (Fri, 29 Oct 2021)


Log Message
[webkitscmpy] Add fetch and rebase
https://bugs.webkit.org/show_bug.cgi?id=232447


Reviewed by Dewei Zhu.

To land commits, we need to be able to rebase a branch against another.
Additionally, when rebasing, we need to discard stale cache bits. This
is also true when pulling and rebasing against main.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.Cache.clear): Clear cache of a specific branch.
(Git.rebase): Rebase a branch on top of another.
(Git.fetch): Fetch specific branch ref.
(Git.pull): Use generalized fetch command, clear cache for updated branch
if that branch is not the default branch.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add rebase mock.
(Git.rebase):
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.main): Recompute branch-point after rebase.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
(test_rebase):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285028 => 285029)

--- trunk/Tools/ChangeLog	2021-10-29 15:37:57 UTC (rev 285028)
+++ trunk/Tools/ChangeLog	2021-10-29 15:44:26 UTC (rev 285029)
@@ -1,3 +1,32 @@
+2021-10-29  Jonathan Bedard  
+
+[webkitscmpy] Add fetch and rebase
+https://bugs.webkit.org/show_bug.cgi?id=232447
+
+
+Reviewed by Dewei Zhu.
+
+To land commits, we need to be able to rebase a branch against another.
+Additionally, when rebasing, we need to discard stale cache bits. This
+is also true when pulling and rebasing against main.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.Cache.clear): Clear cache of a specific branch.
+(Git.rebase): Rebase a branch on top of another.
+(Git.fetch): Fetch specific branch ref.
+(Git.pull): Use generalized fetch command, clear cache for updated branch
+if that branch is not the default branch.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+(Git.__init__): Add rebase mock.
+(Git.rebase):
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.main): Recompute branch-point after rebase.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+(test_rebase):
+
 2021-10-29  Takashi Komori  
 
 WKAPI does not have any APIs to set cookie path to WKWebsiteDataStoreConfigurationRef


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (285028 => 285029)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-29 15:37:57 UTC (rev 285028)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-29 15:44:26 UTC (rev 285029)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.19',
+version='2.2.20',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285028 => 285029)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-29 15:37:57 UTC (rev 285028)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-29 15:44:26 UTC (rev 285029)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 19)
+version = Version(2, 2, 20)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (285028 => 285029)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-29 15:37:57 UTC (rev 285028)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-29 15:44:26 UTC (rev 285029)
@@ -198,6 +198,29 @@
 except (IOError, OSErr

[webkit-changes] [285002] trunk/Tools

2021-10-28 Thread jbedard

Title: [285002] trunk/Tools








Revision 285002
Author jbed...@apple.com
Date 2021-10-28 14:04:37 -0700 (Thu, 28 Oct 2021)


Log Message
[webkitscmpy] Fix commits set on branch
https://bugs.webkit.org/show_bug.cgi?id=232443


Reviewed by Darin Adler.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.commits): We are appending to list of commits, not pre-pending.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
(TestGitHub.test_commits_branch_ref):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (285001 => 285002)

--- trunk/Tools/ChangeLog	2021-10-28 21:01:00 UTC (rev 285001)
+++ trunk/Tools/ChangeLog	2021-10-28 21:04:37 UTC (rev 285002)
@@ -1,3 +1,18 @@
+2021-10-28  Jonathan Bedard  
+
+[webkitscmpy] Fix commits set on branch
+https://bugs.webkit.org/show_bug.cgi?id=232443
+
+
+Reviewed by Darin Adler.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.commits): We are appending to list of commits, not pre-pending.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+(TestGitHub.test_commits_branch_ref):
+
 2021-10-28  Andres Gonzalez  
 
 Isolated tree mode: Dispatch all calls to [WebAccessibilityObjectWrapper accessibilityAttributeValue] in WTR::AccessibilityUIElement to the AX thread.


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (285001 => 285002)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-28 21:01:00 UTC (rev 285001)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-28 21:04:37 UTC (rev 285002)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.18',
+version='2.2.19',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (285001 => 285002)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-28 21:01:00 UTC (rev 285001)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-28 21:04:37 UTC (rev 285002)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 18)
+version = Version(2, 2, 19)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (285001 => 285002)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-28 21:01:00 UTC (rev 285001)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-28 21:04:37 UTC (rev 285002)
@@ -688,10 +688,10 @@
 while line:
 if not line.startswith('commit '):
 raise OSError('Failed to parse `git log` format')
-branch_point = previous[0].branch_point
-identifier = previous[0].identifier
+branch_point = previous[-1].branch_point
+identifier = previous[-1].identifier
 hash = line.split(' ')[-1].rstrip()
-if hash != previous[0].hash:
+if hash != previous[-1].hash:
 identifier -= 1
 
 if not identifier:
@@ -715,12 +715,12 @@
 )
 
 # Ensure that we don't duplicate the first and last commits
-if commit.hash == previous[0].hash:
-previous[0] = commit
+if commit.hash == previous[-1].hash:
+previous[-1] = commit
 
 # If we share a timestamp with the previous commit, that means that this commit has an order
 # less than the set of commits cached in previous
-elif commit.timestamp == previous[0].timestamp:
+elif commit.timestamp == previous[-1].timestamp:
 for cached in previous:
 cached.order += 1
 previous.append(commit)


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py (285001 => 285002)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py	2021-10-28 21:01:00 UTC (rev 285001)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py	2021-10-2

[webkit-changes] [284966] trunk/Tools

2021-10-27 Thread jbedard

Title: [284966] trunk/Tools








Revision 284966
Author jbed...@apple.com
Date 2021-10-27 17:31:42 -0700 (Wed, 27 Oct 2021)


Log Message
[webkitscmpy] Generate commit message template
https://bugs.webkit.org/show_bug.cgi?id=231023


Unreviewed follow-up fix.


* Scripts/git-webkit: Match repository base, not folder containing repository.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.git): Mark hook as executable.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py




Diff

Modified: trunk/Tools/ChangeLog (284965 => 284966)

--- trunk/Tools/ChangeLog	2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/ChangeLog	2021-10-28 00:31:42 UTC (rev 284966)
@@ -1,3 +1,17 @@
+2021-10-27  Jonathan Bedard  
+
+[webkitscmpy] Generate commit message template
+https://bugs.webkit.org/show_bug.cgi?id=231023
+
+
+Unreviewed follow-up fix.
+
+* Scripts/git-webkit: Match repository base, not folder containing repository.
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+(Setup.git): Mark hook as executable.
+
 2021-10-27  Alexey Proskuryakov  
 
 AutoInstall should have separate install directories per CPU architecture


Modified: trunk/Tools/Scripts/git-webkit (284965 => 284966)

--- trunk/Tools/Scripts/git-webkit	2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/git-webkit	2021-10-28 00:31:42 UTC (rev 284966)
@@ -55,7 +55,7 @@
 repository.executable(),
 'config', 'merge.changelog.driver',
 'perl {} --merge-driver -c %O %A %B'.format(os.path.join(
-os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__),
+os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__,
 'Tools', 'Scripts', 'resolve-ChangeLogs',
 )),
 ], capture_output=True, cwd=repository.root_path).returncode:


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284965 => 284966)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-28 00:31:42 UTC (rev 284966)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.17',
+version='2.2.18',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284965 => 284966)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-28 00:31:42 UTC (rev 284966)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 17)
+version = Version(2, 2, 18)
 
 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 (284965 => 284966)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py	2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py	2021-10-28 00:31:42 UTC (rev 284966)
@@ -167,6 +167,7 @@
 with open(target, 'w') as f:
 f.write(contents)
 f.write('\n')
+os.chmod(target, 0o775)
 
 log.warning('Setting git editor for {}...'.format(repository.root_path))
 editor_name = 'default' if args.defaults else Terminal.choose(






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284926] trunk/Tools

2021-10-27 Thread jbedard

Title: [284926] trunk/Tools








Revision 284926
Author jbed...@apple.com
Date 2021-10-27 10:11:30 -0700 (Wed, 27 Oct 2021)


Log Message
[webkitscmpy] Ensure empty line before canonicalization
https://bugs.webkit.org/show_bug.cgi?id=232103


Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py:
(main): Handle empty lines around identifier links, add empty line before identifier links.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/canonicalize_unittest.py:
(TestCanonicalize.test_formated_identifier):
(TestCanonicalize.test_existing_identifier):
(TestCanonicalize.test_git_svn):
(TestCanonicalize.test_git_svn_existing):
(TestCanonicalize.test_branch_commits):
(TestCanonicalize.test_number):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/canonicalize_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (284925 => 284926)

--- trunk/Tools/ChangeLog	2021-10-27 17:08:19 UTC (rev 284925)
+++ trunk/Tools/ChangeLog	2021-10-27 17:11:30 UTC (rev 284926)
@@ -1,3 +1,23 @@
+2021-10-27  Jonathan Bedard  
+
+[webkitscmpy] Ensure empty line before canonicalization
+https://bugs.webkit.org/show_bug.cgi?id=232103
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py:
+(main): Handle empty lines around identifier links, add empty line before identifier links.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/canonicalize_unittest.py:
+(TestCanonicalize.test_formated_identifier):
+(TestCanonicalize.test_existing_identifier):
+(TestCanonicalize.test_git_svn):
+(TestCanonicalize.test_git_svn_existing):
+(TestCanonicalize.test_branch_commits):
+(TestCanonicalize.test_number):
+
 2021-10-27  Alexey Proskuryakov  
 
 webkitdirs.pm should use JSON::XS when available


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284925 => 284926)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-27 17:08:19 UTC (rev 284925)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-27 17:11:30 UTC (rev 284926)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.16',
+version='2.2.17',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284925 => 284926)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-27 17:08:19 UTC (rev 284925)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-27 17:11:30 UTC (rev 284926)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 16)
+version = Version(2, 2, 17)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py (284925 => 284926)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py	2021-10-27 17:08:19 UTC (rev 284925)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py	2021-10-27 17:11:30 UTC (rev 284926)
@@ -56,11 +56,29 @@
 if identifier_index and repository.GIT_SVN_REVISION.match(lines[-1]):
 identifier_index -= 1
 
+# We're trying to cover cases where there is a space between link and git-svn-id:
+# 
+#
+# Canonical link: ...
+# git-svn-id: ...
+# OR
+# 
+# Canonical link: ...
+#
+# git-svn-id: ...
 if identifier_index and lines[identifier_index - 1].startswith(identifier_template.format('').split(':')[0]):
 lines[identifier_index - 1] = identifier_template.format(commit)
+identifier_index = identifier_index - 2
+elif identifier_index and lines[identifier_index - 2].startswith(identifier_template.format('').split(':')[0]):
+del lines[identifier_index - 2]
+lines.insert(identifier_index - 1, identifier_template.format(commit))
+identifier_index = identifier_index - 2
 else:
 lines.insert(identifier_index, identifier_template.format(commit))
 
+if lines[identifier_index]:
+lines.insert(identifier_index, '')
+
 for line in lines:
 pr

[webkit-changes] [284892] trunk/Tools

2021-10-26 Thread jbedard

Title: [284892] trunk/Tools








Revision 284892
Author jbed...@apple.com
Date 2021-10-26 13:10:33 -0700 (Tue, 26 Oct 2021)


Log Message
[webkitscmpy] Comment and close pull-requests
https://bugs.webkit.org/show_bug.cgi?id=232095


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
(BitBucket.request): Add support for activities, opening and closing pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub.__init__): Add issues.
(GitHub.request): Access issue underlying pull-request (which includes global comments).
* Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
(PullRequest.Exception): Added.
(PullRequest.Comment): Added.
(PullRequest.__init__): Add list of pull-request comments, metadata used by generator.
(PullRequest.open): Re-open the pull-request.
(PullRequest.close): Close the pull-request.
(PullRequest.comment): Make a comment on the pull-request.
(PullRequest.comments): List all comments on a pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.update): Handle closing and opening of the pull-request.
(BitBucket.PRGenerator.comment): Make a comment on a pull-request.
(BitBucket.PRGenerator.comments): List all comments on a pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.update): Handle closing and opening of the pull-request.
(GitHub.PRGenerator.comment): Make a comment on a issue underpinning a pull-request.
(GitHub.PRGenerator.comments): List all comments on the pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
(Scm.PRGenerator.update): Add support for opening and closing a pull-request.
(Scm.PRGenerator.comment): Make a comment on a pull-request.
(Scm.PRGenerator.comments): List all comments for a pull-request
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (284891 => 284892)

--- trunk/Tools/ChangeLog	2021-10-26 19:51:18 UTC (rev 284891)
+++ trunk/Tools/ChangeLog	2021-10-26 20:10:33 UTC (rev 284892)
@@ -1,3 +1,40 @@
+2021-10-26  Jonathan Bedard  
+
+[webkitscmpy] Comment and close pull-requests
+https://bugs.webkit.org/show_bug.cgi?id=232095
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
+(BitBucket.request): Add support for activities, opening and closing pull-request.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub.__init__): Add issues.
+(GitHub.request): Access issue underlying pull-request (which includes global comments).
+* Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
+(PullRequest.Exception): Added.
+(PullRequest.Comment): Added.
+(PullRequest.__init__): Add list of pull-request comments, metadata used by generator.
+(PullRequest.open): Re-open the pull-request.
+(PullRequest.close): Close the pull-request.
+(PullRequest.comment): Make a comment on the pull-request.
+(PullRequest.comments): List all comments on a pull-request.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
+(BitBucket.PRGenerator.update): Handle closing and opening of the pull-request.
+(BitBucket.PRGenerator.comment): Make a comment on a pull-request.
+(BitBucket.PRGenerator.comments): List all comments on a pull-request.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+(GitHub.PRGenerator.update): Handle closing and opening of the pull-request.
+(GitHub.PRGenerator.comment): Make a comment on a issue underpinning a pull-request.
+(GitHub.PRGenerator.comments): List all comments on the pull-request.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
+(Scm.PRGenerator.update): Add support for opening and closing a pull-request.
+(Scm.PRGenerator.comment): Ma

[webkit-changes] [284820] trunk

2021-10-25 Thread jbedard

Title: [284820] trunk








Revision 284820
Author jbed...@apple.com
Date 2021-10-25 13:34:50 -0700 (Mon, 25 Oct 2021)


Log Message
Add GitHub usernames for bedison and darinadler

Unreviewed.

* metadata/contributors.json: Add beidson and darinadler.

Modified Paths

trunk/ChangeLog
trunk/metadata/contributors.json




Diff

Modified: trunk/ChangeLog (284819 => 284820)

--- trunk/ChangeLog	2021-10-25 20:24:45 UTC (rev 284819)
+++ trunk/ChangeLog	2021-10-25 20:34:50 UTC (rev 284820)
@@ -1,3 +1,11 @@
+2021-10-25  Jonathan Bedard  
+
+Add GitHub usernames for bedison and darinadler
+
+Unreviewed.
+
+* metadata/contributors.json: Add beidson and darinadler.
+
 2021-10-25  Zan Dobersek  
 
 Add zdobersek's GitHub name to contributors.json


Modified: trunk/metadata/contributors.json (284819 => 284820)

--- trunk/metadata/contributors.json	2021-10-25 20:24:45 UTC (rev 284819)
+++ trunk/metadata/contributors.json	2021-10-25 20:34:50 UTC (rev 284820)
@@ -1106,6 +1106,7 @@
  "beid...@apple.com"
   ],
   "expertise" : "Networking, Storage, WebCore icon database, Back/forward cache, History",
+  "github" : "beidson",
   "name" : "Brady Eidson",
   "nicks" : [
  "bradee-oh"
@@ -1682,6 +1683,7 @@
  "da...@apple.com"
   ],
   "expertise" : "HTML Forms, WebKit API (Mac, Win), HTML Editing, Performance, _javascript_/ECMAScript, Text Encoding, Core DOM, HTML DOM, Canvas, _javascript_ DOM Bindings, ObjC DOM Bindings, Basic types and data structures, Tools, New Features / Standards Support, General (probably a good backup on most topics even if not specifically an expert)",
+  "github" : "darinadler",
   "name" : "Darin Adler",
   "nicks" : [
  "darin"






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284791] trunk/Tools

2021-10-25 Thread jbedard

Title: [284791] trunk/Tools








Revision 284791
Author jbed...@apple.com
Date 2021-10-25 10:40:11 -0700 (Mon, 25 Oct 2021)


Log Message
[webkitscmpy] Log based tests fail in different timezones
https://bugs.webkit.org/show_bug.cgi?id=232197


Reviewed by Dewei Zhu.

Tests based on `git log` need to be timezone aware.

* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
* Scripts/libraries/webkitscmpy/webkitscmpy/test/log_unittest.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/log_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (284790 => 284791)

--- trunk/Tools/ChangeLog	2021-10-25 17:39:00 UTC (rev 284790)
+++ trunk/Tools/ChangeLog	2021-10-25 17:40:11 UTC (rev 284791)
@@ -1,3 +1,16 @@
+2021-10-25  Jonathan Bedard  
+
+[webkitscmpy] Log based tests fail in different timezones
+https://bugs.webkit.org/show_bug.cgi?id=232197
+
+
+Reviewed by Dewei Zhu.
+
+Tests based on `git log` need to be timezone aware.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/log_unittest.py:
+
 2021-10-25  Wenson Hsieh  
 
 REGRESSION (r284079): Audio continues playing on hulu.com in private browsing mode after closing the tab


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py (284790 => 284791)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py	2021-10-25 17:39:00 UTC (rev 284790)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py	2021-10-25 17:40:11 UTC (rev 284791)
@@ -21,6 +21,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
+import time
 
 from datetime import datetime
 from webkitcorepy import run, testing, LoggerCapture, OutputCapture
@@ -317,9 +318,9 @@
 ], cwd=self.path, capture_output=True, encoding='utf-8').stdout,
 '''commit d8bce26fa65c6fc8f39c17927abb77f69fab82fc
 Author: Jonathan Bedard 
-AuthorDate: Sat Oct 03 03:46:40 2020 +
+AuthorDate: {time_a}
 Commit: Jonathan Bedard 
-CommitDate: Sat Oct 03 03:46:40 2020 +
+CommitDate: {time_a}
 
 Patch Series
 git-svn-id: https://svn.example.org/repository/repository/trunk@9 268f45cc-cd09-0410-ab3c-d52691b4dbfc
@@ -326,9 +327,9 @@
 
 commit bae5d1e90999d4f916a8a15810ccfa43f37a2fd6
 Author: Jonathan Bedard 
-AuthorDate: Sat Oct 03 03:46:40 2020 +
+AuthorDate: {time_a}
 Commit: Jonathan Bedard 
-CommitDate: Sat Oct 03 03:46:40 2020 +
+CommitDate: {time_a}
 
 8th commit
 git-svn-id: https://svn.example.org/repository/repository/trunk@8 268f45cc-cd09-0410-ab3c-d52691b4dbfc
@@ -335,14 +336,16 @@
 
 commit 1abe25b443e985f93b90d830e4a7e3731336af4d
 Author: Jonathan Bedard 
-AuthorDate: Sat Oct 03 02:23:20 2020 +
+AuthorDate: {time_b}
 Commit: Jonathan Bedard 
-CommitDate: Sat Oct 03 02:23:20 2020 +
+CommitDate: {time_b}
 
 4th commit
 git-svn-id: https://svn.example.org/repository/repository/trunk@4 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-'''
-)
+'''.format(
+time_a=datetime.utcfromtimestamp(1601668000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +'),
+time_b=datetime.utcfromtimestamp(1601663000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +'),
+))
 
 def test_branch_log(self):
 with mocks.local.Git(self.path, git_svn=True):
@@ -352,9 +355,9 @@
 ], cwd=self.path, capture_output=True, encoding='utf-8').stdout,
 '''commit 790725a6d79e28db2ecdde29548d2262c0bd059d
 Author: Jonathan Bedard 
-AuthorDate: Sat Oct 03 03:30:00 2020 +
+AuthorDate: {time_a}
 Commit: Jonathan Bedard 
-CommitDate: Sat Oct 03 03:30:00 2020 +
+CommitDate: {time_a}
 
 7th commit
 git-svn-id: https://svn.example.org/repository/repository/trunk@7 268f45cc-cd09-0410-ab3c-d52691b4dbfc
@@ -361,9 +364,9 @@
 
 commit 3cd32e352410565bb543821fbf856a6d3caad1c4
 Author: Jonathan Bedard 
-AuthorDate: Sat Oct 03 02:40:00 2020 +
+AuthorDate: {time_b}
 Commit: Jonathan Bedard 
-CommitDate: Sat Oct 03 02:40:00 2020 +
+CommitDate: {time_b}
 
 5th commit
 Cherry pick
@@ -372,14 +375,17 @@
 
 commit a30ce8494bf1ac2807a69844f726be4a9843ca55
 Author: Jonathan Bedard 
-AuthorDate: Sat Oct 03 02:06:40 2020 +
+AuthorDate: {time_c}
 Commit: Jonathan Bedard 
-CommitDate: Sat Oct 03 02:06:40 2020 +
+CommitDate: {time_c}
 
 3rd commit
 git-svn-id: https://svn.example.org/repository/repository/trunk@3 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-'''
-)
+'''.format(
+time_a=datetime.utcfromtimestamp(1601667000 + time.timezone).strftime('%a %b %d %H:%M:%S %Y +'),
+time_b=datetime.utcfromtimestamp(160

[webkit-changes] [284498] trunk/Tools

2021-10-19 Thread jbedard

Title: [284498] trunk/Tools








Revision 284498
Author jbed...@apple.com
Date 2021-10-19 14:44:07 -0700 (Tue, 19 Oct 2021)


Log Message
[webkitscmpy] Override http url with ssh url
https://bugs.webkit.org/show_bug.cgi?id=231965


Reviewed by Ryan Haddad.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git): Exclude / from hostname.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.git): Prompt user to switch to ssh checkout.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
Canonical link: https://commits.webkit.org/243250@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (284497 => 284498)

--- trunk/Tools/ChangeLog	2021-10-19 21:41:53 UTC (rev 284497)
+++ trunk/Tools/ChangeLog	2021-10-19 21:44:07 UTC (rev 284498)
@@ -1,3 +1,17 @@
+2021-10-19  Jonathan Bedard  
+
+[webkitscmpy] Override http url with ssh url
+https://bugs.webkit.org/show_bug.cgi?id=231965
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git): Exclude / from hostname.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+(Setup.git): Prompt user to switch to ssh checkout.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+
 2021-10-19  Ryan Haddad  
 
 [EWS] Move EWS bots to iOS 15 / watchOS 8 / tvOS 15


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284497 => 284498)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-19 21:41:53 UTC (rev 284497)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-19 21:44:07 UTC (rev 284498)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.14',
+version='2.2.15',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284497 => 284498)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-19 21:41:53 UTC (rev 284497)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-19 21:44:07 UTC (rev 284498)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 14)
+version = Version(2, 2, 15)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (284497 => 284498)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-19 21:41:53 UTC (rev 284497)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-19 21:44:07 UTC (rev 284498)
@@ -275,7 +275,7 @@
 
 GIT_COMMIT = re.compile(r'commit (?P[0-9a-f]+)')
 SSH_REMOTE = re.compile('(ssh://)?git@(?P[^:/]+)[:/](?P.+).git')
-HTTP_REMOTE = re.compile('(?Phttps?)://(?P.+)/(?P.+).git')
+HTTP_REMOTE = re.compile(r'(?Phttps?)://(?P[^\/]+)/(?P.+).git')
 REMOTE_BRANCH = re.compile(r'remotes\/(?P[^\/]+)\/(?P.+)')
 
 @classmethod


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (284497 => 284498)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py	2021-10-19 21:41:53 UTC (rev 284497)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py	2021-10-19 21:44:07 UTC (rev 284498)
@@ -131,7 +131,7 @@
 log.warning('Set better Objective-C diffing behavior!')
 
 if args.defaults or Terminal.choose(
-'Auto-color status, diff, and branch?'.format(email),
+'Auto-color status, diff, and branch?',
 default='Yes',
 ) == 'Yes':
 for command in ('status', 'diff', 'branch'):
@@ -187,6 +187,24 @@
 else:
 log.warning("Set git editor to '{}'".format(editor_name))
 
+# Pushing to http repositories is difficult, offer to change http checkouts to ssh
+http_remote = local.Git.HTTP_REMOTE.match(repository.url())
+if http_remote and not args.defaults and Terminal.choose(
+"http based remotes will prompt for your password when pushing,\nwould you like to convert to a ssh remote?",
+default='Yes',
+) == 'Yes':
+if run([
+local.Git.executable(), 'config', 'remote.origin.url',
+

[webkit-changes] [284491] trunk/Tools

2021-10-19 Thread jbedard

Title: [284491] trunk/Tools








Revision 284491
Author jbed...@apple.com
Date 2021-10-19 13:36:29 -0700 (Tue, 19 Oct 2021)


Log Message
[webkitscmpy] Generate commit message template (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=231023


Unreviewed follow-up fix.

* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: MarkupSafe is imported as markupsafe.

Modified Paths

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




Diff

Modified: trunk/Tools/ChangeLog (284490 => 284491)

--- trunk/Tools/ChangeLog	2021-10-19 20:34:23 UTC (rev 284490)
+++ trunk/Tools/ChangeLog	2021-10-19 20:36:29 UTC (rev 284491)
@@ -1,3 +1,13 @@
+2021-10-19  Jonathan Bedard  
+
+[webkitscmpy] Generate commit message template (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=231023
+
+
+Unreviewed follow-up fix.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: MarkupSafe is imported as markupsafe.
+
 2021-10-14  Jonathan Bedard  
 
 [webkitscmpy] Generate commit message template


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284490 => 284491)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-19 20:34:23 UTC (rev 284490)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-19 20:36:29 UTC (rev 284491)
@@ -53,7 +53,7 @@
 AutoInstall.register(Package('monotonic', Version(1, 5)))
 AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))
 AutoInstall.register(Package('xmltodict', Version(0, 11, 0)))
-AutoInstall.register(Package('MarkupSafe', Version(1, 1, 1)))
+AutoInstall.register(Package('markupsafe', Version(1, 1, 1), pypi_name='MarkupSafe'))
 
 if sys.version_info < (3, 0):
 AutoInstall.register(Package('inspect2', Version(0, 1, 2)))






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284485] trunk/Tools

2021-10-19 Thread jbedard

Title: [284485] trunk/Tools








Revision 284485
Author jbed...@apple.com
Date 2021-10-19 13:07:43 -0700 (Tue, 19 Oct 2021)


Log Message
[webkitscmpy] Generate commit message template
https://bugs.webkit.org/show_bug.cgi?id=231023


Reviewed by Dewei Zhu.

* Tools/Scripts/git-webkit: Use prepare-ChangeLog to generate commit messages.
* Tools/Scripts/hooks/prepare-commit-msg: Added.
* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version, add jinja.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add unbound status mock.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
(main): Pass hooks to sub-programs.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.git): iterate through the directory of provided hooks and render with jinja2.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/hooks/prepare-commit-msg: Added.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
(TestSetup.test_commit_message):
Canonical link: https://commits.webkit.org/243242@main

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py


Added Paths

trunk/Tools/Scripts/hooks/
trunk/Tools/Scripts/hooks/prepare-commit-msg
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/hooks/
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/hooks/prepare-commit-msg




Diff

Modified: trunk/Tools/ChangeLog (284484 => 284485)

--- trunk/Tools/ChangeLog	2021-10-19 20:05:16 UTC (rev 284484)
+++ trunk/Tools/ChangeLog	2021-10-19 20:07:43 UTC (rev 284485)
@@ -1,3 +1,25 @@
+2021-10-14  Jonathan Bedard  
+
+[webkitscmpy] Generate commit message template
+https://bugs.webkit.org/show_bug.cgi?id=231023
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/git-webkit: Use prepare-ChangeLog to generate commit messages.
+* Scripts/hooks/prepare-commit-msg: Added.
+* Scripts/libraries/webkitscmpy/setup.py: Bump version, add jinja.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+(Git.__init__): Add unbound status mock.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+(main): Pass hooks to sub-programs.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+(Setup.git): iterate through the directory of provided hooks and render with jinja2.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/hooks/prepare-commit-msg: Added.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+(TestSetup.test_commit_message):
+
 2021-10-19  Jonathan Bedard  
 
 [webkitscmpy] Filter approvers by status


Modified: trunk/Tools/Scripts/git-webkit (284484 => 284485)

--- trunk/Tools/Scripts/git-webkit	2021-10-19 20:05:16 UTC (rev 284484)
+++ trunk/Tools/Scripts/git-webkit	2021-10-19 20:07:43 UTC (rev 284485)
@@ -71,5 +71,6 @@
 identifier_template=is_webkit_filter('Canonical link: https://commits.webkit.org/{}'),
 subversion=is_webkit_filter('https://svn.webkit.org/repository/webkit'),
 additional_setup=is_webkit_filter(additional_setup),
+hooks=os.path.join(os.path.abspath(os.path.join(os.path.dirname(__file__))), 'hooks'),
 ))
 


Added: trunk/Tools/Scripts/hooks/prepare-commit-msg (0 => 284485)

--- trunk/Tools/Scripts/hooks/prepare-commit-msg	(rev 0)
+++ trunk/Tools/Scripts/hooks/prepare-commit-msg	2021-10-19 20:07:43 UTC (rev 284485)
@@ -0,0 +1,76 @@
+#!/usr/bin/env {{ python }}
+
+import os
+import subprocess
+import sys
+
+LOCATION = '{{ location }}'
+SPACING = 8
+SCRIPTS = os.path.dirname(os.path.dirname(LOCATION))
+
+
+def message(source=None, sha=None):
+dirname = None
+commit_message = []
+
+try:
+for line in subprocess.check_output(
+[os.path.join(SCRIPTS, 'prepare-ChangeLog'), '--no-write', '--only-files', '--delimiters'],
+**(dict(encoding='utf-8') if sys.version_info > (3, 0) else dict())
+).splitlines():
+if line == '~':
+dirname = None
+continue
+if line.startswith(' ' * SPACING):
+if dirname:
+line = line.replace('* ', '* {}/'.format(dirname))
+commit_message.append(line[SPACING:])
+continue
+if line.endswith(':'):
+dirname = line.split(':')[

[webkit-changes] [284479] trunk/Tools

2021-10-19 Thread jbedard

Title: [284479] trunk/Tools








Revision 284479
Author jbed...@apple.com
Date 2021-10-19 12:39:26 -0700 (Tue, 19 Oct 2021)


Log Message
[webkitscmpy] Filter approvers by status
https://bugs.webkit.org/show_bug.cgi?id=231843


Reviewed by Dewei Zhu.

If a project defines statuses for it's contributors, we only want
to allow reviewers to approve changes.

* Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
(Contributor): Add reviewer status.
(Contributor.Mapping.load): Keep track of possible statuses.
(Contributor.Mapping.__init__): Ditto.
(Contributor.Mapping.add): Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.PullRequest): If a project defines a reviewer status, enforce it.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator._contributor): Handle case where no name is defined.
(GitHub.PRGenerator.reviewers): If a project defines a reviewer status, enforce it.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (284478 => 284479)

--- trunk/Tools/ChangeLog	2021-10-19 19:28:40 UTC (rev 284478)
+++ trunk/Tools/ChangeLog	2021-10-19 19:39:26 UTC (rev 284479)
@@ -1,3 +1,26 @@
+2021-10-19  Jonathan Bedard  
+
+[webkitscmpy] Filter approvers by status
+https://bugs.webkit.org/show_bug.cgi?id=231843
+
+
+Reviewed by Dewei Zhu.
+
+If a project defines statuses for it's contributors, we only want
+to allow reviewers to approve changes.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
+(Contributor): Add reviewer status.
+(Contributor.Mapping.load): Keep track of possible statuses.
+(Contributor.Mapping.__init__): Ditto.
+(Contributor.Mapping.add): Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
+(BitBucket.PRGenerator.PullRequest): If a project defines a reviewer status, enforce it.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+(GitHub.PRGenerator._contributor): Handle case where no name is defined.
+(GitHub.PRGenerator.reviewers): If a project defines a reviewer status, enforce it.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+
 2021-10-19  Alex Christensen  
 
 Fix iOS API tests after r284304


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284478 => 284479)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-19 19:28:40 UTC (rev 284478)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-19 19:39:26 UTC (rev 284479)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.12',
+version='2.2.13',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284478 => 284479)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-19 19:28:40 UTC (rev 284478)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-19 19:39:26 UTC (rev 284479)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 12)
+version = Version(2, 2, 13)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py (284478 => 284479)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py	2021-10-19 19:28:40 UTC (rev 284478)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py	2021-10-19 19:39:26 UTC (rev 284479)
@@ -35,6 +35,7 @@
 SVN_AUTHOR_RE = re.compile(r'r(?P\d+) \| (?P.*) \| (?P.*) \| \d+ lines?')
 SVN_AUTHOR_Q_RE = re.compile(r'r(?P\d+) \| (?P.*) \| (?P.*)')
 SVN_PATCH_FROM_RE = re.compile(r'Patch by (?P.*) <(?P.*)> on \d+-\d+-\d+')
+REVIEWER = 'reviewer'
 
 class Encoder(json.JSONEncoder):
 
@@ -68,6 +69,8 @@
 created.github = contributor.get('github', created.github)
 created.bitbucket = contributor.get('bitbucket', created.bitbucket)
 
+result.statuses.add(created.status)
+
 if created.github:
 result[created.github] = created
 if created.bitbucket:
@@ -85,6 +88,7 @@

[webkit-changes] [284417] trunk/Tools

2021-10-18 Thread jbedard

Title: [284417] trunk/Tools








Revision 284417
Author jbed...@apple.com
Date 2021-10-18 17:35:22 -0700 (Mon, 18 Oct 2021)


Log Message
[Python-3] Invoke webkit-patch with Python 3 by default (Revert)
https://bugs.webkit.org/show_bug.cgi?id=231591


Reverted to fix webkitbot.

* Scripts/webkit-patch:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkit-patch




Diff

Modified: trunk/Tools/ChangeLog (284416 => 284417)

--- trunk/Tools/ChangeLog	2021-10-19 00:14:41 UTC (rev 284416)
+++ trunk/Tools/ChangeLog	2021-10-19 00:35:22 UTC (rev 284417)
@@ -1,3 +1,13 @@
+2021-10-18  Jonathan Bedard  
+
+[Python-3] Invoke webkit-patch with Python 3 by default (Revert)
+https://bugs.webkit.org/show_bug.cgi?id=231591
+
+
+Reverted to fix webkitbot.
+
+* Scripts/webkit-patch:
+
 2021-10-18  John Pascoe  
 
 [WebAuthn] Obtain consent to create new credential when platform authenticator in excludedCredentials


Modified: trunk/Tools/Scripts/webkit-patch (284416 => 284417)

--- trunk/Tools/Scripts/webkit-patch	2021-10-19 00:14:41 UTC (rev 284416)
+++ trunk/Tools/Scripts/webkit-patch	2021-10-19 00:35:22 UTC (rev 284417)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # Copyright (c) 2011 Code Aurora Forum. All rights reserved.
 # Copyright (c) 2010 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284398] trunk/Tools

2021-10-18 Thread jbedard

Title: [284398] trunk/Tools








Revision 284398
Author jbed...@apple.com
Date 2021-10-18 13:51:23 -0700 (Mon, 18 Oct 2021)


Log Message
[run-api-tests] Use temporary symlink when listing tests
https://bugs.webkit.org/show_bug.cgi?id=230560

Reviewed by Dewei Zhu.

* Scripts/webkitpy/api_tests/manager.py:
(Manager._collect_tests): Copy binary when listing tests to make debuging easier.
* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.copyfile): Return copyfile result.
(FileSystem.copymode): Invoke shutil.copymode.
* Scripts/webkitpy/common/system/filesystem_mock.py:
(MockFileSystem.copymode):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/api_tests/manager.py
trunk/Tools/Scripts/webkitpy/common/system/filesystem.py
trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py




Diff

Modified: trunk/Tools/ChangeLog (284397 => 284398)

--- trunk/Tools/ChangeLog	2021-10-18 20:50:56 UTC (rev 284397)
+++ trunk/Tools/ChangeLog	2021-10-18 20:51:23 UTC (rev 284398)
@@ -1,3 +1,18 @@
+2021-10-18  Jonathan Bedard  
+
+[run-api-tests] Use temporary symlink when listing tests
+https://bugs.webkit.org/show_bug.cgi?id=230560
+
+Reviewed by Dewei Zhu.
+
+* Scripts/webkitpy/api_tests/manager.py:
+(Manager._collect_tests): Copy binary when listing tests to make debuging easier.
+* Scripts/webkitpy/common/system/filesystem.py:
+(FileSystem.copyfile): Return copyfile result.
+(FileSystem.copymode): Invoke shutil.copymode.
+* Scripts/webkitpy/common/system/filesystem_mock.py:
+(MockFileSystem.copymode):
+
 2021-10-18  Andres Gonzalez  
 
 Set isolated tree mode to secondary AX thread in LayoutTests.


Modified: trunk/Tools/Scripts/webkitpy/api_tests/manager.py (284397 => 284398)

--- trunk/Tools/Scripts/webkitpy/api_tests/manager.py	2021-10-18 20:50:56 UTC (rev 284397)
+++ trunk/Tools/Scripts/webkitpy/api_tests/manager.py	2021-10-18 20:51:23 UTC (rev 284398)
@@ -105,14 +105,20 @@
 for canonicalized_binary, path in self._port.path_to_api_test_binaries().items():
 if canonicalized_binary not in specified_binaries:
 continue
+
+to_be_listed = self.host.filesystem.join(self.host.filesystem.dirname(path), 'ToBeListed')
 try:
+self.host.filesystem.copyfile(path, to_be_listed)
+self.host.filesystem.copymode(path, to_be_listed)
 output = self.host.executive.run_command(
-Runner.command_for_port(self._port, [path, '--gtest_list_tests']),
+Runner.command_for_port(self._port, [to_be_listed, '--gtest_list_tests']),
 env=self._port.environment_for_api_tests())
 available_tests += Manager._test_list_from_output(output, '{}.'.format(canonicalized_binary))
 except ScriptError:
 _log.error('Failed to list {} tests'.format(canonicalized_binary))
 raise
+finally:
+self.host.filesystem.remove(to_be_listed)
 
 if len(args) == 0:
 return sorted(available_tests)


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (284397 => 284398)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-10-18 20:50:56 UTC (rev 284397)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-10-18 20:51:23 UTC (rev 284398)
@@ -80,8 +80,11 @@
 return os.chdir(path)
 
 def copyfile(self, source, destination):
-shutil.copyfile(source, destination)
+return shutil.copyfile(source, destination)
 
+def copymode(self, source, destination):
+return shutil.copymode(source, destination)
+
 def dirname(self, path):
 return os.path.dirname(path)
 


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py (284397 => 284398)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py	2021-10-18 20:50:56 UTC (rev 284397)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py	2021-10-18 20:51:23 UTC (rev 284398)
@@ -115,6 +115,9 @@
 self.files[destination] = self.files[source]
 self.written_files[destination] = self.files[source]
 
+def copymode(self, source, destination):
+pass
+
 def dirname(self, path):
 return self._split(path)[0]
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284378] trunk/Tools

2021-10-18 Thread jbedard

Title: [284378] trunk/Tools








Revision 284378
Author jbed...@apple.com
Date 2021-10-18 10:14:49 -0700 (Mon, 18 Oct 2021)


Log Message
[webkitscmpy] Allow repositories to define custom setup commands (Follow0-up)
https://bugs.webkit.org/show_bug.cgi?id=231345


Unreviewed follow-up fix.


* Scripts/git-webkit: Do not specify OpenSource in Tools/Scripts path.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit




Diff

Modified: trunk/Tools/ChangeLog (284377 => 284378)

--- trunk/Tools/ChangeLog	2021-10-18 16:21:37 UTC (rev 284377)
+++ trunk/Tools/ChangeLog	2021-10-18 17:14:49 UTC (rev 284378)
@@ -1,3 +1,13 @@
+2021-10-18  Jonathan Bedard  
+
+[webkitscmpy] Allow repositories to define custom setup commands (Follow0-up)
+https://bugs.webkit.org/show_bug.cgi?id=231345
+
+
+Unreviewed follow-up fix.
+
+* Scripts/git-webkit: Do not specify OpenSource in Tools/Scripts path.
+
 2021-10-18  Alex Christensen  
 
 Regression (r284304) : [ iOS 15 Release ] http/tests/privateClickMeasurement tests are failing


Modified: trunk/Tools/Scripts/git-webkit (284377 => 284378)

--- trunk/Tools/Scripts/git-webkit	2021-10-18 16:21:37 UTC (rev 284377)
+++ trunk/Tools/Scripts/git-webkit	2021-10-18 17:14:49 UTC (rev 284378)
@@ -56,7 +56,7 @@
 'config', 'merge.changelog.driver',
 'perl {} --merge-driver -c %O %A %B'.format(os.path.join(
 os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__),
-'OpenSource', 'Tools', 'Scripts', 'resolve-ChangeLogs',
+'Tools', 'Scripts', 'resolve-ChangeLogs',
 )),
 ], capture_output=True, cwd=repository.root_path).returncode:
 sys.stderr.write('Failed to set the git merging behaivor for changelogs...\n')






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284283] trunk/Tools

2021-10-15 Thread jbedard

Title: [284283] trunk/Tools








Revision 284283
Author jbed...@apple.com
Date 2021-10-15 15:51:41 -0700 (Fri, 15 Oct 2021)


Log Message
[webkitscmpy] Allow repositories to define custom setup commands
https://bugs.webkit.org/show_bug.cgi?id=231345


Reviewed by Dewei Zhu.

* Scripts/git-webkit: Define changelog conflict resolver.
* Scripts/libraries/webkitscmpy/setup.py: Add inspect2 as dependency, bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
(main): Attempt to resolve additional_setup function.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.github): Invoke additional_setup function, if it exists.
(Setup.git): Ditto.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py




Diff

Modified: trunk/Tools/ChangeLog (284282 => 284283)

--- trunk/Tools/ChangeLog	2021-10-15 22:41:44 UTC (rev 284282)
+++ trunk/Tools/ChangeLog	2021-10-15 22:51:41 UTC (rev 284283)
@@ -1,3 +1,20 @@
+2021-10-15  Jonathan Bedard  
+
+[webkitscmpy] Allow repositories to define custom setup commands
+https://bugs.webkit.org/show_bug.cgi?id=231345
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/git-webkit: Define changelog conflict resolver.
+* Scripts/libraries/webkitscmpy/setup.py: Add inspect2 as dependency, bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+(main): Attempt to resolve additional_setup function.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+(Setup.github): Invoke additional_setup function, if it exists.
+(Setup.git): Ditto.
+
 2021-10-15  BJ Burg  
 
 [Cocoa] Web Inspector: handle Promise objects returned from evaluateScriptInExtensionTab


Modified: trunk/Tools/Scripts/git-webkit (284282 => 284283)

--- trunk/Tools/Scripts/git-webkit	2021-10-15 22:41:44 UTC (rev 284282)
+++ trunk/Tools/Scripts/git-webkit	2021-10-15 22:51:41 UTC (rev 284283)
@@ -26,7 +26,8 @@
 import sys
 
 import webkitpy
-from webkitscmpy import local, program, remote
+from webkitcorepy import run
+from webkitscmpy import local, program, remote, Contributor, log
 
 
 def is_webkit_filter(to_return):
@@ -45,10 +46,30 @@
 return callback
 
 
+def additional_setup(args, repository):
+if not isinstance(repository, local.Git):
+return 0
+
+log.warning('Setting merging behavior for changelogs...')
+if run([
+repository.executable(),
+'config', 'merge.changelog.driver',
+'perl {} --merge-driver -c %O %A %B'.format(os.path.join(
+os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__),
+'OpenSource', 'Tools', 'Scripts', 'resolve-ChangeLogs',
+)),
+], capture_output=True, cwd=repository.root_path).returncode:
+sys.stderr.write('Failed to set the git merging behaivor for changelogs...\n')
+return 1
+log.warning('Set merging behavior for changelogs!')
+return 0
+
+
 if '__main__' == __name__:
 sys.exit(program.main(
 path=os.path.dirname(__file__),
 identifier_template=is_webkit_filter('Canonical link: https://commits.webkit.org/{}'),
 subversion=is_webkit_filter('https://svn.webkit.org/repository/webkit'),
+additional_setup=is_webkit_filter(additional_setup),
 ))
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284282 => 284283)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-15 22:41:44 UTC (rev 284282)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-15 22:51:41 UTC (rev 284283)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.11',
+version='2.2.12',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[
@@ -58,7 +58,7 @@
 'webkitscmpy.test',
 ],
 scripts=['git-webkit'],
-install_requires=['fasteners', 'monotonic', 'webkitcorepy', 'xmltodict'],
+install_requires=['fasteners', 'inspect2', 'monotonic', 'webkitcorepy', 'xmltodict'],
 include_package_data=True,
 zip_safe=False,
 )


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284282 => 284283)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-15 22:41:44 UTC (rev 284282)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-15 22:51:41 UTC (rev 284283)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )

[webkit-changes] [284278] trunk

2021-10-15 Thread jbedard

Title: [284278] trunk








Revision 284278
Author jbed...@apple.com
Date 2021-10-15 15:36:55 -0700 (Fri, 15 Oct 2021)


Log Message
Add github username for Dewei Zhu

Unreviewed.

* metadata/contributors.json:

Modified Paths

trunk/ChangeLog
trunk/metadata/contributors.json




Diff

Modified: trunk/ChangeLog (284277 => 284278)

--- trunk/ChangeLog	2021-10-15 22:25:24 UTC (rev 284277)
+++ trunk/ChangeLog	2021-10-15 22:36:55 UTC (rev 284278)
@@ -1,3 +1,11 @@
+2021-10-15  Jonathan Bedard  
+
+Add github username for Dewei Zhu
+
+Unreviewed.
+
+* metadata/contributors.json:
+
 2021-10-15  Andres Gonzalez  
 
 Change Andres Gonzalez status to reviewer.


Modified: trunk/metadata/contributors.json (284277 => 284278)

--- trunk/metadata/contributors.json	2021-10-15 22:25:24 UTC (rev 284277)
+++ trunk/metadata/contributors.json	2021-10-15 22:36:55 UTC (rev 284278)
@@ -1897,6 +1897,7 @@
  "dewei_...@apple.com"
   ],
   "expertise" : "Performance, Tools",
+  "github" : "dewei-zhu",
   "name" : "Dewei Zhu",
   "nicks" : [
  "Dewei"
@@ -6470,8 +6471,8 @@
   "emails" : [
  "vjaq...@igalia.com"
   ],
+  "expertise" : "WebKitGTK, WPE, GStreamer",
   "github" : "ceyusa",
-  "expertise" : "WebKitGTK, WPE, GStreamer",
   "name" : "Victor Jaquez",
   "nicks" : [
  "vjaquez",
@@ -6964,4 +6965,4 @@
   ],
   "status" : "reviewer"
}
-]
+]
\ No newline at end of file






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284263] trunk/Tools

2021-10-15 Thread jbedard

Title: [284263] trunk/Tools








Revision 284263
Author jbed...@apple.com
Date 2021-10-15 12:14:53 -0700 (Fri, 15 Oct 2021)


Log Message
[webkitscmpy] Refactor PR branch management (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=230432


Reviewed by Stephanie Lewis.

When we are uploading a change that includes multiple commits,
the second commit will be on the same branch as the first, but that
branch will be editable. We should not declare that "no commits
have been found on an editable branch," because that's not true.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
(Branch.branch_point): Log the found commit for branches with multiple commits.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py




Diff

Modified: trunk/Tools/ChangeLog (284262 => 284263)

--- trunk/Tools/ChangeLog	2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/ChangeLog	2021-10-15 19:14:53 UTC (rev 284263)
@@ -1,3 +1,21 @@
+2021-10-15  Jonathan Bedard  
+
+[webkitscmpy] Refactor PR branch management (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=230432
+
+
+Reviewed by Stephanie Lewis.
+
+When we are uploading a change that includes multiple commits,
+the second commit will be on the same branch as the first, but that
+branch will be editable. We should not declare that "no commits
+have been found on an editable branch," because that's not true.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
+(Branch.branch_point): Log the found commit for branches with multiple commits.
+
 2021-10-15  Aakash Jain  
 
 Make submit to ews error messages readable


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284262 => 284263)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-15 19:14:53 UTC (rev 284263)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.10',
+version='2.2.11',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284262 => 284263)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-15 19:14:53 UTC (rev 284263)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 10)
+version = Version(2, 2, 11)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py (284262 => 284263)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py	2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py	2021-10-15 19:14:53 UTC (rev 284263)
@@ -62,7 +62,7 @@
 while not commit or cls.editable(commit.branch, repository=repository):
 cnt += 1
 commit = repository.find(argument='HEAD~{}'.format(cnt), include_log=False, include_identifier=False)
-if cnt > 1 or commit.branch != repository.branch:
+if cnt > 1 or commit.branch != repository.branch or cls.editable(commit.branch, repository=repository):
 log.warning('Found {}...'.format(string_utils.pluralize(cnt, 'commit')))
 else:
 log.warning('No commits on editable branch')






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284165] trunk/Tools

2021-10-14 Thread jbedard

Title: [284165] trunk/Tools








Revision 284165
Author jbed...@apple.com
Date 2021-10-14 09:08:07 -0700 (Thu, 14 Oct 2021)


Log Message
[git-webkit] Reset author time when editing commits (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=230224

Reviewed by Dewei Zhu.

update-ref creates a sticky ref file, which is not what we want.
Use 'fetch' instead.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): Use fetch instead of update-ref.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py




Diff

Modified: trunk/Tools/ChangeLog (284164 => 284165)

--- trunk/Tools/ChangeLog	2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/ChangeLog	2021-10-14 16:08:07 UTC (rev 284165)
@@ -1,3 +1,19 @@
+2021-10-14  Jonathan Bedard  
+
+[git-webkit] Reset author time when editing commits (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=230224
+
+Reviewed by Dewei Zhu.
+
+update-ref creates a sticky ref file, which is not what we want.
+Use 'fetch' instead.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.pull): Use fetch instead of update-ref.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+
 2021-10-14  Aakash Jain  
 
 Disable django admin url on ews.webkit.org


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284164 => 284165)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-14 16:08:07 UTC (rev 284165)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.9',
+version='2.2.10',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284164 => 284165)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-14 16:08:07 UTC (rev 284165)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 9)
+version = Version(2, 2, 10)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (284164 => 284165)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-14 16:08:07 UTC (rev 284165)
@@ -814,7 +814,7 @@
 
 if not code and branch:
 code = run(
-[self.executable(), 'update-ref', branch, '{}/{}'.format(remote, branch)],
+[self.executable(), 'fetch', remote, '{}:{}'.format(branch, branch)],
 cwd=self.root_path,
 ).returncode
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (284164 => 284165)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py	2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py	2021-10-14 16:08:07 UTC (rev 284165)
@@ -431,7 +431,7 @@
 cwd=self.path,
 generator=lambda *args, **kwargs: mocks.ProcessCompletion(returncode=0),
 ), mocks.Subprocess.Route(
-self.executable, 'update-ref', re.compile(r'.+'), re.compile(r'.+'),
+self.executable, 'fetch', 'origin', re.compile(r'.+:.+'),
 cwd=self.path,
 generator=lambda *args, **kwargs: mocks.ProcessCompletion(returncode=0),
 ), mocks.Subprocess.Route(






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284128] trunk/Tools

2021-10-13 Thread jbedard

Title: [284128] trunk/Tools








Revision 284128
Author jbed...@apple.com
Date 2021-10-13 15:09:42 -0700 (Wed, 13 Oct 2021)


Log Message
[webkitscmpy] List reviewers for pull-request
https://bugs.webkit.org/show_bug.cgi?id=231577


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
(BitBucket.request): Add state to created pull-reqest.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub):
(GitHub._users): Vend json representation of user for username.
(GitHub.request): Filter review details, add users endpoint.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.main): Match both closed and opened pull-requests.
* Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
(PullRequest): Remove state.
(PullRequest.__init__): Add opened flag, reviewers and generator.
(PullRequest.reviewers): List the users who are reviewing this change.
(PullRequest.approvers): List the users who have aproved this change.
(PullRequest.blockers): List the users that are blocking this change from landing.
(PullRequest.opened): Check the pull-request is opened.
(PullRequest.State): Deleted.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.PullRequest): Set opened flag, specify reviewers.
(BitBucket.PRGenerator.find): Filter by opened flag instead of state.
(BitBucket.PRGenerator.update): Set generator.
(BitBucket.PRGenerator.reviewers): Set reviewer lists.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.PullRequest): Set opened flag, pass generator.
(GitHub.PRGenerator.find): Filter by opened flag instead of state.
(GitHub.PRGenerator.update): Set generator and opened flag.
(GitHub.PRGenerator._contributor): Find contributor matching username.
(GitHub.PRGenerator.reviewers): Populate lists of reviewers for a pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
(Scm.PRGenerator.find): Filter via opened flag instead of state.
(Scm.PRGenerator.reviewers): Function which populates reviewer lists for a pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (284127 => 284128)

--- trunk/Tools/ChangeLog	2021-10-13 21:40:32 UTC (rev 284127)
+++ trunk/Tools/ChangeLog	2021-10-13 22:09:42 UTC (rev 284128)
@@ -1,3 +1,45 @@
+2021-10-13  Jonathan Bedard  
+
+[webkitscmpy] List reviewers for pull-request
+https://bugs.webkit.org/show_bug.cgi?id=231577
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
+(BitBucket.request): Add state to created pull-reqest.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub):
+(GitHub._users): Vend json representation of user for username.
+(GitHub.request): Filter review details, add users endpoint.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.main): Match both closed and opened pull-requests.
+* Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
+(PullRequest): Remove state.
+(PullRequest.__init__): Add opened flag, reviewers and generator.
+(PullRequest.reviewers): List the users who are reviewing this change.
+(PullRequest.approvers): List the users who have aproved this change.
+(PullRequest.blockers): List the users that are blocking this change from landing.
+(PullRequest.opened): Check the pull-request is opened.
+(PullRequest.State): Deleted.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
+(BitBucket.PRGenerator.PullRequest): Set opened flag, specify reviewers.
+(BitBucket.PRGenerator.find): Filter by opened flag instead of state.
+(BitBucket.PRGenerator.update): Set generator.
+(BitBucket.PRGener

[webkit-changes] [284072] trunk/Tools

2021-10-12 Thread jbedard

Title: [284072] trunk/Tools








Revision 284072
Author jbed...@apple.com
Date 2021-10-12 18:09:27 -0700 (Tue, 12 Oct 2021)


Log Message
[AppleSilicon] Support native simulator testing
https://bugs.webkit.org/show_bug.cgi?id=231639


Reviewed by Tim Horton.

* Scripts/webkitpy/port/ios_simulator.py:
(IOSSimulatorPort): Add arm64 as possible architecture.
(IOSSimulatorPort.architecture): Return the native system's architecture.
* Scripts/webkitpy/port/watch_simulator.py:
(WatchSimulatorPort): Add arm64_32.
(WatchSimulatorPort.architecture): Return the native system's 32 bit architecture.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/ios_simulator.py
trunk/Tools/Scripts/webkitpy/port/watch_simulator.py




Diff

Modified: trunk/Tools/ChangeLog (284071 => 284072)

--- trunk/Tools/ChangeLog	2021-10-13 01:06:18 UTC (rev 284071)
+++ trunk/Tools/ChangeLog	2021-10-13 01:09:27 UTC (rev 284072)
@@ -1,3 +1,18 @@
+2021-10-12  Jonathan Bedard  
+
+[AppleSilicon] Support native simulator testing
+https://bugs.webkit.org/show_bug.cgi?id=231639
+
+
+Reviewed by Tim Horton.
+
+* Scripts/webkitpy/port/ios_simulator.py:
+(IOSSimulatorPort): Add arm64 as possible architecture.
+(IOSSimulatorPort.architecture): Return the native system's architecture.
+* Scripts/webkitpy/port/watch_simulator.py:
+(WatchSimulatorPort): Add arm64_32.
+(WatchSimulatorPort.architecture): Return the native system's 32 bit architecture.
+
 2021-10-12  Garrett Davidson  
 
 Adopt platform UI for WebAuthn


Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (284071 => 284072)

--- trunk/Tools/Scripts/webkitpy/port/ios_simulator.py	2021-10-13 01:06:18 UTC (rev 284071)
+++ trunk/Tools/Scripts/webkitpy/port/ios_simulator.py	2021-10-13 01:09:27 UTC (rev 284072)
@@ -38,7 +38,7 @@
 port_name = "ios-simulator"
 
 FUTURE_VERSION = 'future'
-ARCHITECTURES = ['x86_64', 'i386']
+ARCHITECTURES = ['x86_64', 'i386', 'arm64']
 DEFAULT_ARCHITECTURE = 'x86_64'
 
 DEVICE_MANAGER = SimulatedDeviceManager
@@ -50,6 +50,12 @@
 ]
 SDK = apple_additions().get_sdk('iphonesimulator') if apple_additions() else 'iphonesimulator'
 
+def architecture(self):
+result = self.get_option('architecture') or self.host.platform.architecture()
+if result == 'arm64e':
+return 'arm64'
+return result
+
 @staticmethod
 def _version_from_name(name):
 if len(name.split('-')) > 2 and name.split('-')[2].isdigit():


Modified: trunk/Tools/Scripts/webkitpy/port/watch_simulator.py (284071 => 284072)

--- trunk/Tools/Scripts/webkitpy/port/watch_simulator.py	2021-10-13 01:06:18 UTC (rev 284071)
+++ trunk/Tools/Scripts/webkitpy/port/watch_simulator.py	2021-10-13 01:09:27 UTC (rev 284072)
@@ -36,7 +36,7 @@
 class WatchSimulatorPort(WatchPort):
 port_name = 'watchos-simulator'
 
-ARCHITECTURES = ['i386']
+ARCHITECTURES = ['i386', 'arm64_32']
 DEFAULT_ARCHITECTURE = 'i386'
 
 DEVICE_MANAGER = SimulatedDeviceManager
@@ -45,6 +45,9 @@
 SDK = apple_additions().get_sdk('watchsimulator') if apple_additions() else 'watchsimulator'
 
 def architecture(self):
+result = self.get_option('architecture') or self.host.platform.architecture()
+if result in ('arm64', 'arm64e'):
+return 'arm64_32'
 return self.DEFAULT_ARCHITECTURE
 
 # This supports the mapping of a port name such as watchos-simulator-5 to the construction of a port






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284010] trunk/Tools

2021-10-12 Thread jbedard

Title: [284010] trunk/Tools








Revision 284010
Author jbed...@apple.com
Date 2021-10-12 13:22:37 -0700 (Tue, 12 Oct 2021)


Log Message
Reverting r282216 becasue unauthenticated GitHub requests have low rate limits
https://bugs.webkit.org/show_bug.cgi?id=230095

Reviewed by Ryan Haddad.

* CISupport/ews-build/factories.py:
(WatchListFactory.__init__):
* CISupport/ews-build/factories_unittest.py:
(TestExpectedBuildSteps):

Modified Paths

trunk/Tools/CISupport/ews-build/factories.py
trunk/Tools/CISupport/ews-build/factories_unittest.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/ews-build/factories.py (284009 => 284010)

--- trunk/Tools/CISupport/ews-build/factories.py	2021-10-12 20:09:19 UTC (rev 284009)
+++ trunk/Tools/CISupport/ews-build/factories.py	2021-10-12 20:22:37 UTC (rev 284010)
@@ -84,7 +84,6 @@
 self.addStep(UpdateWorkingDirectory())
 self.addStep(ApplyPatch())
 self.addStep(ApplyWatchList())
-self.addStep(VerifyGitHubIntegrity())
 
 
 class BindingsFactory(Factory):


Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (284009 => 284010)

--- trunk/Tools/CISupport/ews-build/factories_unittest.py	2021-10-12 20:09:19 UTC (rev 284009)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py	2021-10-12 20:22:37 UTC (rev 284010)
@@ -49,8 +49,7 @@
 'show-identifier',
 'update-working-directory',
 'apply-patch',
-'apply-watch-list',
-'verify-github-integrity'
+'apply-watch-list'
 ],
 'GTK-Build-EWS': [
 'configure-build',


Modified: trunk/Tools/ChangeLog (284009 => 284010)

--- trunk/Tools/ChangeLog	2021-10-12 20:09:19 UTC (rev 284009)
+++ trunk/Tools/ChangeLog	2021-10-12 20:22:37 UTC (rev 284010)
@@ -1,5 +1,17 @@
 2021-10-12  Jonathan Bedard  
 
+Reverting r282216 becasue unauthenticated GitHub requests have low rate limits
+https://bugs.webkit.org/show_bug.cgi?id=230095
+
+Reviewed by Ryan Haddad.
+
+* CISupport/ews-build/factories.py:
+(WatchListFactory.__init__):
+* CISupport/ews-build/factories_unittest.py:
+(TestExpectedBuildSteps):
+
+2021-10-12  Jonathan Bedard  
+
 [Python-3] Invoke webkit-patch with Python 3 by default
 https://bugs.webkit.org/show_bug.cgi?id=231591
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284005] trunk/Tools

2021-10-12 Thread jbedard

Title: [284005] trunk/Tools








Revision 284005
Author jbed...@apple.com
Date 2021-10-12 12:39:03 -0700 (Tue, 12 Oct 2021)


Log Message
[Python-3] Invoke webkit-patch with Python 3 by default
https://bugs.webkit.org/show_bug.cgi?id=231591


Reviewed by Michael Catanzaro.

* Scripts/webkit-patch: Change shebang to Python 3.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkit-patch




Diff

Modified: trunk/Tools/ChangeLog (284004 => 284005)

--- trunk/Tools/ChangeLog	2021-10-12 19:37:31 UTC (rev 284004)
+++ trunk/Tools/ChangeLog	2021-10-12 19:39:03 UTC (rev 284005)
@@ -1,3 +1,13 @@
+2021-10-12  Jonathan Bedard  
+
+[Python-3] Invoke webkit-patch with Python 3 by default
+https://bugs.webkit.org/show_bug.cgi?id=231591
+
+
+Reviewed by Michael Catanzaro.
+
+* Scripts/webkit-patch: Change shebang to Python 3.
+
 2021-10-12  Yusuke Suzuki  
 
 Unreviewed, run-benchmark fix after r283936


Modified: trunk/Tools/Scripts/webkit-patch (284004 => 284005)

--- trunk/Tools/Scripts/webkit-patch	2021-10-12 19:37:31 UTC (rev 284004)
+++ trunk/Tools/Scripts/webkit-patch	2021-10-12 19:39:03 UTC (rev 284005)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2011 Code Aurora Forum. All rights reserved.
 # Copyright (c) 2010 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [284002] trunk/Tools

2021-10-12 Thread jbedard

Title: [284002] trunk/Tools








Revision 284002
Author jbed...@apple.com
Date 2021-10-12 12:31:02 -0700 (Tue, 12 Oct 2021)


Log Message
Move few scripts from python 2 to python3 (Follow-up)
https://bugs.webkit.org/show_bug.cgi?id=229817

Reviewed by Alexey Proskuryakov.

* CISupport/clean-build: Invoke clean-webkit with Python 3.

Modified Paths

trunk/Tools/CISupport/clean-build
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/clean-build (284001 => 284002)

--- trunk/Tools/CISupport/clean-build	2021-10-12 19:08:29 UTC (rev 284001)
+++ trunk/Tools/CISupport/clean-build	2021-10-12 19:31:02 UTC (rev 284002)
@@ -58,7 +58,7 @@
 if (os.path.isdir(webkit_build_directory)):
 shutil.rmtree(webkit_build_directory)
 
-subprocess.Popen(['python', os.path.join(os.path.dirname(__file__), "..", "Scripts", "clean-webkit")])
+subprocess.Popen(['python3', os.path.join(os.path.dirname(__file__), "..", "Scripts", "clean-webkit")])
 
 if __name__ == '__main__':
 sys.exit(main())


Modified: trunk/Tools/ChangeLog (284001 => 284002)

--- trunk/Tools/ChangeLog	2021-10-12 19:08:29 UTC (rev 284001)
+++ trunk/Tools/ChangeLog	2021-10-12 19:31:02 UTC (rev 284002)
@@ -1,3 +1,12 @@
+2021-10-12  Jonathan Bedard  
+
+Move few scripts from python 2 to python3 (Follow-up)
+https://bugs.webkit.org/show_bug.cgi?id=229817
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/clean-build: Invoke clean-webkit with Python 3.
+
 2021-10-12  Alex Christensen  
 
 Remove non-HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE) code






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283939] trunk/Tools

2021-10-11 Thread jbedard

Title: [283939] trunk/Tools








Revision 283939
Author jbed...@apple.com
Date 2021-10-11 15:19:56 -0700 (Mon, 11 Oct 2021)


Log Message
[build-imagediff] Build universal binaries by default
https://bugs.webkit.org/show_bug.cgi?id=231527


Reviewed by Ryan Haddad.

* Scripts/build-imagediff:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/build-imagediff




Diff

Modified: trunk/Tools/ChangeLog (283938 => 283939)

--- trunk/Tools/ChangeLog	2021-10-11 21:45:29 UTC (rev 283938)
+++ trunk/Tools/ChangeLog	2021-10-11 22:19:56 UTC (rev 283939)
@@ -1,5 +1,15 @@
 2021-10-11  Jonathan Bedard  
 
+[build-imagediff] Build universal binaries by default
+https://bugs.webkit.org/show_bug.cgi?id=231527
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/build-imagediff:
+
+2021-10-11  Jonathan Bedard  
+
 [run-benchmark] Make Python 3 compatible
 https://bugs.webkit.org/show_bug.cgi?id=231512
 


Modified: trunk/Tools/Scripts/build-imagediff (283938 => 283939)

--- trunk/Tools/Scripts/build-imagediff	2021-10-11 21:45:29 UTC (rev 283938)
+++ trunk/Tools/Scripts/build-imagediff	2021-10-11 22:19:56 UTC (rev 283939)
@@ -55,6 +55,8 @@
exit 1;
 }
 
+setArchitecture("x86_64 arm64") if isAppleMacWebKit();
+
 checkRequiredSystemConfig();
 setConfiguration();
 chdirWebKit();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283936] trunk/Tools

2021-10-11 Thread jbedard

Title: [283936] trunk/Tools








Revision 283936
Author jbed...@apple.com
Date 2021-10-11 14:12:08 -0700 (Mon, 11 Oct 2021)


Log Message
[run-benchmark] Make Python 3 compatible
https://bugs.webkit.org/show_bug.cgi?id=231512


Reviewed by Dewei Zhu.

* Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
(LinuxBrowserDriver.launch_url): Encode Popen call if Python 3.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.launch_url): Ditto.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py
trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py




Diff

Modified: trunk/Tools/ChangeLog (283935 => 283936)

--- trunk/Tools/ChangeLog	2021-10-11 20:59:43 UTC (rev 283935)
+++ trunk/Tools/ChangeLog	2021-10-11 21:12:08 UTC (rev 283936)
@@ -1,3 +1,16 @@
+2021-10-11  Jonathan Bedard  
+
+[run-benchmark] Make Python 3 compatible
+https://bugs.webkit.org/show_bug.cgi?id=231512
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
+(LinuxBrowserDriver.launch_url): Encode Popen call if Python 3.
+* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+(OSXSafariDriver.launch_url): Ditto.
+
 2021-10-11  Alex Christensen  
 
 Reduce use of TCPServer


Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py (283935 => 283936)

--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py	2021-10-11 20:59:43 UTC (rev 283935)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py	2021-10-11 21:12:08 UTC (rev 283936)
@@ -99,9 +99,12 @@
 self._browser_arguments = [url]
 exec_args = [self.process_name] + self._browser_arguments
 _log.info('Executing: {browser_cmdline}'.format(browser_cmdline=' '.join(exec_args)))
-self._browser_process = subprocess.Popen(exec_args, env=self._test_environ,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
+self._browser_process = subprocess.Popen(
+exec_args, env=self._test_environ,
+stdout=subprocess.PIPE,
+stderr=subprocess.STDOUT,
+**(dict(encoding='utf-8') if sys.version_info >= (3, 6) else dict())
+)
 
 def launch_webdriver(self, url, driver):
 try:


Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (283935 => 283936)

--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py	2021-10-11 20:59:43 UTC (rev 283935)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py	2021-10-11 21:12:08 UTC (rev 283936)
@@ -67,7 +67,11 @@
 _log.info('Checking if any open file is from "{}".'.format(browser_build_path))
 # Cannot use 'check_call' here as '+D' option will have non-zero return code when not all files under
 # specified folder are used.
-process = subprocess.Popen(['/usr/sbin/lsof', '-a', '-p', str(self._safari_process.pid), '+D', browser_build_absolute_path], stdout=subprocess.PIPE)
+process = subprocess.Popen(
+['/usr/sbin/lsof', '-a', '-p', str(self._safari_process.pid), '+D', browser_build_absolute_path],
+stdout=subprocess.PIPE,
+**(dict(encoding='utf-8') if sys.version_info >= (3, 6) else dict())
+)
 output = process.communicate()[0]
 if has_safari_app:
 assert 'Safari.app/Contents/MacOS/Safari' in output, 'Safari.app is not launched from "{}"'.format(browser_build_path)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283904] trunk/Tools

2021-10-11 Thread jbedard

Title: [283904] trunk/Tools








Revision 283904
Author jbed...@apple.com
Date 2021-10-11 10:00:51 -0700 (Mon, 11 Oct 2021)


Log Message
[build.webkit.org] Build iOS 15 as universal binary (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=231389


Reviewed by Ryan Haddad.

* CISupport/build-webkit-org/config.json: Use universal iOS 15 Simulator Release build.

Modified Paths

trunk/Tools/CISupport/build-webkit-org/config.json
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/config.json (283903 => 283904)

--- trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-11 16:58:40 UTC (rev 283903)
+++ trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-11 17:00:51 UTC (rev 283904)
@@ -285,7 +285,7 @@
 },
 {
   "name": "Apple-iOS-15-Simulator-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ios-simulator-15-release-tests-wk2",
-  "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64"], "device_model": "iphone",
+  "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64", "arm64"], "device_model": "iphone",
   "additionalArguments": ["--no-retry-failures"],
   "workernames": ["bot651", "bot652"]
 },
@@ -297,7 +297,7 @@
 },
 {
   "name": "Apple-iPadOS-15-Simulator-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ipados-simulator-15-release-tests-wk2",
-  "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64"], "device_model": "ipad",
+  "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64", "arm64"], "device_model": "ipad",
   "additionalArguments": ["--no-retry-failures"],
   "workernames": ["bot667"]
 },


Modified: trunk/Tools/ChangeLog (283903 => 283904)

--- trunk/Tools/ChangeLog	2021-10-11 16:58:40 UTC (rev 283903)
+++ trunk/Tools/ChangeLog	2021-10-11 17:00:51 UTC (rev 283904)
@@ -1,3 +1,13 @@
+2021-10-11  Jonathan Bedard  
+
+[build.webkit.org] Build iOS 15 as universal binary (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=231389
+
+
+Reviewed by Ryan Haddad.
+
+* CISupport/build-webkit-org/config.json: Use universal iOS 15 Simulator Release build.
+
 2021-10-10  Michael Catanzaro  
 
 [WPE] Expose WKTextCheckerSetContinuousSpellCheckingEnabled and use it from WKTR






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283856] trunk

2021-10-08 Thread jbedard

Title: [283856] trunk








Revision 283856
Author jbed...@apple.com
Date 2021-10-08 17:41:29 -0700 (Fri, 08 Oct 2021)


Log Message
Add github username for Michael Catanzaro

Unreviewed.

* metadata/contributors.json:

Modified Paths

trunk/ChangeLog
trunk/metadata/contributors.json




Diff

Modified: trunk/ChangeLog (283855 => 283856)

--- trunk/ChangeLog	2021-10-09 00:41:24 UTC (rev 283855)
+++ trunk/ChangeLog	2021-10-09 00:41:29 UTC (rev 283856)
@@ -1,3 +1,11 @@
+2021-10-08  Jonathan Bedard  
+
+Add github username for Michael Catanzaro
+
+Unreviewed.
+
+* metadata/contributors.json:
+
 2021-10-08  Kenneth Russell  
 
 Add github username for kbr


Modified: trunk/metadata/contributors.json (283855 => 283856)

--- trunk/metadata/contributors.json	2021-10-09 00:41:24 UTC (rev 283855)
+++ trunk/metadata/contributors.json	2021-10-09 00:41:29 UTC (rev 283856)
@@ -4640,6 +4640,7 @@
  "mcatanz...@igalia.com"
   ],
   "expertise" : "The WebKitGTK Port, Epiphany, Soup HTTP Backend",
+  "github" : "mcatanzaro",
   "name" : "Michael Catanzaro",
   "nicks" : [
  "mcatanzaro"






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283847] trunk/Tools

2021-10-08 Thread jbedard

Title: [283847] trunk/Tools








Revision 283847
Author jbed...@apple.com
Date 2021-10-08 16:02:19 -0700 (Fri, 08 Oct 2021)


Log Message
[webkitscmpy] Allow caller to differentiate remote branches
https://bugs.webkit.org/show_bug.cgi?id=231450


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.branches): Change _branches_for to branches_for.
(Git.branches_for): Allow call to differentiate remote branches
to be returned, or return dictionary of all remotes.
(Git.commit): Change _branches_for to branches_for.
(Git._branches_for): Renamed branches_for.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py




Diff

Modified: trunk/Tools/ChangeLog (283846 => 283847)

--- trunk/Tools/ChangeLog	2021-10-08 22:57:14 UTC (rev 283846)
+++ trunk/Tools/ChangeLog	2021-10-08 23:02:19 UTC (rev 283847)
@@ -1,3 +1,20 @@
+2021-10-08  Jonathan Bedard  
+
+[webkitscmpy] Allow caller to differentiate remote branches
+https://bugs.webkit.org/show_bug.cgi?id=231450
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.branches): Change _branches_for to branches_for.
+(Git.branches_for): Allow call to differentiate remote branches
+to be returned, or return dictionary of all remotes.
+(Git.commit): Change _branches_for to branches_for.
+(Git._branches_for): Renamed branches_for.
+
 2021-10-08  Michael Catanzaro  
 
 Ensure webkitpy secret storage works successfully on Linux using only autoinstalled libraries


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (283846 => 283847)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-08 22:57:14 UTC (rev 283846)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-08 23:02:19 UTC (rev 283847)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.7',
+version='2.2.8',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (283846 => 283847)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-08 22:57:14 UTC (rev 283846)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-08 23:02:19 UTC (rev 283847)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 7)
+version = Version(2, 2, 8)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (283846 => 283847)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-08 22:57:14 UTC (rev 283846)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-08 23:02:19 UTC (rev 283847)
@@ -31,6 +31,7 @@
 import time
 
 from datetime import datetime, timedelta
+from collections import defaultdict
 
 from webkitcorepy import run, decorators, NestedFuzzyDict
 from webkitscmpy.local import Scm
@@ -275,6 +276,7 @@
 GIT_COMMIT = re.compile(r'commit (?P[0-9a-f]+)')
 SSH_REMOTE = re.compile('(ssh://)?git@(?P[^:/]+)[:/](?P.+).git')
 HTTP_REMOTE = re.compile('(?Phttps?)://(?P.+)/(?P.+).git')
+REMOTE_BRANCH = re.compile(r'remotes\/(?P[^\/]+)\/(?P.+)')
 
 @classmethod
 @decorators.Memoize()
@@ -388,7 +390,7 @@
 
 @property
 def branches(self):
-return self._branches_for()
+return self.branches_for()
 
 @property
 def tags(self):
@@ -434,7 +436,7 @@
 raise self.Exception('Failed to retrieve revision count for {}'.format(native_parameter))
 return int(revision_count.stdout)
 
-def _branches_for(self, hash=None):
+def branches_for(self, hash=None, remote=True):
 branch = run(
 [self.executable(), 'branch', '-a'] + (['--contains', hash] if hash else []),
 cwd=self.root_path,
@@ -443,9 +445,22 @@
 )
 if branch.returncode:
 raise self.Exception('Failed to retrieve branch list for {}'.format(self.root_path))
-result = [branch.lstrip(' *') for branch in filter(lambda branch: '->' not in branch, branch.stdout.splitlines())]
-return sorted(set(['/'.join(branch.split('/')[2:]) if branch.startswith('remotes/origin/') else branch for branch in result]))
+result = defaultdict(set)
+

[webkit-changes] [283833] trunk

2021-10-08 Thread jbedard

   contributor = Bot(name, data.get('emails'), data.get('nicks'), data.get('aliases'), data.get('expertise'), data.get('github'))
 else:
-contributor = Contributor(name, data.get('emails'), data.get('nicks'), data.get('aliases'), data.get('expertise'))
+contributor = Contributor(name, data.get('emails'), data.get('nicks'), data.get('aliases'), data.get('expertise'), data.get('github'))
 
 self._contributors.append(contributor)
 


Modified: trunk/metadata/contributors.json (283832 => 283833)

--- trunk/metadata/contributors.json	2021-10-08 19:44:59 UTC (rev 283832)
+++ trunk/metadata/contributors.json	2021-10-08 19:53:57 UTC (rev 283833)
@@ -229,6 +229,7 @@
   "emails" : [
  "alanc...@apple.com"
   ],
+  "github" : "alancoon",
   "name" : "Alan Coon",
   "nicks" : [
  "alancoon"
@@ -400,6 +401,7 @@
  "a...@webkit.org",
  "a...@apple.com"
   ],
+  "github" : "aproskuryakov",
   "name" : "Alexey Proskuryakov",
   "nicks" : [
  "ap"
@@ -3529,6 +3531,7 @@
  "jbed...@webkit.org"
   ],
   "expertise" : "webkitpy, Python, testing",
+  "github" : "JonWBedard",
   "name" : "Jonathan Bedard",
   "nicks" : [
  "jbedard",
@@ -4020,6 +4023,7 @@
   "emails" : [
  "kocsen_ch...@apple.com"
   ],
+  "github" : "kocsenc",
   "name" : "Kocsen Chung",
   "status" : "committer"
},
@@ -4527,6 +4531,7 @@
   "emails" : [
  "jlew...@apple.com"
   ],
+  "github" : "rancored-mongoose",
   "name" : "Matt Lewis",
   "nicks" : [
  "mattlewis"
@@ -5601,6 +5606,7 @@
   "emails" : [
  "ryanhad...@apple.com"
   ],
+  "github" : "ryanhaddad",
   "name" : "Ryan Haddad",
   "nicks" : [
  "ryanhaddad"
@@ -6910,4 +6916,4 @@
   ],
   "status" : "reviewer"
}
-]
+]
\ No newline at end of file






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283824] trunk/Tools

2021-10-08 Thread jbedard

Title: [283824] trunk/Tools








Revision 283824
Author jbed...@apple.com
Date 2021-10-08 12:19:16 -0700 (Fri, 08 Oct 2021)


Log Message
[webkitcorepy] Not possible to autoinstall a package with micro version 0
https://bugs.webkit.org/show_bug.cgi?id=230540


Reviewed by Michael Catanzaro.

* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py:
(VersionTestCase.test_int_constructor): Default values are 'None.'
* Scripts/libraries/webkitcorepy/webkitcorepy/version.py:
(Version.from_iterable):
(Version.__init__): Use 'None' as the default value instead of 0.
(Version.__setitem__): Support 'None' as a version value.
(Version.__contains__): Ditto.
(Version.__hash__): Ditto.
(Version.__cmp__): Ditto.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py




Diff

Modified: trunk/Tools/ChangeLog (283823 => 283824)

--- trunk/Tools/ChangeLog	2021-10-08 19:16:57 UTC (rev 283823)
+++ trunk/Tools/ChangeLog	2021-10-08 19:19:16 UTC (rev 283824)
@@ -1,3 +1,23 @@
+2021-10-08  Jonathan Bedard  
+
+[webkitcorepy] Not possible to autoinstall a package with micro version 0
+https://bugs.webkit.org/show_bug.cgi?id=230540
+
+
+Reviewed by Michael Catanzaro.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py:
+(VersionTestCase.test_int_constructor): Default values are 'None.'
+* Scripts/libraries/webkitcorepy/webkitcorepy/version.py:
+(Version.from_iterable):
+(Version.__init__): Use 'None' as the default value instead of 0.
+(Version.__setitem__): Support 'None' as a version value.
+(Version.__contains__): Ditto.
+(Version.__hash__): Ditto.
+(Version.__cmp__): Ditto.
+
 2021-10-08  Andres Gonzalez  
 
 AX: AXMathRootRadicand should return an array of elements, not just the first


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (283823 => 283824)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-10-08 19:16:57 UTC (rev 283823)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-10-08 19:19:16 UTC (rev 283824)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.11.1',
+version='0.11.2',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (283823 => 283824)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-10-08 19:16:57 UTC (rev 283823)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-10-08 19:19:16 UTC (rev 283824)
@@ -43,7 +43,7 @@
 from webkitcorepy.editor import Editor
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 11, 1)
+version = Version(0, 11, 2)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py (283823 => 283824)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py	2021-10-08 19:16:57 UTC (rev 283823)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/version_unittest.py	2021-10-08 19:19:16 UTC (rev 283824)
@@ -52,10 +52,10 @@
 def test_int_constructor(self):
 v = Version(1)
 self.assertEqual(v.major, 1)
-self.assertEqual(v.minor, 0)
-self.assertEqual(v.tiny, 0)
-self.assertEqual(v.micro, 0)
-self.assertEqual(v.nano, 0)
+self.assertEqual(v.minor, None)
+self.assertEqual(v.tiny, None)
+self.assertEqual(v.micro, None)
+self.assertEqual(v.nano, None)
 
 def test_len(self):
 self.assertEqual(len(Version(1, 2, 3, 4, 5)), 5)


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py (283823 => 283824)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py	2021-10-08 19:16:57 UTC (rev 283823)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/version.py	2021-10-08 19:19:16 UTC (rev 283824)
@@ -37,7 +37,7 @@
 def from_iterable(val):
 result = Version()
 for i in range(len(val)):
-result[i] = int(val[i])
+result[i] = None if val[i] is None else int(val[i])
 return result
 
 @staticmethod
@@ -45,12 +45,12 @@
 from webkitpy.common.version_name_map import VersionNameMap
 return Vers

[webkit-changes] [283759] trunk/Tools

2021-10-07 Thread jbedard

Title: [283759] trunk/Tools








Revision 283759
Author jbed...@apple.com
Date 2021-10-07 17:09:51 -0700 (Thu, 07 Oct 2021)


Log Message
[webkitscmpy] Library should own contributors.json loading
https://bugs.webkit.org/show_bug.cgi?id=231310


Unreviewed follow-up fix.

* Scripts/git-webkit: Fix imports.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit




Diff

Modified: trunk/Tools/ChangeLog (283758 => 283759)

--- trunk/Tools/ChangeLog	2021-10-07 23:45:07 UTC (rev 283758)
+++ trunk/Tools/ChangeLog	2021-10-08 00:09:51 UTC (rev 283759)
@@ -4,6 +4,16 @@
 https://bugs.webkit.org/show_bug.cgi?id=231310
 
 
+Unreviewed follow-up fix.
+
+* Scripts/git-webkit: Fix imports.
+
+2021-10-07  Jonathan Bedard  
+
+[webkitscmpy] Library should own contributors.json loading
+https://bugs.webkit.org/show_bug.cgi?id=231310
+
+
 Reviewed by Dewei Zhu.
 
 * Scripts/git-webkit: Do not load contributors from webkitpy.


Modified: trunk/Tools/Scripts/git-webkit (283758 => 283759)

--- trunk/Tools/Scripts/git-webkit	2021-10-07 23:45:07 UTC (rev 283758)
+++ trunk/Tools/Scripts/git-webkit	2021-10-08 00:09:51 UTC (rev 283759)
@@ -25,7 +25,8 @@
 import os
 import sys
 
-from webkitscmpy import local, program, remote, Contributor
+import webkitpy
+from webkitscmpy import local, program, remote
 
 
 def is_webkit_filter(to_return):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283758] trunk/Tools

2021-10-07 Thread jbedard

Title: [283758] trunk/Tools








Revision 283758
Author jbed...@apple.com
Date 2021-10-07 16:45:07 -0700 (Thu, 07 Oct 2021)


Log Message
[webkitscmpy] Library should own contributors.json loading
https://bugs.webkit.org/show_bug.cgi?id=231310


Reviewed by Dewei Zhu.

* Scripts/git-webkit: Do not load contributors from webkitpy.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
(Contributor.Encoder.default): Save contributor status to json.
(Contributor.Mapping.load): contributors.json is a list, may include
status, aliases and nicks.
(Contributor.Mapping.save): Save contributors to json file.
(Contributor.Mapping.__iter__): Iterate through all contributors.
(Contributor.__init__): Add status to contributor.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py:
(Scm.__init__): Attempt to load contributors.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
(Svn.__init__): Set root_path before constructing base class.
* Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:
(ScmBase.__init__): Only reset path if it's not already defined.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py:
(TestContributor.test_iteration):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (283757 => 283758)

--- trunk/Tools/ChangeLog	2021-10-07 23:43:09 UTC (rev 283757)
+++ trunk/Tools/ChangeLog	2021-10-07 23:45:07 UTC (rev 283758)
@@ -1,5 +1,32 @@
 2021-10-07  Jonathan Bedard  
 
+[webkitscmpy] Library should own contributors.json loading
+https://bugs.webkit.org/show_bug.cgi?id=231310
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/git-webkit: Do not load contributors from webkitpy.
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
+(Contributor.Encoder.default): Save contributor status to json.
+(Contributor.Mapping.load): contributors.json is a list, may include
+status, aliases and nicks.
+(Contributor.Mapping.save): Save contributors to json file.
+(Contributor.Mapping.__iter__): Iterate through all contributors.
+(Contributor.__init__): Add status to contributor.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py:
+(Scm.__init__): Attempt to load contributors.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+(Svn.__init__): Set root_path before constructing base class.
+* Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:
+(ScmBase.__init__): Only reset path if it's not already defined.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py:
+(TestContributor.test_iteration):
+
+2021-10-07  Jonathan Bedard  
+
 [webkitscmpy] Share cache between processes
 https://bugs.webkit.org/show_bug.cgi?id=231176
 


Modified: trunk/Tools/Scripts/git-webkit (283757 => 283758)

--- trunk/Tools/Scripts/git-webkit	2021-10-07 23:43:09 UTC (rev 283757)
+++ trunk/Tools/Scripts/git-webkit	2021-10-07 23:45:07 UTC (rev 283758)
@@ -25,7 +25,6 @@
 import os
 import sys
 
-from webkitpy.common.config.committers import CommitterList
 from webkitscmpy import local, program, remote, Contributor
 
 
@@ -46,21 +45,8 @@
 
 
 if '__main__' == __name__:
-contributors = Contributor.Mapping()
-for contributor in CommitterList().contributors():
-c = contributors.create(contributor.full_name, *contributor.emails)
-if not c:
-continue
-for alias in contributor.aliases or []:
-if alias not in contributors:
-contributors[alias] = c
-for nick in contributor.irc_nicknames or []:
-if nick not in contributors:
-contributors[nick] = c
-
 sys.exit(program.main(
 path=os.path.dirname(__file__),
-contributors=is_webkit_filter(contributors),
 identifier_template=is_webkit_filter('Canonical link: https://commits.webkit.org/{}'),
 subversion=is_webkit_filter('https://svn.webkit.org/repository/webkit'),
 ))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (283757 => 283758)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-07 23:43:09 UTC (rev 283757)

[webkit-changes] [283751] trunk/Tools

2021-10-07 Thread jbedard

Title: [283751] trunk/Tools








Revision 283751
Author jbed...@apple.com
Date 2021-10-07 16:00:15 -0700 (Thu, 07 Oct 2021)


Log Message
[webkitscmpy] Share cache between processes
https://bugs.webkit.org/show_bug.cgi?id=231176


Reviewed by Dewei Zhu.

Generating the identifier cache is more expensive than reading a file with
that cache in it. This is particularly relevant for webservers, which are
likely running multiple processes.

Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.Cache.__init__): Move cache loading into "load" function.
(Git.Cache.load): Open cache file.
(Git.Cache.to_hash): If we fail to find a match, attempt to load the file
before populating the file.
(Git.Cache.to_revision): Ditto.
(Git.Cache.to_identifier): Ditto.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py




Diff

Modified: trunk/Tools/ChangeLog (283750 => 283751)

--- trunk/Tools/ChangeLog	2021-10-07 22:55:33 UTC (rev 283750)
+++ trunk/Tools/ChangeLog	2021-10-07 23:00:15 UTC (rev 283751)
@@ -1,5 +1,29 @@
 2021-10-07  Jonathan Bedard  
 
+[webkitscmpy] Share cache between processes
+https://bugs.webkit.org/show_bug.cgi?id=231176
+
+
+Reviewed by Dewei Zhu.
+
+Generating the identifier cache is more expensive than reading a file with
+that cache in it. This is particularly relevant for webservers, which are
+likely running multiple processes.
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.Cache.__init__): Move cache loading into "load" function.
+(Git.Cache.load): Open cache file.
+(Git.Cache.to_hash): If we fail to find a match, attempt to load the file
+before populating the file.
+(Git.Cache.to_revision): Ditto.
+(Git.Cache.to_identifier): Ditto.
+
+2021-10-07  Jonathan Bedard  
+
 [contributors.json] Relocation (Part 7)
 https://bugs.webkit.org/show_bug.cgi?id=229690
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (283750 => 283751)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-07 22:55:33 UTC (rev 283750)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-07 23:00:15 UTC (rev 283751)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.4',
+version='2.2.5',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (283750 => 283751)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-07 22:55:33 UTC (rev 283750)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-07 23:00:15 UTC (rev 283751)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 4)
+version = Version(2, 2, 5)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (283750 => 283751)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-07 22:55:33 UTC (rev 283750)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-10-07 23:00:15 UTC (rev 283751)
@@ -49,6 +49,9 @@
 self._last_populated = {}
 self._guranteed_for = guranteed_for
 
+self.load()
+
+def load(self):
 if not os.path.exists(self.path):
 return
 
@@ -204,13 +207,17 @@
 _, b_count, branch = parts
 if b_count < 0:
 return None
-if branch not in self._ordered_commits or len(self._ordered_commits[branch]) <= b_count:
-if populate:
-self.populate(branch=branch)
-return self.to_hash(identifier=identifier, populate=False)
-return None
-return self._ordered_commits[branch][b_count]
+if branch in self._ordered_commits and len(self._ordered_commits[branch]) > b_count:
+return self._ordered_commits[branch][b_count]
 
+self.load()
+if branch in self._ordered_commits and len(self._ordered_commits[branch]) > b_count:
+return self._ordered_commits[branch][b_count]
+if populate:
+self.populate(branch=branch)
+

[webkit-changes] [283749] trunk/Tools

2021-10-07 Thread jbedard

Title: [283749] trunk/Tools








Revision 283749
Author jbed...@apple.com
Date 2021-10-07 15:50:17 -0700 (Thu, 07 Oct 2021)


Log Message
[tvOS] Build simulator for arm64
https://bugs.webkit.org/show_bug.cgi?id=231390


Reviewed by Alexey Proskuryakov.

* CISupport/build-webkit-org/config.json: Change tvOS simulator build to arm64.
* CISupport/ews-build/config.json: Ditto.

Modified Paths

trunk/Tools/CISupport/build-webkit-org/config.json
trunk/Tools/CISupport/ews-build/config.json
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/config.json (283748 => 283749)

--- trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-07 22:27:52 UTC (rev 283748)
+++ trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-07 22:50:17 UTC (rev 283749)
@@ -314,7 +314,7 @@
 },
 {
   "name": "Apple-tvOS-Simulator-15-Release-Build", "factory": "BuildFactory", "builddir": "tvos-simulator-15-release",
-  "platform": "tvos-simulator-15", "configuration": "release", "architectures": ["x86_64"],
+  "platform": "tvos-simulator-15", "configuration": "release", "architectures": ["arm64"],
   "workernames": ["bot608"]
 },
 {


Modified: trunk/Tools/CISupport/ews-build/config.json (283748 => 283749)

--- trunk/Tools/CISupport/ews-build/config.json	2021-10-07 22:27:52 UTC (rev 283748)
+++ trunk/Tools/CISupport/ews-build/config.json	2021-10-07 22:50:17 UTC (rev 283749)
@@ -214,7 +214,7 @@
 {
   "name": "tvOS-14-Simulator-Build-EWS", "shortname": "tv-sim", "icon": "buildOnly",
   "factory": "tvOSBuildFactory", "platform": "tvos-simulator-14",
-  "configuration": "release", "architectures": ["x86_64"],
+  "configuration": "release", "architectures": ["arm64"],
   "workernames": ["ews168", "ews170"]
 },
 {


Modified: trunk/Tools/ChangeLog (283748 => 283749)

--- trunk/Tools/ChangeLog	2021-10-07 22:27:52 UTC (rev 283748)
+++ trunk/Tools/ChangeLog	2021-10-07 22:50:17 UTC (rev 283749)
@@ -1,3 +1,14 @@
+2021-10-07  Jonathan Bedard  
+
+[tvOS] Build simulator for arm64
+https://bugs.webkit.org/show_bug.cgi?id=231390
+
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/build-webkit-org/config.json: Change tvOS simulator build to arm64.
+* CISupport/ews-build/config.json: Ditto.
+
 2021-10-07  Tim Horton  
 
 BifurcatedGraphicsContext doesn't bifurcate draw{Tiled}Image






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283746] trunk/Tools

2021-10-07 Thread jbedard

Title: [283746] trunk/Tools








Revision 283746
Author jbed...@apple.com
Date 2021-10-07 15:12:34 -0700 (Thu, 07 Oct 2021)


Log Message
[build.webkit.org] Build iOS 15 as universal binary
https://bugs.webkit.org/show_bug.cgi?id=231389


Reviewed by Ryan Haddad.

* CISupport/build-webkit-org/config.json: Make iOS 15 Simulator Release build universal.

Modified Paths

trunk/Tools/CISupport/build-webkit-org/config.json
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/config.json (283745 => 283746)

--- trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-07 21:29:40 UTC (rev 283745)
+++ trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-07 22:12:34 UTC (rev 283746)
@@ -57,12 +57,10 @@
 { "name": "bot612", "platform": "*" },
 { "name": "bot613", "platform": "*" },
 { "name": "bot600", "platform": "*" },
-{ "name": "bot614", "platform": "*" },
 { "name": "bot684", "platform": "*" },
-{ "name": "bot685", "platform": "*" },
 
-
 { "name": "bot673", "platform": "ios-15" },
+{ "name": "bot614", "platform": "ios-simulator-15" },
 { "name": "bot651", "platform": "ios-simulator-15" },
 { "name": "bot652", "platform": "ios-simulator-15" },
 { "name": "bot653", "platform": "ios-simulator-15" },
@@ -69,6 +67,7 @@
 { "name": "bot654", "platform": "ios-simulator-15" },
 { "name": "bot641", "platform": "ios-simulator-15" },
 { "name": "bot682", "platform": "ios-simulator-15" },
+{ "name": "bot685", "platform": "ios-simulator-15" },
 { "name": "bot694", "platform": "ios-simulator-15" },
 { "name": "bot695", "platform": "ios-simulator-15" },
 { "name": "bot667", "platform": "ios-simulator-15"},
@@ -274,9 +273,9 @@
 },
 {
   "name": "Apple-iOS-15-Simulator-Release-Build", "factory": "BuildFactory", "builddir": "ios-simulator-15-release",
-  "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64"],
+  "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64", "arm64"],
   "triggers": ["ios-simulator-15-release-tests-wk2", "ipados-simulator-15-release-tests-wk2"],
-  "workernames": ["bot641", "bot682"]
+  "workernames": ["bot614", "bot641", "bot682", "bot685"]
 },
 {
   "name": "Apple-iOS-15-Simulator-Debug-Build", "factory": "BuildFactory", "builddir": "ios-simulator-15-debug",


Modified: trunk/Tools/ChangeLog (283745 => 283746)

--- trunk/Tools/ChangeLog	2021-10-07 21:29:40 UTC (rev 283745)
+++ trunk/Tools/ChangeLog	2021-10-07 22:12:34 UTC (rev 283746)
@@ -1,3 +1,13 @@
+2021-10-07  Jonathan Bedard  
+
+[build.webkit.org] Build iOS 15 as universal binary
+https://bugs.webkit.org/show_bug.cgi?id=231389
+
+
+Reviewed by Ryan Haddad.
+
+* CISupport/build-webkit-org/config.json: Make iOS 15 Simulator Release build universal.
+
 2021-10-07  Stephan Szabo  
 
 [WinCairo] Support run-jsc-stress-tests without posix commands






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283743] trunk/Tools

2021-10-07 Thread jbedard

Title: [283743] trunk/Tools








Revision 283743
Author jbed...@apple.com
Date 2021-10-07 14:22:39 -0700 (Thu, 07 Oct 2021)


Log Message
[WebKitBot] Land local changes on production host
https://bugs.webkit.org/show_bug.cgi?id=231388


Reviewed by Yusuke Suzuki.

* WebKitBot/src/Commit.mjs: Add Slack ID integration.
* WebKitBot/src/Contributors.mjs: Ditto.
* WebKitBot/src/Utility.mjs:
* WebKitBot/src/WebKitBot.mjs: Add "hi" and "yt" commands.
* WebKitBot/src/index.mjs:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitBot/src/Commit.mjs
trunk/Tools/WebKitBot/src/Contributors.mjs
trunk/Tools/WebKitBot/src/Utility.mjs
trunk/Tools/WebKitBot/src/WebKitBot.mjs
trunk/Tools/WebKitBot/src/index.mjs




Diff

Modified: trunk/Tools/ChangeLog (283742 => 283743)

--- trunk/Tools/ChangeLog	2021-10-07 21:08:11 UTC (rev 283742)
+++ trunk/Tools/ChangeLog	2021-10-07 21:22:39 UTC (rev 283743)
@@ -1,3 +1,17 @@
+2021-10-07  Jonathan Bedard  
+
+[WebKitBot] Land local changes on production host
+https://bugs.webkit.org/show_bug.cgi?id=231388
+
+
+Reviewed by Yusuke Suzuki.
+
+* WebKitBot/src/Commit.mjs: Add Slack ID integration.
+* WebKitBot/src/Contributors.mjs: Ditto.
+* WebKitBot/src/Utility.mjs:
+* WebKitBot/src/WebKitBot.mjs: Add "hi" and "yt" commands.
+* WebKitBot/src/index.mjs: 
+
 2021-10-07  Michael Catanzaro  
 
 Misc compiler warning fixes, October 2021


Modified: trunk/Tools/WebKitBot/src/Commit.mjs (283742 => 283743)

--- trunk/Tools/WebKitBot/src/Commit.mjs	2021-10-07 21:08:11 UTC (rev 283742)
+++ trunk/Tools/WebKitBot/src/Commit.mjs	2021-10-07 21:22:39 UTC (rev 283743)
@@ -78,8 +78,12 @@
 this._author = this._email;
 if (this._email) {
 let entry = contributors.queryWithEmail(this._email);
-if (entry && entry.nicks && entry.nicks[0])
-this._author = `${entry.name} (@${entry.nicks[0]})`;
+if (entry) {
+if (entry.nicks && entry.nicks[0])
+this._author = `${entry.name} (@${entry.nicks[0]})`;
+if (entry.slackId)
+this._authorSlackId = entry.slackId;
+}
 }
 }
 if (this._revert) {
@@ -107,6 +111,7 @@
 get radar() { return this._radar; }
 get title() { return this._title; }
 get author() { return this._author; }
+get authorSlackId() { return this._authorSlackId; }
 get url() { return this._url; }
 
 message()
@@ -113,7 +118,10 @@
 {
 let results = [];
 results.push(escapeForSlackText(`${this._title}`));
-results.push(escapeForSlackText(`${this._url} by ${this._author}`));
+if (!this._authorSlackId)
+results.push(escapeForSlackText(`${this._url} by ${this._author}`));
+else
+results.push(`${escapeForSlackText(this._url)} by <@${this._authorSlackId}>`);
 let urls = [];
 if (this._bugzilla !== null)
 urls.push(escapeForSlackText(`https://webkit.org/b/${this._bugzilla}`));


Modified: trunk/Tools/WebKitBot/src/Contributors.mjs (283742 => 283743)

--- trunk/Tools/WebKitBot/src/Contributors.mjs	2021-10-07 21:08:11 UTC (rev 283742)
+++ trunk/Tools/WebKitBot/src/Contributors.mjs	2021-10-07 21:22:39 UTC (rev 283743)
@@ -49,4 +49,13 @@
 {
 return this.emails.get(email);
 }
+
+queryWithSlackId(slackId)
+{
+for (let entry of this.emails.values()) {
+if (entry.slackId === slackId)
+return entry;
+}
+return null;
+}
 }


Modified: trunk/Tools/WebKitBot/src/Utility.mjs (283742 => 283743)

--- trunk/Tools/WebKitBot/src/Utility.mjs	2021-10-07 21:08:11 UTC (rev 283742)
+++ trunk/Tools/WebKitBot/src/Utility.mjs	2021-10-07 21:22:39 UTC (rev 283743)
@@ -31,11 +31,9 @@
 return text.replace("&", "&").replace("<", "<").replace(">", ">");
 }
 
-const DEBUG = false;
-
 export function dataLogLn(message)
 {
-if (DEBUG)
+if (process.env.DEBUG)
 console.log(message);
 }
 


Modified: trunk/Tools/WebKitBot/src/WebKitBot.mjs (283742 => 283743)

--- trunk/Tools/WebKitBot/src/WebKitBot.mjs	2021-10-07 21:08:11 UTC (rev 283742)
+++ trunk/Tools/WebKitBot/src/WebKitBot.mjs	2021-10-07 21:22:39 UTC (rev 283743)
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import {stat} from "fs";
 import path from "path";
 import util from "util";
 import {execFile, spawn} from "child_process";
@@ -30,12 +31,12 @@
 import AsyncTaskQueue from "./AsyncTaskQueue.mjs";
 import {dataLogLn, escapeForSlackText, isASCII, rootDirectoryOfWebKit} from "./Utility.mjs";
 
-const webkitPatchPath = path.resolve(rootDirectoryOfWebKit(), "Tools", "Scripts", "webkit-patch");
 const defaultTaskLimit = 10;
 const defaultPullPeriod = 60 * 1000 * 60;
 const defaultTimeoutForRevert = 60 * 1000 * 10;
 
 const execFile

[webkit-changes] [283528] trunk/Tools

2021-10-04 Thread jbedard

Title: [283528] trunk/Tools








Revision 283528
Author jbed...@apple.com
Date 2021-10-04 17:52:23 -0700 (Mon, 04 Oct 2021)


Log Message
[ews-build.webkit.org] check-patch-relevance can get stuck
https://bugs.webkit.org/show_bug.cgi?id=231190


Reviewed by Alexey Proskuryakov.

* CISupport/ews-build/steps.py:
(CheckPatchRelevance): Compute all regexes in advance.
(CheckPatchRelevance._patch_is_relevant): Rely on pre-computed regexes,
limit the number of characters to check in a line to 250 and include a
hard-timeout so that a patch can never get EWS stuck.

Modified Paths

trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (283527 => 283528)

--- trunk/Tools/CISupport/ews-build/steps.py	2021-10-05 00:33:56 UTC (rev 283527)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-10-05 00:52:23 UTC (rev 283528)
@@ -38,6 +38,7 @@
 import requests
 import socket
 import sys
+import time
 
 if sys.version_info < (3, 5):
 print('ERROR: Please use Python 3. This code is not compatible with Python 2.')
@@ -394,82 +395,84 @@
 name = 'check-patch-relevance'
 description = ['check-patch-relevance running']
 descriptionDone = ['Patch contains relevant changes']
+MAX_LINE_SIZE = 250
 
-bindings_paths = [
-'Source/WebCore',
-'Tools',
+bindings_path_regexes = [
+re.compile(rb'Source/WebCore', re.IGNORECASE),
+re.compile(rb'Tools', re.IGNORECASE),
 ]
 
-services_paths = [
-'Tools/CISupport/build-webkit-org',
-'Tools/CISupport/ews-build',
-'Tools/CISupport/Shared',
-'Tools/Scripts/libraries/resultsdbpy',
-'Tools/Scripts/libraries/webkitcorepy',
-'Tools/Scripts/libraries/webkitscmpy',
+services_path_regexes = [
+re.compile(rb'Tools/CISupport/build-webkit-org', re.IGNORECASE),
+re.compile(rb'Tools/CISupport/ews-build', re.IGNORECASE),
+re.compile(rb'Tools/CISupport/Shared', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/libraries/resultsdbpy', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/libraries/webkitcorepy', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/libraries/webkitscmpy', re.IGNORECASE),
 ]
 
-jsc_paths = [
-'.*jsc.*',
-'.*_javascript_core.*',
-'JSTests/',
-'Source/WTF/',
-'Source/bmalloc/',
-'.*Makefile.*',
-'Tools/Scripts/build-webkit',
-'Tools/Scripts/webkitdirs.pm',
+jsc_path_regexes = [
+re.compile(rb'.*jsc.*', re.IGNORECASE),
+re.compile(rb'.*_javascript_core.*', re.IGNORECASE),
+re.compile(rb'JSTests/', re.IGNORECASE),
+re.compile(rb'Source/WTF/', re.IGNORECASE),
+re.compile(rb'Source/bmalloc/', re.IGNORECASE),
+re.compile(rb'.*Makefile.*', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/build-webkit', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/webkitdirs.pm', re.IGNORECASE),
 ]
 
-wk1_paths = [
-'Source/WebKitLegacy',
-'Source/WebCore',
-'Source/WebInspectorUI',
-'Source/WebDriver',
-'Source/WTF',
-'Source/bmalloc',
-'Source/_javascript_Core',
-'Source/ThirdParty',
-'LayoutTests',
-'Tools',
+wk1_path_regexes = [
+re.compile(rb'Source/WebKitLegacy', re.IGNORECASE),
+re.compile(rb'Source/WebCore', re.IGNORECASE),
+re.compile(rb'Source/WebInspectorUI', re.IGNORECASE),
+re.compile(rb'Source/WebDriver', re.IGNORECASE),
+re.compile(rb'Source/WTF', re.IGNORECASE),
+re.compile(rb'Source/bmalloc', re.IGNORECASE),
+re.compile(rb'Source/_javascript_Core', re.IGNORECASE),
+re.compile(rb'Source/ThirdParty', re.IGNORECASE),
+re.compile(rb'LayoutTests', re.IGNORECASE),
+re.compile(rb'Tools', re.IGNORECASE),
 ]
 
-big_sur_builder_paths = [
-'Source/',
-'Tools/',
+big_sur_builder_path_regexes = [
+re.compile(rb'Source/', re.IGNORECASE),
+re.compile(rb'Tools/', re.IGNORECASE),
 ]
-webkitpy_paths = [
-'Tools/Scripts/webkitpy',
-'Tools/Scripts/libraries',
-'Tools/Scripts/commit-log-editor',
-'Source/WebKit/Scripts',
+webkitpy_path_regexes = [
+re.compile(rb'Tools/Scripts/webkitpy', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/libraries', re.IGNORECASE),
+re.compile(rb'Tools/Scripts/commit-log-editor', re.IGNORECASE),
+re.compile(rb'Source/WebKit/Scripts', re.IGNORECASE),
 ]
 
 group_to_paths_mapping = {
-'bindings': bindings_paths,
-'bigsur-release-build': big_sur_builder_paths,
-'services-ews': services_paths,
-'jsc': jsc_paths,
-'webkitpy': webkitpy_paths,
-'wk1-tests': wk1_paths,
-'windows': wk1_paths,
+'bindings': bindings_path_regexes,
+'bigsur-release-build': big_sur_builder_path_regexes,

[webkit-changes] [283429] trunk/Tools

2021-10-01 Thread jbedard

Title: [283429] trunk/Tools








Revision 283429
Author jbed...@apple.com
Date 2021-10-01 18:04:26 -0700 (Fri, 01 Oct 2021)


Log Message
[webkitpy] Add a delay between successive iOS simulator boots (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=226376

Unreviewed infrastrucutre fix.


* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager._boot_device): Increase delay to support iOS 15.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py




Diff

Modified: trunk/Tools/ChangeLog (283428 => 283429)

--- trunk/Tools/ChangeLog	2021-10-02 00:53:30 UTC (rev 283428)
+++ trunk/Tools/ChangeLog	2021-10-02 01:04:26 UTC (rev 283429)
@@ -1,5 +1,15 @@
 2021-10-01  Jonathan Bedard  
 
+[webkitpy] Add a delay between successive iOS simulator boots (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=226376
+
+Unreviewed infrastrucutre fix.
+
+* Scripts/webkitpy/xcode/simulated_device.py:
+(SimulatedDeviceManager._boot_device): Increase delay to support iOS 15.
+
+2021-10-01  Jonathan Bedard  
+
 [webkitscmpy] Get pull-request by number
 https://bugs.webkit.org/show_bug.cgi?id=231039
 


Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (283428 => 283429)

--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2021-10-02 00:53:30 UTC (rev 283428)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2021-10-02 01:04:26 UTC (rev 283429)
@@ -367,7 +367,7 @@
 host.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'boot', device.udid])
 SimulatedDeviceManager.INITIALIZED_DEVICES.append(device)
 # FIXME: Remove this delay once rdar://77234240 is resolved.
-time.sleep(10)
+time.sleep(15)
 
 @staticmethod
 def device_count_for_type(device_type, host=None, use_booted_simulator=True, **kwargs):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283428] trunk/Tools

2021-10-01 Thread jbedard

Title: [283428] trunk/Tools








Revision 283428
Author jbed...@apple.com
Date 2021-10-01 17:53:30 -0700 (Fri, 01 Oct 2021)


Log Message
[webkitscmpy] Get pull-request by number
https://bugs.webkit.org/show_bug.cgi?id=231039


Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub.request): Add pull-request access by number.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.PullRequest): Shared JSON pull-request generator.
(BitBucket.PRGenerator.get): Get pull-request by number.
(BitBucket.PRGenerator.find): Use shared pull-request generator.
(BitBucket.PRGenerator.create): Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.PullRequest): Shared JSON pull-request generator.
(GitHub.PRGenerator.get): Get pull-request by number.
(GitHub.PRGenerator.find): Use shared pull-request generator.
(GitHub.PRGenerator.create):
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
(Scm.PRGenerator.get):
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
(TestNetworkPullRequestGitHub): Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (283427 => 283428)

--- trunk/Tools/ChangeLog	2021-10-02 00:22:27 UTC (rev 283427)
+++ trunk/Tools/ChangeLog	2021-10-02 00:53:30 UTC (rev 283428)
@@ -1,3 +1,30 @@
+2021-10-01  Jonathan Bedard  
+
+[webkitscmpy] Get pull-request by number
+https://bugs.webkit.org/show_bug.cgi?id=231039
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub.request): Add pull-request access by number.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
+(BitBucket.PRGenerator.PullRequest): Shared JSON pull-request generator.
+(BitBucket.PRGenerator.get): Get pull-request by number.
+(BitBucket.PRGenerator.find): Use shared pull-request generator.
+(BitBucket.PRGenerator.create): Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
+(GitHub.PRGenerator.PullRequest): Shared JSON pull-request generator.
+(GitHub.PRGenerator.get): Get pull-request by number.
+(GitHub.PRGenerator.find): Use shared pull-request generator.
+(GitHub.PRGenerator.create):
+* Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
+(Scm.PRGenerator.get):
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+(TestNetworkPullRequestGitHub): Added.
+
 2021-10-01  Alex Christensen  
 
 Implement HTTPS proxy in HTTPServer


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (283427 => 283428)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-02 00:22:27 UTC (rev 283427)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-02 00:53:30 UTC (rev 283428)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.3',
+version='2.2.4',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (283427 => 283428)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-02 00:22:27 UTC (rev 283427)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-02 00:53:30 UTC (rev 283428)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 3)
+version = Version(2, 2, 4)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py (283427 => 283428)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py	2021-10-02 00:22:27 UTC (rev 283427)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py	2021-10-02 00:53:30 UTC (rev 283428)
@@ -335,7 +335,7 @@
 username = (json or {}).get('owner', None)

[webkit-changes] [283391] trunk/Tools

2021-10-01 Thread jbedard

Title: [283391] trunk/Tools








Revision 283391
Author jbed...@apple.com
Date 2021-10-01 12:46:03 -0700 (Fri, 01 Oct 2021)


Log Message
[webkitcorepy] Add TaskPool (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=220547


Unreviewed pip install modification.


* Scripts/libraries/webkitcorepy/setup.py: Bump version, add tblib.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version,].

Modified Paths

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




Diff

Modified: trunk/Tools/ChangeLog (283390 => 283391)

--- trunk/Tools/ChangeLog	2021-10-01 19:38:16 UTC (rev 283390)
+++ trunk/Tools/ChangeLog	2021-10-01 19:46:03 UTC (rev 283391)
@@ -1,3 +1,14 @@
+2021-10-01  Jonathan Bedard  
+
+[webkitcorepy] Add TaskPool (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=220547
+
+
+Unreviewed pip install modification.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version, add tblib.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version,].
+
 2021-10-01  Chris Dumez  
 
 Drop legacy USE(LEGACY_CFNETWORK_DOWNLOADS) code paths


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (283390 => 283391)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-10-01 19:38:16 UTC (rev 283390)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-10-01 19:46:03 UTC (rev 283391)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.11.0',
+version='0.11.1',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[
@@ -57,6 +57,7 @@
 'mock',
 'requests',
 'six',
+'tblib',
 'whichcraft',
 ],
 include_package_data=True,


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (283390 => 283391)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-10-01 19:38:16 UTC (rev 283390)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-10-01 19:46:03 UTC (rev 283391)
@@ -43,7 +43,7 @@
 from webkitcorepy.editor import Editor
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 11, 0)
+version = Version(0, 11, 1)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283373] trunk/Tools

2021-10-01 Thread jbedard

Title: [283373] trunk/Tools








Revision 283373
Author jbed...@apple.com
Date 2021-10-01 09:27:24 -0700 (Fri, 01 Oct 2021)


Log Message
[webkitscmpy] Linkify http urls in pull-requests
https://bugs.webkit.org/show_bug.cgi?id=230655

Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
(PullRequest):
(PullRequest.escape_html): Escape any html and linkify http urls.
(PullRequest.unescape_html): Unescape escaped html and strip links from http urls.
(PullRequest.create_body): Use  and escape html in commit messages.
(PullRequest.parse_body): Match both  and ```, escape html if  was used.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.create): Opt out of linkifying http in comment body.
(BitBucket.PRGenerator.update): Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (283372 => 283373)

--- trunk/Tools/ChangeLog	2021-10-01 16:21:23 UTC (rev 283372)
+++ trunk/Tools/ChangeLog	2021-10-01 16:27:24 UTC (rev 283373)
@@ -1,3 +1,23 @@
+2021-10-01  Jonathan Bedard  
+
+[webkitscmpy] Linkify http urls in pull-requests
+https://bugs.webkit.org/show_bug.cgi?id=230655
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
+(PullRequest): 
+(PullRequest.escape_html): Escape any html and linkify http urls.
+(PullRequest.unescape_html): Unescape escaped html and strip links from http urls.
+(PullRequest.create_body): Use  and escape html in commit messages.
+(PullRequest.parse_body): Match both  and ```, escape html if  was used.
+* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
+(BitBucket.PRGenerator.create): Opt out of linkifying http in comment body.
+(BitBucket.PRGenerator.update): Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+
 2021-10-01  Kimmo Kinnunen  
 
 Add Kimmo Kinnunen as reviewer


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (283372 => 283373)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-01 16:21:23 UTC (rev 283372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-10-01 16:27:24 UTC (rev 283373)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.2',
+version='2.2.3',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (283372 => 283373)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-01 16:21:23 UTC (rev 283372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-10-01 16:27:24 UTC (rev 283373)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 2)
+version = Version(2, 2, 3)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py (283372 => 283373)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py	2021-10-01 16:21:23 UTC (rev 283372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py	2021-10-01 16:27:24 UTC (rev 283373)
@@ -26,8 +26,23 @@
 
 
 class PullRequest(object):
-COMMIT_BODY_RE = re.compile(r'\A (?P[0-9a-f]+)\n```\n(?P.+)\n```\n?\Z', flags=re.DOTALL)
+COMMIT_BODY_RES = [
+dict(
+re=re.compile(r'\A (?P[0-9a-f]+)\n```\n(?P.+)\n```\n?\Z', flags=re.DOTALL),
+escaped=False,
+), dict(
+re=re.compile(r'\A (?P[0-9a-f]+)\n\n(?P.+)\n\n?\Z', flags=re.DOTALL),
+escaped=True,
+),
+]
 DIVIDER_LEN = 70
+ESCAPE_TABLE = {
+'"': '"',
+"'": ''',
+'>': ' >',
+'<': '<',
+'&': '&',
+}
 
 class State(object):
 OPENED = 'opened'
@@ -34,12 +49,31 @@
 CLOSED = 'closed'
 
 @classmethod
-def create_body(cls, body, commits):
+def escape_html(cls, message):
+message = ''.join(cls.ESCAPE_TA

[webkit-changes] [283292] trunk/Tools

2021-09-29 Thread jbedard

Title: [283292] trunk/Tools








Revision 283292
Author jbed...@apple.com
Date 2021-09-29 18:25:13 -0700 (Wed, 29 Sep 2021)


Log Message
[webkitscmpy] Contributors may be undefined
https://bugs.webkit.org/show_bug.cgi?id=230997


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
(main): Ensure that repositories always have defined contributors.

Modified Paths

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




Diff

Modified: trunk/Tools/ChangeLog (283291 => 283292)

--- trunk/Tools/ChangeLog	2021-09-30 00:57:38 UTC (rev 283291)
+++ trunk/Tools/ChangeLog	2021-09-30 01:25:13 UTC (rev 283292)
@@ -1,3 +1,16 @@
+2021-09-29  Jonathan Bedard  
+
+[webkitscmpy] Contributors may be undefined
+https://bugs.webkit.org/show_bug.cgi?id=230997
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+(main): Ensure that repositories always have defined contributors.
+
 2021-09-29  Basuke Suzuki  
 
 [webkitpy] LOG_CHANNEL is widely used in the codebase and shouldn't be treated as error


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (283291 => 283292)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-30 00:57:38 UTC (rev 283291)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-30 01:25:13 UTC (rev 283292)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.1',
+version='2.2.2',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (283291 => 283292)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-30 00:57:38 UTC (rev 283291)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-30 01:25:13 UTC (rev 283292)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 1)
+version = Version(2, 2, 2)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py (283291 => 283292)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py	2021-09-30 00:57:38 UTC (rev 283291)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py	2021-09-30 01:25:13 UTC (rev 283292)
@@ -104,7 +104,7 @@
 repository = local.Scm.from_path(path=parsed.repository, contributors=None if callable(contributors) else contributors)
 
 if callable(contributors):
-repository.contributors = contributors(repository)
+repository.contributors = contributors(repository) or repository.contributors
 if callable(identifier_template):
 identifier_template = identifier_template(repository)
 if callable(subversion):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [283126] trunk/Tools

2021-09-27 Thread jbedard

Title: [283126] trunk/Tools








Revision 283126
Author jbed...@apple.com
Date 2021-09-27 10:18:12 -0700 (Mon, 27 Sep 2021)


Log Message
Exception in run-webkit-tests: Bad file descriptor (Revert)
https://bugs.webkit.org/show_bug.cgi?id=229994


Unreviewed revert.

Revert of 241391@main, 241474@main, 241546@main and 241782@main


* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.rmtree):
* Scripts/webkitpy/port/server_process.py:
(ServerProcess.write):
(ServerProcess._wait_for_data_and_update_buffers_using_select):
* Scripts/webkitpy/port/simulator_process.py:
(SimulatorProcess):
(SimulatorProcess._start):
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.launch_app):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/filesystem.py
trunk/Tools/Scripts/webkitpy/port/server_process.py
trunk/Tools/Scripts/webkitpy/port/simulator_process.py
trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py




Diff

Modified: trunk/Tools/ChangeLog (283125 => 283126)

--- trunk/Tools/ChangeLog	2021-09-27 17:13:06 UTC (rev 283125)
+++ trunk/Tools/ChangeLog	2021-09-27 17:18:12 UTC (rev 283126)
@@ -1,3 +1,24 @@
+2021-09-27  Jonathan Bedard  
+
+Exception in run-webkit-tests: Bad file descriptor (Revert)
+https://bugs.webkit.org/show_bug.cgi?id=229994
+
+
+Unreviewed revert.
+
+Revert of 241391@main, 241474@main, 241546@main and 241782@main
+
+* Scripts/webkitpy/common/system/filesystem.py:
+(FileSystem.rmtree):
+* Scripts/webkitpy/port/server_process.py:
+(ServerProcess.write):
+(ServerProcess._wait_for_data_and_update_buffers_using_select):
+* Scripts/webkitpy/port/simulator_process.py:
+(SimulatorProcess):
+(SimulatorProcess._start):
+* Scripts/webkitpy/xcode/simulated_device.py:
+(SimulatedDevice.launch_app):
+
 2021-09-27  Youenn Fablet  
 
 Make sure to reset presenting application pid in case of mediaserverd crash


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (283125 => 283126)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-09-27 17:13:06 UTC (rev 283125)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-09-27 17:18:12 UTC (rev 283126)
@@ -290,10 +290,7 @@
 
 def rmtree(self, path):
 """Delete the directory rooted at path, whether empty or not."""
-try:
-shutil.rmtree(path, ignore_errors=True)
-except OSError:
-pass
+shutil.rmtree(path, ignore_errors=True)
 
 def copytree(self, source, destination):
 shutil.copytree(source, destination)


Modified: trunk/Tools/Scripts/webkitpy/port/server_process.py (283125 => 283126)

--- trunk/Tools/Scripts/webkitpy/port/server_process.py	2021-09-27 17:13:06 UTC (rev 283125)
+++ trunk/Tools/Scripts/webkitpy/port/server_process.py	2021-09-27 17:18:12 UTC (rev 283126)
@@ -184,7 +184,7 @@
 try:
 self._proc.stdin.write(string_utils.encode(bytes))
 self._proc.stdin.flush()
-except (IOError, OSError, ValueError):
+except (IOError, ValueError):
 self.stop(0.0)
 # stop() calls _reset(), so we have to set crashed to True after calling stop()
 # unless we already know that this is a timeout.
@@ -284,10 +284,6 @@
 select_fds = (out_fd, err_fd)
 try:
 read_fds, _, _ = select.select(select_fds, [], select_fds, max(deadline - time.time(), 0))
-except OSError:
-# FIXME: https://bugs.webkit.org/show_bug.cgi?id=229994
-_log.debug('Caught OSError for {}, continuing'.format(self.pid()))
-return
 except select.error as e:
 # We can ignore EINVAL since it's likely the process just crashed and we'll
 # figure that out the next time through the loop in _read().
@@ -316,10 +312,6 @@
 _log.debug('{} because of no data while reading stdout for the server process.'.format(self._crash_message))
 self._crashed = True
 self._error += data
-except OSError:
-# FIXME: https://bugs.webkit.org/show_bug.cgi?id=229994
-_log.debug('Caught OSError for {}, continuing'.format(self.pid()))
-pass
 except IOError:
 # We can ignore the IOErrors because we will detect if the subporcess crashed
 # the next time through the loop in _read()


Modified: trunk/Tools/Scripts/webkitpy/port/simulator_process.py (283125 => 283126)

--- trunk/Tools/Scripts/webkitpy/port/simulator_process.py	2021-09-27 17:13:06 UTC (rev 283125)
+++ trunk/Tools/Scripts/webkitpy/port/simulator_process.py	2021-09-27 17:18:12 UTC (rev 283126)
@@ -31,7 +31,6 @@
 
 
 class SimulatorProcess(ServerProcess):
-RETRY = 3
 
 class Popen(object):
 
@@ -107,36 +106,26 @@
 
 # FIXME : This timeout should be 15 seconds
 with

[webkit-changes] [283071] trunk/Tools

2021-09-24 Thread jbedard

Title: [283071] trunk/Tools








Revision 283071
Author jbed...@apple.com
Date 2021-09-24 17:45:15 -0700 (Fri, 24 Sep 2021)


Log Message
[run-webkit-tests] Use Python 3 (Revert)
https://bugs.webkit.org/show_bug.cgi?id=226658


Unreviewed revert.

When running run-webkit-tests with Python 3, our simulator often
encounter https://bugs.webkit.org/show_bug.cgi?id=230513. Until we
resolve this bug, we must use Python 2 to run run-webkit-tests.


* CISupport/build-webkit-org/steps.py:
(RunWebKitTests):
* CISupport/build-webkit-org/steps_unittest.py:
* CISupport/ews-build/steps.py:
(RunWebKitTests):
* CISupport/ews-build/steps_unittest.py:
(test_success):
(test_warnings):
* Scripts/run-webkit-tests:

Modified Paths

trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-webkit-tests




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (283070 => 283071)

--- trunk/Tools/CISupport/build-webkit-org/steps.py	2021-09-25 00:40:36 UTC (rev 283070)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2021-09-25 00:45:15 UTC (rev 283071)
@@ -536,7 +536,7 @@
 description = ["layout-tests running"]
 descriptionDone = ["layout-tests"]
 resultDirectory = "layout-test-results"
-command = ["python3", "Tools/Scripts/run-webkit-tests",
+command = ["python", "Tools/Scripts/run-webkit-tests",
"--no-build",
"--no-show-results",
"--no-new-test-results",


Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (283070 => 283071)

--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-09-25 00:40:36 UTC (rev 283070)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-09-25 00:45:15 UTC (rev 283071)
@@ -793,7 +793,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -817,7 +817,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -844,7 +844,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -869,7 +869,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -894,7 +894,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -936,7 +936,7 @@
 ExpectShell(
 workdir='wkdir',
 logEnviron=False,
-command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python',

[webkit-changes] [283039] trunk

2021-09-24 Thread jbedard

Title: [283039] trunk








Revision 283039
Author jbed...@apple.com
Date 2021-09-24 06:31:03 -0700 (Fri, 24 Sep 2021)


Log Message
[iOS 15] Support building WebKit (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=227002


Reviewed by Ryan Haddad.

Source/WebCore/PAL:

* pal/spi/cocoa/QuartzCoreSPI.h: Add CAFenceHandle.
* pal/spi/ios/SystemPreviewSPI.h: Ditto.

Source/WTF:

* wtf/spi/darwin/XPCSPI.h: Import NSError header.

WebKitLibraries:

* WebKitPrivateFrameworkStubs/iOS/15/VisionKitCore.framework/VisionKitCore.tbd: Added.

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h
trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h
trunk/WebKitLibraries/ChangeLog


Added Paths

trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/15/VisionKitCore.framework/
trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/15/VisionKitCore.framework/VisionKitCore.tbd




Diff

Modified: trunk/Source/WTF/ChangeLog (283038 => 283039)

--- trunk/Source/WTF/ChangeLog	2021-09-24 13:23:47 UTC (rev 283038)
+++ trunk/Source/WTF/ChangeLog	2021-09-24 13:31:03 UTC (rev 283039)
@@ -1,3 +1,13 @@
+2021-09-24  Jonathan Bedard  
+
+[iOS 15] Support building WebKit (Part 3)
+https://bugs.webkit.org/show_bug.cgi?id=227002
+
+
+Reviewed by Ryan Haddad.
+
+* wtf/spi/darwin/XPCSPI.h: Import NSError header.
+
 2021-09-23  Tim Horton  
 
 Move more linked-on-or-after checks to WebCore::linkedOnOrAfter()


Modified: trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h (283038 => 283039)

--- trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2021-09-24 13:23:47 UTC (rev 283038)
+++ trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2021-09-24 13:31:03 UTC (rev 283039)
@@ -120,6 +120,7 @@
 #else // USE(APPLE_INTERNAL_SDK)
 
 #ifdef __OBJC__
+#import 
 #if HAVE(OS_LAUNCHD_JOB)
 @interface OSLaunchdJob : NSObject
 - (instancetype)initWithPlist:(xpc_object_t)plist;


Modified: trunk/Source/WebCore/PAL/ChangeLog (283038 => 283039)

--- trunk/Source/WebCore/PAL/ChangeLog	2021-09-24 13:23:47 UTC (rev 283038)
+++ trunk/Source/WebCore/PAL/ChangeLog	2021-09-24 13:31:03 UTC (rev 283039)
@@ -1,3 +1,14 @@
+2021-09-24  Jonathan Bedard  
+
+[iOS 15] Support building WebKit (Part 3)
+https://bugs.webkit.org/show_bug.cgi?id=227002
+
+
+Reviewed by Ryan Haddad.
+
+* pal/spi/cocoa/QuartzCoreSPI.h: Add CAFenceHandle.
+* pal/spi/ios/SystemPreviewSPI.h: Ditto.
+
 2021-09-23  Simon Fraser  
 
 Unify more media-related WebCore source files


Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h (283038 => 283039)

--- trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h	2021-09-24 13:23:47 UTC (rev 283038)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h	2021-09-24 13:31:03 UTC (rev 283039)
@@ -55,6 +55,10 @@
 #ifdef __OBJC__
 typedef struct _CARenderContext CARenderContext;
 
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
+@class CAFenceHandle;
+#endif
+
 @interface CAContext : NSObject
 @end
 
@@ -87,6 +91,11 @@
 @property (strong) CALayer *layer;
 @property CGColorSpaceRef colorSpace;
 @property (readonly) CARenderContext* renderContext;
+
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
+-(BOOL)addFence:(CAFenceHandle *)handle;
+#endif
+
 @end
 
 @interface CALayer ()


Modified: trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (283038 => 283039)

--- trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h	2021-09-24 13:23:47 UTC (rev 283038)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h	2021-09-24 13:31:03 UTC (rev 283039)
@@ -46,6 +46,8 @@
 @class QLItem;
 @class QLPreviewController;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol ASVThumbnailViewDelegate 
 - (void)thumbnailView:(ASVThumbnailView *)thumbnailView wantsToPresentPreviewController:(QLPreviewController *)previewController forItem:(QLItem *)item;
 @end
@@ -75,7 +77,7 @@
 #if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
 
 @class ASVInlinePreview;
-
+@class CAFenceHandle;
 @interface ASVInlinePreview : NSObject
 @property (nonatomic, readonly) CALayer *layer;
 
@@ -94,4 +96,6 @@
 
 #endif
 
+NS_ASSUME_NONNULL_END
+
 #endif


Modified: trunk/WebKitLibraries/ChangeLog (283038 => 283039)

--- trunk/WebKitLibraries/ChangeLog	2021-09-24 13:23:47 UTC (rev 283038)
+++ trunk/WebKitLibraries/ChangeLog	2021-09-24 13:31:03 UTC (rev 283039)
@@ -1,3 +1,13 @@
+2021-09-24  Jonathan Bedard  
+
+[iOS 15] Support building WebKit (Part 3)
+https://bugs.webkit.org/show_bug.cgi?id=227002
+
+
+Reviewed by Ryan Haddad.
+
+* WebKitPrivateFrameworkStubs/iOS/15/VisionKitCore.framework/VisionKitCore.tbd: Added.
+
 2021-07-07  Tim Horton  
 
 Add WKHoverPlatter and some knobs to tweak its appearance


Added: trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/15/VisionKitCore.framework/VisionKitCore.tbd (0 => 283039)

--- trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/15/

[webkit-changes] [282770] trunk/Tools

2021-09-20 Thread jbedard

Title: [282770] trunk/Tools








Revision 282770
Author jbed...@apple.com
Date 2021-09-20 12:52:35 -0700 (Mon, 20 Sep 2021)


Log Message
[webkitcorepy] Move FileLock from webkitpy
https://bugs.webkit.org/show_bug.cgi?id=230320


Reviewed by Dewei Zhu.

Move FileLock from webkitpy into webkitcorepy, implement FileLock as a more
modern Python API.

* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/file_lock.py: Added.
(FileLock):
(FileLock.__init__):
(FileLock.acquired): Check if the current process has acquired the lock.
(FileLock.acquire): Attempt to acquire lockfile.
(FileLock.release): Release lockfile, if this process owns the lock.
(FileLock.__enter__): Invoke acquire.
(FileLock.__exit__): Invoke release.
* Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py:
* Scripts/libraries/webkitcorepy/webkitcorepy/mocks/file_lock.py: Copied from Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py.
(FileLock): Single-thread stub implementation of FileLock for testing without a filesystem.
* Scripts/libraries/webkitcorepy/webkitcorepy/tests/file_lock_unittest.py: Added.
(FileLockTestCase):
(FileLockTestCase.__init__):
(FileLockTestCase.setUp):
(FileLockTestCase.tearDown):
(FileLockTestCase.test_basic):
(FileLockTestCase.test_locked):
(FileLockTestCase.test_locked_timeout):
(FileLockTestCase.test_double):
* Scripts/webkitpy/common/system/file_lock.py: Removed.
* Scripts/webkitpy/common/system/file_lock_integrationtest.py: Removed.
* Scripts/webkitpy/common/system/systemhost.py:
(SystemHost.make_file_lock): Use webkitcorepy's FileLock.
* Scripts/webkitpy/common/system/systemhost_mock.py:
(MockSystemHost.make_file_lock): Use webkitcorepy's mocks.FileLock.
* Scripts/webkitpy/tool/commands/rebaseline.py:
(RebaselineTest._update_expectations_file): Use webkitcorepy's FileLock.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py
trunk/Tools/Scripts/webkitpy/common/system/systemhost.py
trunk/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py


Added Paths

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/file_lock.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/file_lock.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/file_lock_unittest.py


Removed Paths

trunk/Tools/Scripts/webkitpy/common/system/file_lock.py
trunk/Tools/Scripts/webkitpy/common/system/file_lock_integrationtest.py




Diff

Modified: trunk/Tools/ChangeLog (282769 => 282770)

--- trunk/Tools/ChangeLog	2021-09-20 19:32:34 UTC (rev 282769)
+++ trunk/Tools/ChangeLog	2021-09-20 19:52:35 UTC (rev 282770)
@@ -1,3 +1,45 @@
+2021-09-20  Jonathan Bedard  
+
+[webkitcorepy] Move FileLock from webkitpy
+https://bugs.webkit.org/show_bug.cgi?id=230320
+
+
+Reviewed by Dewei Zhu.
+
+Move FileLock from webkitpy into webkitcorepy, implement FileLock as a more
+modern Python API.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/file_lock.py: Added.
+(FileLock):
+(FileLock.__init__):
+(FileLock.acquired): Check if the current process has acquired the lock.
+(FileLock.acquire): Attempt to acquire lockfile.
+(FileLock.release): Release lockfile, if this process owns the lock.
+(FileLock.__enter__): Invoke acquire.
+(FileLock.__exit__): Invoke release.
+* Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py:
+* Scripts/libraries/webkitcorepy/webkitcorepy/mocks/file_lock.py: Copied from Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py.
+(FileLock): Single-thread stub implementation of FileLock for testing without a filesystem.
+* Scripts/libraries/webkitcorepy/webkitcorepy/tests/file_lock_unittest.py: Added.
+(FileLockTestCase):
+(FileLockTestCase.__init__):
+(FileLockTestCase.setUp):
+(FileLockTestCase.tearDown):
+(FileLockTestCase.test_basic):
+(FileLockTestCase.test_locked):
+(FileLockTestCase.test_locked_timeout):
+(FileLockTestCase.test_double):
+* Scripts/webkitpy/common/system/file_lock.py: Removed.
+* Scripts/webkitpy/common/system/file_lock_integrationtest.py: Removed.
+* Scripts/webkitpy/common/system/systemhost.py:
+(SystemHost.make_file_lock): Use webkitcorepy's FileLock.
+* Scripts/webkitpy/common/system/systemhost_mock.py:
+(MockSystemHost.make_file_lock): Use webkitcorepy's mocks.FileLock.
+* Scripts/webkitpy/too

[webkit-changes] [282715] trunk/Tools

2021-09-17 Thread jbedard

Title: [282715] trunk/Tools








Revision 282715
Author jbed...@apple.com
Date 2021-09-17 17:28:39 -0700 (Fri, 17 Sep 2021)


Log Message
[git-webkit] Reset author time when editing commits (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=230224


Unreviewed follow-up fix.


* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): We can't update SVN if the HEAD commit does not have a revision.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py




Diff

Modified: trunk/Tools/ChangeLog (282714 => 282715)

--- trunk/Tools/ChangeLog	2021-09-18 00:22:35 UTC (rev 282714)
+++ trunk/Tools/ChangeLog	2021-09-18 00:28:39 UTC (rev 282715)
@@ -1,5 +1,16 @@
 2021-09-17  Jonathan Bedard  
 
+[git-webkit] Reset author time when editing commits (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=230224
+
+
+Unreviewed follow-up fix.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.pull): We can't update SVN if the HEAD commit does not have a revision.
+
+2021-09-17  Jonathan Bedard  
+
 [webkitscmpy] Refactor PR branch management
 https://bugs.webkit.org/show_bug.cgi?id=230432
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (282714 => 282715)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-18 00:22:35 UTC (rev 282714)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-18 00:28:39 UTC (rev 282715)
@@ -795,7 +795,7 @@
 ), 'HEAD...{}'.format('{}/{}'.format(remote, branch)),
 ], cwd=self.root_path, env={'FILTER_BRANCH_SQUELCH_WARNING': '1'}).returncode
 
-if not code and self.is_svn:
+if not code and self.is_svn and commit.revision:
 return run([
 self.executable(), 'svn', 'fetch', '--log-window-size=5000', '-r', '{}:HEAD'.format(commit.revision),
 ], cwd=self.root_path).returncode






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282714] trunk/Tools

2021-09-17 Thread jbedard

Title: [282714] trunk/Tools








Revision 282714
Author jbed...@apple.com
Date 2021-09-17 17:22:35 -0700 (Fri, 17 Sep 2021)


Log Message
[webkitscmpy] Refactor PR branch management
https://bugs.webkit.org/show_bug.cgi?id=230432


Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
(Branch): Specify that the 'eng' prefix is for pull-requests.
(Branch.normalize_branch_name): Normalized branch names should consider other developement prefixes.
(Branch.editable): Check if a branch is editable. Only includes development branches at the moment,
will include commit-queue in the near future.
(Branch.branch_point): Moved from pull_request.py.
(Branch.main):
(Branch.normalize_issue): Renamed normalize_branch_name.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py:
(Pull.main): branch_point is now owned Branch command.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.main): Match DEV_BRANCHES instead of PREFIX, branch_point is now owned Branch command.
(PullRequest.branch_point): Moved to branch.py.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py




Diff

Modified: trunk/Tools/ChangeLog (282713 => 282714)

--- trunk/Tools/ChangeLog	2021-09-18 00:16:18 UTC (rev 282713)
+++ trunk/Tools/ChangeLog	2021-09-18 00:22:35 UTC (rev 282714)
@@ -1,3 +1,27 @@
+2021-09-17  Jonathan Bedard  
+
+[webkitscmpy] Refactor PR branch management
+https://bugs.webkit.org/show_bug.cgi?id=230432
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
+(Branch): Specify that the 'eng' prefix is for pull-requests.
+(Branch.normalize_branch_name): Normalized branch names should consider other developement prefixes.
+(Branch.editable): Check if a branch is editable. Only includes development branches at the moment,
+will include commit-queue in the near future.
+(Branch.branch_point): Moved from pull_request.py.
+(Branch.main):
+(Branch.normalize_issue): Renamed normalize_branch_name.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py:
+(Pull.main): branch_point is now owned Branch command.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.main): Match DEV_BRANCHES instead of PREFIX, branch_point is now owned Branch command.
+(PullRequest.branch_point): Moved to branch.py.
+
 2021-09-17  Kate Cheney  
 
 Remove unnecessary ITP memory store code


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (282713 => 282714)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-18 00:16:18 UTC (rev 282713)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-18 00:22:35 UTC (rev 282714)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.2.0',
+version='2.2.1',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (282713 => 282714)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-18 00:16:18 UTC (rev 282713)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-18 00:22:35 UTC (rev 282714)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 2, 0)
+version = Version(2, 2, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py (282713 => 282714)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py	2021-09-18 00:16:18 UTC (rev 282713)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py	2021-09-18 00:22:35 UTC (rev 282714)
@@ -25,7 +25,7 @@
 
 from .command import Command
 
-from webkitcorepy import run, Terminal
+from webkitcorepy import run, string_utils, Terminal
 from webkitscmpy import local, log
 
 
@@ -33,7 +33,7 @@
 name = 'branch'
 help = 'Create a local development branch from the current checkout state'
 
-PREFIX = 'eng'
+PR_PREFIX = 'eng'
 
 @classmethod
 def parser(cls, parser, loggers=None):

[webkit-changes] [282625] trunk/Tools

2021-09-16 Thread jbedard

Title: [282625] trunk/Tools








Revision 282625
Author jbed...@apple.com
Date 2021-09-16 18:16:04 -0700 (Thu, 16 Sep 2021)


Log Message
Exception in run-webkit-tests: Bad file descriptor (Part 4)
https://bugs.webkit.org/show_bug.cgi?id=229994


Reviewed by Stephanie Lewis.

* Scripts/webkitpy/port/simulator_process.py:
(SimulatorProcess):
(SimulatorProcess._start): Retry app start if OSError is caught when constructing stdout/stdin/stderr.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/simulator_process.py




Diff

Modified: trunk/Tools/ChangeLog (282624 => 282625)

--- trunk/Tools/ChangeLog	2021-09-17 01:04:59 UTC (rev 282624)
+++ trunk/Tools/ChangeLog	2021-09-17 01:16:04 UTC (rev 282625)
@@ -1,3 +1,15 @@
+2021-09-16  Jonathan Bedard  
+
+Exception in run-webkit-tests: Bad file descriptor (Part 4)
+https://bugs.webkit.org/show_bug.cgi?id=229994
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/webkitpy/port/simulator_process.py:
+(SimulatorProcess):
+(SimulatorProcess._start): Retry app start if OSError is caught when constructing stdout/stdin/stderr.
+
 2021-09-16  Megan Gardner  
 
 Fix TestWebKitAPI.WebKit.AppHighlightsInImageOverlays to work with changing menu states.


Modified: trunk/Tools/Scripts/webkitpy/port/simulator_process.py (282624 => 282625)

--- trunk/Tools/Scripts/webkitpy/port/simulator_process.py	2021-09-17 01:04:59 UTC (rev 282624)
+++ trunk/Tools/Scripts/webkitpy/port/simulator_process.py	2021-09-17 01:16:04 UTC (rev 282625)
@@ -31,6 +31,7 @@
 
 
 class SimulatorProcess(ServerProcess):
+RETRY = 3
 
 class Popen(object):
 
@@ -106,26 +107,36 @@
 
 # FIXME : This timeout should be 15 seconds
 with Timeout(30, handler=RuntimeError('Timed out waiting for pid {} to connect at port {}'.format(self._pid, self._target_host.listening_port())), patch=False):
-stdin = None
-stdout = None
-stderr = None
-try:
-# This order matches the client side connections in Tools/TestRunnerShared/IOSLayoutTestCommunication.cpp setUpIOSLayoutTestCommunication()
-stdin = SimulatorProcess._accept_connection_create_file(self._target_host.listening_socket, 'wb')
-stdout = SimulatorProcess._accept_connection_create_file(self._target_host.listening_socket, 'rb')
-stderr = SimulatorProcess._accept_connection_create_file(self._target_host.listening_socket, 'rb')
-except:
-# We set self._proc as _reset() and _kill() depend on it.
-self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr, self._target_host)
-if self._proc.poll() is not None:
+for _ in range(self.RETRY):
+stdin = None
+stdout = None
+stderr = None
+try:
+# This order matches the client side connections in Tools/TestRunnerShared/IOSLayoutTestCommunication.cpp setUpIOSLayoutTestCommunication()
+stdin = SimulatorProcess._accept_connection_create_file(self._target_host.listening_socket, 'wb')
+stdout = SimulatorProcess._accept_connection_create_file(self._target_host.listening_socket, 'rb')
+stderr = SimulatorProcess._accept_connection_create_file(self._target_host.listening_socket, 'rb')
+
+self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr, self._target_host)
+return
+
+except OSError:
+self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr, self._target_host)
+self._target_host.executive.kill_process(self._proc.pid)
 self._reset()
-raise Exception('App {} with pid {} crashed before stdin could be attached'.format(os.path.basename(self._cmd[0]), self._pid))
-self._kill()
-self._reset()
-raise
 
-self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr, self._target_host)
+except:
+# We set self._proc as _reset() and _kill() depend on it.
+self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr, self._target_host)
+if self._proc.poll() is not None:
+self._reset()
+raise Exception('App {} with pid {} crashed before stdin could be attached'.format(os.path.basename(self._cmd[0]), self._pid))
+self._kill()
+self._reset()
+raise
 
+raise Exception('Failed to start app {} after {} retries'.format(self._cmd[0], self.RETRY))
+
 def stop(self, timeout_secs=3.0):
 # Only bother to check for leaks or stderr if the process is still running.
 if self.poll() is None:

[webkit-changes] [282409] trunk/Tools

2021-09-14 Thread jbedard

Title: [282409] trunk/Tools








Revision 282409
Author jbed...@apple.com
Date 2021-09-14 14:14:59 -0700 (Tue, 14 Sep 2021)


Log Message
[git-webkit] Reset author time when editing commits (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=230224


Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): Force-update ref of pulled branch, reset author time of all rebased commits.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py: Add update-ref mock.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
(TestDoPullRequest):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (282408 => 282409)

--- trunk/Tools/ChangeLog	2021-09-14 20:21:43 UTC (rev 282408)
+++ trunk/Tools/ChangeLog	2021-09-14 21:14:59 UTC (rev 282409)
@@ -1,5 +1,21 @@
 2021-09-14  Jonathan Bedard  
 
+[git-webkit] Reset author time when editing commits (Part 2)
+https://bugs.webkit.org/show_bug.cgi?id=230224
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.pull): Force-update ref of pulled branch, reset author time of all rebased commits.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py: Add update-ref mock.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+(TestDoPullRequest):
+
+2021-09-14  Jonathan Bedard  
+
 [git-webkit] Reset author time when editing commits (Part 1)
 https://bugs.webkit.org/show_bug.cgi?id=230224
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (282408 => 282409)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-14 20:21:43 UTC (rev 282408)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-14 21:14:59 UTC (rev 282409)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.1.3',
+version='2.2.0',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (282408 => 282409)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-14 20:21:43 UTC (rev 282408)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-14 21:14:59 UTC (rev 282409)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 1, 3)
+version = Version(2, 2, 0)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (282408 => 282409)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-14 20:21:43 UTC (rev 282408)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-14 21:14:59 UTC (rev 282409)
@@ -768,15 +768,33 @@
 cwd=self.root_path,
 ).returncode else self.commit()
 
-def pull(self, rebase=None, branch=None):
-commit = self.commit() if self.is_svn else None
+def pull(self, rebase=None, branch=None, remote='origin'):
+commit = self.commit() if self.is_svn or branch else None
 code = run(
 [self.executable(), 'pull'] + (
-['origin', branch] if branch else []
+[remote, branch] if branch else []
 ) + (
 [] if rebase is None else ['--rebase={}'.format('True' if rebase else 'False')]
 ), cwd=self.root_path,
 ).returncode
+
+if not code and branch:
+code = run(
+[self.executable(), 'update-ref', branch, '{}/{}'.format(remote, branch)],
+cwd=self.root_path,
+).returncode
+
+if not code and branch and rebase:
+result = run([self.executable(), 'rev-parse', 'HEAD'], cwd=self.root_path, capture_output=True, encoding='utf-8')
+if not result.returncode and result.stdout.rstrip() != commit.hash:
+code = run([
+self.executable(),
+'filter-branch', '-f',
+'--env-filter', "GIT_AUTHOR_DATE='{date}';GIT_COMMITTER_DATE='{date}'".format(
+

[webkit-changes] [282404] trunk/Tools

2021-09-14 Thread jbedard

Title: [282404] trunk/Tools








Revision 282404
Author jbed...@apple.com
Date 2021-09-14 13:06:15 -0700 (Tue, 14 Sep 2021)


Log Message
[git-webkit] Reset author time when editing commits (Part 1)
https://bugs.webkit.org/show_bug.cgi?id=230224


Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py: Capture 'git commit date=now'.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.create_commit): Always reset commit date.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py




Diff

Modified: trunk/Tools/ChangeLog (282403 => 282404)

--- trunk/Tools/ChangeLog	2021-09-14 19:59:52 UTC (rev 282403)
+++ trunk/Tools/ChangeLog	2021-09-14 20:06:15 UTC (rev 282404)
@@ -1,3 +1,15 @@
+2021-09-14  Jonathan Bedard  
+
+[git-webkit] Reset author time when editing commits (Part 1)
+https://bugs.webkit.org/show_bug.cgi?id=230224
+
+
+Reviewed by Stephanie Lewis.
+
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py: Capture 'git commit date=now'.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.create_commit): Always reset commit date.
+
 2021-09-14  Hoa Dinh  
 
 Provide a way to update the commit message with an updated list of changed files/functions


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (282403 => 282404)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py	2021-09-14 19:59:52 UTC (rev 282403)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py	2021-09-14 20:06:15 UTC (rev 282404)
@@ -415,11 +415,11 @@
 generator=lambda *args, **kwargs:
 mocks.ProcessCompletion(returncode=0) if re.match(r'^[A-Za-z0-9-]+/[A-Za-z0-9/-]+$', args[2]) else mocks.ProcessCompletion(),
 ), mocks.Subprocess.Route(
-self.executable, 'commit',
+self.executable, 'commit', '--date=now',
 cwd=self.path,
 generator=lambda *args, **kwargs: self.commit(amend=False),
 ), mocks.Subprocess.Route(
-self.executable, 'commit', '--amend',
+self.executable, 'commit', '--date=now', '--amend',
 cwd=self.path,
 generator=lambda *args, **kwargs: self.commit(amend=True),
 ), mocks.Subprocess.Route(


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py (282403 => 282404)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py	2021-09-14 19:59:52 UTC (rev 282403)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py	2021-09-14 20:06:15 UTC (rev 282404)
@@ -75,7 +75,7 @@
 sys.stderr.write('No modified files\n')
 return 1
 log.warning('Amending commit...' if has_commit else 'Creating commit...')
-if run([repository.executable(), 'commit'] + (['--amend'] if has_commit else []), cwd=repository.root_path).returncode:
+if run([repository.executable(), 'commit', '--date=now'] + (['--amend'] if has_commit else []), cwd=repository.root_path).returncode:
 sys.stderr.write('Failed to generate commit\n')
 return 1
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282347] trunk/Tools

2021-09-13 Thread jbedard

Title: [282347] trunk/Tools








Revision 282347
Author jbed...@apple.com
Date 2021-09-13 12:01:24 -0700 (Mon, 13 Sep 2021)


Log Message
Running iOS layout tests sometimes fails with a utf-8 error
https://bugs.webkit.org/show_bug.cgi?id=230082

Reviewed by Alexey Proskuryakov.

* Scripts/webkitpy/port/driver.py:
(Driver.run_test): Decode errors should not be fatal, since it's possible
that stdout may be a png from a timed out test.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/driver.py




Diff

Modified: trunk/Tools/ChangeLog (282346 => 282347)

--- trunk/Tools/ChangeLog	2021-09-13 18:49:29 UTC (rev 282346)
+++ trunk/Tools/ChangeLog	2021-09-13 19:01:24 UTC (rev 282347)
@@ -1,3 +1,14 @@
+2021-09-13  Jonathan Bedard  
+
+Running iOS layout tests sometimes fails with a utf-8 error
+https://bugs.webkit.org/show_bug.cgi?id=230082
+
+Reviewed by Alexey Proskuryakov.
+
+* Scripts/webkitpy/port/driver.py:
+(Driver.run_test): Decode errors should not be fatal, since it's possible
+that stdout may be a png from a timed out test.
+
 2021-09-13  Yoshiaki Jitsukawa  
 
 [TestWTF] Hash tests for denorm_min should be skipped if denorm is not supported.


Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (282346 => 282347)

--- trunk/Tools/Scripts/webkitpy/port/driver.py	2021-09-13 18:49:29 UTC (rev 282346)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py	2021-09-13 19:01:24 UTC (rev 282347)
@@ -243,7 +243,7 @@
 # In the timeout case, we kill the hung process as well.
 out, err = self._server_process.stop(self._port.driver_stop_timeout() if stop_when_done else 0.0)
 if out:
-text += string_utils.decode(out, target_type=str)
+text += string_utils.decode(out, target_type=str, errors='backslashreplace')
 if err:
 self.error_from_test += string_utils.decode(err, target_type=str)
 self._server_process = None






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282302] trunk/Tools

2021-09-10 Thread jbedard

Title: [282302] trunk/Tools








Revision 282302
Author jbed...@apple.com
Date 2021-09-10 16:39:55 -0700 (Fri, 10 Sep 2021)


Log Message
[webkitcorepy] AutoInstall occasionally raising SSL error (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=230169


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(Package.archives): Add retry when listing archives.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py




Diff

Modified: trunk/Tools/ChangeLog (282301 => 282302)

--- trunk/Tools/ChangeLog	2021-09-10 23:29:37 UTC (rev 282301)
+++ trunk/Tools/ChangeLog	2021-09-10 23:39:55 UTC (rev 282302)
@@ -1,3 +1,16 @@
+2021-09-10  Jonathan Bedard  
+
+[webkitcorepy] AutoInstall occasionally raising SSL error (Part 2)
+https://bugs.webkit.org/show_bug.cgi?id=230169
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+(Package.archives): Add retry when listing archives.
+
 2021-09-10  David Kilzer  
 
 Fix ASan+UBSan builds: part two


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (282301 => 282302)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-10 23:29:37 UTC (rev 282301)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-10 23:39:55 UTC (rev 282302)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.10.2',
+version='0.10.3',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (282301 => 282302)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-10 23:29:37 UTC (rev 282301)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-10 23:39:55 UTC (rev 282302)
@@ -42,7 +42,7 @@
 from webkitcorepy.call_by_need import CallByNeed
 from webkitcorepy.editor import Editor
 
-version = Version(0, 10, 2)
+version = Version(0, 10, 3)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (282301 => 282302)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	2021-09-10 23:29:37 UTC (rev 282301)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	2021-09-10 23:39:55 UTC (rev 282302)
@@ -178,68 +178,80 @@
 
 AutoInstall._verify_index()
 path = 'simple/{}/'.format(self.pypi_name)
-response = AutoInstall._request('https://{}/{}'.format(AutoInstall.index, path))
-try:
-if response.code != 200:
-raise ValueError('The package {} was not found on {}'.format(self.pypi_name, AutoInstall.index))
+count = 0
+while count <= (AutoInstall.times_to_retry or 0):
+response = None
+try:
+response = AutoInstall._request('https://{}/{}'.format(AutoInstall.index, path))
+if response.code != 200:
+raise ValueError('The package {} was not found on {}'.format(self.pypi_name, AutoInstall.index))
 
-packages = SimplyPypiIndexPageParser.parse(response.read().decode("UTF-8"))
-cached_tags = None
+packages = SimplyPypiIndexPageParser.parse(response.read().decode("UTF-8"))
+cached_tags = None
 
-for package in reversed(packages):
-if self.wheel:
-match = re.search(r'.+-([^-]+-[^-]+-[^-]+).whl', package['name'])
-if not match:
-continue
+for package in reversed(packages):
+if self.wheel:
+match = re.search(r'.+-([^-]+-[^-]+-[^-]+).whl', package['name'])
+if not match:
+continue
 
-from packaging import tags
+from packaging import tags
 
-if not cached_tags:
-cached_tags = set(AutoInstall.tags())
+if not cached_tags:
+cached_tags = set(AutoInstall.tags())
 
-if all([tag not in cached_tags for tag in tags.parse_tag(match.group(1))]):
-continue
+if all([tag not in cached_tags for tag in tags.parse_tag(match.group(1))]):
+

[webkit-changes] [282296] trunk/Tools

2021-09-10 Thread jbedard

Title: [282296] trunk/Tools








Revision 282296
Author jbed...@apple.com
Date 2021-09-10 15:36:11 -0700 (Fri, 10 Sep 2021)


Log Message
[resultsdbpy] model.casserole_unittest.CasseroleTest.test_asynchronous failing
https://bugs.webkit.org/show_bug.cgi?id=230162


Reviewed by Ryan Haddad.

* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
* Scripts/libraries/resultsdbpy/resultsdbpy/model/casserole_unittest.py:
(CasseroleTest.test_asynchronous): Child processes do not pick up MockTime.
* Scripts/libraries/resultsdbpy/setup.py: Bump version.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py
trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/model/casserole_unittest.py
trunk/Tools/Scripts/libraries/resultsdbpy/setup.py




Diff

Modified: trunk/Tools/ChangeLog (282295 => 282296)

--- trunk/Tools/ChangeLog	2021-09-10 22:32:43 UTC (rev 282295)
+++ trunk/Tools/ChangeLog	2021-09-10 22:36:11 UTC (rev 282296)
@@ -1,3 +1,16 @@
+2021-09-10  Jonathan Bedard  
+
+[resultsdbpy] model.casserole_unittest.CasseroleTest.test_asynchronous failing
+https://bugs.webkit.org/show_bug.cgi?id=230162
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py: Bump version.
+* Scripts/libraries/resultsdbpy/resultsdbpy/model/casserole_unittest.py:
+(CasseroleTest.test_asynchronous): Child processes do not pick up MockTime.
+* Scripts/libraries/resultsdbpy/setup.py: Bump version.
+
 2021-09-10  Stephan Szabo  
 
 [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py (282295 => 282296)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-09-10 22:32:43 UTC (rev 282295)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py	2021-09-10 22:36:11 UTC (rev 282296)
@@ -44,7 +44,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(3, 1, 1)
+version = Version(3, 1, 2)
 
 import webkitflaskpy
 


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/model/casserole_unittest.py (282295 => 282296)

--- trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/model/casserole_unittest.py	2021-09-10 22:32:43 UTC (rev 282295)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/model/casserole_unittest.py	2021-09-10 22:36:11 UTC (rev 282296)
@@ -49,12 +49,11 @@
 nodes = CasseroleNodes('https://casserole.webkit.org/api/cluster-endpoints', interval_seconds=10, asynchronous=True)
 self.assertEqual(['start'], nodes.nodes)
 
-with mocks.Requests('casserole.webkit.org', **{
-'api/cluster-endpoints': mocks.Response(text='url1,url2')
-}):
-self.assertEqual(['start'], nodes.nodes)
-time.sleep(15)
-self.assertEqual(['url1', 'url2'], nodes.nodes)
+with mocks.Requests('casserole.webkit.org', **{
+'api/cluster-endpoints': mocks.Response(text='url1,url2')
+}):
+nodes = CasseroleNodes('https://casserole.webkit.org/api/cluster-endpoints', interval_seconds=10, asynchronous=True)
+self.assertEqual(['url1', 'url2'], nodes.nodes)
 
 def test_list_like(self):
 with mocks.Requests('casserole.webkit.org', **{


Modified: trunk/Tools/Scripts/libraries/resultsdbpy/setup.py (282295 => 282296)

--- trunk/Tools/Scripts/libraries/resultsdbpy/setup.py	2021-09-10 22:32:43 UTC (rev 282295)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/setup.py	2021-09-10 22:36:11 UTC (rev 282296)
@@ -30,7 +30,7 @@
 
 setup(
 name='resultsdbpy',
-version='3.1.1',
+version='3.1.2',
 description='Library for visualizing, processing and storing test results.',
 long_description=readme(),
 classifiers=[






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282294] trunk/Tools

2021-09-10 Thread jbedard

Title: [282294] trunk/Tools








Revision 282294
Author jbed...@apple.com
Date 2021-09-10 15:16:06 -0700 (Fri, 10 Sep 2021)


Log Message
[webkitcorepy] AutoInstall occasionally raising SSL error
https://bugs.webkit.org/show_bug.cgi?id=230169


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(AutoInstall._request): Pass cafile into urlopen directly.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py




Diff

Modified: trunk/Tools/ChangeLog (282293 => 282294)

--- trunk/Tools/ChangeLog	2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/ChangeLog	2021-09-10 22:16:06 UTC (rev 282294)
@@ -1,3 +1,16 @@
+2021-09-10  Jonathan Bedard  
+
+[webkitcorepy] AutoInstall occasionally raising SSL error
+https://bugs.webkit.org/show_bug.cgi?id=230169
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+(AutoInstall._request): Pass cafile into urlopen directly.
+
 2021-09-10  Aakash Jain  
 
 [build.webkit.org] Remove ./ from command invocations


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (282293 => 282294)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-10 22:16:06 UTC (rev 282294)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.10.1',
+version='0.10.2',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (282293 => 282294)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-10 22:16:06 UTC (rev 282294)
@@ -42,7 +42,7 @@
 from webkitcorepy.call_by_need import CallByNeed
 from webkitcorepy.editor import Editor
 
-version = Version(0, 10, 1)
+version = Version(0, 10, 2)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (282293 => 282294)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	2021-09-10 21:05:21 UTC (rev 282293)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	2021-09-10 22:16:06 UTC (rev 282294)
@@ -26,7 +26,6 @@
 import os
 import platform
 import re
-import ssl
 import subprocess
 import shutil
 import sys
@@ -409,10 +408,7 @@
 
 @classmethod
 def _request(cls, url, ca_cert_path=None):
-context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-if ca_cert_path or cls.ca_cert_path:
-context.load_verify_locations(cafile=ca_cert_path or cls.ca_cert_path)
-return urlopen(url, timeout=cls.timeout, context=context)
+return urlopen(url, timeout=cls.timeout, cafile=ca_cert_path or cls.ca_cert_path)
 
 @classmethod
 def enabled(cls):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282268] trunk/Tools

2021-09-10 Thread jbedard

Title: [282268] trunk/Tools








Revision 282268
Author jbed...@apple.com
Date 2021-09-10 08:07:52 -0700 (Fri, 10 Sep 2021)


Log Message
Exception in run-webkit-tests: Bad file descriptor (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=229994


Unreviewed follow-up fix.


* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.rmtree): shutil.rmtree doesn't ignore bad file descriptor OSErrors.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/filesystem.py




Diff

Modified: trunk/Tools/ChangeLog (282267 => 282268)

--- trunk/Tools/ChangeLog	2021-09-10 14:26:56 UTC (rev 282267)
+++ trunk/Tools/ChangeLog	2021-09-10 15:07:52 UTC (rev 282268)
@@ -1,3 +1,14 @@
+2021-09-10  Jonathan Bedard  
+
+Exception in run-webkit-tests: Bad file descriptor (Part 3)
+https://bugs.webkit.org/show_bug.cgi?id=229994
+
+
+Unreviewed follow-up fix.
+
+* Scripts/webkitpy/common/system/filesystem.py:
+(FileSystem.rmtree): shutil.rmtree doesn't ignore bad file descriptor OSErrors.
+
 2021-09-09  Simon Fraser  
 
 Fix some lldb data provider issues


Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (282267 => 282268)

--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-09-10 14:26:56 UTC (rev 282267)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py	2021-09-10 15:07:52 UTC (rev 282268)
@@ -290,7 +290,10 @@
 
 def rmtree(self, path):
 """Delete the directory rooted at path, whether empty or not."""
-shutil.rmtree(path, ignore_errors=True)
+try:
+shutil.rmtree(path, ignore_errors=True)
+except OSError:
+pass
 
 def copytree(self, source, destination):
 shutil.copytree(source, destination)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282185] trunk/Tools

2021-09-08 Thread jbedard

Title: [282185] trunk/Tools








Revision 282185
Author jbed...@apple.com
Date 2021-09-08 17:20:18 -0700 (Wed, 08 Sep 2021)


Log Message
Exception in run-webkit-tests: Bad file descriptor (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=229994


Reviewed by Ryan Haddad.

* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.launch_app): Catch OSError.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py




Diff

Modified: trunk/Tools/ChangeLog (282184 => 282185)

--- trunk/Tools/ChangeLog	2021-09-08 23:56:21 UTC (rev 282184)
+++ trunk/Tools/ChangeLog	2021-09-09 00:20:18 UTC (rev 282185)
@@ -1,3 +1,14 @@
+2021-09-08  Jonathan Bedard  
+
+Exception in run-webkit-tests: Bad file descriptor (Part 2)
+https://bugs.webkit.org/show_bug.cgi?id=229994
+
+
+Reviewed by Ryan Haddad.
+
+* Scripts/webkitpy/xcode/simulated_device.py:
+(SimulatedDevice.launch_app): Catch OSError.
+
 2021-09-08  Sihui Liu  
 
 Regression (r282130): [ macOS iOS wk2 ] imported/w3c/web-platform-tests/storage/persisted.https.any.html is failing


Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (282184 => 282185)

--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2021-09-08 23:56:21 UTC (rev 282184)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2021-09-09 00:20:18 UTC (rev 282185)
@@ -666,12 +666,17 @@
 
 with Timeout(timeout, handler=RuntimeError(u'Timed out waiting for process to open {} on {}'.format(bundle_id, self.udid)), patch=False):
 while True:
-output = self.executive.run_command(
-['xcrun', 'simctl', 'launch', self.udid, bundle_id] + args,
-env=environment_to_use,
-error_handler=_log_debug_error,
-return_stderr=False,
-)
+output = ''
+try:
+output = self.executive.run_command(
+['xcrun', 'simctl', 'launch', self.udid, bundle_id] + args,
+env=environment_to_use,
+error_handler=_log_debug_error,
+return_stderr=False,
+)
+except OSError as e:
+_log.debug("simctl launch raised '{}'".format(e))
+continue
 match = re.match(r'(?P[^:]+): (?P\d+)\n', output)
 # FIXME: We shouldn't need to check the PID .
 if match and self.executive.check_running_pid(int(match.group('pid'))):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282166] trunk/Tools

2021-09-08 Thread jbedard

Title: [282166] trunk/Tools








Revision 282166
Author jbed...@apple.com
Date 2021-09-08 13:07:58 -0700 (Wed, 08 Sep 2021)


Log Message
[webkitcorepy] Add support for find_spec
https://bugs.webkit.org/show_bug.cgi?id=230009


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(AutoInstall.find_spec): Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py




Diff

Modified: trunk/Tools/ChangeLog (282165 => 282166)

--- trunk/Tools/ChangeLog	2021-09-08 19:57:54 UTC (rev 282165)
+++ trunk/Tools/ChangeLog	2021-09-08 20:07:58 UTC (rev 282166)
@@ -1,3 +1,16 @@
+2021-09-08  Jonathan Bedard  
+
+[webkitcorepy] Add support for find_spec
+https://bugs.webkit.org/show_bug.cgi?id=230009
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+(AutoInstall.find_spec): Added.
+
 2021-09-08  Fujii Hironori  
 
 [Win][DumpRenderTree] ASSERTION FAILED: openWindows().size() == 1 in runTest


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (282165 => 282166)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-08 19:57:54 UTC (rev 282165)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-08 20:07:58 UTC (rev 282166)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.10.0',
+version='0.10.1',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (282165 => 282166)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-08 19:57:54 UTC (rev 282165)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-08 20:07:58 UTC (rev 282166)
@@ -42,7 +42,7 @@
 from webkitcorepy.call_by_need import CallByNeed
 from webkitcorepy.editor import Editor
 
-version = Version(0, 10, 0)
+version = Version(0, 10, 1)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (282165 => 282166)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	2021-09-08 19:57:54 UTC (rev 282165)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	2021-09-08 20:07:58 UTC (rev 282166)
@@ -590,6 +590,13 @@
 return None
 
 @classmethod
+def find_spec(cls, fullname, path=None, target=None):
+loader = cls.find_module(fullname, path=path)
+if not loader:
+return None
+return loader.create_module(None)
+
+@classmethod
 def find_module(cls, fullname, path=None):
 if not cls.enabled() or path is not None:
 return None






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282113] trunk/Tools

2021-09-07 Thread jbedard

Title: [282113] trunk/Tools








Revision 282113
Author jbed...@apple.com
Date 2021-09-07 16:02:45 -0700 (Tue, 07 Sep 2021)


Log Message
[git-webkit] Support callbacks as main arguments (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=229739


Unreviewed follow-up fix.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.url): For compatibility, use git config directly.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py




Diff

Modified: trunk/Tools/ChangeLog (282112 => 282113)

--- trunk/Tools/ChangeLog	2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/ChangeLog	2021-09-07 23:02:45 UTC (rev 282113)
@@ -1,5 +1,18 @@
 2021-09-07  Jonathan Bedard  
 
+[git-webkit] Support callbacks as main arguments (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=229739
+
+
+Unreviewed follow-up fix.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.url): For compatibility, use git config directly.
+
+2021-09-07  Jonathan Bedard  
+
 [git-webkit] Support callbacks as main arguments
 https://bugs.webkit.org/show_bug.cgi?id=229739
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (282112 => 282113)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-07 23:02:45 UTC (rev 282113)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.1.2',
+version='2.1.3',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (282112 => 282113)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-07 23:02:45 UTC (rev 282113)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 1, 2)
+version = Version(2, 1, 3)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (282112 => 282113)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-07 23:02:45 UTC (rev 282113)
@@ -380,10 +380,7 @@
 
 @decorators.Memoize()
 def url(self, name=None):
-result = run([self.executable(), 'remote', 'get-url', name or 'origin'], cwd=self.root_path, capture_output=True, encoding='utf-8')
-if result.returncode:
-raise self.Exception('Failed to retrieve remote for {}'.format(self.root_path))
-return result.stdout.rstrip()
+return self.config().get('remote.{}.url'.format(name or 'origin'))
 
 @decorators.Memoize()
 def remote(self, name=None):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282108] trunk/Tools

2021-09-07 Thread jbedard

Title: [282108] trunk/Tools








Revision 282108
Author jbed...@apple.com
Date 2021-09-07 15:04:55 -0700 (Tue, 07 Sep 2021)


Log Message
[git-webkit] Support callbacks as main arguments
https://bugs.webkit.org/show_bug.cgi?id=229739


Reviewed by Dewei Zhu.

* Scripts/git-webkit:
(is_webkit_filter): Return item if repository is Webkit.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
(main): Pass repository to contributors, identifier_template and subversion
to dynamically generate values if those arguments are callable.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-webkit
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py




Diff

Modified: trunk/Tools/ChangeLog (282107 => 282108)

--- trunk/Tools/ChangeLog	2021-09-07 21:21:02 UTC (rev 282107)
+++ trunk/Tools/ChangeLog	2021-09-07 22:04:55 UTC (rev 282108)
@@ -1,3 +1,19 @@
+2021-09-07  Jonathan Bedard  
+
+[git-webkit] Support callbacks as main arguments
+https://bugs.webkit.org/show_bug.cgi?id=229739
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/git-webkit:
+(is_webkit_filter): Return item if repository is Webkit.
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+(main): Pass repository to contributors, identifier_template and subversion
+to dynamically generate values if those arguments are callable.
+
 2021-09-07  Chris Dumez  
 
 Implement origin partitioning (top-origin/frame-origin) for BroadcastChannel


Modified: trunk/Tools/Scripts/git-webkit (282107 => 282108)

--- trunk/Tools/Scripts/git-webkit	2021-09-07 21:21:02 UTC (rev 282107)
+++ trunk/Tools/Scripts/git-webkit	2021-09-07 22:04:55 UTC (rev 282108)
@@ -26,9 +26,25 @@
 import sys
 
 from webkitpy.common.config.committers import CommitterList
-from webkitscmpy import program, Contributor
+from webkitscmpy import local, program, remote, Contributor
 
 
+def is_webkit_filter(to_return):
+def callback(repository):
+if isinstance(repository, local.Scm):
+repository = repository.remote()
+if not isinstance(repository, remote.Scm):
+return None
+if getattr(repository, 'name', None) == 'WebKit':
+return to_return
+url = "" 'url', '')
+if 'svn.webkit.org' in url or 'git.webkit.org' in url:
+return to_return
+return None
+
+return callback
+
+
 if '__main__' == __name__:
 contributors = Contributor.Mapping()
 for contributor in CommitterList().contributors():
@@ -44,8 +60,8 @@
 
 sys.exit(program.main(
 path=os.path.dirname(__file__),
-contributors=contributors,
-identifier_template='Canonical link: https://commits.webkit.org/{}',
-subversion='https://svn.webkit.org/repository/webkit',
+contributors=is_webkit_filter(contributors),
+identifier_template=is_webkit_filter('Canonical link: https://commits.webkit.org/{}'),
+subversion=is_webkit_filter('https://svn.webkit.org/repository/webkit'),
 ))
 


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (282107 => 282108)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-07 21:21:02 UTC (rev 282107)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-07 22:04:55 UTC (rev 282108)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.1.1',
+version='2.1.2',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (282107 => 282108)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-07 21:21:02 UTC (rev 282107)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-07 22:04:55 UTC (rev 282108)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 1, 1)
+version = Version(2, 1, 2)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py (282107 => 282108)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py	2021-09-07 21:21:02 UTC (rev 282107)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py	2021-09-07 22:04:55 UTC (rev 282108)
@@ -99,10 +99,17 @@
 parsed = parser.parse_args(args=args)
 
 if parsed.repository.startswi

[webkit-changes] [282091] trunk/Tools

2021-09-07 Thread jbedard

Title: [282091] trunk/Tools








Revision 282091
Author jbed...@apple.com
Date 2021-09-07 09:37:33 -0700 (Tue, 07 Sep 2021)


Log Message
Exception in run-webkit-tests: Bad file descriptor (Part 1)
https://bugs.webkit.org/show_bug.cgi?id=229994

Reviewed by Aakash Jain.

* Scripts/webkitpy/port/server_process.py:
(ServerProcess.write): Catch "Bad file descriptor."
(ServerProcess._wait_for_data_and_update_buffers_using_select): Ditto.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/server_process.py




Diff

Modified: trunk/Tools/ChangeLog (282090 => 282091)

--- trunk/Tools/ChangeLog	2021-09-07 16:30:15 UTC (rev 282090)
+++ trunk/Tools/ChangeLog	2021-09-07 16:37:33 UTC (rev 282091)
@@ -1,5 +1,16 @@
 2021-09-07  Jonathan Bedard  
 
+Exception in run-webkit-tests: Bad file descriptor (Part 1)
+https://bugs.webkit.org/show_bug.cgi?id=229994
+
+Reviewed by Aakash Jain.
+
+* Scripts/webkitpy/port/server_process.py:
+(ServerProcess.write): Catch "Bad file descriptor."
+(ServerProcess._wait_for_data_and_update_buffers_using_select): Ditto.
+
+2021-09-07  Jonathan Bedard  
+
 run_webkit_tests failed to print error message in python3 in linux_get_crash_log.py
 https://bugs.webkit.org/show_bug.cgi?id=229971
 


Modified: trunk/Tools/Scripts/webkitpy/port/server_process.py (282090 => 282091)

--- trunk/Tools/Scripts/webkitpy/port/server_process.py	2021-09-07 16:30:15 UTC (rev 282090)
+++ trunk/Tools/Scripts/webkitpy/port/server_process.py	2021-09-07 16:37:33 UTC (rev 282091)
@@ -184,7 +184,7 @@
 try:
 self._proc.stdin.write(string_utils.encode(bytes))
 self._proc.stdin.flush()
-except (IOError, ValueError):
+except (IOError, OSError, ValueError):
 self.stop(0.0)
 # stop() calls _reset(), so we have to set crashed to True after calling stop()
 # unless we already know that this is a timeout.
@@ -284,6 +284,10 @@
 select_fds = (out_fd, err_fd)
 try:
 read_fds, _, _ = select.select(select_fds, [], select_fds, max(deadline - time.time(), 0))
+except OSError:
+# FIXME: https://bugs.webkit.org/show_bug.cgi?id=229994
+_log.debug('Caught OSError for {}, continuing'.format(self.pid()))
+return
 except select.error as e:
 # We can ignore EINVAL since it's likely the process just crashed and we'll
 # figure that out the next time through the loop in _read().
@@ -312,6 +316,10 @@
 _log.debug('{} because of no data while reading stdout for the server process.'.format(self._crash_message))
 self._crashed = True
 self._error += data
+except OSError:
+# FIXME: https://bugs.webkit.org/show_bug.cgi?id=229994
+_log.debug('Caught OSError for {}, continuing'.format(self.pid()))
+pass
 except IOError:
 # We can ignore the IOErrors because we will detect if the subporcess crashed
 # the next time through the loop in _read()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [282087] trunk/Tools

2021-09-07 Thread jbedard

Title: [282087] trunk/Tools








Revision 282087
Author jbed...@apple.com
Date 2021-09-07 08:44:40 -0700 (Tue, 07 Sep 2021)


Log Message
run_webkit_tests failed to print error message in python3 in linux_get_crash_log.py
https://bugs.webkit.org/show_bug.cgi?id=229971

Reviewed by Aakash Jain.

* Scripts/webkitpy/port/linux_get_crash_log.py:
(GDBCrashLogGenerator._get_gdb_output):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py




Diff

Modified: trunk/Tools/ChangeLog (282086 => 282087)

--- trunk/Tools/ChangeLog	2021-09-07 15:30:28 UTC (rev 282086)
+++ trunk/Tools/ChangeLog	2021-09-07 15:44:40 UTC (rev 282087)
@@ -1,3 +1,13 @@
+2021-09-07  Jonathan Bedard  
+
+run_webkit_tests failed to print error message in python3 in linux_get_crash_log.py
+https://bugs.webkit.org/show_bug.cgi?id=229971
+
+Reviewed by Aakash Jain.
+
+* Scripts/webkitpy/port/linux_get_crash_log.py:
+(GDBCrashLogGenerator._get_gdb_output):
+
 2021-09-07  Carlos Alberto Lopez Perez  
 
 [GTK] The Xvfb display server may fail to start sometimes causing tests to randomly crash (v3)


Modified: trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py (282086 => 282087)

--- trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py	2021-09-07 15:30:28 UTC (rev 282086)
+++ trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py	2021-09-07 15:44:40 UTC (rev 282087)
@@ -60,7 +60,7 @@
 stdout, stderr = proc.communicate()
 errors = [stderr_line.strip().decode('utf8', 'ignore') for stderr_line in stderr.splitlines()]
 if proc.returncode != 0:
-stdout = ('ERROR: The gdb process exited with non-zero return code %s\n\n' % proc.returncode) + stdout
+stdout = (b'ERROR: The gdb process exited with non-zero return code %s\n\n' % str(proc.returncode)) + stdout
 return (stdout.decode('utf8', 'ignore'), errors)
 
 def _get_tmp_file_name(self, coredumpctl, filename):






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281968] trunk/Tools

2021-09-02 Thread jbedard

Title: [281968] trunk/Tools








Revision 281968
Author jbed...@apple.com
Date 2021-09-02 17:57:14 -0700 (Thu, 02 Sep 2021)


Log Message
[webkit-patch] apply-watchlist command fails on python 3 (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=229822


Reviewed by Aakash Jain.

* Scripts/webkitpy/common/checkout/diff_parser.py:
(get_diff_converter): Potentially decode bytes.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py




Diff

Modified: trunk/Tools/ChangeLog (281967 => 281968)

--- trunk/Tools/ChangeLog	2021-09-02 23:54:29 UTC (rev 281967)
+++ trunk/Tools/ChangeLog	2021-09-03 00:57:14 UTC (rev 281968)
@@ -1,3 +1,14 @@
+2021-09-02  Jonathan Bedard  
+
+[webkit-patch] apply-watchlist command fails on python 3 (Follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=229822
+
+
+Reviewed by Aakash Jain.
+
+* Scripts/webkitpy/common/checkout/diff_parser.py:
+(get_diff_converter): Potentially decode bytes.
+
 2021-09-02  Lauro Moura  
 
 [GLIB] run-gtk-tests does not require GI outside the sandbox


Modified: trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py (281967 => 281968)

--- trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py	2021-09-02 23:54:29 UTC (rev 281967)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py	2021-09-03 00:57:14 UTC (rev 281968)
@@ -86,6 +86,8 @@
  converter from git to SVN.
 """
 for i, line in enumerate(lines[:-1]):
+line = string_utils.decode(line)
+
 # Stop when we find the first patch
 if line[:3] == "+++" and lines[i + 1] == "---":
 break






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281956] trunk/Tools

2021-09-02 Thread jbedard

Title: [281956] trunk/Tools








Revision 281956
Author jbed...@apple.com
Date 2021-09-02 14:59:56 -0700 (Thu, 02 Sep 2021)


Log Message
[contributors.json] Relocation (Part 6)
https://bugs.webkit.org/show_bug.cgi?id=229690


Reviewed by Yusuke Suzuki.

* WebKitBot/src/Commit.mjs: Use name instead of fullName.
* WebKitBot/src/Contributors.mjs: Load contributors from metadata/contributors.json,
parse as list instead of dictionary.
* WebKitBot/tests/Commit.test.mjs: Load contributors from metadata/contributors.json.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitBot/src/Commit.mjs
trunk/Tools/WebKitBot/src/Contributors.mjs
trunk/Tools/WebKitBot/tests/Commit.test.mjs




Diff

Modified: trunk/Tools/ChangeLog (281955 => 281956)

--- trunk/Tools/ChangeLog	2021-09-02 21:49:25 UTC (rev 281955)
+++ trunk/Tools/ChangeLog	2021-09-02 21:59:56 UTC (rev 281956)
@@ -1,5 +1,18 @@
 2021-09-02  Jonathan Bedard  
 
+[contributors.json] Relocation (Part 6)
+https://bugs.webkit.org/show_bug.cgi?id=229690
+
+
+Reviewed by Yusuke Suzuki.
+
+* WebKitBot/src/Commit.mjs: Use name instead of fullName.
+* WebKitBot/src/Contributors.mjs: Load contributors from metadata/contributors.json,
+parse as list instead of dictionary.
+* WebKitBot/tests/Commit.test.mjs: Load contributors from metadata/contributors.json.
+
+2021-09-02  Jonathan Bedard  
+
 [webkit-patch] apply-watchlist command fails on python 3
 https://bugs.webkit.org/show_bug.cgi?id=229822
 


Modified: trunk/Tools/WebKitBot/src/Commit.mjs (281955 => 281956)

--- trunk/Tools/WebKitBot/src/Commit.mjs	2021-09-02 21:49:25 UTC (rev 281955)
+++ trunk/Tools/WebKitBot/src/Commit.mjs	2021-09-02 21:59:56 UTC (rev 281956)
@@ -42,9 +42,9 @@
 if (!entry.nicks)
 continue;
 
-let nameWithNicks = `${entry.fullName} (@${entry.nicks[0]})`;
-if (change.includes(entry.fullName)) {
-change = replaceAll(entry.fullName, nameWithNicks, change);
+let nameWithNicks = `${entry.name} (@${entry.nicks[0]})`;
+if (change.includes(entry.name)) {
+change = replaceAll(entry.name, nameWithNicks, change);
 for (let email of entry.emails)
 change = replaceAll(`<${email}>`, "", change);
 } else {
@@ -79,7 +79,7 @@
 if (this._email) {
 let entry = contributors.queryWithEmail(this._email);
 if (entry && entry.nicks && entry.nicks[0])
-this._author = `${entry.fullName} (@${entry.nicks[0]})`;
+this._author = `${entry.name} (@${entry.nicks[0]})`;
 }
 }
 if (this._revert) {


Modified: trunk/Tools/WebKitBot/src/Contributors.mjs (281955 => 281956)

--- trunk/Tools/WebKitBot/src/Contributors.mjs	2021-09-02 21:49:25 UTC (rev 281955)
+++ trunk/Tools/WebKitBot/src/Contributors.mjs	2021-09-02 21:59:56 UTC (rev 281956)
@@ -25,7 +25,7 @@
 
 import axios from "axios";
 
-const contributorsURL = "https://svn.webkit.org/repository/webkit/trunk/Tools/Scripts/webkitpy/common/config/contributors.json";
+const contributorsURL = "https://svn.webkit.org/repository/webkit/trunk/metadata/contributors.json";
 
 export default class Contributors {
 static async create()
@@ -38,8 +38,7 @@
 {
 this.emails = new Map;
 this.entries = [];
-for (let [fullName, entry] of Object.entries(data)) {
-entry.fullName = fullName;
+for (let entry of data) {
 this.entries.push(entry);
 for (let email of entry.emails)
 this.emails.set(email, entry);


Modified: trunk/Tools/WebKitBot/tests/Commit.test.mjs (281955 => 281956)

--- trunk/Tools/WebKitBot/tests/Commit.test.mjs	2021-09-02 21:49:25 UTC (rev 281955)
+++ trunk/Tools/WebKitBot/tests/Commit.test.mjs	2021-09-02 21:59:56 UTC (rev 281956)
@@ -30,7 +30,7 @@
 import Contributors from "../src/Contributors.mjs";
 import {rootDirectoryOfWebKit} from "../src/Utility.mjs";
 
-const localContributorsPath = path.resolve(rootDirectoryOfWebKit(), "Tools", "Scripts", "webkitpy", "common", "config", "contributors.json");
+const localContributorsPath = path.resolve(rootDirectoryOfWebKit(), "metadata", "contributors.json");
 const contributors = new Contributors(JSON.parse(readFileSync(localContributorsPath)));
 const readFileAsync = util.promisify(readFile);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281953] trunk/Tools

2021-09-02 Thread jbedard

Title: [281953] trunk/Tools








Revision 281953
Author jbed...@apple.com
Date 2021-09-02 14:17:21 -0700 (Thu, 02 Sep 2021)


Log Message
[webkit-patch] apply-watchlist command fails on python 3
https://bugs.webkit.org/show_bug.cgi?id=229822


Reviewed by Aakash Jain.

* Scripts/webkitpy/common/checkout/diff_parser.py:
(DiffParser._parse_into_diff_files): Ensure all diff lines are strings.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py




Diff

Modified: trunk/Tools/ChangeLog (281952 => 281953)

--- trunk/Tools/ChangeLog	2021-09-02 21:09:15 UTC (rev 281952)
+++ trunk/Tools/ChangeLog	2021-09-02 21:17:21 UTC (rev 281953)
@@ -1,5 +1,16 @@
 2021-09-02  Jonathan Bedard  
 
+[webkit-patch] apply-watchlist command fails on python 3
+https://bugs.webkit.org/show_bug.cgi?id=229822
+
+
+Reviewed by Aakash Jain.
+
+* Scripts/webkitpy/common/checkout/diff_parser.py:
+(DiffParser._parse_into_diff_files): Ensure all diff lines are strings.
+
+2021-09-02  Jonathan Bedard  
+
 [webkitpy] WrappedPopen breaks process returncode
 https://bugs.webkit.org/show_bug.cgi?id=229824
 


Modified: trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py (281952 => 281953)

--- trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py	2021-09-02 21:09:15 UTC (rev 281952)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py	2021-09-02 21:17:21 UTC (rev 281953)
@@ -31,6 +31,8 @@
 import logging
 import re
 
+from webkitcorepy import string_utils
+
 _log = logging.getLogger(__name__)
 
 
@@ -152,7 +154,7 @@
 new_diff_line = None
 transform_line = get_diff_converter(diff_input)
 for line in diff_input:
-line = line.rstrip("\n")
+line = string_utils.decode(line).rstrip("\n")
 line = transform_line(line)
 
 file_declaration = match(r"^Index: (?P.+)", line)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281952] trunk/Tools

2021-09-02 Thread jbedard

Title: [281952] trunk/Tools








Revision 281952
Author jbed...@apple.com
Date 2021-09-02 14:09:15 -0700 (Thu, 02 Sep 2021)


Log Message
[webkitpy] WrappedPopen breaks process returncode
https://bugs.webkit.org/show_bug.cgi?id=229824

Reviewed by Carlos Alberto Lopez Perez.

* Scripts/webkitpy/common/system/executive.py:
(WrappedPopen.__init__): Define underlying object.
(WrappedPopen.returncode): Return underlying object's returncode.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/executive.py




Diff

Modified: trunk/Tools/ChangeLog (281951 => 281952)

--- trunk/Tools/ChangeLog	2021-09-02 20:41:18 UTC (rev 281951)
+++ trunk/Tools/ChangeLog	2021-09-02 21:09:15 UTC (rev 281952)
@@ -1,3 +1,14 @@
+2021-09-02  Jonathan Bedard  
+
+[webkitpy] WrappedPopen breaks process returncode
+https://bugs.webkit.org/show_bug.cgi?id=229824
+
+Reviewed by Carlos Alberto Lopez Perez.
+
+* Scripts/webkitpy/common/system/executive.py:
+(WrappedPopen.__init__): Define underlying object.
+(WrappedPopen.returncode): Return underlying object's returncode.
+
 2021-09-02  Carlos Alberto Lopez Perez  
 
 [GTK][WPE] Port API test runner to python3 (v2)


Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (281951 => 281952)

--- trunk/Tools/Scripts/webkitpy/common/system/executive.py	2021-09-02 20:41:18 UTC (rev 281951)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py	2021-09-02 21:09:15 UTC (rev 281952)
@@ -83,11 +83,16 @@
 
 class WrappedPopen(object):
 def __init__(self, popen):
-for attribute in dir(popen):
-if attribute.startswith('__'):
+self._popen = popen
+for attribute in dir(self._popen):
+if attribute.startswith('__') or attribute == 'returncode':
 continue
-setattr(self, attribute, getattr(popen, attribute))
+setattr(self, attribute, getattr(self._popen, attribute))
 
+@property
+def returncode(self):
+return self._popen.returncode
+
 def __enter__(self):
 return self
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281938] trunk/Tools

2021-09-02 Thread jbedard

Title: [281938] trunk/Tools








Revision 281938
Author jbed...@apple.com
Date 2021-09-02 11:31:12 -0700 (Thu, 02 Sep 2021)


Log Message
[contributors.json] Relocation (Part 5)
https://bugs.webkit.org/show_bug.cgi?id=229690


Reviewed by Aakash Jain.

* CISupport/ews-build/steps.py:
(ValidateCommiterAndReviewer): Pull from metadata/contributors.json.
(ValidateCommiterAndReviewer.load_contributors_from_disk): Ditto.
(ValidateCommiterAndReviewer.load_contributors): Parse contributors.json as list instead of dictionary.
* CISupport/ews-build/steps_unittest.py:

Modified Paths

trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (281937 => 281938)

--- trunk/Tools/CISupport/ews-build/steps.py	2021-09-02 17:51:43 UTC (rev 281937)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-09-02 18:31:12 UTC (rev 281938)
@@ -899,13 +899,13 @@
 class ValidateCommiterAndReviewer(buildstep.BuildStep):
 name = 'validate-commiter-and-reviewer'
 descriptionDone = ['Validated commiter and reviewer']
-url = ''
+url = ''
 contributors = {}
 
 def load_contributors_from_disk(self):
 cwd = os.path.abspath(os.path.dirname(__file__))
-tools_dir_path = os.path.dirname(os.path.dirname(cwd))
-contributors_path = os.path.join(tools_dir_path, 'Scripts/webkitpy/common/config/contributors.json')
+repo_root = os.path.dirname(os.path.dirname(os.path.dirname(cwd)))
+contributors_path = os.path.join(repo_root, 'metadata/contributors.json')
 try:
 with open(contributors_path, 'rb') as contributors_json:
 return json.load(contributors_json)
@@ -930,11 +930,12 @@
 contributors_json = self.load_contributors_from_disk()
 
 contributors = {}
-for key, value in contributors_json.items():
+for value in contributors_json:
+name = value.get('name')
 emails = value.get('emails')
-if emails:
+if name and emails:
 bugzilla_email = emails[0].lower()  # We're requiring that the first email is the primary bugzilla email
-contributors[bugzilla_email] = {'name': key, 'status': value.get('status')}
+contributors[bugzilla_email] = {'name': name, 'status': value.get('status')}
 return contributors
 
 @defer.inlineCallbacks


Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281937 => 281938)

--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-09-02 17:51:43 UTC (rev 281937)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-09-02 18:31:12 UTC (rev 281938)
@@ -4216,8 +4216,8 @@
 
 def test_load_contributors_from_disk(self):
 ValidateCommiterAndReviewer._addToLog = lambda cls, logtype, log: sys.stdout.write(log)
-contributors = ValidateCommiterAndReviewer().load_contributors_from_disk()
-self.assertEqual(contributors['Aakash Jain']['nicks'], ['aakash_jain'])
+contributors = filter(lambda element: element.get('name') == 'Aakash Jain', ValidateCommiterAndReviewer().load_contributors_from_disk())
+self.assertEqual(list(contributors)[0]['emails'], ['aakash_j...@apple.com'])
 
 
 class TestCheckPatchStatusOnEWSQueues(BuildStepMixinAdditions, unittest.TestCase):


Modified: trunk/Tools/ChangeLog (281937 => 281938)

--- trunk/Tools/ChangeLog	2021-09-02 17:51:43 UTC (rev 281937)
+++ trunk/Tools/ChangeLog	2021-09-02 18:31:12 UTC (rev 281938)
@@ -1,3 +1,17 @@
+2021-09-02  Jonathan Bedard  
+
+[contributors.json] Relocation (Part 5)
+https://bugs.webkit.org/show_bug.cgi?id=229690
+
+
+Reviewed by Aakash Jain.
+
+* CISupport/ews-build/steps.py:
+(ValidateCommiterAndReviewer): Pull from metadata/contributors.json.
+(ValidateCommiterAndReviewer.load_contributors_from_disk): Ditto.
+(ValidateCommiterAndReviewer.load_contributors): Parse contributors.json as list instead of dictionary.
+* CISupport/ews-build/steps_unittest.py:
+
 2021-09-02  Lauro Moura  
 
 [webkitcorepy] Evaluate default Editor to false when not found






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281936] trunk/Websites/bugs.webkit.org

2021-09-02 Thread jbedard

Title: [281936] trunk/Websites/bugs.webkit.org








Revision 281936
Author jbed...@apple.com
Date 2021-09-02 10:32:51 -0700 (Thu, 02 Sep 2021)


Log Message
[contributors.json] Relocation (Part 4)
https://bugs.webkit.org/show_bug.cgi?id=229690


Reviewed by Aakash Jain.

* committers-autocomplete.js: Use metadata/contributors.json.
(parseCommittersPy): Parse contributors.json as list instead of dictionary.

Modified Paths

trunk/Websites/bugs.webkit.org/ChangeLog
trunk/Websites/bugs.webkit.org/committers-autocomplete.js




Diff

Modified: trunk/Websites/bugs.webkit.org/ChangeLog (281935 => 281936)

--- trunk/Websites/bugs.webkit.org/ChangeLog	2021-09-02 17:25:34 UTC (rev 281935)
+++ trunk/Websites/bugs.webkit.org/ChangeLog	2021-09-02 17:32:51 UTC (rev 281936)
@@ -1,3 +1,14 @@
+2021-09-02  Jonathan Bedard  
+
+[contributors.json] Relocation (Part 4)
+https://bugs.webkit.org/show_bug.cgi?id=229690
+
+
+Reviewed by Aakash Jain.
+
+* committers-autocomplete.js: Use metadata/contributors.json.
+(parseCommittersPy): Parse contributors.json as list instead of dictionary.
+
 2021-04-27  Jonathan Bedard  
 
 Bugzilla needs to linkify identifiers (Part 2)


Modified: trunk/Websites/bugs.webkit.org/committers-autocomplete.js (281935 => 281936)

--- trunk/Websites/bugs.webkit.org/committers-autocomplete.js	2021-09-02 17:25:34 UTC (rev 281935)
+++ trunk/Websites/bugs.webkit.org/committers-autocomplete.js	2021-09-02 17:32:51 UTC (rev 281936)
@@ -24,7 +24,7 @@
 // DAMAGE.
 
 WebKitCommitters = (function() {
-var COMMITTERS_URL = 'https://svn.webkit.org/repository/webkit/trunk/Tools/Scripts/webkitpy/common/config/contributors.json';
+var COMMITTERS_URL = 'https://svn.webkit.org/repository/webkit/trunk/metadata/contributors.json';
 var m_committers;
 
 function statusToType(status) {
@@ -36,19 +36,15 @@
 }
 
 function parseCommittersPy(text) {
-var contributors = JSON.parse(text);
-
 m_committers = [];
-
-for (var name in contributors) {
-var record = contributors[name];
+JSON.parse(text).forEach(contributor => {
 m_committers.push({
-name: name,
-emails: record.emails,
-irc: record.nicks,
-type: statusToType(record.status),
+name: contributor.name,
+emails: contributor.emails,
+irc: contributor.nicks,
+type: statusToType(contributor.status),
 });
-}
+})
 }
 
 function loadCommitters(callback) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281932] trunk/Websites/webkit.org

2021-09-02 Thread jbedard

Title: [281932] trunk/Websites/webkit.org








Revision 281932
Author jbed...@apple.com
Date 2021-09-02 09:42:55 -0700 (Thu, 02 Sep 2021)


Log Message
[contributors.json] Relocation (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=229690


Reviewed by Aakash Jain.

* commit-review.md: Link to metadata/contributors.json.
* wp-content/themes/webkit/team.php: Load from metadata/contributors.json,
load list instead of dictionary.

Modified Paths

trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/commit-review.md
trunk/Websites/webkit.org/wp-content/themes/webkit/team.php




Diff

Modified: trunk/Websites/webkit.org/ChangeLog (281931 => 281932)

--- trunk/Websites/webkit.org/ChangeLog	2021-09-02 16:41:20 UTC (rev 281931)
+++ trunk/Websites/webkit.org/ChangeLog	2021-09-02 16:42:55 UTC (rev 281932)
@@ -1,3 +1,15 @@
+2021-09-02  Jonathan Bedard  
+
+[contributors.json] Relocation (Part 3)
+https://bugs.webkit.org/show_bug.cgi?id=229690
+
+
+Reviewed by Aakash Jain.
+
+* commit-review.md: Link to metadata/contributors.json.
+* wp-content/themes/webkit/team.php: Load from metadata/contributors.json,
+load list instead of dictionary.
+
 2021-08-31  Jonathan Bedard  
 
 [contributors.json] Replace class=bot with status=bot


Modified: trunk/Websites/webkit.org/commit-review.md (281931 => 281932)

--- trunk/Websites/webkit.org/commit-review.md	2021-09-02 16:41:20 UTC (rev 281931)
+++ trunk/Websites/webkit.org/commit-review.md	2021-09-02 16:42:55 UTC (rev 281932)
@@ -10,7 +10,7 @@
 
 Once someone is successfully nominated for WebKit Committer status, Apple will take care of sending the committer agreement and setting up a Subversion account once signed and received.
 
-Once someone is successfully nominated for WebKit Reviewer status, the nominating Reviewer or another responsible party should inform the candidate and ask for indication of acceptance from the potential new reviewer. If the candidate accepts, [contributors.json](http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json) will be updated.
+Once someone is successfully nominated for WebKit Reviewer status, the nominating Reviewer or another responsible party should inform the candidate and ask for indication of acceptance from the potential new reviewer. If the candidate accepts, [contributors.json](http://trac.webkit.org/browser/trunk/metadata/contributors.json) will be updated.
 
 ## Criteria for Committers
 


Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/team.php (281931 => 281932)

--- trunk/Websites/webkit.org/wp-content/themes/webkit/team.php	2021-09-02 16:41:20 UTC (rev 281931)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/team.php	2021-09-02 16:42:55 UTC (rev 281932)
@@ -157,21 +157,18 @@
 };
 
 function parseContributorsJSON(text) {
-var contributorsJSON = JSON.parse(text);
-var contributors = [];
-
-for (var contributor in contributorsJSON) {
-var data = ""
-if (data.status == "bot")
-continue;
+let contributors = [];
+JSON.parse(text).forEach(contributor => {
+if (contributor.class == "bot")
+return;
 contributors.push({
-name: contributor,
-kind: data.status ? data.status : 'contributor',
-emails: data.emails,
-nicks: data.nicks,
-expertise: data.expertise
+name: contributor.name,
+kind: contributor.status ? contributor.status : 'contributor',
+emails: contributor.emails,
+nicks: contributor.nicks,
+expertise: contributor.expertise
 });
-}
+});
 return contributors;
 }
 
@@ -266,7 +263,7 @@
 populateContributorList(contributors, 'contributor');
 };
 xhr._onerror_ = function () { document.getElementById('team').textContent = 'There was an issue loading data for the WebKit Team. not obtain contributors.json'; };
-xhr.open('GET', svnTrunkUrl + 'Tools/Scripts/webkitpy/common/config/contributors.json');
+xhr.open('GET', svnTrunkUrl + 'metadata/contributors.json');
 xhr.send();
 
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281923] trunk/Tools

2021-09-02 Thread jbedard

Title: [281923] trunk/Tools








Revision 281923
Author jbed...@apple.com
Date 2021-09-02 08:15:51 -0700 (Thu, 02 Sep 2021)


Log Message
[buildbot] Only serve content through nginx
https://bugs.webkit.org/show_bug.cgi?id=229785


Reviewed by Alexey Proskuryakov.

* CISupport/build-webkit-org/master.cfg: Only expose webserver to localhost.
* CISupport/ews-build/master.cfg: Ditto.

Modified Paths

trunk/Tools/CISupport/build-webkit-org/master.cfg
trunk/Tools/CISupport/ews-build/master.cfg
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/master.cfg (281922 => 281923)

--- trunk/Tools/CISupport/build-webkit-org/master.cfg	2021-09-02 14:58:05 UTC (rev 281922)
+++ trunk/Tools/CISupport/build-webkit-org/master.cfg	2021-09-02 15:15:51 UTC (rev 281923)
@@ -20,7 +20,7 @@
 
 # permissions for WebStatus
 
-c['www'] = dict(port=8710, plugins=dict(waterfall_view={}, console_view={}, grid_view={}), allowed_origins=["*"])
+c['www'] = dict(port='tcp:8710:interface=127.0.0.1', plugins=dict(waterfall_view={}, console_view={}, grid_view={}), allowed_origins=["*"])
 c['www']['ui_default_config'] = {
 'Builders.show_workers_name': True,
 'Builders.buildFetchLimit': 1000,


Modified: trunk/Tools/CISupport/ews-build/master.cfg (281922 => 281923)

--- trunk/Tools/CISupport/ews-build/master.cfg	2021-09-02 14:58:05 UTC (rev 281922)
+++ trunk/Tools/CISupport/ews-build/master.cfg	2021-09-02 15:15:51 UTC (rev 281923)
@@ -20,7 +20,7 @@
 
 c = BuildmasterConfig = {}
 
-c['www'] = dict(port=8010, allowed_origins=["*"])
+c['www'] = dict(port='tcp:8010:interface=127.0.0.1', allowed_origins=["*"])
 c['www']['custom_templates_dir'] = 'templates'
 
 c['www']['ui_default_config'] = { 


Modified: trunk/Tools/ChangeLog (281922 => 281923)

--- trunk/Tools/ChangeLog	2021-09-02 14:58:05 UTC (rev 281922)
+++ trunk/Tools/ChangeLog	2021-09-02 15:15:51 UTC (rev 281923)
@@ -1,3 +1,14 @@
+2021-09-02  Jonathan Bedard  
+
+[buildbot] Only serve content through nginx
+https://bugs.webkit.org/show_bug.cgi?id=229785
+
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/build-webkit-org/master.cfg: Only expose webserver to localhost.
+* CISupport/ews-build/master.cfg: Ditto.
+
 2021-09-02  Lauro Moura  
 
 [GLIB] Garden itp API test failure after r281886






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281871] trunk/Tools

2021-09-01 Thread jbedard

Title: [281871] trunk/Tools








Revision 281871
Author jbed...@apple.com
Date 2021-09-01 13:22:18 -0700 (Wed, 01 Sep 2021)


Log Message
[git-webkit] Automatic rebasing or pull-requests (Follow-up fix.)
https://bugs.webkit.org/show_bug.cgi?id=229625


Reviewed by Yusuke Suzuki.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): Set commit for git-svn checkouts.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py




Diff

Modified: trunk/Tools/ChangeLog (281870 => 281871)

--- trunk/Tools/ChangeLog	2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/ChangeLog	2021-09-01 20:22:18 UTC (rev 281871)
@@ -1,3 +1,16 @@
+2021-09-01  Jonathan Bedard  
+
+[git-webkit] Automatic rebasing or pull-requests (Follow-up fix.)
+https://bugs.webkit.org/show_bug.cgi?id=229625
+
+
+Reviewed by Yusuke Suzuki.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.pull): Set commit for git-svn checkouts.
+
 2021-09-01  Carlos Alberto Lopez Perez  
 
 [GTK] The Xvfb display server may fail to start sometimes causing tests to randomly crash


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (281870 => 281871)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-09-01 20:22:18 UTC (rev 281871)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.1.0',
+version='2.1.1',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (281870 => 281871)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-09-01 20:22:18 UTC (rev 281871)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 1, 0)
+version = Version(2, 1, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (281870 => 281871)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-01 20:20:47 UTC (rev 281870)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py	2021-09-01 20:22:18 UTC (rev 281871)
@@ -772,6 +772,7 @@
 ).returncode else self.commit()
 
 def pull(self, rebase=None, branch=None):
+commit = self.commit() if self.is_svn else None
 code = run(
 [self.executable(), 'pull'] + (
 ['origin', branch] if branch else []






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [281862] trunk/Tools

2021-09-01 Thread jbedard

Title: [281862] trunk/Tools








Revision 281862
Author jbed...@apple.com
Date 2021-09-01 11:15:18 -0700 (Wed, 01 Sep 2021)


Log Message
[git-webkit] Add automatic Editor configuration
https://bugs.webkit.org/show_bug.cgi?id=228867


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitcorepy/setup.py: Bump version, add whichcraft.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/editor.py: Added.
(Editor): Class representing a text editor
(Editor.atom):
(Editor.sublime):
(Editor.textmate):
(Editor.xcode):
(Editor.textedit):
(Editor.default): System's default text editor.
(Editor.preferred): User's prefered text editor.
(Editor.by_name): Search for text editor by name.
(Editor.programs): List all available text editor programs on this machine.
(Editor.__init__):
(Editor.open): Open a file with a text editor.
(Editor.__repr__):
(Editor.__bool__):
* Scripts/libraries/webkitscmpy/setup.py: Bump version, remove whichcraft.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.git): Prompt user and set commit log editor.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py


Added Paths

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




Diff

Modified: trunk/Tools/ChangeLog (281861 => 281862)

--- trunk/Tools/ChangeLog	2021-09-01 17:57:34 UTC (rev 281861)
+++ trunk/Tools/ChangeLog	2021-09-01 18:15:18 UTC (rev 281862)
@@ -1,3 +1,34 @@
+2021-09-01  Jonathan Bedard  
+
+[git-webkit] Add automatic Editor configuration
+https://bugs.webkit.org/show_bug.cgi?id=228867
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitcorepy/setup.py: Bump version, add whichcraft.
+* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+* Scripts/libraries/webkitcorepy/webkitcorepy/editor.py: Added.
+(Editor): Class representing a text editor 
+(Editor.atom):
+(Editor.sublime):
+(Editor.textmate):
+(Editor.xcode):
+(Editor.textedit):
+(Editor.default): System's default text editor.
+(Editor.preferred): User's prefered text editor.
+(Editor.by_name): Search for text editor by name.
+(Editor.programs): List all available text editor programs on this machine.
+(Editor.__init__):
+(Editor.open): Open a file with a text editor.
+(Editor.__repr__):
+(Editor.__bool__):
+* Scripts/libraries/webkitscmpy/setup.py: Bump version, remove whichcraft.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+(Setup.git): Prompt user and set commit log editor.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+
 2021-09-01  Kevin Neal  
 
 [RunBindingsTests] Invoke with Python 3


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (281861 => 281862)

--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-01 17:57:34 UTC (rev 281861)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py	2021-09-01 18:15:18 UTC (rev 281862)
@@ -30,7 +30,7 @@
 
 setup(
 name='webkitcorepy',
-version='0.9.1',
+version='0.10.0',
 description='Library containing various Python support classes and functions.',
 long_description=readme(),
 classifiers=[
@@ -57,6 +57,7 @@
 'mock',
 'requests',
 'six',
+'whichcraft',
 ],
 include_package_data=True,
 zip_safe=False,


Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (281861 => 281862)

--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-01 17:57:34 UTC (rev 281861)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	2021-09-01 18:15:18 UTC (rev 281862)
@@ -40,8 +40,9 @@
 from webkitcorepy.measure_time import MeasureTime
 from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
 from webkitcorepy.call_by_need import CallByNeed
+from webkitcorepy.editor import Editor
 
-version = Version(0, 9, 1)
+version = Version(0, 10, 0)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):
@@ -69,6 +70,7 @@
 AutoInstall.register(Package('tblib', Version(1, 7, 0)))
 AutoInstall.register(Package('urllib3', Version(1, 25, 10)))
 AutoInstall.register(Package('wheel', Version(0, 35, 1)))
+AutoInstall.register(Package('whichcraft', Versi

[webkit-changes] [281821] trunk/Tools

2021-08-31 Thread jbedard

Title: [281821] trunk/Tools








Revision 281821
Author jbed...@apple.com
Date 2021-08-31 13:42:13 -0700 (Tue, 31 Aug 2021)


Log Message
[git-webkit] Automatic rebasing or pull-requests
https://bugs.webkit.org/show_bug.cgi?id=229625


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): Add rebase and branch arguments.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add pull.rebase = true in default config.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py:
(Pull): Add 'up' and 'update' aliases.
(Pull.main): Update the source branch of a pull-request branches.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.parser): Add --rebase/--no-rebase options.
(PullRequest.main): Update and rebase a pull-request on it's source branch.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
(TestPullRequest.test_staged):
(TestPullRequest.test_modified):
(TestPullRequest.test_github):
(TestPullRequest.test_github_update):
(TestPullRequest.test_bitbucket):
(TestPullRequest.test_bitbucket_update):
* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py:
(TestSetupGitSvn.test_empty):
(TestSetupGitSvn.test_add):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (281820 => 281821)

--- trunk/Tools/ChangeLog	2021-08-31 20:40:41 UTC (rev 281820)
+++ trunk/Tools/ChangeLog	2021-08-31 20:42:13 UTC (rev 281821)
@@ -1,3 +1,34 @@
+2021-08-31  Jonathan Bedard  
+
+[git-webkit] Automatic rebasing or pull-requests
+https://bugs.webkit.org/show_bug.cgi?id=229625
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+(Git.pull): Add rebase and branch arguments.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+(Git.__init__): Add pull.rebase = true in default config.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py:
+(Pull): Add 'up' and 'update' aliases.
+(Pull.main): Update the source branch of a pull-request branches.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.parser): Add --rebase/--no-rebase options.
+(PullRequest.main): Update and rebase a pull-request on it's source branch.
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+(TestPullRequest.test_staged):
+(TestPullRequest.test_modified):
+(TestPullRequest.test_github):
+(TestPullRequest.test_github_update):
+(TestPullRequest.test_bitbucket):
+(TestPullRequest.test_bitbucket_update):
+* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py:
+(TestSetupGitSvn.test_empty):
+(TestSetupGitSvn.test_add):
+
 2021-08-31  Kate Cheney  
 
 Loads after session restore marked app initiated in Safari


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (281820 => 281821)

--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-08-31 20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2021-08-31 20:42:13 UTC (rev 281821)
@@ -29,7 +29,7 @@
 
 setup(
 name='webkitscmpy',
-version='2.0.0',
+version='2.0.1',
 description='Library designed to interact with git and svn repositories.',
 long_description=readme(),
 classifiers=[


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (281820 => 281821)

--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-08-31 20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2021-08-31 20:42:13 UTC (rev 281821)
@@ -46,7 +46,7 @@
 "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
 )
 
-version = Version(2, 0, 0)
+version = Version(2, 0, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))


Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/

[webkit-changes] [281806] trunk

2021-08-31 Thread jbedard

Title: [281806] trunk








Revision 281806
Author jbed...@apple.com
Date 2021-08-31 09:11:37 -0700 (Tue, 31 Aug 2021)


Log Message
[contributors.json] Replace class=bot with status=bot
https://bugs.webkit.org/show_bug.cgi?id=229712


Reviewed by Aakash Jain.

Tools:

* Scripts/webkitpy/common/config/committers.py:
(Contributor.as_dict): bot is now a status, not a class.
(CommitterList.load_json): Ditto.
* Scripts/webkitpy/common/config/contributors.json: Replace class=bot with status=bot.

Websites/webkit.org:

* wp-content/themes/webkit/team.php: "bot" is now a status, not a class.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/committers.py
trunk/Tools/Scripts/webkitpy/common/config/contributors.json
trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/wp-content/themes/webkit/team.php




Diff

Modified: trunk/Tools/ChangeLog (281805 => 281806)

--- trunk/Tools/ChangeLog	2021-08-31 15:43:07 UTC (rev 281805)
+++ trunk/Tools/ChangeLog	2021-08-31 16:11:37 UTC (rev 281806)
@@ -1,3 +1,16 @@
+2021-08-31  Jonathan Bedard  
+
+[contributors.json] Replace class=bot with status=bot
+https://bugs.webkit.org/show_bug.cgi?id=229712
+
+
+Reviewed by Aakash Jain.
+
+* Scripts/webkitpy/common/config/committers.py:
+(Contributor.as_dict): bot is now a status, not a class.
+(CommitterList.load_json): Ditto.
+* Scripts/webkitpy/common/config/contributors.json: Replace class=bot with status=bot.
+
 2021-08-30  Megan Gardner  
 
 Fix double-tap-on-editable-content-for-selection-then-drag-* tests.


Modified: trunk/Tools/Scripts/webkitpy/common/config/committers.py (281805 => 281806)

--- trunk/Tools/Scripts/webkitpy/common/config/committers.py	2021-08-31 15:43:07 UTC (rev 281805)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py	2021-08-31 16:11:37 UTC (rev 281806)
@@ -189,7 +189,7 @@
 info["expertise"] = self.expertise
 
 if self.is_bot:
-info["class"] = "bot"
+info["status"] = "bot"
 
 return info
 
@@ -249,7 +249,7 @@
 elif status == "committer":
 contributor = Committer(name, data.get('emails'), data.get('nicks'), data.get('aliases'), data.get('expertise'))
 self._committers.append(contributor)
-elif data.get('class') == 'bot':
+elif status == 'bot':
 contributor = Bot(name, data.get('emails'), data.get('nicks'), data.get('aliases'), data.get('expertise'))
 else:
 contributor = Contributor(name, data.get('emails'), data.get('nicks'), data.get('aliases'), data.get('expertise'))


Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (281805 => 281806)

--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2021-08-31 15:43:07 UTC (rev 281805)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2021-08-31 16:11:37 UTC (rev 281806)
@@ -154,10 +154,10 @@
   "status" : "committer"
},
"Adobe Bug Tracker" : {
-  "class" : "bot",
   "emails" : [
  "webkitbugtrac...@adobe.com"
-  ]
+  ],
+  "status" : "bot"
},
"Adrian Perez de Castro" : {
   "emails" : [
@@ -1388,10 +1388,10 @@
   ]
},
"Commit Queue" : {
-  "class" : "bot",
   "emails" : [
  "commit-qu...@webkit.org"
-  ]
+  ],
+  "status" : "bot"
},
"Conrad Shultz" : {
   "emails" : [
@@ -4801,10 +4801,10 @@
   ]
},
"Radar WebKit Bug Importer" : {
-  "class" : "bot",
   "emails" : [
  "webkit-bug-impor...@group.apple.com"
-  ]
+  ],
+  "status" : "bot"
},
"Radu Stavila" : {
   "emails" : [
@@ -5873,19 +5873,19 @@
   ]
},
"WebKit Review Bot" : {
-  "class" : "bot",
   "emails" : [
  "webkit.review@gmail.com"
   ],
   "nicks" : [
  "sheriff-bot"
-  ]
+  ],
+  "status" : "bot"
},
"WebKitGTK Bugs" : {
-  "class" : "bot",
   "emails" : [
  "bugs-nore...@webkitgtk.org"
-  ]
+  ],
+  "status" : "bot"
},
"Wenson Hsieh" : {
   "emails" : [


Modified: trunk/Websites/webkit.org/ChangeLog (281805 => 281806)

--- trunk/Websites/webkit.org/ChangeLog	2021-08-31 15:43:07 UTC (rev 281805)
+++ trunk/Websites/webkit.org/ChangeLog	2021-08-31 16:11:37 UTC (rev 281806)
@@ -1,3 +1,13 @@
+2021-08-31  Jonathan Bedard  
+
+[contributors.json] Replace class=bot with status=bot
+https://bugs.webkit.org/show_bug.cgi?id=229712
+
+
+Reviewed by Aakash Jain.
+
+* wp-content/themes/webkit/team.php: "bot" is now a status, not a class.
+
 2021-02-17  Ling Ho  
 
 WebKit nighly archives page not working for Big Sur


Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/team.php (281805 => 281806)

--- trunk/Websites/webkit.org/wp-content/themes/webkit/team.php	2021-08-3

[webkit-changes] [281695] trunk/Tools

2021-08-27 Thread jbedard

Title: [281695] trunk/Tools








Revision 281695
Author jbed...@apple.com
Date 2021-08-27 08:16:27 -0700 (Fri, 27 Aug 2021)


Log Message
[git-webkit] Add pull-request command (Part 6)
https://bugs.webkit.org/show_bug.cgi?id=229089


Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add commit, add and push commands.
(Git.commit): Create new commit from staged files.
(Git.add): Stage modified files.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
(BitBucket.__init__): Add pull_requests.
(BitBucket.request): Add ability to list and edit pull requets.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub.__init__): Add pull_requests.
(GitHub.request): Add ability to list and edit pull requets.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py: Add PullRequest.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.parser): Add '--add' and '--no-add' to allow user to specify how modified files
are incorperated into the pull-request.
(PullRequest.create_commit): Based on currently modified files, either create a new commit or
add those files to an existing commit.
(PullRequest.branch_point): Determine when this branch diverged from a production branch.
(PullRequest.main): Create branch, create commit on branch, push branch and either create or
update a pull-request.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.find):
(BitBucket.PRGenerator.create):
(BitBucket.PRGenerator.update):
(BitBucket.__init__): Add pull_request generator.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.find):
(GitHub.PRGenerator.create):
(GitHub.PRGenerator.update):
(GitHub.__init__): Add pull_request generator.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
(Scm.PRGenerator.__init__):
(Scm.PRGenerator.find):
(Scm.PRGenerator.create):
(Scm.PRGenerator.update):
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
(TestDoPullRequest.setUp):
(TestDoPullRequest.test_svn):
(TestDoPullRequest.test_no_modified):
(TestDoPullRequest.test_staged):
(TestDoPullRequest.test_modified):
(TestDoPullRequest.test_github):
(TestDoPullRequest.test_github_update):
(TestDoPullRequest.test_stash):
(TestDoPullRequest.test_stash_update):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py


Added Paths

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




Diff

Modified: trunk/Tools/ChangeLog (281694 => 281695)

--- trunk/Tools/ChangeLog	2021-08-27 14:51:58 UTC (rev 281694)
+++ trunk/Tools/ChangeLog	2021-08-27 15:16:27 UTC (rev 281695)
@@ -1,5 +1,60 @@
 2021-08-27  Jonathan Bedard  
 
+[git-webkit] Add pull-request command (Part 6)
+https://bugs.webkit.org/show_bug.cgi?id=229089
+
+
+Reviewed by Dewei Zhu.
+
+* Scripts/libraries/webkitscmpy/setup.py: Bump version.
+* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+(Git.__init__): Add commit, add and push commands.
+(Git.commit): Create new commit from staged files.
+(Git.add): Stage modified files.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/bitbucket.py:
+(BitBucket.__init__): Add pull_requests.
+(BitBucket.request): Add ability to list and edit pull requets.
+* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+(GitHub.__init__): Add pull_requests.
+(GitHub.request): Add ability to list and edit pull requets.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py: Add PullRequest.
+* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+(PullRequest.parser): Add '--add' and '--no-add' to allow user to specify how modified files
+are incorperated into the pull-request.
+(PullRequest.create_commit): Based on currently modified files, either create a new commit or
+add those files to an existing commit.
+(Pul

[webkit-changes] [281690] trunk/Tools

2021-08-27 Thread jbedard

Title: [281690] trunk/Tools








Revision 281690
Author jbed...@apple.com
Date 2021-08-27 02:40:20 -0700 (Fri, 27 Aug 2021)


Log Message
[run-webkit-tests] Use Python 3 (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=226658


Reviewed by Ryan Haddad.

* CISupport/ews-build/steps.py:
(RunWebKitTests): Change invocation to Python 3.
* CISupport/ews-build/steps_unittest.py:
(test_success): Change invocation to Python 3.
(test_warnings): Ditto.

Modified Paths

trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (281689 => 281690)

--- trunk/Tools/CISupport/ews-build/steps.py	2021-08-27 07:38:27 UTC (rev 281689)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-08-27 09:40:20 UTC (rev 281690)
@@ -2146,7 +2146,7 @@
 test_failures_log_name = 'test-failures'
 ENABLE_GUARD_MALLOC = False
 EXIT_AFTER_FAILURES = '30'
-command = ['python', 'Tools/Scripts/run-webkit-tests',
+command = ['python3', 'Tools/Scripts/run-webkit-tests',
'--no-build',
'--no-show-results',
'--no-new-test-results',


Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281689 => 281690)

--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-08-27 07:38:27 UTC (rev 281689)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-08-27 09:40:20 UTC (rev 281690)
@@ -1691,7 +1691,7 @@
 ExpectShell(workdir='wkdir',
 logfiles={'json': self.jsonFileName},
 logEnviron=False,
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
+command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
 )
 + 0,
 )
@@ -1706,7 +1706,7 @@
 ExpectShell(workdir='wkdir',
 logfiles={'json': self.jsonFileName},
 logEnviron=False,
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
+command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
 )
 + 0
 + ExpectShell.log('stdio', stdout='''Unexpected flakiness: timeouts (2)
@@ -1743,7 +1743,7 @@
 ExpectShell(workdir='wkdir',
 logfiles={'json': self.jsonFileName},
 logEnviron=False,
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
+command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
 )
 + 2
 + ExpectShell.log('json', stdout=self.results_json_regressions),
@@ -1772,7 +1772,7 @@
 ExpectShell(workdir='wkdir',
 logfiles={'json': self.jsonFileName},
 logEnviron=False,
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
+command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
 )
 + 0
 + ExpectShell.log('json', stdout=self.results_json_flakes),
@@ -1791,7 +1791

[webkit-changes] [281673] trunk/Tools

2021-08-26 Thread jbedard

Title: [281673] trunk/Tools








Revision 281673
Author jbed...@apple.com
Date 2021-08-26 16:24:19 -0700 (Thu, 26 Aug 2021)


Log Message
[kill-old-processes] Invoke with Python 3
https://bugs.webkit.org/show_bug.cgi?id=229576


Rubber-stamped by Darin Adler.

* CISupport/build-webkit-org/steps.py:
(KillOldProcesses): Invoke with Python 3.
* CISupport/build-webkit-org/steps_unittest.py:
(TestKillOldProcesses.test_success):
(TestKillOldProcesses.test_failure):
* CISupport/ews-build/steps.py:
(KillOldProcesses): Invoke with Python 3.
* CISupport/ews-build/steps_unittest.py:
* CISupport/kill-old-processes: Change shebang to Python 3.

Modified Paths

trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/CISupport/kill-old-processes
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281672 => 281673)

--- trunk/Tools/CISupport/build-webkit-org/steps.py	2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2021-08-26 23:24:19 UTC (rev 281673)
@@ -171,7 +171,7 @@
 name = "kill-old-processes"
 description = ["killing old processes"]
 descriptionDone = ["killed old processes"]
-command = ["python", "./Tools/CISupport/kill-old-processes", "buildbot"]
+command = ["python3", "./Tools/CISupport/kill-old-processes", "buildbot"]
 
 
 class TriggerCrashLogSubmission(shell.Compile):


Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (281672 => 281673)

--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-08-26 23:24:19 UTC (rev 281673)
@@ -237,7 +237,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=True,
-command=['python', './Tools/CISupport/kill-old-processes', 'buildbot'],
+command=['python3', './Tools/CISupport/kill-old-processes', 'buildbot'],
 ) + 0,
 )
 self.expectOutcome(result=SUCCESS, state_string='killed old processes')
@@ -250,7 +250,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=True,
-command=['python', './Tools/CISupport/kill-old-processes', 'buildbot'],
+command=['python3', './Tools/CISupport/kill-old-processes', 'buildbot'],
 ) + 2
 + ExpectShell.log('stdio', stdout='Unexpected error.'),
 )


Modified: trunk/Tools/CISupport/ews-build/steps.py (281672 => 281673)

--- trunk/Tools/CISupport/ews-build/steps.py	2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-08-26 23:24:19 UTC (rev 281673)
@@ -2089,7 +2089,7 @@
 name = 'kill-old-processes'
 description = ['killing old processes']
 descriptionDone = ['Killed old processes']
-command = ['python', 'Tools/CISupport/kill-old-processes', 'buildbot']
+command = ['python3', 'Tools/CISupport/kill-old-processes', 'buildbot']
 
 def __init__(self, **kwargs):
 super(KillOldProcesses, self).__init__(timeout=2 * 60, logEnviron=False, **kwargs)


Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281672 => 281673)

--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-08-26 23:24:19 UTC (rev 281673)
@@ -816,7 +816,7 @@
 self.setupStep(KillOldProcesses())
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
-command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
+command=['python3', 'Tools/CISupport/kill-old-processes', 'buildbot'],
 logEnviron=False,
 timeout=120,
 )
@@ -829,7 +829,7 @@
 self.setupStep(KillOldProcesses())
 self.expectRemoteCommands(
 ExpectShell(workdir='wkdir',
-command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
+command=['python3', 'Tools/CISupport/kill-old-processes', 'buildbot'],
 logEnviron=False,
 timeout=120,
 )


Modified: trunk/Tools/CISupport/kill-old-processes (281672 => 281673)

--- trunk/Tools/CISupport/kill-old-processes	2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/kill-old-processes	2021-08-26 23:24:19 UTC (rev 281673)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2010 Apple Inc.  All rights reserved.
 # Copyright (C) 2011 Google Inc.  All rights reserved.
 #
@@ -51,6 +51,8 @@
 def orphanedShmSegmentsByUser(username):
 ret = []
 output = subprocess.check_output(["ipcs", "-m"])
+if type

[webkit-changes] [281627] trunk/Tools

2021-08-26 Thread jbedard

Title: [281627] trunk/Tools








Revision 281627
Author jbed...@apple.com
Date 2021-08-26 09:25:19 -0700 (Thu, 26 Aug 2021)


Log Message
[run-webkit-tests] Use Python 3 (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=226658


Reviewed by Aakash Jain.

* CISupport/build-webkit-org/steps.py:
(RunWebKitTests): Change invocation to Python 3.
* CISupport/build-webkit-org/steps_unittest.py:
* CISupport/kill-old-processes:
(main): run-webkit-tests may be invoked with Python 3.

Modified Paths

trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/kill-old-processes
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281626 => 281627)

--- trunk/Tools/CISupport/build-webkit-org/steps.py	2021-08-26 16:24:23 UTC (rev 281626)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2021-08-26 16:25:19 UTC (rev 281627)
@@ -531,7 +531,7 @@
 description = ["layout-tests running"]
 descriptionDone = ["layout-tests"]
 resultDirectory = "layout-test-results"
-command = ["python", "./Tools/Scripts/run-webkit-tests",
+command = ["python3", "./Tools/Scripts/run-webkit-tests",
"--no-build",
"--no-show-results",
"--no-new-test-results",


Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (281626 => 281627)

--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-08-26 16:24:23 UTC (rev 281626)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-08-26 16:25:19 UTC (rev 281627)
@@ -793,7 +793,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -817,7 +817,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -844,7 +844,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -869,7 +869,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -894,7 +894,7 @@
 workdir='wkdir',
 timeout=1200,
 logEnviron=False,
-command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
  '--build-number', '101', '--buildbot-worker', 'ews100',
@@ -936,7 +936,7 @@
 ExpectShell(
 workdir='wkdir',
 logEnviron=False,
-command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
  '--no-new-test-results', '--clobber-old-results',
  '--builder-name', 'Apple-iOS-14-Simulator-Debug-Build',
  '--build-number', '101', '--buil

[webkit-changes] [281586] trunk/Tools

2021-08-25 Thread jbedard

Title: [281586] trunk/Tools








Revision 281586
Author jbed...@apple.com
Date 2021-08-25 14:18:16 -0700 (Wed, 25 Aug 2021)


Log Message
[git-webkit] Use Python 3 in CI
https://bugs.webkit.org/show_bug.cgi?id=229498


Reviewed by Aakash Jain.

* CISupport/build-webkit-org/steps.py:
(ShowIdentifier.start): Invoke git-webkit with Python 3.
* CISupport/build-webkit-org/steps_unittest.py:
(TestShowIdentifier.test_success):
(TestShowIdentifier.test_failure):
* CISupport/ews-build/steps.py:
(ShowIdentifier.start): Invoke git-webkit with Python 3.
* CISupport/ews-build/steps_unittest.py:

Modified Paths

trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281585 => 281586)

--- trunk/Tools/CISupport/build-webkit-org/steps.py	2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2021-08-25 21:18:16 UTC (rev 281586)
@@ -1264,7 +1264,7 @@
 self.log_observer = logobserver.BufferLogObserver()
 self.addLogObserver('stdio', self.log_observer)
 revision = self.getProperty('got_revision')
-self.setCommand(['python', 'Tools/Scripts/git-webkit', 'find', 'r{}'.format(revision)])
+self.setCommand(['python3', 'Tools/Scripts/git-webkit', 'find', 'r{}'.format(revision)])
 return shell.ShellCommand.start(self)
 
 def evaluateCommand(self, cmd):


Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (281585 => 281586)

--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py	2021-08-25 21:18:16 UTC (rev 281586)
@@ -513,7 +513,7 @@
 ExpectShell(workdir='wkdir',
 timeout=600,
 logEnviron=False,
-command=['python', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
+command=['python3', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
 ExpectShell.log('stdio', stdout='Identifier: 233939@main') +
 0,
 )
@@ -529,7 +529,7 @@
 ExpectShell(workdir='wkdir',
 timeout=600,
 logEnviron=False,
-command=['python', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
+command=['python3', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
 ExpectShell.log('stdio', stdout='Unexpected failure') +
 2,
 )


Modified: trunk/Tools/CISupport/ews-build/steps.py (281585 => 281586)

--- trunk/Tools/CISupport/ews-build/steps.py	2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-08-25 21:18:16 UTC (rev 281586)
@@ -223,7 +223,7 @@
 revision = self.getProperty('ews_revision', self.getProperty('got_revision'))
 if not revision:
 revision = 'HEAD'
-self.setCommand(['python', 'Tools/Scripts/git-webkit', 'find', revision])
+self.setCommand(['python3', 'Tools/Scripts/git-webkit', 'find', revision])
 return shell.ShellCommand.start(self)
 
 def evaluateCommand(self, cmd):


Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281585 => 281586)

--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-08-25 21:18:16 UTC (rev 281586)
@@ -4349,7 +4349,7 @@
 ExpectShell(workdir='wkdir',
 timeout=300,
 logEnviron=False,
-command=['python', 'Tools/Scripts/git-webkit', 'find', '51a6aec9f664']) +
+command=['python3', 'Tools/Scripts/git-webkit', 'find', '51a6aec9f664']) +
 ExpectShell.log('stdio', stdout='Identifier: 233175@main') +
 0,
 )
@@ -4364,7 +4364,7 @@
 ExpectShell(workdir='wkdir',
 timeout=300,
 logEnviron=False,
-command=['python', 'Tools/Scripts/git-webkit', 'find', 'HEAD']) +
+command=['python3', 'Tools/Scripts/git-webkit', 'find', 'HEAD']) +
 ExpectShell.log('stdio', stdout='Unexpected failure') +
 2,
 )


Modified: trunk/Tools/ChangeLog (281585 => 281586)

--- trunk/Tools/ChangeLog	2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/ChangeLog	2021-08-25 21:18:16 UTC (rev 281586)
@@ -1,5 +1,22 @@
 2021-08-25  Jonathan Bedard  
 
+[git-webkit] Use Python 3 in CI
+https://bugs.webkit.org/show_bug.cgi?id=229498
+
+
+Reviewed by Aakash Jain.
+
+* CISupport/build-webkit-org/steps.py:
+(ShowIdentifier.start): Invoke git-webkit with Python 3.
+*

< 1 2 3 4 5 6 7 8 9 10 >

301 - 400 of 1413 matches

Mail list logo