Changeset 182119 in webkit

Timestamp:

Mar 29, 2015 11:47:04 AM (9 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

[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 deleting SCM untracked files and reverting changes for tracked files.

• BuildSlaveSupport/clean-build:

(main): Adding call to Tools/Scripts/clean-webkit.

• Scripts/clean-webkit: Added.

(main): Removes untracked and changed files.

• Scripts/webkitpy/common/checkout/scm/git.py:

(Git.untracked_files): Retrieves GIT untracked files.

• Scripts/webkitpy/common/checkout/scm/scm.py:

(SCM.untracked_files): Retrieves SVN untracked files.
(SCM):
(SCM.discard_untracked_files): Deletes untracked files/folders.

• Scripts/webkitpy/common/checkout/scm/scm_unittest.py:

(SCMTest._shared_test_untracked_files): Unit testing for untracked files.
(test_untracked_files):
(GitSVNTest.test_untracked_files):

• Scripts/webkitpy/common/checkout/scm/svn.py:

(SVN.untracked_files):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/clean-build (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Scripts/clean-webkit (added)
• Scripts/webkitpy/common/checkout/scm/git.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/common/checkout/scm/svn.py (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/clean-build

@@ -51 +51 @@
     shutil.rmtree(webkit_build_directory)
 
+    subprocess.Popen(['python', os.path.join(os.path.dirname(__file__), "..", "Scripts", "clean-webkit"])
+
 if __name__ == '__main__':
     sys.exit(main())

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-29  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 deleting SCM untracked files and reverting changes for tracked files.
+
+        * BuildSlaveSupport/clean-build:
+        (main): Adding call to Tools/Scripts/clean-webkit.
+        * Scripts/clean-webkit: Added.
+        (main): Removes untracked and changed files.
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        (Git.untracked_files): Retrieves GIT untracked files.
+        * Scripts/webkitpy/common/checkout/scm/scm.py:
+        (SCM.untracked_files): Retrieves SVN untracked files.
+        (SCM):
+        (SCM.discard_untracked_files): Deletes untracked files/folders.
+        * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+        (SCMTest._shared_test_untracked_files): Unit testing for untracked files.
+        (test_untracked_files):
+        (GitSVNTest.test_untracked_files):
+        * Scripts/webkitpy/common/checkout/scm/svn.py:
+        (SVN.untracked_files):
+
 2015-03-27  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -215 +215 @@
         return self.run_status_and_extract_filenames(status_command, updated_in_index_regexp)
 
+    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>.+)$")]
+
     def changed_files(self, git_commit=None):
         # FIXME: --diff-filter could be used to avoid the "extract_filenames" step.

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py

@@ -205 +205 @@
         self._subclass_must_implement()
 
+    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)
+
     def discard_working_directory_changes(self):
         self._subclass_must_implement()

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

@@ -310 +310 @@
         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"])
+
+        # 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")
+
     def _shared_test_added_files(self):
         write_into_file_at_path("test_file", "changed content")
@@ -807 +830 @@
         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()
@@ -1460 +1486 @@
         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()

trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py

@@ -145 +145 @@
         return self._run_svn(["diff"], cwd=self.checkout_root, decode_output=False) != ""
 
+    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?"))
+
     def discard_working_directory_changes(self):
         # Make sure there are no locks lying around from a previously aborted svn invocation.