/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

(broken) merge aaron's workingtree format changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
157
157
        return self.inventory.iter_entries_by_dir(
158
158
            specific_file_ids=specific_file_ids)
159
159
 
 
160
    def iter_reference_entries(self):
 
161
        for path, entry in self.iter_entries_by_dir():
 
162
            if entry.kind == 'tree-reference':
 
163
                yield path, entry
 
164
 
160
165
    def kind(self, file_id):
161
166
        raise NotImplementedError("subclasses must implement kind")
162
167
 
 
168
    def get_reference_revision(self, entry, path=None):
 
169
        raise NotImplementedError("subclasses must implement "
 
170
                                  "get_reference_revision")
 
171
 
163
172
    def _comparison_data(self, entry, path):
164
173
        """Return a tuple of kind, executable, stat_value for a file.
165
174
 
676
685
                if (self.source.get_symlink_target(file_id) != 
677
686
                    self.target.get_symlink_target(file_id)):
678
687
                    changed_content = True
 
688
            elif from_kind == 'tree-reference':
 
689
                if (self.source.get_reference_revision(from_entry, from_path)
 
690
                    != self.target.get_reference_revision(to_entry, to_path)):
 
691
                    changed_content = True 
679
692
            parent = (from_parent, to_entry.parent_id)
680
693
            name = (from_name, to_entry.name)
681
694
            executable = (from_executable, to_executable)