Title: [120787] trunk/Tools
- Revision
- 120787
- Author
- [email protected]
- Date
- 2012-06-19 18:46:34 -0700 (Tue, 19 Jun 2012)
Log Message
svn.delete_list fails to delete empty parent directories
https://bugs.webkit.org/show_bug.cgi?id=89520
Reviewed by Dirk Pranke.
These functions were calling scm.delete and scm.add, which already
delete the parent directory. We'd get an exception when we tried to
delete the parent directory again.
* Scripts/webkitpy/common/checkout/scm/svn.py:
(SVN._add_parent_directories):
(SVN._delete_parent_directories):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120786 => 120787)
--- trunk/Tools/ChangeLog 2012-06-20 01:33:30 UTC (rev 120786)
+++ trunk/Tools/ChangeLog 2012-06-20 01:46:34 UTC (rev 120787)
@@ -1,3 +1,18 @@
+2012-06-19 Adam Barth <[email protected]>
+
+ svn.delete_list fails to delete empty parent directories
+ https://bugs.webkit.org/show_bug.cgi?id=89520
+
+ Reviewed by Dirk Pranke.
+
+ These functions were calling scm.delete and scm.add, which already
+ delete the parent directory. We'd get an exception when we tried to
+ delete the parent directory again.
+
+ * Scripts/webkitpy/common/checkout/scm/svn.py:
+ (SVN._add_parent_directories):
+ (SVN._delete_parent_directories):
+
2012-06-19 Thiago Marcos P. Santos <[email protected]>
webkitpy: Simplify fetch_bugs_matching_search()
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (120786 => 120787)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2012-06-20 01:33:30 UTC (rev 120786)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2012-06-20 01:46:34 UTC (rev 120787)
@@ -172,10 +172,6 @@
"""Does 'svn add' to the path and its parents."""
if self.in_working_directory(path):
return
- dirname = os.path.dirname(path)
- # We have dirname directry - ensure it added.
- if dirname != path:
- self._add_parent_directories(dirname)
self.add(path)
def add_list(self, paths, return_exit_code=False):
@@ -189,9 +185,6 @@
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_list(self, paths):
for path in paths:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
