Changeset 268531 in webkit

Timestamp:

Oct 15, 2020 10:37:30 AM (4 years ago)

Author:

Jonathan Bedard

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/commit.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-15  Jonathan Bedard  <jbedard@apple.com>
+
+        [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  <aakash_jain@apple.com>
 

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

@@ -47 +47 @@
     )
 
-version = Version(0, 2, 0)
+version = Version(0, 2, 1)
 
 AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))

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

@@ -32 +32 @@
     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
@@ -113 +113 @@
                 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)

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

@@ -57 +57 @@
         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'))