← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-07 00:57:24 UTC
  • mfrom: (6405.2.18 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120207005724-xvfawh5exf1ohusu
(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1648
1648
    def run(self, dir=u'.'):
1649
1649
        tree = WorkingTree.open_containing(dir)[0]
1650
1650
        self.add_cleanup(tree.lock_read().unlock)
1651
 
        new_inv = tree.inventory
 
1651
        new_inv = tree.root_inventory
1652
1652
        old_tree = tree.basis_tree()
1653
1653
        self.add_cleanup(old_tree.lock_read().unlock)
1654
 
        old_inv = old_tree.inventory
 
1654
        old_inv = old_tree.root_inventory
1655
1655
        renames = []
1656
1656
        iterator = tree.iter_changes(old_tree, include_unchanged=True)
1657
1657
        for f, paths, c, v, p, n, k, e in iterator:
4673
4673
                if tree.kind(file_id) != "directory":
4674
4674
                    continue
4675
4675
 
4676
 
                for name, ie in tree.inventory.iter_entries(file_id):
 
4676
                # FIXME: Support nested trees
 
4677
                for name, ie in tree.root_inventory.iter_entries(file_id):
4677
4678
                    interesting_ids.add(ie.file_id)
4678
4679
            new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4679
4680
        else: