28
class RevisionTree(tree.Tree):
28
class RevisionTree(tree.InventoryTree):
29
29
"""Tree viewing a previous revision.
31
31
File text can be retrieved from the text store.
34
def __init__(self, repository, revision_id):
35
self._repository = repository
34
def __init__(self, branch, inv, revision_id):
35
# for compatability the 'branch' parameter has not been renamed to
36
# repository at this point. However, we should change RevisionTree's
37
# construction to always be via Repository and not via direct
38
# construction - this will mean that we can change the constructor
39
# with much less chance of breaking client code.
40
self._repository = branch
36
42
self._revision_id = revision_id
37
43
self._rules_searcher = None
39
def has_versioned_directories(self):
40
"""See `Tree.has_versioned_directories`."""
41
return self._repository._format.supports_versioned_directories
43
45
def supports_tree_reference(self):
44
46
return getattr(self._repository._format, "supports_tree_reference",
60
62
"""Return the revision id associated with this tree."""
61
63
return self._revision_id
63
def get_file_revision(self, file_id, path=None):
64
"""Return the revision id in which a file was last changed."""
65
raise NotImplementedError(self.get_file_revision)
67
65
def get_file_text(self, file_id, path=None):
68
66
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
69
67
return ''.join(content)
71
69
def get_file(self, file_id, path=None):
72
70
return StringIO(self.get_file_text(file_id))
75
return self._repository.is_locked()
78
self._repository.lock_read()
82
return '<%s instance at %x, rev_id=%r>' % (
83
self.__class__.__name__, id(self), self._revision_id)
86
self._repository.unlock()
88
def _get_rules_searcher(self, default_searcher):
89
"""See Tree._get_rules_searcher."""
90
if self._rules_searcher is None:
91
self._rules_searcher = super(RevisionTree,
92
self)._get_rules_searcher(default_searcher)
93
return self._rules_searcher
96
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
98
def __init__(self, repository, inv, revision_id):
99
RevisionTree.__init__(self, repository, revision_id)
100
self._inventory = inv
102
def get_file_mtime(self, file_id, path=None):
103
ie = self._inventory[file_id]
72
def iter_files_bytes(self, desired_files):
73
"""See Tree.iter_files_bytes.
75
This version is implemented on top of Repository.extract_files_bytes"""
76
repo_desired_files = [(f, self.inventory[f].revision, i)
77
for f, i in desired_files]
105
revision = self._repository.get_revision(ie.revision)
106
except errors.NoSuchRevision:
107
raise errors.FileTimestampUnavailable(self.id2path(file_id))
108
return revision.timestamp
79
for result in self._repository.iter_files_bytes(repo_desired_files):
81
except errors.RevisionNotPresent, e:
82
raise errors.NoSuchFile(e.revision_id)
84
def annotate_iter(self, file_id,
85
default_revision=revision.CURRENT_REVISION):
86
"""See Tree.annotate_iter"""
87
text_key = (file_id, self.inventory[file_id].revision)
88
annotator = self._repository.texts.get_annotator()
89
annotations = annotator.annotate_flat(text_key)
90
return [(key[-1], line) for key, line in annotations]
110
92
def get_file_size(self, file_id):
93
"""See Tree.get_file_size"""
111
94
return self._inventory[file_id].text_size
113
96
def get_file_sha1(self, file_id, path=None, stat_value=None):
116
99
return ie.text_sha1
119
def get_file_revision(self, file_id, path=None):
102
def get_file_mtime(self, file_id, path=None):
120
103
ie = self._inventory[file_id]
105
revision = self._repository.get_revision(ie.revision)
106
except errors.NoSuchRevision:
107
raise errors.FileTimestampUnavailable(self.id2path(file_id))
108
return revision.timestamp
123
110
def is_executable(self, file_id, path=None):
124
111
ie = self._inventory[file_id]
146
133
for path, entry in entries:
147
134
yield path, 'V', entry.kind, entry.file_id, entry
149
def get_symlink_target(self, file_id, path=None):
136
def get_symlink_target(self, file_id):
150
137
ie = self._inventory[file_id]
151
138
# Inventories store symlink targets in unicode
152
139
return ie.symlink_target
183
170
def _file_size(self, entry, stat_value):
184
171
return entry.text_size
173
def _get_ancestors(self, default_revision):
174
return set(self._repository.get_ancestry(self._revision_id,
178
return self._repository.is_locked()
181
self._repository.lock_read()
185
return '<%s instance at %x, rev_id=%r>' % (
186
self.__class__.__name__, id(self), self._revision_id)
189
self._repository.unlock()
186
191
def walkdirs(self, prefix=""):
187
192
_directory = 'directory'
188
193
inv = self.inventory
212
217
if dir[2] == _directory:
213
218
pending.append(dir)
215
def iter_files_bytes(self, desired_files):
216
"""See Tree.iter_files_bytes.
218
This version is implemented on top of Repository.extract_files_bytes"""
219
repo_desired_files = [(f, self.get_file_revision(f), i)
220
for f, i in desired_files]
222
for result in self._repository.iter_files_bytes(repo_desired_files):
224
except errors.RevisionNotPresent, e:
225
raise errors.NoSuchFile(e.revision_id)
227
def annotate_iter(self, file_id,
228
default_revision=revision.CURRENT_REVISION):
229
"""See Tree.annotate_iter"""
230
text_key = (file_id, self.get_file_revision(file_id))
231
annotator = self._repository.texts.get_annotator()
232
annotations = annotator.annotate_flat(text_key)
233
return [(key[-1], line) for key, line in annotations]
220
def _get_rules_searcher(self, default_searcher):
221
"""See Tree._get_rules_searcher."""
222
if self._rules_searcher is None:
223
self._rules_searcher = super(RevisionTree,
224
self)._get_rules_searcher(default_searcher)
225
return self._rules_searcher
236
228
class InterCHKRevisionTree(tree.InterTree):
added
removed
bzrlib/revisiontree.py
