Diff
Modified: trunk/Tools/ChangeLog (274829 => 274830)
--- trunk/Tools/ChangeLog 2021-03-23 00:43:11 UTC (rev 274829)
+++ trunk/Tools/ChangeLog 2021-03-23 00:47:22 UTC (rev 274830)
@@ -1,3 +1,19 @@
+2021-03-22 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Base GitHub mock links on provided remote
+ https://bugs.webkit.org/show_bug.cgi?id=223611
+ <rdar://problem/75713760>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
+ (GitHub.__init__): Standardize mock GitHub path.
+ (GitHub._parents_of_request): Base link path on GitHub remote.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+ (TestGitHub):
+
2021-03-22 Devin Rousso <[email protected]>
Remove unused JS and CSS files of media controls
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (274829 => 274830)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-03-23 00:43:11 UTC (rev 274829)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-03-23 00:47:22 UTC (rev 274830)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='0.13.5',
+ version='0.13.6',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (274829 => 274830)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-03-23 00:43:11 UTC (rev 274829)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-03-23 00:47:22 UTC (rev 274830)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 13, 5)
+version = Version(0, 13, 6)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py (274829 => 274830)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py 2021-03-23 00:43:11 UTC (rev 274829)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py 2021-03-23 00:47:22 UTC (rev 274830)
@@ -32,7 +32,7 @@
top = None
def __init__(
- self, remote='github.example.com/WebKit/webkit', datafile=None,
+ self, remote='github.example.com/WebKit/WebKit', datafile=None,
default_branch='main', git_svn=False,
):
if not scmremote.GitHub.is_webserver('https://{}'.format(remote)):
@@ -208,11 +208,11 @@
' <div class="Box-header Box-header--blue position-relative">\n'
' <h2 class="sr-only">Latest commit</h2>\n'
' <div class="..." data-issue-and-pr-hovercards-enabled>\n'
- ' <include-fragment src="" aria-label="Loading latest commit">\n'
+ ' <include-fragment src="" aria-label="Loading latest commit">\n'
' </include-fragment>\n'
' <ul class="list-style-none d-flex">\n'
' <li class="ml-0 ml-md-3">\n'
- ' <a data-pjax href=""
+ ' <a data-pjax href=""
' <svg class="octicon octicon-history text-gray"><path></path></svg>\n'
' <span class="d-none d-sm-inline">\n'
' <strong>{count}</strong>\n'
@@ -226,6 +226,7 @@
'</div>\n'
'...\n'
'</html>\n'.format(
+ project='/'.join(self.remote.split('/')[1:]),
ref=commit.hash,
count=commit.identifier + (commit.branch_point or 0),
), url=""
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py (274829 => 274830)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py 2021-03-23 00:43:11 UTC (rev 274829)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py 2021-03-23 00:47:22 UTC (rev 274830)
@@ -285,7 +285,7 @@
class TestGitHub(unittest.TestCase):
- remote = 'https://github.example.com/WebKit/webkit'
+ remote = 'https://github.example.com/WebKit/WebKit'
def test_detection(self):
self.assertEqual(remote.GitHub.is_webserver('https://github.example.com/WebKit/webkit'), True)
