Rev 3800: CommitBuilder.record_iter_changes handles directories becoming files and links. in http://people.ubuntu.com/~robertc/baz2.0/commit-iterchanges

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/commit-iterchanges

------------------------------------------------------------
revno: 3800
revision-id: robertc at robertcollins.net-20081202045858-fs4oxqvwpeppf9rm
parent: robertc at robertcollins.net-20081202044925-nzzxxo3usf3prh3a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-iterchanges
timestamp: Tue 2008-12-02 15:58:58 +1100
message:
  CommitBuilder.record_iter_changes handles directories becoming files and links.
modified:
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py	2008-12-02 04:49:25 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py	2008-12-02 04:58:58 +0000
@@ -972,7 +972,8 @@
         self.requireFeature(tests.SymlinkFeature)
         os.symlink('target', name)
 
-    def _check_kind_change(self, make_before, make_after, expect_fs_hash=False):
+    def _check_kind_change(self, make_before, make_after, expect_fs_hash=False,
+        mini_commit=None):
         tree = self.make_branch_and_tree('.')
         path = 'name'
         make_before(path)
@@ -982,15 +983,24 @@
             make_after(path)
 
         self._add_commit_change_check_changed(tree, path, change_kind,
-            expect_fs_hash=expect_fs_hash)
+            expect_fs_hash=expect_fs_hash, mini_commit=mini_commit)
 
     def test_last_modified_dir_file(self):
         self._check_kind_change(self.make_dir, self.make_file,
             expect_fs_hash=True)
 
+    def test_last_modified_dir_file_ric(self):
+        self._check_kind_change(self.make_dir, self.make_file,
+            expect_fs_hash=True,
+            mini_commit=self.mini_commit_record_iter_changes)
+
     def test_last_modified_dir_link(self):
         self._check_kind_change(self.make_dir, self.make_link)
 
+    def test_last_modified_dir_link_ric(self):
+        self._check_kind_change(self.make_dir, self.make_link,
+            mini_commit=self.mini_commit_record_iter_changes)
+
     def test_last_modified_link_file(self):
         self._check_kind_change(self.make_link, self.make_file,
             expect_fs_hash=True)