← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

Merge bzr.dev and tree-file-ids-as-tuples.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
788
788
        :return: Inventory and inventory file id
789
789
        """
790
790
        if isinstance(file_id, tuple):
791
 
            if len(file_id) != 0:
 
791
            if len(file_id) != 1:
792
792
                raise ValueError("nested trees not yet supported: %r" % file_id)
793
793
            file_id = file_id[0]
794
794
        return self.root_inventory, file_id
839
839
        # NB: we specifically *don't* call self.has_filename, because for
840
840
        # WorkingTrees that can indicate files that exist on disk but that
841
841
        # are not versioned.
842
 
        # FIXME: Support nested trees
843
842
        return set((p for p in paths if self.path2id(p) is None))
844
843
 
845
844
    @needs_read_lock
865
864
                    raise AssertionError("%r != %r" % (
866
865
                        inventory, self.root_inventory))
867
866
                inventory_file_ids.append(inv_file_id)
868
 
        # FIXME: Support nested trees
869
 
        return self.root_inventory.iter_entries_by_dir(
870
 
            specific_file_ids=inventory_file_ids, yield_parents=yield_parents)
 
867
        for (path, entry) in return self.root_inventory.iter_entries_by_dir(
 
868
            specific_file_ids=inventory_file_ids, yield_parents=yield_parents):
 
869
            if entry.kind == 'tree-reference':
 
870
                raise NotImplementedError(entry)
 
871
            yield path, entry
871
872
 
872
873
    @deprecated_method(deprecated_in((2, 5, 0)))
873
874
    def get_file_by_path(self, path):