Title: [268531] trunk/Tools
- Revision
- 268531
- Author
- [email protected]
- Date
- 2020-10-15 10:37:30 -0700 (Thu, 15 Oct 2020)
Log Message
[webkitscmpy] Support <identifier>@ abbreviated idiom
https://bugs.webkit.org/show_bug.cgi?id=217716
<rdar://problem/70299119>
Rubber-stamped by Aakash Jain.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/commit.py:
(Commit):
(Commit._parse_identifier): Support <identifier>@ shorthand.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py:
(TestCommit.test_parse_identifier):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (268530 => 268531)
--- trunk/Tools/ChangeLog 2020-10-15 17:34:30 UTC (rev 268530)
+++ trunk/Tools/ChangeLog 2020-10-15 17:37:30 UTC (rev 268531)
@@ -1,3 +1,18 @@
+2020-10-15 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Support <identifier>@ abbreviated idiom
+ https://bugs.webkit.org/show_bug.cgi?id=217716
+ <rdar://problem/70299119>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/commit.py:
+ (Commit):
+ (Commit._parse_identifier): Support <identifier>@ shorthand.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py:
+ (TestCommit.test_parse_identifier):
+
2020-10-15 Aakash Jain <[email protected]>
EWS bot should fail if a new test is missing its result
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (268530 => 268531)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-10-15 17:34:30 UTC (rev 268530)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2020-10-15 17:37:30 UTC (rev 268531)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 2, 0)
+version = Version(0, 2, 1)
AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py (268530 => 268531)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py 2020-10-15 17:34:30 UTC (rev 268530)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py 2020-10-15 17:37:30 UTC (rev 268531)
@@ -31,7 +31,7 @@
class Commit(object):
HASH_RE = re.compile(r'^[a-f0-9A-F]+$')
REVISION_RE = re.compile(r'^[Rr]?(?P<revision>\d+)$')
- IDENTIFIER_RE = re.compile(r'^((?P<branch_point>\d+)\.)?(?P<identifier>-?\d+)(@(?P<branch>\S+))?$')
+ IDENTIFIER_RE = re.compile(r'^((?P<branch_point>\d+)\.)?(?P<identifier>-?\d+)(@(?P<branch>\S*))?$')
NUMBER_RE = re.compile(r'^-?\d*$')
HASH_LABEL_SIZE = 12
@@ -112,7 +112,7 @@
identifier = match.group('branch_point'), int(match.group('identifier'))
if identifier[0]:
identifier = int(identifier[0]), identifier[1]
- branch = match.group('branch')
+ branch = match.group('branch') or None
elif cls.NUMBER_RE.match(identifier):
identifier = None, int(identifier)
else:
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py (268530 => 268531)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py 2020-10-15 17:34:30 UTC (rev 268530)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py 2020-10-15 17:37:30 UTC (rev 268531)
@@ -56,6 +56,7 @@
def test_parse_identifier(self):
self.assertEqual((None, 1234, None), Commit._parse_identifier('1234'))
self.assertEqual((None, 1234, None), Commit._parse_identifier(1234))
+ self.assertEqual((None, 1234, None), Commit._parse_identifier('1234@'))
self.assertEqual((None, 1234, 'main'), Commit._parse_identifier('1234@main'))
self.assertEqual((None, 1234, 'eng/bug'), Commit._parse_identifier('1234@eng/bug'))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
