<!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>[213625] 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/213625">213625</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-08 20:23:48 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>import-w3c-tests doesn't work with svn repositories.
https://bugs.webkit.org/show_bug.cgi?id=169190
Patch by Sam Weinig <sam@webkit.org> on 2017-03-08
Reviewed by Tim Horton.
The script assumed you had WebKit checked-out as a git repository, but
there was no reason for that.
* Scripts/webkitpy/common/checkout/scm/git.py:
(Git.clone):
Add a class method to clone a repository which does not require
an existing checkout.
(Git.fetch):
(Git.checkout):
Add methods needed for test_downloader.py, so it doesn't have to use
the internal _run_git
* Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader.checkout_test_repository):
Switch to using Git.clone(), which doesn't require an existing git
directory, and then also adopt non private methods to fetch/checkout.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmgitpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_downloaderpy">trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213624 => 213625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-09 04:04:29 UTC (rev 213624)
+++ trunk/Tools/ChangeLog 2017-03-09 04:23:48 UTC (rev 213625)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-03-08 Sam Weinig <sam@webkit.org>
+
+ import-w3c-tests doesn't work with svn repositories.
+ https://bugs.webkit.org/show_bug.cgi?id=169190
+
+ Reviewed by Tim Horton.
+
+ The script assumed you had WebKit checked-out as a git repository, but
+ there was no reason for that.
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+ (Git.clone):
+ Add a class method to clone a repository which does not require
+ an existing checkout.
+
+ (Git.fetch):
+ (Git.checkout):
+ Add methods needed for test_downloader.py, so it doesn't have to use
+ the internal _run_git
+
+ * Scripts/webkitpy/w3c/test_downloader.py:
+ (TestDownloader.checkout_test_repository):
+ Switch to using Git.clone(), which doesn't require an existing git
+ directory, and then also adopt non private methods to fetch/checkout.
+
</ins><span class="cx"> 2017-03-08 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Resource Load Statistics: Communicate to the network process which domains to partition
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmgitpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (213624 => 213625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2017-03-09 04:04:29 UTC (rev 213624)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2017-03-09 04:23:48 UTC (rev 213625)
</span><span class="lines">@@ -115,6 +115,14 @@
</span><span class="cx"> # The Windows bots seem to through a WindowsError when git isn't installed.
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+ @classmethod
+ def clone(cls, url, directory, executive=None):
+ try:
+ executive = executive or Executive()
+ return executive.run_command([cls.executable_name, 'clone', '-v', url, directory], error_handler=Executive.ignore_error)
+ except OSError, e:
+ return False
+
</ins><span class="cx"> def find_checkout_root(self, path):
</span><span class="cx"> # "git rev-parse --show-cdup" would be another way to get to the root
</span><span class="cx"> checkout_root = self._run_git(['rev-parse', '--show-toplevel'], cwd=(path or "./")).strip()
</span><span class="lines">@@ -572,3 +580,12 @@
</span><span class="cx">
</span><span class="cx"> def files_changed_summary_for_commit(self, commit_id):
</span><span class="cx"> return self._run_git(['diff-tree', '--shortstat', '--no-renames', '--no-commit-id', commit_id])
</span><ins>+
+ def fetch(self):
+ return self._run_git(['fetch'])
+
+ def checkout(self, revision, quiet=None):
+ command = ['checkout', revision]
+ if quiet:
+ command += ['-q']
+ return self._run_git(command)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_downloaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py (213624 => 213625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2017-03-09 04:04:29 UTC (rev 213624)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2017-03-09 04:23:48 UTC (rev 213625)
</span><span class="lines">@@ -80,18 +80,19 @@
</span><span class="cx"> return Git(test_repository, None, executive=self._host.executive, filesystem=self._filesystem)
</span><span class="cx">
</span><span class="cx"> def checkout_test_repository(self, revision, url, directory):
</span><del>- git = self.git('.')
</del><ins>+ git = None
</ins><span class="cx"> if not self._filesystem.exists(directory):
</span><span class="cx"> _log.info('Cloning %s into %s...' % (url, directory))
</span><del>- git._run_git(['clone', '-v', url, directory])
</del><ins>+ Git.clone(url, directory, self._host.executive)
+ git = self.git(directory)
</ins><span class="cx"> elif self._options.fetch is True:
</span><ins>+ git = self.git(directory)
</ins><span class="cx"> _log.info('Fetching %s...' % url)
</span><del>- git._run_git(['-C', directory, 'fetch'])
</del><ins>+ git.fetch()
+ else:
+ git = self.git(directory)
</ins><span class="cx"> _log.info('Checking out revision ' + revision)
</span><del>- checkout_arguments = ['-C', directory, 'checkout', revision]
- if not self._options.verbose:
- checkout_arguments += ['-q']
- git._run_git(checkout_arguments)
</del><ins>+ git.checkout(revision, not self._options.verbose)
</ins><span class="cx">
</span><span class="cx"> def _init_paths_from_expectations(self):
</span><span class="cx"> import_lines = json.loads(self._filesystem.read_text_file(self.import_expectations_path))
</span></span></pre>
</div>
</div>
</body>
</html>