Merge lp:~bzr/bzr/parent-directories into lp:~bzr/bzr/trunk-old

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

This patch is one of the building blocks for faster selective file commit.

[Martin Pool (mbp)]

I think this is a good example of a function where a doctest would be easy to add and make the meaning more clear.

review: Approve

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2009-05-16 08:21:11 +0000
+++ bzrlib/osutils.py	2009-05-18 11:35:18 +0000
@@ -867,6 +867,16 @@
     return pathjoin(*p)
 
 
+def parent_directories(filename):
+    """Return the list of parent directories, deepest first."""
+    parents = []
+    parts = splitpath(dirname(filename))
+    while parts:
+        parents.append(joinpath(parts))
+        parts.pop()
+    return parents
+
+
 try:
     from bzrlib._chunks_to_lines_pyx import chunks_to_lines
 except ImportError:
 
=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py	2009-05-07 05:08:46 +0000
+++ bzrlib/tests/test_osutils.py	2009-05-18 11:35:18 +0000
@@ -860,6 +860,15 @@
         self.assertRaises(errors.BzrError, osutils.splitpath, 'a/../b')
 
 
+class TestParentDirectories(tests.TestCaseInTempDir):
+    """Test osutils.parent_directories()"""
+
+    def test_parent_directories(self):
+        self.assertEqual([], osutils.parent_directories('a'))
+        self.assertEqual(['a'], osutils.parent_directories('a/b'))
+        self.assertEqual(['a/b', 'a'], osutils.parent_directories('a/b/c'))
+
+
 class TestMacFuncsDirs(tests.TestCaseInTempDir):
     """Test mac special functions that require directories."""