Changeset 274483 in webkit

Timestamp:

Mar 16, 2021, 9:34:00 AM (6 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Decode multiple commit representations
​https://bugs.webkit.org/show_bug.cgi?id=223224
<rdar://problem/75455129>

Reviewed by Dewei Zhu.

• Scripts/libraries/webkitscmpy/setup.py: Bump version.
• Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Ditto.
• Scripts/libraries/webkitscmpy/webkitscmpy/commit.py:

(Commit.from_json): Decode old results database style commit representations.

• Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2021-03-16  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Decode multiple commit representations
+        https://bugs.webkit.org/show_bug.cgi?id=223224
+        <rdar://problem/75455129>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/commit.py:
+        (Commit.from_json): Decode old results database style commit representations.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py:
+
 2021-03-16  Dean Johnson  <dean_johnson@apple.com>
 

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

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='0.13.1',
+    version='0.13.2',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),

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

@@ -47 +47 @@
     )
 
-version = Version(0, 13, 1)
+version = Version(0, 13, 2)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

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

@@ -147 +147 @@
         return None
 
+    @classmethod
+    def from_json(cls, data):
+        data = data if isinstance(data, dict) else json.loads(data)
+        hash_from_id = None
+        revision_from_id = cls._parse_revision(data.get('id'))
+        if not revision_from_id:
+            hash_from_id = cls._parse_hash(data.get('id'))
+
+        return cls(
+            repository_id=data.get('repository_id'),
+            branch=data.get('branch'),
+            hash=data.get('hash', hash_from_id),
+            revision=data.get('revision', revision_from_id),
+            timestamp=data.get('timestamp'),
+            identifier=data.get('identifier'),
+            branch_point=data.get('branch_point'),
+            order=data.get('order'),
+            author=data.get('author', data.get('committer')),
+            message=data.get('message'),
+        )
+
     def __init__(
         self,
@@ -185 +206 @@
             )
 
+        if isinstance(timestamp, six.string_types) and timestamp.isdigit():
+            timestamp = int(timestamp)
         if timestamp and not isinstance(timestamp, int):
             raise TypeError("Expected 'timestamp' to be of type int, got '{}'".format(timestamp))
         self.timestamp = timestamp
 
+        if isinstance(order, six.string_types) and order.isdigit():
+            order = int(order)
         if order and not isinstance(order, int):
             raise TypeError("Expected 'order' to be of type int, got '{}'".format(order))
@@ -195 +220 @@
         if author and isinstance(author, dict) and author.get('name'):
             self.author = Contributor(author.get('name'), author.get('emails'))
+        elif author and isinstance(author, six.string_types) and '@' in author:
+            self.author = Contributor(author, author)
         elif author and not isinstance(author, Contributor):
             raise TypeError("Expected 'author' to be of type {}, got '{}'".format(Contributor, author))

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

@@ -254 +254 @@
 
         self.assertEqual(commit_a, commit_b)
+
+    def test_from_json(self):
+        self.assertEqual(
+            Commit.from_json(dict(
+                repository_id='webkit',
+                id=1234,
+                timestamp=1000,
+            )), Commit(
+                repository_id='webkit',
+                revision=1234,
+                timestamp=1000,
+            ),
+        )
+
+        self.assertEqual(
+            Commit.from_json(dict(
+                repository_id='webkit',
+                id='c3bd784f8b88bd03f64467ddd3304ed8be28acbe',
+                timestamp=2000,
+            )), Commit(
+                repository_id='webkit',
+                hash='c3bd784f8b88bd03f64467ddd3304ed8be28acbe',
+                timestamp=2000,
+            ),
+        )
+
+    def test_from_json_str(self):
+        contributor = Contributor.from_scm_log('Author: jbedard@apple.com <jbedard@apple.com>')
+        self.assertEqual(
+            Commit.from_json('''{
+    "revision": 1,
+    "hash": "c3bd784f8b88bd03f64467ddd3304ed8be28acbe",
+    "identifier": "1@main",
+    "timestamp": 1000,
+    "author": "jbedard@apple.com",
+    "message": "Message"
+}'''), Commit(
+                revision=1,
+                hash='c3bd784f8b88bd03f64467ddd3304ed8be28acbe',
+                identifier='1@main',
+                timestamp=1000,
+                author=Contributor.Encoder().default(contributor),
+                message='Message'
+            ),
+        )