/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/revisiontree.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
73
73
    def get_file(self, file_id):
74
74
        return StringIO(self.get_file_text(file_id))
75
75
 
 
76
    def annotate_iter(self, file_id):
 
77
        """See Tree.annotate_iter"""
 
78
        w = self.get_weave(file_id)
 
79
        return w.annotate_iter(self.inventory[file_id].revision)
 
80
 
76
81
    def get_file_size(self, file_id):
77
82
        return self._inventory[file_id].text_size
78
83
 
79
 
    def get_file_sha1(self, file_id, path=None):
 
84
    def get_file_sha1(self, file_id, path=None, stat_value=None):
80
85
        ie = self._inventory[file_id]
81
86
        if ie.kind == "file":
82
87
            return ie.text_sha1
113
118
    def kind(self, file_id):
114
119
        return self._inventory[file_id].kind
115
120
 
 
121
    def _comparison_data(self, entry, path):
 
122
        if entry is None:
 
123
            return None, False, None
 
124
        return entry.kind, entry.executable, None
 
125
 
 
126
    def _file_size(self, entry, stat_value):
 
127
        assert entry.text_size is not None
 
128
        return entry.text_size
 
129
 
116
130
    def lock_read(self):
117
131
        self._repository.lock_read()
118
132