« back to all changes in this revision
Viewing changes to bzrlib/revisiontree.py
- browse files at revision 5757.7.10
- compare with another revision
- compare with revision 5820.1.28
- download diff
- download tarball
- view history from revision 5757.7.10
- Committer: Jelmer Vernooij
- Date: 2011-04-18 23:21:01 UTC
- mfrom: (5799 +trunk)
- mto: This revision was merged to the branch mainline in revision 5800.
- Revision ID: jelmer@samba.org-20110418232101-utgj6599ow9ny9nh
merge bzr.dev.
- files modified:
- Makefile
added
removed
bzrlib/revisiontree.py
25
25
)
26
26
27
27
28
class RevisionTree(tree.InventoryTree):
28
class RevisionTree(tree.Tree):
29
29
"""Tree viewing a previous revision.
30
30
31
31
File text can be retrieved from the text store.
32
32
"""
33
33
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
41
self._inventory = inv
34
def __init__(self, repository, revision_id):
35
self._repository = repository
42
36
self._revision_id = revision_id
43
37
self._rules_searcher = None
44
38
69
63
def get_file(self, file_id, path=None):
70
64
return StringIO(self.get_file_text(file_id))
71
65
72
def iter_files_bytes(self, desired_files):
73
"""See Tree.iter_files_bytes.
74
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]
66
def is_locked(self):
67
return self._repository.is_locked()
68
69
def lock_read(self):
70
self._repository.lock_read()
71
return self
72
73
def __repr__(self):
74
return '<%s instance at %x, rev_id=%r>' % (
75
self.__class__.__name__, id(self), self._revision_id)
76
77
def unlock(self):
78
self._repository.unlock()
79
80
def _get_rules_searcher(self, default_searcher):
81
"""See Tree._get_rules_searcher."""
82
if self._rules_searcher is None:
83
self._rules_searcher = super(RevisionTree,
84
self)._get_rules_searcher(default_searcher)
85
return self._rules_searcher
86
87
88
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
89
90
def __init__(self, repository, inv, revision_id):
91
RevisionTree.__init__(self, repository, revision_id)
92
self._inventory = inv
93
94
def get_file_mtime(self, file_id, path=None):
95
ie = self._inventory[file_id]
78
96
try:
79
for result in self._repository.iter_files_bytes(repo_desired_files):
80
yield result
81
except errors.RevisionNotPresent, e:
82
raise errors.NoSuchFile(e.revision_id)
83
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]
97
revision = self._repository.get_revision(ie.revision)
98
except errors.NoSuchRevision:
99
raise errors.FileTimestampUnavailable(self.id2path(file_id))
100
return revision.timestamp
91
101
92
102
def get_file_size(self, file_id):
93
"""See Tree.get_file_size"""
94
103
return self._inventory[file_id].text_size
95
104
96
105
def get_file_sha1(self, file_id, path=None, stat_value=None):
99
108
return ie.text_sha1
100
109
return None
101
110
102
def get_file_mtime(self, file_id, path=None):
103
ie = self._inventory[file_id]
104
try:
105
revision = self._repository.get_revision(ie.revision)
106
except errors.NoSuchRevision:
107
raise errors.FileTimestampUnavailable(self.id2path(file_id))
108
return revision.timestamp
109
110
111
def is_executable(self, file_id, path=None):
111
112
ie = self._inventory[file_id]
112
113
if ie.kind != "file":
174
175
return set(self._repository.get_ancestry(self._revision_id,
175
176
topo_sorted=False))
176
177
177
def is_locked(self):
178
return self._repository.is_locked()
179
180
def lock_read(self):
181
self._repository.lock_read()
182
return self
183
184
def __repr__(self):
185
return '<%s instance at %x, rev_id=%r>' % (
186
self.__class__.__name__, id(self), self._revision_id)
187
188
def unlock(self):
189
self._repository.unlock()
190
191
178
def walkdirs(self, prefix=""):
192
179
_directory = 'directory'
193
180
inv = self.inventory
217
204
if dir[2] == _directory:
218
205
pending.append(dir)
219
206
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
207
def iter_files_bytes(self, desired_files):
208
"""See Tree.iter_files_bytes.
209
210
This version is implemented on top of Repository.extract_files_bytes"""
211
repo_desired_files = [(f, self.inventory[f].revision, i)
212
for f, i in desired_files]
213
try:
214
for result in self._repository.iter_files_bytes(repo_desired_files):
215
yield result
216
except errors.RevisionNotPresent, e:
217
raise errors.NoSuchFile(e.revision_id)
218
219
def annotate_iter(self, file_id,
220
default_revision=revision.CURRENT_REVISION):
221
"""See Tree.annotate_iter"""
222
text_key = (file_id, self.inventory[file_id].revision)
223
annotator = self._repository.texts.get_annotator()
224
annotations = annotator.annotate_flat(text_key)
225
return [(key[-1], line) for key, line in annotations]
226
226
227
227
228
228
class InterCHKRevisionTree(tree.InterTree):
Loggerhead is a web-based interface for Breezy
Version: 2.0.1