Rev 3802: CommitBuilder.record_iter_changes handles files becoming directories 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: 3802
revision-id: robertc at robertcollins.net-20081202050536-mv2h9p0kpins19am
parent: robertc at robertcollins.net-20081202050308-myy4vqjzjmp3wzq7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-iterchanges
timestamp: Tue 2008-12-02 16:05:36 +1100
message:
  CommitBuilder.record_iter_changes handles files becoming directories and links.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-12-02 04:49:25 +0000
+++ b/bzrlib/repository.py	2008-12-02 05:05:36 +0000
@@ -686,10 +686,9 @@
                         if change[1][1] != '' or self.repository.supports_rich_root():
                             self._add_text_to_weave(change[0], [], heads, None)
                 elif kind == 'tree-reference':
-                    if change[2]:
-                        import pdb;pdb.set_trace()
+                    raise AssertionError('unknown kind %r' % kind)
                 else:
-                        raise AssertionError('unknown kind %r' % kind)
+                    raise AssertionError('unknown kind %r' % kind)
                 if not carried_over:
                     entry.revision = modified_rev
                 else:

=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py	2008-12-02 05:03:08 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py	2008-12-02 05:05:36 +0000
@@ -1020,5 +1020,13 @@
     def test_last_modified_file_dir(self):
         self._check_kind_change(self.make_file, self.make_dir)
 
+    def test_last_modified_file_dir_ric(self):
+        self._check_kind_change(self.make_file, self.make_dir,
+            mini_commit=self.mini_commit_record_iter_changes)
+
     def test_last_modified_file_link(self):
         self._check_kind_change(self.make_file, self.make_link)
+
+    def test_last_modified_file_link_ric(self):
+        self._check_kind_change(self.make_file, self.make_link,
+            mini_commit=self.mini_commit_record_iter_changes)