Diff
Modified: trunk/Tools/ChangeLog (265076 => 265077)
--- trunk/Tools/ChangeLog 2020-07-30 05:43:30 UTC (rev 265076)
+++ trunk/Tools/ChangeLog 2020-07-30 06:58:29 UTC (rev 265077)
@@ -1,3 +1,21 @@
+2020-07-29 Fujii Hironori <[email protected]>
+
+ Replace 'http://svn.webkit.org' with 'https://svn.webkit.org' in webkitpy scripts
+ https://bugs.webkit.org/show_bug.cgi?id=214957
+
+ Reviewed by Daniel Bates.
+
+ SVNRepository.has_authorization_for_realm failed to find the realm
+ string.
+
+ * Scripts/webkitpy/common/checkout/changelog.py:
+ (ChangeLogEntry): Removed a unused variable 'svn_id_regexp'.
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ * Scripts/webkitpy/common/config/urls.py:
+ * Scripts/webkitpy/tool/commands/suggestnominations.py:
+ (AbstractCommitLogCommand): Changed _revision_regexp to use 'https?' to accept 'https'.
+ * Scripts/webkitpy/tool/commands/suggestnominations_unittest.py:
+
2020-07-29 Darin Adler <[email protected]>
Add script to help us count uses of non-inclusive terms
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (265076 => 265077)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2020-07-30 05:43:30 UTC (rev 265076)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2020-07-30 06:58:29 UTC (rev 265077)
@@ -103,9 +103,6 @@
# e.g. == Rolled over to ChangeLog-2011-02-16 ==
rolled_over_regexp = r'^== Rolled over to ChangeLog-\d{4}-\d{2}-\d{2} ==$'
- # e.g. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96161 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- svn_id_regexp = r'git-svn-id: http://svn.webkit.org/repository/webkit/trunk@(?P<svnid>\d+) '
-
split_names_regexp = r'\s*(?:,(?:\s+and\s+|&)?|(?:^|\s+)and\s+|&&|[/+&])\s*'
def __init__(self, contents, committer_list=None, revision=None):
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (265076 => 265077)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2020-07-30 05:43:30 UTC (rev 265076)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2020-07-30 06:58:29 UTC (rev 265077)
@@ -808,7 +808,7 @@
K 15
svn:realmstring
V 39
-<http://svn.webkit.org:80> Mac OS Forge
+<https://svn.webkit.org:443> Mac OS Forge
K 8
username
V 17
@@ -822,7 +822,7 @@
K 15
svn:realmstring
V 39
-<http://svn.webkit.org:80> Mac OS Forge
+<https://svn.webkit.org:443> Mac OS Forge
K 8
username
V 17
@@ -852,7 +852,7 @@
K 15
svn:realmstring
V 39
-<http://svn.webkit.org:80> Mac OS Forge
+<https://svn.webkit.org:443> Mac OS Forge
K 8
username
V 17
@@ -1769,7 +1769,12 @@
self.assertEqual(scm.svn_branch(scm.checkout_root), 'trunk')
self.assertEqual(scm.svn_url(scm.checkout_root), 'http://svn.webkit.org/repository/webkit/trunk')
- scm._most_recent_log_matching = lambda grep_str, path: 'git-svn-id: http://svn.webkit.org/repository/webkit/branch/specialSubmission@258000 268f45cc-cd09-0410-ab3c-d52691b4dbfc'
+ scm._most_recent_log_matching = lambda grep_str, path: 'git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258024 268f45cc-cd09-0410-ab3c-d52691b4dbfc'
+ self.assertEqual(scm.svn_revision(scm.checkout_root), '258024')
+ self.assertEqual(scm.svn_branch(scm.checkout_root), 'trunk')
+ self.assertEqual(scm.svn_url(scm.checkout_root), 'https://svn.webkit.org/repository/webkit/trunk')
+
+ scm._most_recent_log_matching = lambda grep_str, path: 'git-svn-id: https://svn.webkit.org/repository/webkit/branch/specialSubmission@258000 268f45cc-cd09-0410-ab3c-d52691b4dbfc'
self.assertEqual(scm.svn_revision(scm.checkout_root), '258000')
self.assertEqual(scm.svn_branch(scm.checkout_root), 'specialSubmission')
- self.assertEqual(scm.svn_url(scm.checkout_root), 'http://svn.webkit.org/repository/webkit/branch/specialSubmission')
+ self.assertEqual(scm.svn_url(scm.checkout_root), 'https://svn.webkit.org/repository/webkit/branch/specialSubmission')
Modified: trunk/Tools/Scripts/webkitpy/common/config/urls.py (265076 => 265077)
--- trunk/Tools/Scripts/webkitpy/common/config/urls.py 2020-07-30 05:43:30 UTC (rev 265076)
+++ trunk/Tools/Scripts/webkitpy/common/config/urls.py 2020-07-30 06:58:29 UTC (rev 265077)
@@ -53,7 +53,7 @@
buildbot_url = "https://build.webkit.org"
svn_server_host = "svn.webkit.org"
-svn_server_realm = "<http://svn.webkit.org:80> Mac OS Forge"
+svn_server_realm = "<https://svn.webkit.org:443> Mac OS Forge"
ewsserver_default_host = "ews.webkit.org"
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations.py (265076 => 265077)
--- trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations.py 2020-07-30 05:43:30 UTC (rev 265076)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations.py 2020-07-30 06:58:29 UTC (rev 265077)
@@ -52,7 +52,7 @@
_patch_by_regexp = re.compile(r'^Patch by (?P<name>.+?)\s+<(?P<email>[^<>]+)> on (?P<date>\d{4}-\d{2}-\d{2})$', re.MULTILINE)
_committer_regexp = re.compile(r'^Author: (?P<email>\S+)\s+<[^>]+>$', re.MULTILINE)
_date_regexp = re.compile(r'^Date: (?P<date>\d{4}-\d{2}-\d{2}) (?P<time>\d{2}:\d{2}:\d{2}) [\+\-]\d{4}$', re.MULTILINE)
- _revision_regexp = re.compile(r'^git-svn-id: http://svn.webkit.org/repository/webkit/trunk@(?P<svnid>\d+) (?P<gitid>[0-9a-f\-]{36})$', re.MULTILINE)
+ _revision_regexp = re.compile(r'^git-svn-id: https?://svn.webkit.org/repository/webkit/trunk@(?P<svnid>\d+) (?P<gitid>[0-9a-f\-]{36})$', re.MULTILINE)
def __init__(self, options=None):
options = options or []
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations_unittest.py (265076 => 265077)
--- trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations_unittest.py 2020-07-30 05:43:30 UTC (rev 265076)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations_unittest.py 2020-07-30 06:58:29 UTC (rev 265077)
@@ -43,7 +43,7 @@
Reviewed by Geoffrey Garen.
- git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95219 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95219 268f45cc-cd09-0410-ab3c-d52691b4dbfc
"""
mock_same_author_commit_message = """Author: [email protected] <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: 2011-09-15 19:56:21 +0000
@@ -53,7 +53,7 @@
Reviewed by Geoffrey Garen.
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95219 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95219 268f45cc-cd09-0410-ab3c-d52691b4dbfc
"""
def _make_options(self, verbose=False, **kwargs):
@@ -91,7 +91,7 @@
* WebKit.gyp:
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
"""
def test_basic(self):