← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.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/builtins.py
1555
1555
    def run(self, dir=u'.'):
1556
1556
        tree = WorkingTree.open_containing(dir)[0]
1557
1557
        self.add_cleanup(tree.lock_read().unlock)
1558
 
        new_inv = tree.inventory
 
1558
        new_inv = tree.root_inventory
1559
1559
        old_tree = tree.basis_tree()
1560
1560
        self.add_cleanup(old_tree.lock_read().unlock)
1561
 
        old_inv = old_tree.inventory
 
1561
        old_inv = old_tree.root_inventory
1562
1562
        renames = []
1563
1563
        iterator = tree.iter_changes(old_tree, include_unchanged=True)
1564
1564
        for f, paths, c, v, p, n, k, e in iterator:
2278
2278
        self.add_cleanup(tree.lock_read().unlock)
2279
2279
        old = tree.basis_tree()
2280
2280
        self.add_cleanup(old.lock_read().unlock)
2281
 
        for path, ie in old.inventory.iter_entries():
 
2281
        for path, ie in old.iter_entries_by_dir():
2282
2282
            if not tree.has_id(ie.file_id):
2283
2283
                self.outf.write(path)
2284
2284
                if show_ids:
4580
4580
                if tree.kind(file_id) != "directory":
4581
4581
                    continue
4582
4582
 
4583
 
                for name, ie in tree.inventory.iter_entries(file_id):
 
4583
                # FIXME: Support nested trees
 
4584
                for name, ie in tree.root_inventory.iter_entries(file_id):
4584
4585
                    interesting_ids.add(ie.file_id)
4585
4586
            new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4586
4587
        else: