Changeset 280663 in webkit

Timestamp:

Aug 4, 2021, 2:29:09 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[check-github-mirror-integrity] Store remote cache in checkout
​https://bugs.webkit.org/show_bug.cgi?id=228792
<rdar://problem/81527357>

Reviewed by Aakash Jain.

• Scripts/check-github-mirror-integrity: Use the local checkout to store the svn.webkit.org, if possible.
• Scripts/libraries/webkitscmpy/setup.py: Bump version.
• Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Ditto.
• Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py:

(Svn.init): Allow caller to define cache path.
(Svn._cache_path): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-github-mirror-integrity (modified) (1 diff)
• Scripts/libraries/webkitscmpy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-04  Jonathan Bedard  <jbedard@apple.com>
+
+        [check-github-mirror-integrity] Store remote cache in checkout
+        https://bugs.webkit.org/show_bug.cgi?id=228792
+        <rdar://problem/81527357>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/check-github-mirror-integrity: Use the local checkout to store the svn.webkit.org, if possible.
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py:
+        (Svn.__init__): Allow caller to define cache path.
+        (Svn._cache_path): Deleted.
+
 2021-08-04  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/check-github-mirror-integrity

@@ -28 +28 @@
 
 from webkitpy import webkitscmpy
-from webkitscmpy import remote
+from webkitscmpy import local, remote
 
 
 def main():
+    cache_path = None
+    try:
+        repo = local.Scm.from_path(os.path.dirname(__file__))
+        cache_path = os.path.join(repo.root_path, '.git' if repo.is_git else '.svn', 'svn-webkit-org-cache.json')
+    except OSError:
+        pass
+
     mirror = remote.GitHub('https://github.com/WebKit/WebKit')
-    repository = remote.Svn('https://svn.webkit.org/repository/webkit')    
+    repository = remote.Svn('https://svn.webkit.org/repository/webkit', cache_path=cache_path)
 
     mirror_tip = mirror.commit(branch='main')

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

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='1.0.5',
+    version='1.0.6',
     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(1, 0, 5)
+version = Version(1, 0, 6)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py

@@ -47 +47 @@
         return True if cls.URL_RE.match(url) else False
 
-    def __init__(self, url, dev_branches=None, prod_branches=None, contributors=None, id=None):
+    def __init__(self, url, dev_branches=None, prod_branches=None, contributors=None, id=None, cache_path=None):
         if url[-1] != '/':
             url += '/'
@@ -59 +59 @@
             id=id or url.split('/')[-2].lower(),
         )
+
+        if not cache_path:
+            from webkitscmpy.mocks import remote
+            host = 'svn.{}'.format(self.URL_RE.match(self.url).group('host'))
+            if host in remote.Svn.remotes:
+                host = 'mock-{}'.format(host)
+            cache_path = os.path.join(tempfile.gettempdir(), host, 'webkitscmpy-cache.json')
+        self._cache_path = cache_path
 
         if os.path.exists(self._cache_path):
@@ -194 +202 @@
     def tags(self):
         return self.list('tags')
-
-    @property
-    @decorators.Memoize()
-    def _cache_path(self):
-        from webkitscmpy.mocks import remote
-        host = 'svn.{}'.format(self.URL_RE.match(self.url).group('host'))
-        if host in remote.Svn.remotes:
-            host = 'mock-{}'.format(host)
-        return os.path.join(tempfile.gettempdir(), host, 'webkitscmpy-cache.json')
 
     def _cache_lock(self):