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