Title: [294442] trunk/Tools/Scripts/libraries/webkitscmpy
Revision
294442
Author
[email protected]
Date
2022-05-18 15:22:52 -0700 (Wed, 18 May 2022)

Log Message

[git-webkit] Remove space in radar URLs
https://bugs.webkit.org/show_bug.cgi?id=240592
<rdar://problem/93519659>

Reviewed by Chris Dumez.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py:
(PullRequest):
(PullRequest.escape_html):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:

Canonical link: https://commits.webkit.org/250718@main

Modified Paths

Diff

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (294441 => 294442)


--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2022-05-18 22:16:44 UTC (rev 294441)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py	2022-05-18 22:22:52 UTC (rev 294442)
@@ -29,7 +29,7 @@
 
 setup(
     name='webkitscmpy',
-    version='4.14.1',
+    version='4.14.2',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),
     classifiers=[

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (294441 => 294442)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2022-05-18 22:16:44 UTC (rev 294441)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2022-05-18 22:22:52 UTC (rev 294442)
@@ -46,7 +46,7 @@
         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
     )
 
-version = Version(4, 14, 1)
+version = Version(4, 14, 2)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py (294441 => 294442)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py	2022-05-18 22:16:44 UTC (rev 294441)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/pull_request.py	2022-05-18 22:22:52 UTC (rev 294442)
@@ -74,7 +74,7 @@
     ESCAPE_TABLE = {
         '"': '&quot;',
         "'": '&apos;',
-        '>': ' &gt;',
+        '>': '&gt;',
         '<': '&lt;',
         '&': '&amp;',
     }
@@ -82,7 +82,7 @@
     @classmethod
     def escape_html(cls, message):
         message = ''.join(cls.ESCAPE_TABLE.get(c, c) for c in message)
-        return re.sub(r'(https?://[^\s<>,:;]+)', r'<a href="" message)
+        return re.sub(r'(https?://[^\s<>,:;]+?)(?=[\s<>,:;]|(&gt))', r'<a href="" message)
 
     @classmethod
     def unescape_html(cls, message):

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py (294441 => 294442)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py	2022-05-18 22:16:44 UTC (rev 294441)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py	2022-05-18 22:22:52 UTC (rev 294442)
@@ -76,16 +76,20 @@
         self.assertEqual(commits[0].message, '[scoping] Bug to fix\n\nReviewed by Tim Contributor.')
 
     def test_create_body_multiple_linked(self):
+        self.maxDiff = None
         self.assertEqual(
             PullRequest.create_body(None, [Commit(
                 hash='11aa76f9fc380e9fe06157154f32b304e8dc4749',
-                message='[scoping] Bug to fix (Part 2)\nhttps://bugs.webkit.org/1234\n\nReviewed by Tim Contributor.\n',
+                message='[scoping] Bug to fix (Part 3)\nhttps://bugs.webkit.org/1234\n\nReviewed by Tim Contributor.\n',
             ), Commit(
                 hash='53ea230fcedbce327eb1c45a6ab65a88de864505',
-                message='[scoping] Bug to fix (Part 1)\n<http://bugs.webkit.org/1234>\n\nReviewed by Tim Contributor.\n',
+                message='[scoping] Bug to fix (Part 2)\n<http://bugs.webkit.org/1234>\n\nReviewed by Tim Contributor.\n',
+            ), Commit(
+                hash='ccc39e76f938a1685e388991fc3127a85d0be0f0',
+                message='[scoping] Bug to fix (Part 1)\n<rdar:///1234>\n\nReviewed by Tim Contributor.\n',
             )]), '''#### 11aa76f9fc380e9fe06157154f32b304e8dc4749
 <pre>
-[scoping] Bug to fix (Part 2)
+[scoping] Bug to fix (Part 3)
 <a href=""
 
 Reviewed by Tim Contributor.
@@ -93,8 +97,16 @@
 ----------------------------------------------------------------------
 #### 53ea230fcedbce327eb1c45a6ab65a88de864505
 <pre>
+[scoping] Bug to fix (Part 2)
+&lt;<a href=""
+
+Reviewed by Tim Contributor.
+</pre>
+----------------------------------------------------------------------
+#### ccc39e76f938a1685e388991fc3127a85d0be0f0
+<pre>
 [scoping] Bug to fix (Part 1)
-&lt;<a href="" &gt;
+&lt;rdar:///1234&gt;
 
 Reviewed by Tim Contributor.
 </pre>''',
@@ -160,7 +172,7 @@
 #### 53ea230fcedbce327eb1c45a6ab65a88de864505
 <pre>
 [scoping] Bug to fix (Part 1)
-&lt;<a href="" &gt;
+&lt;<a href=""
 
 Reviewed by Tim Contributor.
 </pre>''')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to