/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_commit_builder.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-22 16:17:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6403.
  • Revision ID: jelmer@samba.org-20111222161728-q1kk5ugfkm8sfw4k
Don't access revision tree before commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
323
323
            # pointless commit.
324
324
            self.assertFalse(builder.any_changes())
325
325
            builder.finish_inventory()
 
326
            builder.commit('')
326
327
            builder_tree = builder.revision_tree()
327
328
            new_root_id = builder_tree.get_root_id()
328
329
            new_root_revision = builder_tree.get_file_revision(new_root_id)
333
334
                # We should see a new root revision
334
335
                self.assertNotEqual(old_revision_id, new_root_revision)
335
336
        finally:
336
 
            builder.abort()
337
337
            tree.unlock()
338
338
 
339
339
    def test_commit_record_entry_contents(self):
992
992
                                [inv_key])[inv_key]
993
993
                self.assertEqual(inv_sha1, builder.inv_sha1)
994
994
            self.assertIs(None, builder.new_inventory)
 
995
            rev2 = builder.commit('')
995
996
            new_inventory = builder.revision_tree().inventory
996
997
            new_entry = new_inventory[file_id]
997
998
            if delta_against_basis:
1000
1001
            else:
1001
1002
                expected_delta = None
1002
1003
                self.assertFalse(version_recorded)
1003
 
            rev2 = builder.commit('')
1004
1004
            tree.set_parent_ids([rev2])
1005
1005
        except:
1006
1006
            builder.abort()