<!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>[182135] 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/182135">182135</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-30 00:25:10 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/182119">r182119</a>.
https://bugs.webkit.org/show_bug.cgi?id=143196
problem with syntax (Requested by youenn on #webkit).
Reverted changeset:
"[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/182119</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportcleanbuild">trunk/Tools/BuildSlaveSupport/clean-build</a></li>
<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="#trunkToolsScriptswebkitpycommoncheckoutscmscmpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmsvnpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptscleanwebkit">trunk/Tools/Scripts/clean-webkit</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportcleanbuild"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/clean-build (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/clean-build 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/BuildSlaveSupport/clean-build 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -50,7 +50,5 @@
</span><span class="cx">
</span><span class="cx"> shutil.rmtree(webkit_build_directory)
</span><span class="cx">
</span><del>- subprocess.Popen(['python', os.path.join(os.path.dirname(__file__), "..", "Scripts", "clean-webkit"])
-
</del><span class="cx"> if __name__ == '__main__':
</span><span class="cx"> sys.exit(main())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/ChangeLog 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-30 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r182119.
+ https://bugs.webkit.org/show_bug.cgi?id=143196
+
+ problem with syntax (Requested by youenn on #webkit).
+
+ Reverted changeset:
+
+ "[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/182119
+
</ins><span class="cx"> 2015-03-30 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Start the features.json files
</span></span></pre></div>
<a id="trunkToolsScriptscleanwebkit"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/clean-webkit (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/clean-webkit 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/Scripts/clean-webkit 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-#!/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()
-
-
-sys.exit(main())
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmgitpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -214,12 +214,6 @@
</span><span class="cx"> updated_in_index_regexp = '^M[ M] (?P<filename>.+)$'
</span><span class="cx"> return self.run_status_and_extract_filenames(status_command, updated_in_index_regexp)
</span><span class="cx">
</span><del>- def untracked_files(self):
- status_command = [self.executable_name, 'status', '--short', '--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>.+)$")]
-
</del><span class="cx"> def changed_files(self, git_commit=None):
</span><span class="cx"> # FIXME: --diff-filter could be used to avoid the "extract_filenames" step.
</span><span class="cx"> status_command = [self.executable_name, 'diff', '-r', '--name-status', "--no-renames", "--no-ext-diff", "--full-index", self.merge_base(git_commit)]
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscmpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -204,16 +204,6 @@
</span><span class="cx"> def has_working_directory_changes(self):
</span><span class="cx"> self._subclass_must_implement()
</span><span class="cx">
</span><del>- def untracked_files(self):
- self._subclass_must_implement()
-
- def discard_untracked_files(self):
- for filename in self.untracked_files():
- if self._filesystem.isdir(filename):
- self._filesystem.rmtree(filename)
- else:
- self._filesystem.remove(filename)
-
</del><span class="cx"> def discard_working_directory_changes(self):
</span><span class="cx"> self._subclass_must_implement()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -309,29 +309,6 @@
</span><span class="cx"> self.assertItemsEqual(self.scm.changed_files(), ["test_dir/test_file3", "test_file"])
</span><span class="cx"> os.chdir(old_cwd)
</span><span class="cx">
</span><del>- 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"])
-
- # Validate that untracked_files do not change with .gitignore/svn:ignore.
- # FIXME: Add svn:ignore property setting
- write_into_file_at_path(".gitignore", "test_file_new\ntest_dir_new\n")
- self.assertItemsEqual(scm.untracked_files(), [".gitignore", "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(), [".gitignore", "test_dir_new", "test_file_new"])
-
- os.chdir(old_cwd)
- shutil.rmtree("test_dir_new")
- os.remove(".gitignore")
- os.remove("test_file_new")
-
</del><span class="cx"> def _shared_test_added_files(self):
</span><span class="cx"> write_into_file_at_path("test_file", "changed content")
</span><span class="cx"> self.assertItemsEqual(self.scm.added_files(), [])
</span><span class="lines">@@ -829,9 +806,6 @@
</span><span class="cx"> def test_changed_files(self):
</span><span class="cx"> self._shared_test_changed_files()
</span><span class="cx">
</span><del>- def test_untracked_files(self):
- self._shared_test_untracked_files(self.scm)
-
</del><span class="cx"> def test_changed_files_for_revision(self):
</span><span class="cx"> self._shared_test_changed_files_for_revision()
</span><span class="cx">
</span><span class="lines">@@ -1485,9 +1459,6 @@
</span><span class="cx"> def test_changed_files(self):
</span><span class="cx"> self._shared_test_changed_files()
</span><span class="cx">
</span><del>- def test_untracked_files(self):
- self._shared_test_untracked_files(self.scm)
-
</del><span class="cx"> def test_changed_files_for_revision(self):
</span><span class="cx"> self._shared_test_changed_files_for_revision()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmsvnpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (182134 => 182135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2015-03-30 07:20:43 UTC (rev 182134)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2015-03-30 07:25:10 UTC (rev 182135)
</span><span class="lines">@@ -144,11 +144,6 @@
</span><span class="cx"> # FIXME: What about files which are not committed yet?
</span><span class="cx"> return self._run_svn(["diff"], cwd=self.checkout_root, decode_output=False) != ""
</span><span class="cx">
</span><del>- def untracked_files(self):
- status_command = [self.executable_name, "status", "--no-ignore"]
- status_command.extend(self._patch_directories)
- return self.run_status_and_extract_filenames(status_command, self._status_regexp("I?"))
-
</del><span class="cx"> def discard_working_directory_changes(self):
</span><span class="cx"> # Make sure there are no locks lying around from a previously aborted svn invocation.
</span><span class="cx"> # This is slightly dangerous, as it's possible the user is running another svn process
</span></span></pre>
</div>
</div>
</body>
</html>