~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-17 16:48:41 UTC
  • mto: This revision was merged to the branch mainline in revision 6470.
  • Revision ID: jelmer@samba.org-20120217164841-75by526tq3yagy8d
UseĀ .iter_entries_by_dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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