Merge lp:~henninge/launchpad/bug-526643-prefix into lp:launchpad

[Henning Eggers]

Avoid code duplication by using create_prefix and smart_add from bzrlib.

[Henning Eggers (henninge)]

Hi Aaron,
I agree that this change is actually a bit small for its own branch. I guess I thought there would be more work involved. I had arrived at the same solution for create_prefix and put_bytes but did not see that smart_add needs to be used. Thank you for showing me how to do this.

Cheers,
Henning

[Aaron Bentley (abentley)]

Actually, I guess os.path.split should become os.path.basename, since we no longer need fname for anything.

review: Approve

[Henning Eggers (henninge)]

Good point! Although it's dirname that we want ... ;-) Thanks!

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2010-02-22 12:26:18 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2010-02-23 22:15:28 +0000
@@ -867,22 +867,6 @@
         self.assertFalse(job.generateDiffs())
 
 
-def all_dirs(directory):
-    """Generate all parent directories and the directory itself.
-
-    Passing 'a/b/c/d' produces ['a', 'a/b', 'a/b/c', 'a/b/c/d'].
-    """
-    if directory == '':
-        return []
-    dirs = [directory]
-    while(1):
-        head, tail = os.path.split(directory)
-        if head == '':
-            return reversed(dirs)
-        directory = head
-        dirs.append(directory)
-
-
 class TestRosettaUploadJob(TestCaseWithFactory):
     """Tests for RosettaUploadJob."""
 
@@ -937,21 +921,18 @@
         seen_dirs = set()
         for file_pair in files:
             file_name = file_pair[0]
-            dname, fname = os.path.split(file_name)
-            for adir in all_dirs(dname):
-                if adir in seen_dirs:
-                    continue
-                self.tree.bzrdir.root_transport.mkdir(adir)
-                self.tree.add(adir)
-                seen_dirs.add(adir)
             try:
                 file_content = file_pair[1]
                 if file_content is None:
                     raise IndexError # Same as if missing.
             except IndexError:
                 file_content = self.factory.getUniqueString()
+            dname = os.path.dirname(file_name)
+            self.tree.bzrdir.root_transport.clone(dname).create_prefix()
             self.tree.bzrdir.root_transport.put_bytes(file_name, file_content)
-            self.tree.add(file_name)
+        if len(files) > 0:
+            self.tree.smart_add(
+                [self.tree.abspath(file_pair[0]) for file_pair in files])
         if commit_message is None:
             commit_message = self.factory.getUniqueString('commit')
         revision_id = self.tree.commit(commit_message)