← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« 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
153
153
        file_id = osutils.safe_file_id(file_id)
154
154
        return self._inventory[file_id].kind
155
155
 
 
156
    def path_content_summary(self, path):
 
157
        """See Tree.path_content_summary."""
 
158
        id = self.inventory.path2id(path)
 
159
        if id is None:
 
160
            return ('missing', None, None, None)
 
161
        entry = self._inventory[id]
 
162
        kind = entry.kind
 
163
        if kind == 'file':
 
164
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
 
165
        elif kind == 'symlink':
 
166
            return (kind, None, None, entry.symlink_target)
 
167
        else:
 
168
            return (kind, None, None, None)
 
169
 
156
170
    def _comparison_data(self, entry, path):
157
171
        if entry is None:
158
172
            return None, False, None