<!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>[194696] 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/194696">194696</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-01-07 06:00:00 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[buildbot] clean-build script should remove untracked files and revert local changes too
https://bugs.webkit.org/show_bug.cgi?id=142400
Reviewed by Ryosuke Niwa.
This patch cleans the WebKit folder by reverting tracked files changes and deleting SCM untracked files, including SCM ignored files.
A helper routine SCM.discard_untracked_files is added for that purpose.
* BuildSlaveSupport/clean-build:
(main): Making call to Scripts/clean-webkit
* Scripts/clean-webkit: Added.
(main): Revert changes and delete untracked files.
* Scripts/webkitpy/common/checkout/scm/scm.py:
(SCM.discard_untracked_files): Helper function to discard untracked files or folders found by SCM.
* Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
(SCMTest._shared_test_discard_untracked_files):
(test_discard_untracked_files): Tests that untracked file and untracked folder get discarded correctly.</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="#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>
</ul>
<h3>Added 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 (194695 => 194696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/clean-build 2016-01-07 08:17:03 UTC (rev 194695)
+++ trunk/Tools/BuildSlaveSupport/clean-build 2016-01-07 14:00:00 UTC (rev 194696)
</span><span class="lines">@@ -53,7 +53,10 @@
</span><span class="cx"> webkit_build_directory = subprocess.Popen(['perl', os.path.join(os.path.dirname(__file__), "..", "Scripts", "webkit-build-directory"),
</span><span class="cx"> "--" + platform, "--" + options.configuration, '--top-level'], stdout=subprocess.PIPE).communicate()[0].strip()
</span><span class="cx">
</span><del>- shutil.rmtree(webkit_build_directory)
</del><ins>+ if (os.path.isdir(webkit_build_directory)):
+ shutil.rmtree(webkit_build_directory)
</ins><span class="cx">
</span><ins>+ subprocess.Popen(['python', os.path.join(os.path.dirname(__file__), "..", "Scripts", "clean-webkit")])
+
</ins><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 (194695 => 194696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-07 08:17:03 UTC (rev 194695)
+++ trunk/Tools/ChangeLog 2016-01-07 14:00:00 UTC (rev 194696)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-07 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [buildbot] clean-build script should remove untracked files and revert local changes too
+ https://bugs.webkit.org/show_bug.cgi?id=142400
+
+ Reviewed by Ryosuke Niwa.
+
+ This patch cleans the WebKit folder by reverting tracked files changes and deleting SCM untracked files, including SCM ignored files.
+ A helper routine SCM.discard_untracked_files is added for that purpose.
+
+ * BuildSlaveSupport/clean-build:
+ (main): Making call to Scripts/clean-webkit
+ * Scripts/clean-webkit: Added.
+ (main): Revert changes and delete untracked files.
+ * Scripts/webkitpy/common/checkout/scm/scm.py:
+ (SCM.discard_untracked_files): Helper function to discard untracked files or folders found by SCM.
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ (SCMTest._shared_test_discard_untracked_files):
+ (test_discard_untracked_files): Tests that untracked file and untracked folder get discarded correctly.
+
</ins><span class="cx"> 2016-01-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a setting and preferences to enable display-list drawing. Does nothing yet.
</span></span></pre></div>
<a id="trunkToolsScriptscleanwebkit"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/clean-webkit (0 => 194696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/clean-webkit (rev 0)
+++ trunk/Tools/Scripts/clean-webkit 2016-01-07 14:00:00 UTC (rev 194696)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+#!/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())
</ins><span class="cx">Property changes on: trunk/Tools/Scripts/clean-webkit
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscmpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (194695 => 194696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2016-01-07 08:17:03 UTC (rev 194695)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2016-01-07 14:00:00 UTC (rev 194696)
</span><span class="lines">@@ -207,6 +207,13 @@
</span><span class="cx"> def untracked_files(self, include_ignored_files=False):
</span><span class="cx"> self._subclass_must_implement()
</span><span class="cx">
</span><ins>+ 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)
+
</ins><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 (194695 => 194696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2016-01-07 08:17:03 UTC (rev 194695)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2016-01-07 14:00:00 UTC (rev 194696)
</span><span class="lines">@@ -332,6 +332,28 @@
</span><span class="cx"> os.remove("test_file_new")
</span><span class="cx"> os.remove("test_file_new.pyc")
</span><span class="cx">
</span><ins>+ 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")
+
</ins><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">@@ -832,6 +854,9 @@
</span><span class="cx"> def test_untracked_files(self):
</span><span class="cx"> self._shared_test_untracked_files(self.scm)
</span><span class="cx">
</span><ins>+ def test_discard_untracked_files(self):
+ self._shared_test_discard_untracked_files(self.scm)
+
</ins><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>
</div>
</body>
</html>