<!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>[286623] 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/286623">286623</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-12-07 14:31:12 -0800 (Tue, 07 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[commits.webkit.org] Fallback to remote repository (Part 1)
https://bugs.webkit.org/show_bug.cgi?id=233904
<rdar://problem/86131927>

Reviewed by Dewei Zhu.

* Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py: Bump version.
* Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py:
(Checkout.Encoder.default):
(Checkout.__init__): Allow user to specify a remote fallback repository.
* Tools/Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py:
(CheckoutRoute.commit): If no commit is found, query the fallback repository.
* Tools/Scripts/libraries/reporelaypy/run: Add --fallback option.
* Tools/Scripts/libraries/reporelaypy/setup.py: Bump version.

Canonical link: https://commits.webkit.org/244936@main</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptslibrariesreporelaypyreporelaypy__init__py">trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py</a></li>
<li><a href="#trunkToolsScriptslibrariesreporelaypyreporelaypycheckoutpy">trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py</a></li>
<li><a href="#trunkToolsScriptslibrariesreporelaypyreporelaypycheckoutroutepy">trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py</a></li>
<li><a href="#trunkToolsScriptslibrariesreporelaypyrun">trunk/Tools/Scripts/libraries/reporelaypy/run</a></li>
<li><a href="#trunkToolsScriptslibrariesreporelaypysetuppy">trunk/Tools/Scripts/libraries/reporelaypy/setup.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (286622 => 286623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-12-07 22:17:49 UTC (rev 286622)
+++ trunk/Tools/ChangeLog       2021-12-07 22:31:12 UTC (rev 286623)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-12-06  Jonathan Bedard  <jbedard@apple.com>
+
+        [commits.webkit.org] Fallback to remote repository (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=233904
+        <rdar://problem/86131927>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/reporelaypy/reporelaypy/__init__.py: Bump version.
+        * Scripts/libraries/reporelaypy/reporelaypy/checkout.py:
+        (Checkout.Encoder.default):
+        (Checkout.__init__): Allow user to specify a remote fallback repository.
+        * Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py:
+        (CheckoutRoute.commit): If no commit is found, query the fallback repository.
+        * Scripts/libraries/reporelaypy/run: Add --fallback option.
+        * Scripts/libraries/reporelaypy/setup.py: Bump version.
+
</ins><span class="cx"> 2021-12-07  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [reporelaypy] Autoinstall missing lupa fakeredis dependency
</span></span></pre></div>
<a id="trunkToolsScriptslibrariesreporelaypyreporelaypy__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py (286622 => 286623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py        2021-12-07 22:17:49 UTC (rev 286622)
+++ trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py   2021-12-07 22:31:12 UTC (rev 286623)
</span><span class="lines">@@ -44,7 +44,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(0, 1, 2)
</del><ins>+version = Version(0, 2, 0)
</ins><span class="cx"> 
</span><span class="cx"> import webkitflaskpy
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptslibrariesreporelaypyreporelaypycheckoutpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py (286622 => 286623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py        2021-12-07 22:17:49 UTC (rev 286622)
+++ trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py   2021-12-07 22:31:12 UTC (rev 286623)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> import sys
</span><span class="cx"> 
</span><span class="cx"> from webkitcorepy import run
</span><del>-from webkitscmpy import local
</del><ins>+from webkitscmpy import local, remote
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class Checkout(object):
</span><span class="lines">@@ -43,11 +43,14 @@
</span><span class="cx">             if not isinstance(obj, Checkout):
</span><span class="cx">                 return super(Checkout.Encoder, self).default(obj)
</span><span class="cx"> 
</span><del>-            return dict(
</del><ins>+            result = dict(
</ins><span class="cx">                 path=obj.path,
</span><span class="cx">                 url=obj.url,
</span><span class="cx">                 sentinal=obj.sentinal,
</span><span class="cx">             )
</span><ins>+            if obj.fallback_repository:
+                result['fallback_url'] = obj.fallback_repository.url
+            return result
</ins><span class="cx"> 
</span><span class="cx">     @classmethod
</span><span class="cx">     def from_json(cls, data):
</span><span class="lines">@@ -66,12 +69,15 @@
</span><span class="cx">                 cloned.write('yes\n')
</span><span class="cx">         return 0
</span><span class="cx"> 
</span><del>-    def __init__(self, path, url=None, http_proxy=None, sentinal=True, primary=True):
</del><ins>+    def __init__(self, path, url=None, http_proxy=None, sentinal=True, fallback_url=None, primary=True):
</ins><span class="cx">         self.sentinal = sentinal
</span><span class="cx">         self.path = path
</span><span class="cx">         self.url = url
</span><span class="cx">         self._repository = None
</span><span class="cx">         self._child_process = None
</span><ins>+        self.fallback_repository = remote.Scm.from_url(fallback_url) if fallback_url else None
+        if self.fallback_repository:
+            self.fallback_repository.commit()
</ins><span class="cx"> 
</span><span class="cx">         containing_path = os.path.dirname(path)
</span><span class="cx">         if not os.path.isdir(containing_path):
</span></span></pre></div>
<a id="trunkToolsScriptslibrariesreporelaypyreporelaypycheckoutroutepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py (286622 => 286623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py   2021-12-07 22:17:49 UTC (rev 286622)
+++ trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkoutroute.py      2021-12-07 22:31:12 UTC (rev 286623)
</span><span class="lines">@@ -145,9 +145,19 @@
</span><span class="cx">         if not self.checkout.repository:
</span><span class="cx">             return None
</span><span class="cx"> 
</span><del>-        commit = self.checkout.repository.find(ref) if ref else self.checkout.repository.commit()
</del><ins>+        commit = None
+        try:
+            commit = self.checkout.repository.find(ref) if ref else self.checkout.repository.commit()
+        except (RuntimeError, ValueError):
+            pass
+
</ins><span class="cx">         if not commit:
</span><del>-            return commit
</del><ins>+            try:
+                if self.checkout.fallback_repository:
+                    return self.checkout.fallback_repository.find(ref)
+            except (RuntimeError, ValueError):
+                pass
+            return None
</ins><span class="cx"> 
</span><span class="cx">         encoded = json.dumps(commit, cls=Commit.Encoder)
</span><span class="cx">         self.database.set(commit.hash, encoded)
</span></span></pre></div>
<a id="trunkToolsScriptslibrariesreporelaypyrun"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/reporelaypy/run (286622 => 286623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/reporelaypy/run    2021-12-07 22:17:49 UTC (rev 286622)
+++ trunk/Tools/Scripts/libraries/reporelaypy/run       2021-12-07 22:31:12 UTC (rev 286623)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx">         '--update', dest='update_interval', default=0, action='store', type=int,
</span><span class="cx">         help='Set the number of seconds to wait between polling git checkout',
</span><span class="cx">     )
</span><ins>+    group.add_argument(
+        '--fallback', dest='fallback', default=None, action='store', type=str,
+        help='Fallback repository URL',
+    )
</ins><span class="cx"> 
</span><span class="cx">     group = parser.add_argument_group('Database')
</span><span class="cx">     group.add_argument(
</span><span class="lines">@@ -111,10 +115,18 @@
</span><span class="cx">     print('Connected to database!')
</span><span class="cx"> 
</span><span class="cx">     print('Finding checkout...')
</span><del>-    checkout = Checkout(path=args.path, url=args.url, http_proxy=args.http_proxy, sentinal=args.sentinal)
</del><ins>+    checkout = Checkout(
+        path=args.path,
+        url=args.url,
+        http_proxy=args.http_proxy,
+        sentinal=args.sentinal,
+        fallback_url=args.fallback,
+    )
</ins><span class="cx">     print('Git checkout:')
</span><span class="cx">     print('    Path: {}'.format(checkout.path))
</span><span class="cx">     print('    URL: {}'.format(checkout.url))
</span><ins>+    if checkout.fallback_repository:
+        print('    Fallback: {}'.format(checkout.fallback_repository.url))
</ins><span class="cx">     if not checkout.repository:
</span><span class="cx">         print('    Cloning repository...')
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptslibrariesreporelaypysetuppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/reporelaypy/setup.py (286622 => 286623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/reporelaypy/setup.py       2021-12-07 22:17:49 UTC (rev 286622)
+++ trunk/Tools/Scripts/libraries/reporelaypy/setup.py  2021-12-07 22:31:12 UTC (rev 286623)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> setup(
</span><span class="cx">     name='reporelaypy',
</span><del>-    version='0.1.2',
</del><ins>+    version='0.2.0',
</ins><span class="cx">     description='Library for visualizing, processing and storing test results.',
</span><span class="cx">     long_description=readme(),
</span><span class="cx">     classifiers=[
</span></span></pre>
</div>
</div>

</body>
</html>