← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Alexander Belchenko
  • Date: 2007-11-19 22:54:30 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3008.
  • Revision ID: bialix@ukr.net-20071119225430-x0ewosrsagis0yno
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_commit_builder.py
147
147
        builder = tree.branch.get_commit_builder([parent_tree.inventory])
148
148
        try:
149
149
            ie = inventory.make_entry('directory', '', None,
150
 
                    tree.inventory.root.file_id)
 
150
                    tree.get_root_id())
151
151
            delta, version_recorded = builder.record_entry_contents(
152
152
                ie, [parent_tree.inventory], '', tree,
153
153
                tree.path_content_summary(''))
367
367
            # root
368
368
            builder.record_entry_contents(
369
369
                inventory.make_entry('directory', '', None,
370
 
                    tree.inventory.root.file_id), parent_invs, '', tree,
 
370
                    tree.get_root_id()), parent_invs, '', tree,
371
371
                    tree.path_content_summary(''))
372
372
            def commit_id(file_id):
373
373
                old_ie = tree.inventory[file_id]
379
379
 
380
380
            file_id = tree.path2id(new_name)
381
381
            parent_id = tree.inventory[file_id].parent_id
382
 
            if parent_id != tree.inventory.root.file_id:
 
382
            if parent_id != tree.get_root_id():
383
383
                commit_id(parent_id)
384
384
            # because a change of some sort is meant to have occurred,
385
385
            # recording the entry must return True.