← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
372
372
        elif self.reporter is None:
373
373
            self.reporter = self._select_reporter()
374
374
        if self.config_stack is None:
375
 
            self.config_stack = self.branch.get_config_stack()
 
375
            self.config_stack = self.work_tree.get_config_stack()
376
376
 
377
377
        self._set_specific_file_ids()
378
378
 
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(