/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

Merge from by-reference-trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
153
153
        return self.inventory.iter_entries_by_dir(
154
154
            specific_file_ids=specific_file_ids)
155
155
 
 
156
    def iter_reference_entries(self):
 
157
        for path, entry in self.iter_entries_by_dir():
 
158
            if entry.kind == 'tree-reference':
 
159
                yield path, entry
 
160
 
156
161
    def kind(self, file_id):
157
162
        raise NotImplementedError("subclasses must implement kind")
158
163
 
 
164
    def get_reference_revision(self, entry, path=None):
 
165
        raise NotImplementedError("subclasses must implement "
 
166
                                  "get_reference_revision")
 
167
 
159
168
    def _comparison_data(self, entry, path):
160
169
        """Return a tuple of kind, executable, stat_value for a file.
161
170
 
644
653
                if (from_tree.get_symlink_target(file_id) != 
645
654
                    to_tree.get_symlink_target(file_id)):
646
655
                    changed_content = True
 
656
            elif from_kind == 'tree-reference':
 
657
                if (from_tree.get_reference_revision(from_entry, from_path) !=
 
658
                    to_tree.get_reference_revision(to_entry, to_path)):
 
659
                    changed_content = True 
647
660
            parent = (from_parent, to_entry.parent_id)
648
661
            name = (from_name, to_entry.name)
649
662
            executable = (from_executable, to_executable)