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

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 00:16:15 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124001615-ru3uwevs9d48kxcn
Add root_inventory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
667
667
        # entries and the order is preserved when doing this.
668
668
        if self.use_record_iter_changes:
669
669
            return
670
 
        self.basis_inv = self.basis_tree.inventory
 
670
        self.basis_inv = self.basis_tree.root_inventory
671
671
        self.parent_invs = [self.basis_inv]
672
672
        for revision in self.parents[1:]:
673
673
            if self.branch.repository.has_revision(revision):
834
834
        deleted_paths = {}
835
835
        # XXX: Note that entries may have the wrong kind because the entry does
836
836
        # not reflect the status on disk.
837
 
        work_inv = self.work_tree.inventory
 
837
        # FIXME: Nested trees
 
838
        work_inv = self.work_tree.root_inventory
838
839
        # NB: entries will include entries within the excluded ids/paths
839
840
        # because iter_entries_by_dir has no 'exclude' facility today.
840
841
        entries = work_inv.iter_entries_by_dir(