Diff
Modified: trunk/Tools/BuildSlaveSupport/clean-build (182247 => 182248)
--- trunk/Tools/BuildSlaveSupport/clean-build 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/BuildSlaveSupport/clean-build 2015-04-01 19:20:14 UTC (rev 182248)
@@ -48,10 +48,7 @@
webkit_build_directory = subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"),
"--" + generic_platform, "--" + options.configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip()
- if (os.path.isdir(webkit_build_directory)):
- shutil.rmtree(webkit_build_directory)
+ shutil.rmtree(webkit_build_directory)
- subprocess.Popen(['python', os.path.join(os.path.dirname(__file__), "..", "Scripts", "clean-webkit")])
-
if __name__ == '__main__':
sys.exit(main())
Modified: trunk/Tools/ChangeLog (182247 => 182248)
--- trunk/Tools/ChangeLog 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/ChangeLog 2015-04-01 19:20:14 UTC (rev 182248)
@@ -1,3 +1,22 @@
+2015-04-01 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r182174 and r182177.
+ https://bugs.webkit.org/show_bug.cgi?id=143314
+
+ Try to correct EWS failures (Requested by bfulgham on
+ #webkit).
+
+ Reverted changesets:
+
+ "Python SCM should be able to retrieve untracked files"
+ https://bugs.webkit.org/show_bug.cgi?id=143135
+ http://trac.webkit.org/changeset/182174
+
+ "[buildbot] clean-build script should remove untracked files
+ and revert local changes too"
+ https://bugs.webkit.org/show_bug.cgi?id=142400
+ http://trac.webkit.org/changeset/182177
+
2015-04-01 Alex Christensen <achristen...@webkit.org>
[Content Extensions] Properly handle regexes that match everything.
Deleted: trunk/Tools/Scripts/clean-webkit (182247 => 182248)
--- trunk/Tools/Scripts/clean-webkit 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/Scripts/clean-webkit 2015-04-01 19:20:14 UTC (rev 182248)
@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2015 Canon Incorporated. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above
-# copyright notice, this list of conditions and the following
-# disclaimer.
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials
-# provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-import sys
-
-from webkitpy.common.checkout.scm.detection import SCMDetector
-from webkitpy.common.host import Host
-from webkitpy.common.system.filesystem import FileSystem
-
-
-def main():
- fs = FileSystem()
- host = Host()
- scm = SCMDetector(fs, host.executive).detect_scm_system(fs.getcwd())
-
- scm.discard_working_directory_changes()
- scm.discard_untracked_files(discard_ignored_files=True)
-
-
-sys.exit(main())
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (182247 => 182248)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2015-04-01 19:20:14 UTC (rev 182248)
@@ -214,14 +214,6 @@
updated_in_index_regexp = '^M[ M] (?P<filename>.+)$'
return self.run_status_and_extract_filenames(status_command, updated_in_index_regexp)
- def untracked_files(self, include_ignored_files=False):
- status_command = [self.executable_name, 'status', '--short']
- if include_ignored_files:
- status_command.append('--ignored')
- status_command.extend(self._patch_directories)
- # Remove the last / for folders to match SVN behavior.
- return [value if not value.endswith('/') else value[:-1] for value in self.run_status_and_extract_filenames(status_command, "^[?!][?!] (?P<filename>.+)$")]
-
def changed_files(self, git_commit=None):
# FIXME: --diff-filter could be used to avoid the "extract_filenames" step.
status_command = [self.executable_name, 'diff', '-r', '--name-status', "--no-renames", "--no-ext-diff", "--full-index", self.merge_base(git_commit)]
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (182247 => 182248)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2015-04-01 19:20:14 UTC (rev 182248)
@@ -204,16 +204,6 @@
def has_working_directory_changes(self):
self._subclass_must_implement()
- def untracked_files(self, include_ignored_files=False):
- self._subclass_must_implement()
-
- def discard_untracked_files(self, discard_ignored_files=False):
- for filename in self.untracked_files(discard_ignored_files):
- if self._filesystem.isdir(filename):
- self._filesystem.rmtree(filename)
- else:
- self._filesystem.remove(filename)
-
def discard_working_directory_changes(self):
self._subclass_must_implement()
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (182247 => 182248)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2015-04-01 19:20:14 UTC (rev 182248)
@@ -309,51 +309,6 @@
self.assertItemsEqual(self.scm.changed_files(), ["test_dir/test_file3", "test_file"])
os.chdir(old_cwd)
- def _shared_test_untracked_files(self, scm):
- write_into_file_at_path("test_file_new", "new content")
- self.assertItemsEqual(scm.untracked_files(), ["test_file_new"])
-
- os.mkdir("test_dir_new")
- write_into_file_at_path("test_dir_new/test_file_new", "new stuff")
- self.assertItemsEqual(scm.untracked_files(), ["test_dir_new", "test_file_new"])
-
- old_cwd = os.getcwd()
- os.chdir("test_dir_new")
- # Validate that untracked_files do not change with our cwd.
- self.assertItemsEqual(scm.untracked_files(), ["test_dir_new", "test_file_new"])
-
- os.chdir(old_cwd)
-
- write_into_file_at_path("test_file_new.pyc", "new ignored file")
- self.assertItemsEqual(scm.untracked_files(), ["test_dir_new", "test_file_new"])
- self.assertItemsEqual(scm.untracked_files(include_ignored_files=True), ["test_file_new.pyc", "test_dir_new", "test_file_new"])
-
- shutil.rmtree("test_dir_new")
- os.remove("test_file_new")
- os.remove("test_file_new.pyc")
-
- def _shared_test_discard_untracked_files(self, scm):
- write_into_file_at_path("test_file_new", "new content")
- os.mkdir("test_dir_new")
- write_into_file_at_path("test_dir_new/test_file_new", "new stuff")
- self.assertItemsEqual(scm.untracked_files(), ["test_dir_new", "test_file_new"])
- scm.discard_untracked_files()
- self.assertItemsEqual(scm.untracked_files(), [])
-
- write_into_file_at_path("test_file_new.pyc", "new content")
- self.assertItemsEqual(scm.untracked_files(True), ["test_file_new.pyc"])
- scm.discard_untracked_files(discard_ignored_files=False)
- self.assertItemsEqual(scm.untracked_files(True), ["test_file_new.pyc"])
- scm.discard_untracked_files(discard_ignored_files=True)
- self.assertItemsEqual(scm.untracked_files(True), [])
-
- if os.path.isdir("test_dir_new"):
- shutil.rmtree("test_dir_new")
- if os.path.isfile("test_file_new"):
- os.remove("test_file_new")
- if os.path.isfile("test_file_new.pyc"):
- os.remove("test_file_new.pyc")
-
def _shared_test_added_files(self):
write_into_file_at_path("test_file", "changed content")
self.assertItemsEqual(self.scm.added_files(), [])
@@ -851,12 +806,6 @@
def test_changed_files(self):
self._shared_test_changed_files()
- def test_untracked_files(self):
- self._shared_test_untracked_files(self.scm)
-
- def test_discard_untracked_files(self):
- self._shared_test_discard_untracked_files(self.scm)
-
def test_changed_files_for_revision(self):
self._shared_test_changed_files_for_revision()
@@ -1510,9 +1459,6 @@
def test_changed_files(self):
self._shared_test_changed_files()
- def test_untracked_files(self):
- self._shared_test_untracked_files(self.scm)
-
def test_changed_files_for_revision(self):
self._shared_test_changed_files_for_revision()
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (182247 => 182248)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2015-04-01 19:02:35 UTC (rev 182247)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2015-04-01 19:20:14 UTC (rev 182248)
@@ -144,13 +144,6 @@
# FIXME: What about files which are not committed yet?
return self._run_svn(["diff"], cwd=self.checkout_root, decode_output=False) != ""
- def untracked_files(self, include_ignored_files=False):
- status_command = [self.executable_name, "status"]
- if include_ignored_files:
- status_command.append("--no-ignore")
- status_command.extend(self._patch_directories)
- return self.run_status_and_extract_filenames(status_command, self._status_regexp("I?"))
-
def discard_working_directory_changes(self):
# Make sure there are no locks lying around from a previously aborted svn invocation.
# This is slightly dangerous, as it's possible the user is running another svn process
