Modified: trunk/Tools/ChangeLog (172417 => 172418)
--- trunk/Tools/ChangeLog 2014-08-11 23:03:49 UTC (rev 172417)
+++ trunk/Tools/ChangeLog 2014-08-11 23:26:26 UTC (rev 172418)
@@ -1,3 +1,26 @@
+2014-08-11 Bem Jones-Bey <[email protected]>
+
+ 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.
+
2014-08-11 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix GTK+ make distcheck.
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (172417 => 172418)
--- 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)
@@ -61,9 +61,8 @@
- Upon completion, script outputs the total number tests imported, broken down by test type
- Also upon completion, each directory where files are imported will have w3c-import.log written
- 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.
+ 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.
- On subsequent imports, this file is read to determine if files have been removed in the newer changesets.
The script removes these files accordingly.
@@ -150,8 +149,6 @@
self.destination_directory = webkit_finder.path_from_webkit_base("LayoutTests", options.destination)
- self.changeset = CHANGESET_NOT_AVAILABLE
-
self.import_list = []
def do_import(self):
@@ -160,16 +157,8 @@
else:
for test_path in self.options.test_paths:
self.find_importable_tests(os.path.join(self.source_directory, test_path))
- self.load_changeset()
self.import_tests()
- 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
-
def should_keep_subdir(self, root, subdir):
DIRS_TO_SKIP = ('work-in-progress', 'tools', 'support')
should_skip = subdir.startswith('.') or (root == self.source_directory and subdir in DIRS_TO_SKIP)
@@ -380,13 +369,15 @@
import_log = open(os.path.join(import_directory, 'w3c-import.log'), 'w')
import_log.write('The tests in this directory were imported from the W3C repository.\n')
- 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')
+ 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')
import_log.write('Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport\n\n')
import_log.write('Do NOT modify or remove this file\n\n')
import_log.write('------------------------------------------------------------------------\n')
import_log.write('Last Import: ' + now.strftime('%Y-%m-%d %H:%M') + '\n')
- import_log.write('W3C Mercurial changeset: ' + self.changeset + '\n')
import_log.write('------------------------------------------------------------------------\n')
import_log.write('Properties requiring vendor prefixes:\n')
if prop_list:
