Changeset 92655 in webkit

Timestamp:

Aug 8, 2011 5:11:31 PM (13 years ago)

Author:

abarth@webkit.org

Message:

scm.delete should delete empty parent directories as well
​https://bugs.webkit.org/show_bug.cgi?id=65878

Reviewed by Eric Seidel.

This behavior makes SVN match GIT (which has no concept of empty
directories). This bug comes up a lot when optimizing baselines, which
often create empty directories when we're able to optimize everything
out of a given folder.

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

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/common/checkout/scm/svn.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-08  Adam Barth  <abarth@webkit.org>
+
+        scm.delete should delete empty parent directories as well
+        https://bugs.webkit.org/show_bug.cgi?id=65878
+
+        Reviewed by Eric Seidel.
+
+        This behavior makes SVN match GIT (which has no concept of empty
+        directories).  This bug comes up a lot when optimizing baselines, which
+        often create empty directories when we're able to optimize everything
+        out of a given folder.
+
+        * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+        * Scripts/webkitpy/common/checkout/scm/svn.py:
+
 2011-08-08  Lucas Forschler  <lforschler@apple.com>
 

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

@@ -512 +512 @@
         self.assertTrue("added_dir/added_file" in self.scm.added_files())
 
+    def _shared_test_delete_recursively(self):
+        os.mkdir("added_dir")
+        write_into_file_at_path("added_dir/added_file", "new stuff")
+        self.scm.add("added_dir/added_file")
+        self.assertTrue("added_dir/added_file" in self.scm.added_files())
+        self.scm.delete("added_dir/added_file")
+        self.assertFalse("added_dir" in self.scm.added_files())
+
+    def _shared_test_delete_recursively_or_not(self):
+        os.mkdir("added_dir")
+        write_into_file_at_path("added_dir/added_file", "new stuff")
+        write_into_file_at_path("added_dir/another_added_file", "more new stuff")
+        self.scm.add("added_dir/added_file")
+        self.scm.add("added_dir/another_added_file")
+        self.assertTrue("added_dir/added_file" in self.scm.added_files())
+        self.assertTrue("added_dir/another_added_file" in self.scm.added_files())
+        self.scm.delete("added_dir/added_file")
+        self.assertTrue("added_dir/another_added_file" in self.scm.added_files())
+
     def _shared_test_exists(self, scm, commit_function):
         os.chdir(scm.checkout_root)
@@ -843 +862 @@
         self.assertTrue("test_file" in self.scm.deleted_files())
 
+    def test_delete_recursively(self):
+        self._shared_test_delete_recursively()
+
+    def test_delete_recursively_or_not(self):
+        self._shared_test_delete_recursively_or_not()
+
     def test_head_svn_revision(self):
         self._shared_test_head_svn_revision()
@@ -1460 +1485 @@
         self.assertTrue("test_file_commit1" in self.scm.deleted_files())
 
+    def test_delete_recursively(self):
+        self._shared_test_delete_recursively()
+
+    def test_delete_recursively_or_not(self):
+        self._shared_test_delete_recursively_or_not()
+
     def test_head_svn_revision(self):
         self._shared_test_head_svn_revision()

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

@@ -69 +69 @@
     svn_server_realm = "<http://svn.webkit.org:80> Mac OS Forge"
 
+    _svn_metadata_files = frozenset(['.svn', '_svn'])
+
     def __init__(self, cwd, patch_directories, executive=None):
         SCM.__init__(self, cwd, executive)
@@ -172 +174 @@
         return self.run(["svn", "add", path], return_exit_code=return_exit_code)
 
+    def _delete_parent_directories(self, path):
+        if not self.in_working_directory(path):
+            return
+        if set(os.listdir(path)) - self._svn_metadata_files:
+            return  # Directory has non-trivial files in it.
+        self.delete(path)
+        dirname = os.path.dirname(path)
+        if dirname != path:
+            self._delete_parent_directories(dirname)
+
     def delete(self, path):
-        parent, base = os.path.split(os.path.abspath(path))
-        return self.run(["svn", "delete", "--force", base], cwd=parent)
+        abs_path = os.path.abspath(path)
+        parent, base = os.path.split(abs_path)
+        result = self.run(["svn", "delete", "--force", base], cwd=parent)
+        self._delete_parent_directories(os.path.dirname(abs_path))
+        return result
 
     def exists(self, path):