<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280663] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280663">280663</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-08-04 14:29:09 -0700 (Wed, 04 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptscheckgithubmirrorintegrity">trunk/Tools/Scripts/check-github-mirror-integrity</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpysetuppy">trunk/Tools/Scripts/libraries/webkitscmpy/setup.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpy__init__py">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpyremotesvnpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (280662 => 280663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-08-04 21:22:39 UTC (rev 280662)
+++ trunk/Tools/ChangeLog       2021-08-04 21:29:09 UTC (rev 280663)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2021-08-04  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><ins>+        [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>
+
</ins><span class="cx">         [check-github-mirror-integrity] Compare current time to canonical time
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=228787
</span><span class="cx">         <rdar://problem/81524499>
</span></span></pre></div>
<a id="trunkToolsScriptscheckgithubmirrorintegrity"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/check-github-mirror-integrity (280662 => 280663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/check-github-mirror-integrity        2021-08-04 21:22:39 UTC (rev 280662)
+++ trunk/Tools/Scripts/check-github-mirror-integrity   2021-08-04 21:29:09 UTC (rev 280663)
</span><span class="lines">@@ -27,12 +27,19 @@
</span><span class="cx"> import time
</span><span class="cx"> 
</span><span class="cx"> from webkitpy import webkitscmpy
</span><del>-from webkitscmpy import remote
</del><ins>+from webkitscmpy import local, remote
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> def main():
</span><ins>+    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
+
</ins><span class="cx">     mirror = remote.GitHub('https://github.com/WebKit/WebKit')
</span><del>-    repository = remote.Svn('https://svn.webkit.org/repository/webkit')    
</del><ins>+    repository = remote.Svn('https://svn.webkit.org/repository/webkit', cache_path=cache_path)
</ins><span class="cx"> 
</span><span class="cx">     mirror_tip = mirror.commit(branch='main')
</span><span class="cx">     canonical_tip = repository.commit(branch='trunk')
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpysetuppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (280662 => 280663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py       2021-08-04 21:22:39 UTC (rev 280662)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py  2021-08-04 21:29:09 UTC (rev 280663)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> setup(
</span><span class="cx">     name='webkitscmpy',
</span><del>-    version='1.0.5',
</del><ins>+    version='1.0.6',
</ins><span class="cx">     description='Library designed to interact with git and svn repositories.',
</span><span class="cx">     long_description=readme(),
</span><span class="cx">     classifiers=[
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpy__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (280662 => 280663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py        2021-08-04 21:22:39 UTC (rev 280662)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py   2021-08-04 21:29:09 UTC (rev 280663)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
</span><span class="cx">     )
</span><span class="cx"> 
</span><del>-version = Version(1, 0, 5)
</del><ins>+version = Version(1, 0, 6)
</ins><span class="cx"> 
</span><span class="cx"> AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
</span><span class="cx"> AutoInstall.register(Package('monotonic', Version(1, 5)))
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpyremotesvnpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py (280662 => 280663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py      2021-08-04 21:22:39 UTC (rev 280662)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py 2021-08-04 21:29:09 UTC (rev 280663)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">     def is_webserver(cls, url):
</span><span class="cx">         return True if cls.URL_RE.match(url) else False
</span><span class="cx"> 
</span><del>-    def __init__(self, url, dev_branches=None, prod_branches=None, contributors=None, id=None):
</del><ins>+    def __init__(self, url, dev_branches=None, prod_branches=None, contributors=None, id=None, cache_path=None):
</ins><span class="cx">         if url[-1] != '/':
</span><span class="cx">             url += '/'
</span><span class="cx">         if not self.is_webserver(url):
</span><span class="lines">@@ -59,6 +59,14 @@
</span><span class="cx">             id=id or url.split('/')[-2].lower(),
</span><span class="cx">         )
</span><span class="cx"> 
</span><ins>+        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
+
</ins><span class="cx">         if os.path.exists(self._cache_path):
</span><span class="cx">             try:
</span><span class="cx">                 with self._cache_lock(), open(self._cache_path) as file:
</span><span class="lines">@@ -194,15 +202,6 @@
</span><span class="cx">     def tags(self):
</span><span class="cx">         return self.list('tags')
</span><span class="cx"> 
</span><del>-    @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')
-
</del><span class="cx">     def _cache_lock(self):
</span><span class="cx">         return fasteners.InterProcessLock(os.path.join(os.path.dirname(self._cache_path), 'cache.lock'))
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>