<!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>[172418] 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/172418">172418</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-08-11 16:26:26 -0700 (Mon, 11 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove hg changeset from w3c-import.log
https://bugs.webkit.org/show_bug.cgi?id=135735
Reviewed by Ryosuke Niwa.
Since the csswg's test suite is now accessible via github and it is
possible to push changes by creating github pull requests, the hg
changeset makes less sense, as many people will just use a clone of
the git repo. There isn't an obvious thing to replace it with, so
might as well remove it for now instead of having it just be set to
UNKNOWN in imports.
This also adds a pointer to the github repo in the generated comments
in the w3c-import.log.
* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__): Remove changeset handling.
(TestImporter.do_import): Ditto.
(TestImporter.write_import_log): Ditto.
(TestImporter.load_changeset): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_importerpy">trunk/Tools/Scripts/webkitpy/w3c/test_importer.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172417 => 172418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-11 23:03:49 UTC (rev 172417)
+++ trunk/Tools/ChangeLog 2014-08-11 23:26:26 UTC (rev 172418)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-08-11 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ Remove hg changeset from w3c-import.log
+ https://bugs.webkit.org/show_bug.cgi?id=135735
+
+ Reviewed by Ryosuke Niwa.
+
+ Since the csswg's test suite is now accessible via github and it is
+ possible to push changes by creating github pull requests, the hg
+ changeset makes less sense, as many people will just use a clone of
+ the git repo. There isn't an obvious thing to replace it with, so
+ might as well remove it for now instead of having it just be set to
+ UNKNOWN in imports.
+
+ This also adds a pointer to the github repo in the generated comments
+ in the w3c-import.log.
+
+ * Scripts/webkitpy/w3c/test_importer.py:
+ (TestImporter.__init__): Remove changeset handling.
+ (TestImporter.do_import): Ditto.
+ (TestImporter.write_import_log): Ditto.
+ (TestImporter.load_changeset): Deleted.
+
</ins><span class="cx"> 2014-08-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ make distcheck.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (172417 => 172418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2014-08-11 23:03:49 UTC (rev 172417)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2014-08-11 23:26:26 UTC (rev 172418)
</span><span class="lines">@@ -61,9 +61,8 @@
</span><span class="cx"> - Upon completion, script outputs the total number tests imported, broken down by test type
</span><span class="cx">
</span><span class="cx"> - Also upon completion, each directory where files are imported will have w3c-import.log written
</span><del>- with a timestamp, the W3C Mercurial changeset if available, the list of CSS properties used that
- require prefixes, the list of imported files, and guidance for future test modification and
- maintenance.
</del><ins>+ with a timestamp, the list of CSS properties used that require prefixes, the list of imported files,
+ and guidance for future test modification and maintenance.
</ins><span class="cx">
</span><span class="cx"> - On subsequent imports, this file is read to determine if files have been removed in the newer changesets.
</span><span class="cx"> The script removes these files accordingly.
</span><span class="lines">@@ -150,8 +149,6 @@
</span><span class="cx">
</span><span class="cx"> self.destination_directory = webkit_finder.path_from_webkit_base("LayoutTests", options.destination)
</span><span class="cx">
</span><del>- self.changeset = CHANGESET_NOT_AVAILABLE
-
</del><span class="cx"> self.import_list = []
</span><span class="cx">
</span><span class="cx"> def do_import(self):
</span><span class="lines">@@ -160,16 +157,8 @@
</span><span class="cx"> else:
</span><span class="cx"> for test_path in self.options.test_paths:
</span><span class="cx"> self.find_importable_tests(os.path.join(self.source_directory, test_path))
</span><del>- self.load_changeset()
</del><span class="cx"> self.import_tests()
</span><span class="cx">
</span><del>- def load_changeset(self):
- """Returns the current changeset from mercurial or "Not Available"."""
- try:
- self.changeset = self.host.executive.run_command(['hg', 'tip']).split('changeset:')[1]
- except (OSError, ScriptError):
- self.changeset = CHANGESET_NOT_AVAILABLE
-
</del><span class="cx"> def should_keep_subdir(self, root, subdir):
</span><span class="cx"> DIRS_TO_SKIP = ('work-in-progress', 'tools', 'support')
</span><span class="cx"> should_skip = subdir.startswith('.') or (root == self.source_directory and subdir in DIRS_TO_SKIP)
</span><span class="lines">@@ -380,13 +369,15 @@
</span><span class="cx">
</span><span class="cx"> import_log = open(os.path.join(import_directory, 'w3c-import.log'), 'w')
</span><span class="cx"> import_log.write('The tests in this directory were imported from the W3C repository.\n')
</span><del>- import_log.write('Do NOT modify these tests directly in Webkit. Instead, push changes to the W3C CSS repo:\n\n')
- import_log.write('http://hg.csswg.org/test\n\n')
</del><ins>+ import_log.write('Do NOT modify these tests directly in Webkit.\n')
+ import_log.write('Instead, push changes to the W3C CSS repo:\n')
+ import_log.write('\thttp://hg.csswg.org/test\n')
+ import_log.write('Or create a pull request on the W3C CSS github:\n')
+ import_log.write('\thttps://github.com/w3c/csswg-test\n\n')
</ins><span class="cx"> import_log.write('Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport\n\n')
</span><span class="cx"> import_log.write('Do NOT modify or remove this file\n\n')
</span><span class="cx"> import_log.write('------------------------------------------------------------------------\n')
</span><span class="cx"> import_log.write('Last Import: ' + now.strftime('%Y-%m-%d %H:%M') + '\n')
</span><del>- import_log.write('W3C Mercurial changeset: ' + self.changeset + '\n')
</del><span class="cx"> import_log.write('------------------------------------------------------------------------\n')
</span><span class="cx"> import_log.write('Properties requiring vendor prefixes:\n')
</span><span class="cx"> if prop_list:
</span></span></pre>
</div>
</div>
</body>
</html>