31
33
File text can be retrieved from the text store.
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
def __init__(self, repository, revision_id):
37
self._repository = repository
42
38
self._revision_id = revision_id
43
39
self._rules_searcher = None
41
def has_versioned_directories(self):
42
"""See `Tree.has_versioned_directories`."""
43
return self._repository._format.supports_versioned_directories
45
45
def supports_tree_reference(self):
46
46
return getattr(self._repository._format, "supports_tree_reference",
62
62
"""Return the revision id associated with this tree."""
63
63
return self._revision_id
65
def get_file_revision(self, file_id, path=None):
66
"""Return the revision id in which a file was last changed."""
67
raise NotImplementedError(self.get_file_revision)
65
69
def get_file_text(self, file_id, path=None):
66
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
67
return ''.join(content)
70
for (identifier, content) in self.iter_files_bytes([(file_id, None)]):
71
ret = "".join(content)
69
74
def get_file(self, file_id, path=None):
70
75
return StringIO(self.get_file_text(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]
78
return self._repository.is_locked()
81
self._repository.lock_read()
85
return '<%s instance at %x, rev_id=%r>' % (
86
self.__class__.__name__, id(self), self._revision_id)
89
self._repository.unlock()
91
def _get_rules_searcher(self, default_searcher):
92
"""See Tree._get_rules_searcher."""
93
if self._rules_searcher is None:
94
self._rules_searcher = super(RevisionTree,
95
self)._get_rules_searcher(default_searcher)
96
return self._rules_searcher
99
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
101
def __init__(self, repository, inv, revision_id):
102
RevisionTree.__init__(self, repository, revision_id)
103
self._inventory = inv
105
def get_file_mtime(self, file_id, path=None):
106
inv, inv_file_id = self._unpack_file_id(file_id)
107
ie = inv[inv_file_id]
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]
109
revision = self._repository.get_revision(ie.revision)
110
except errors.NoSuchRevision:
111
raise errors.FileTimestampUnavailable(self.id2path(file_id))
112
return revision.timestamp
92
114
def get_file_size(self, file_id):
93
"""See Tree.get_file_size"""
94
return self._inventory[file_id].text_size
115
inv, inv_file_id = self._unpack_file_id(file_id)
116
return inv[inv_file_id].text_size
96
118
def get_file_sha1(self, file_id, path=None, stat_value=None):
97
ie = self._inventory[file_id]
119
inv, inv_file_id = self._unpack_file_id(file_id)
120
ie = inv[inv_file_id]
98
121
if ie.kind == "file":
99
122
return ie.text_sha1
102
def get_file_mtime(self, file_id, path=None):
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
125
def get_file_revision(self, file_id, path=None):
126
inv, inv_file_id = self._unpack_file_id(file_id)
127
ie = inv[inv_file_id]
110
130
def is_executable(self, file_id, path=None):
111
ie = self._inventory[file_id]
131
inv, inv_file_id = self._unpack_file_id(file_id)
132
ie = inv[inv_file_id]
112
133
if ie.kind != "file":
114
135
return ie.executable
116
137
def has_filename(self, filename):
117
return bool(self.inventory.path2id(filename))
138
return bool(self.path2id(filename))
119
140
def list_files(self, include_root=False, from_dir=None, recursive=True):
120
141
# The only files returned by this are those from the version
122
142
if from_dir is None:
123
143
from_dir_id = None
144
inv = self.root_inventory
125
from_dir_id = inv.path2id(from_dir)
146
inv, from_dir_id = self._path2inv_file_id(from_dir)
126
147
if from_dir_id is None:
127
148
# Directory not versioned
133
154
for path, entry in entries:
134
155
yield path, 'V', entry.kind, entry.file_id, entry
136
def get_symlink_target(self, file_id):
137
ie = self._inventory[file_id]
157
def get_symlink_target(self, file_id, path=None):
158
inv, inv_file_id = self._unpack_file_id(file_id)
159
ie = inv[inv_file_id]
138
160
# Inventories store symlink targets in unicode
139
161
return ie.symlink_target
141
163
def get_reference_revision(self, file_id, path=None):
142
return self.inventory[file_id].reference_revision
164
inv, inv_file_id = self._unpack_file_id(file_id)
165
return inv[inv_file_id].reference_revision
144
167
def get_root_id(self):
145
if self.inventory.root:
146
return self.inventory.root.file_id
168
if self.root_inventory.root:
169
return self.root_inventory.root.file_id
148
171
def kind(self, file_id):
149
return self._inventory[file_id].kind
172
inv, inv_file_id = self._unpack_file_id(file_id)
173
return inv[inv_file_id].kind
151
175
def path_content_summary(self, path):
152
176
"""See Tree.path_content_summary."""
153
id = self.inventory.path2id(path)
177
inv, file_id = self._path2inv_file_id(path)
155
179
return ('missing', None, None, None)
156
entry = self._inventory[id]
157
181
kind = entry.kind
158
182
if kind == 'file':
159
183
return (kind, entry.text_size, entry.executable, entry.text_sha1)
217
222
if dir[2] == _directory:
218
223
pending.append(dir)
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
225
def iter_files_bytes(self, desired_files):
226
"""See Tree.iter_files_bytes.
228
This version is implemented on top of Repository.iter_files_bytes"""
229
repo_desired_files = [(f, self.get_file_revision(f), i)
230
for f, i in desired_files]
232
for result in self._repository.iter_files_bytes(repo_desired_files):
234
except errors.RevisionNotPresent, e:
235
raise errors.NoSuchFile(e.file_id)
237
def annotate_iter(self, file_id,
238
default_revision=revision.CURRENT_REVISION):
239
"""See Tree.annotate_iter"""
240
text_key = (file_id, self.get_file_revision(file_id))
241
annotator = self._repository.texts.get_annotator()
242
annotations = annotator.annotate_flat(text_key)
243
return [(key[-1], line) for key, line in annotations]
245
def __eq__(self, other):
248
if isinstance(other, InventoryRevisionTree):
249
return (self.root_inventory == other.root_inventory)
252
def __ne__(self, other):
253
return not (self == other)
256
raise ValueError('not hashable')
228
259
class InterCHKRevisionTree(tree.InterTree):
added
removed
bzrlib/revisiontree.py
