Title: [275352] trunk/Tools
- Revision
- 275352
- Author
- [email protected]
- Date
- 2021-04-01 04:06:06 -0700 (Thu, 01 Apr 2021)
Log Message
[webkitscmpy] Support case where contributor did not define email
https://bugs.webkit.org/show_bug.cgi?id=224005
<rdar://problem/76058258>
Rubber-stamped by Aakash Jain.
* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
(Contributor):
(Contributor.Mapping.create): An email of 'None' should not be indexed.
(Contributor.from_scm_log): Handle case where contributor is defined, but email isn't.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (275351 => 275352)
--- trunk/Tools/ChangeLog 2021-04-01 10:26:37 UTC (rev 275351)
+++ trunk/Tools/ChangeLog 2021-04-01 11:06:06 UTC (rev 275352)
@@ -1,3 +1,18 @@
+2021-04-01 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Support case where contributor did not define email
+ https://bugs.webkit.org/show_bug.cgi?id=224005
+ <rdar://problem/76058258>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
+ (Contributor):
+ (Contributor.Mapping.create): An email of 'None' should not be indexed.
+ (Contributor.from_scm_log): Handle case where contributor is defined, but email isn't.
+
2021-03-31 Chris Dumez <[email protected]>
Add API test for Bug 224022
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (275351 => 275352)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-04-01 10:26:37 UTC (rev 275351)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-04-01 11:06:06 UTC (rev 275352)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.5.7',
+ version='0.5.8',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (275351 => 275352)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-04-01 10:26:37 UTC (rev 275351)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-04-01 11:06:06 UTC (rev 275352)
@@ -37,7 +37,7 @@
from webkitcorepy.task_pool import TaskPool
from webkitcorepy.credentials import credentials
-version = Version(0, 5, 7)
+version = Version(0, 5, 8)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py (275351 => 275352)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py 2021-04-01 10:26:37 UTC (rev 275351)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py 2021-04-01 11:06:06 UTC (rev 275352)
@@ -31,6 +31,7 @@
GIT_AUTHOR_RE = re.compile(r'Author: (?P<author>.*) <(?P<email>[^@]+@[^@]+)(@.*)?>')
AUTOMATED_CHECKIN_RE = re.compile(r'Author: (?P<author>.*) <devnull>')
UNKNOWN_AUTHOR = re.compile(r'Author: (?P<author>.*) <None>')
+ EMPTY_AUTHOR = re.compile(r'Author: (?P<author>.*) <>')
SVN_AUTHOR_RE = re.compile(r'r\d+ \| (?P<email>.*) \| (?P<date>.*) \| \d+ lines?')
SVN_PATCH_FROM_RE = re.compile(r'Patch by (?P<author>.*) <(?P<email>.*)> on \d+-\d+-\d+')
@@ -102,6 +103,8 @@
self[contributor.name] = contributor
for email in contributor.emails or []:
+ if not email:
+ continue
self[email] = contributor
self[email.lower()] = contributor
return contributor
@@ -112,7 +115,7 @@
email = None
author = None
- for _expression_ in [cls.GIT_AUTHOR_RE, cls.SVN_AUTHOR_RE, cls.SVN_PATCH_FROM_RE, cls.AUTOMATED_CHECKIN_RE, cls.UNKNOWN_AUTHOR]:
+ for _expression_ in [cls.GIT_AUTHOR_RE, cls.SVN_AUTHOR_RE, cls.SVN_PATCH_FROM_RE, cls.AUTOMATED_CHECKIN_RE, cls.UNKNOWN_AUTHOR, cls.EMPTY_AUTHOR]:
match = _expression_.match(line)
if match:
if 'author' in _expression_.groupindex:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
