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
<rdar://problem/83693400>

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

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  <jbed...@apple.com>
+
+        [webkitscmpy] Contributors may be undefined
+        https://bugs.webkit.org/show_bug.cgi?id=230997
+        <rdar://problem/83693400>
+
+        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  <basuke.suz...@sony.com>
 
         [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 <package 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

Reply via email to