← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-20 12:40:02 UTC
  • mfrom: (6468.2.8 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120220124002-0wte938ee8s7k0pm
(jelmer) Avoid direct access of tree inventories in a couple more places.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
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
 
        # FIXME: Nested trees
838
 
        work_inv = self.work_tree.root_inventory
839
837
        # NB: entries will include entries within the excluded ids/paths
840
838
        # because iter_entries_by_dir has no 'exclude' facility today.
841
 
        entries = work_inv.iter_entries_by_dir(
 
839
        entries = self.work_tree.iter_entries_by_dir(
842
840
            specific_file_ids=self.specific_file_ids, yield_parents=True)
843
841
        for path, existing_ie in entries:
844
842
            file_id = existing_ie.file_id