/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/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 03:04:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124030458-aj2syolemmi6knri
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2367
2367
        other_tree.lock_tree_write()
2368
2368
        try:
2369
2369
            new_parents = other_tree.get_parent_ids()
2370
 
            other_root = other_tree.inventory.root
 
2370
            other_root = other_tree.root_inventory.root
2371
2371
            other_root.parent_id = new_root_parent
2372
2372
            other_root.name = osutils.basename(other_tree_path)
2373
 
            self.inventory.add(other_root)
2374
 
            add_children(self.inventory, other_root)
2375
 
            self._write_inventory(self.inventory)
 
2373
            self.root_inventory.add(other_root)
 
2374
            add_children(self.root_inventory, other_root)
 
2375
            self._write_inventory(self.root_inventory)
2376
2376
            # normally we don't want to fetch whole repositories, but i think
2377
2377
            # here we really do want to consolidate the whole thing.
2378
2378
            for parent_id in other_tree.get_parent_ids():
2422
2422
            tree_bzrdir = branch_bzrdir
2423
2423
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
2424
2424
        wt.set_parent_ids(self.get_parent_ids())
2425
 
        my_inv = self.inventory
 
2425
        # FIXME: Support nested trees
 
2426
        my_inv = self.root_inventory
2426
2427
        child_inv = inventory.Inventory(root_id=None)
2427
2428
        new_root = my_inv[file_id]
2428
2429
        my_inv.remove_recursive_id(file_id)
2695
2696
                raise errors.BzrRenameFailedError(from_rel,to_rel,
2696
2697
                    errors.NotVersionedError(path=from_rel))
2697
2698
            # put entry back in the inventory so we can rename it
2698
 
            from_entry = basis_tree.inventory[from_id].copy()
 
2699
            from_entry = basis_tree.root_inventory[from_id].copy()
2699
2700
            from_inv.add(from_entry)
2700
2701
        else:
2701
2702
            from_inv, from_inv_id = self._unpack_file_id(from_id)
2829
2830
 
2830
2831
    def _rollback_move(self, moved):
2831
2832
        """Try to rollback a previous move in case of an filesystem error."""
2832
 
        inv = self.inventory
2833
2833
        for entry in moved:
2834
2834
            try:
2835
2835
                self._move_entry(WorkingTree._RenameEntry(