← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 17:18:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124171838-rlfe6yhyz4rylgcj
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
864
864
                    raise AssertionError("%r != %r" % (
865
865
                        inventory, self.root_inventory))
866
866
                inventory_file_ids.append(inv_file_id)
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
 
867
        # FIXME: Handle nested trees
 
868
        return self.root_inventory.iter_entries_by_dir(
 
869
            specific_file_ids=inventory_file_ids, yield_parents=yield_parents)
872
870
 
873
871
    @deprecated_method(deprecated_in((2, 5, 0)))
874
872
    def get_file_by_path(self, path):
1033
1031
            if (self.source.get_symlink_target(file_id) !=
1034
1032
                self.target.get_symlink_target(file_id)):
1035
1033
                changed_content = True
1036
 
            # XXX: Yes, the indentation below is wrong. But fixing it broke
1037
 
            # test_merge.TestMergerEntriesLCAOnDisk.
1038
 
            # test_nested_tree_subtree_renamed_and_modified. We'll wait for
1039
 
            # the fix from bzr.dev -- vila 2009026
1040
 
            elif source_kind == 'tree-reference':
1041
 
                if (self.source.get_reference_revision(file_id, source_path)
1042
 
                    != self.target.get_reference_revision(file_id, target_path)):
 
1034
        elif source_kind == 'tree-reference':
 
1035
            if (self.source.get_reference_revision(file_id, source_path)
 
1036
                != self.target.get_reference_revision(file_id, target_path)):
1043
1037
                    changed_content = True
1044
1038
        parent = (source_parent, target_parent)
1045
1039
        name = (source_name, target_name)