13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""RevisionTree - a Tree implementation backed by repository data for a revision."""
19
from __future__ import absolute_import
21
19
from cStringIO import StringIO
23
21
from bzrlib import (
30
class RevisionTree(tree.Tree):
25
from bzrlib.tree import Tree
28
class RevisionTree(Tree):
31
29
"""Tree viewing a previous revision.
33
31
File text can be retrieved from the text store.
36
def __init__(self, repository, revision_id):
37
self._repository = repository
38
self._revision_id = revision_id
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
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._weave_store = branch.weave_store
43
self._revision_id = osutils.safe_revision_id(revision_id)
45
45
def supports_tree_reference(self):
46
return getattr(self._repository._format, "supports_tree_reference",
49
48
def get_parent_ids(self):
50
49
"""See Tree.get_parent_ids.
57
56
parent_ids = self._repository.get_revision(
58
57
self._revision_id).parent_ids
61
60
def get_revision_id(self):
62
61
"""Return the revision id associated with this tree."""
63
62
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)
69
def get_file_text(self, file_id, path=None):
70
for (identifier, content) in self.iter_files_bytes([(file_id, None)]):
71
ret = "".join(content)
74
def get_file(self, file_id, path=None):
64
def get_weave(self, file_id):
65
file_id = osutils.safe_file_id(file_id)
66
return self._weave_store.get_weave(file_id,
67
self._repository.get_transaction())
69
def get_file_lines(self, file_id):
70
file_id = osutils.safe_file_id(file_id)
71
ie = self._inventory[file_id]
72
weave = self.get_weave(file_id)
73
return weave.get_lines(ie.revision)
75
def get_file_text(self, file_id):
76
file_id = osutils.safe_file_id(file_id)
77
return ''.join(self.get_file_lines(file_id))
79
def get_file(self, file_id):
80
file_id = osutils.safe_file_id(file_id)
75
81
return StringIO(self.get_file_text(file_id))
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
ie = self._inventory[file_id]
108
revision = self._repository.get_revision(ie.revision)
109
except errors.NoSuchRevision:
110
raise errors.FileTimestampUnavailable(self.id2path(file_id))
111
return revision.timestamp
83
def annotate_iter(self, file_id):
84
"""See Tree.annotate_iter"""
85
file_id = osutils.safe_file_id(file_id)
86
w = self.get_weave(file_id)
87
return w.annotate_iter(self.inventory[file_id].revision)
113
89
def get_file_size(self, file_id):
90
file_id = osutils.safe_file_id(file_id)
114
91
return self._inventory[file_id].text_size
116
93
def get_file_sha1(self, file_id, path=None, stat_value=None):
94
file_id = osutils.safe_file_id(file_id)
117
95
ie = self._inventory[file_id]
118
96
if ie.kind == "file":
119
97
return ie.text_sha1
122
def get_file_revision(self, file_id, path=None):
100
def get_file_mtime(self, file_id, path=None):
101
file_id = osutils.safe_file_id(file_id)
123
102
ie = self._inventory[file_id]
103
revision = self._repository.get_revision(ie.revision)
104
return revision.timestamp
126
106
def is_executable(self, file_id, path=None):
107
file_id = osutils.safe_file_id(file_id)
127
108
ie = self._inventory[file_id]
128
109
if ie.kind != "file":
130
111
return ie.executable
132
113
def has_filename(self, filename):
133
114
return bool(self.inventory.path2id(filename))
135
def list_files(self, include_root=False, from_dir=None, recursive=True):
116
def list_files(self, include_root=False):
136
117
# The only files returned by this are those from the version
141
from_dir_id = inv.path2id(from_dir)
142
if from_dir_id is None:
143
# Directory not versioned
145
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
146
if inv.root is not None and not include_root and from_dir is None:
118
entries = self.inventory.iter_entries()
119
# skip the root for compatability with the current apis.
120
if self.inventory.root is not None and not include_root:
147
121
# skip the root for compatability with the current apis.
149
123
for path, entry in entries:
150
124
yield path, 'V', entry.kind, entry.file_id, entry
152
def get_symlink_target(self, file_id, path=None):
126
def get_symlink_target(self, file_id):
127
file_id = osutils.safe_file_id(file_id)
153
128
ie = self._inventory[file_id]
154
# Inventories store symlink targets in unicode
155
return ie.symlink_target
129
return ie.symlink_target;
157
131
def get_reference_revision(self, file_id, path=None):
158
132
return self.inventory[file_id].reference_revision
162
136
return self.inventory.root.file_id
164
138
def kind(self, file_id):
139
file_id = osutils.safe_file_id(file_id)
165
140
return self._inventory[file_id].kind
167
def path_content_summary(self, path):
168
"""See Tree.path_content_summary."""
169
id = self.inventory.path2id(path)
171
return ('missing', None, None, None)
172
entry = self._inventory[id]
175
return (kind, entry.text_size, entry.executable, entry.text_sha1)
176
elif kind == 'symlink':
177
return (kind, None, None, entry.symlink_target)
179
return (kind, None, None, None)
181
142
def _comparison_data(self, entry, path):
182
143
if entry is None:
183
144
return None, False, None
184
145
return entry.kind, entry.executable, None
186
147
def _file_size(self, entry, stat_value):
148
assert entry.text_size is not None
187
149
return entry.text_size
152
self._repository.lock_read()
155
return '<%s instance at %x, rev_id=%r>' % (
156
self.__class__.__name__, id(self), self._revision_id)
159
self._repository.unlock()
189
161
def walkdirs(self, prefix=""):
190
162
_directory = 'directory'
191
163
inv = self.inventory
214
186
for dir in reversed(dirblock):
215
187
if dir[2] == _directory:
216
188
pending.append(dir)
218
def iter_files_bytes(self, desired_files):
219
"""See Tree.iter_files_bytes.
221
This version is implemented on top of Repository.iter_files_bytes"""
222
repo_desired_files = [(f, self.get_file_revision(f), i)
223
for f, i in desired_files]
225
for result in self._repository.iter_files_bytes(repo_desired_files):
227
except errors.RevisionNotPresent, e:
228
raise errors.NoSuchFile(e.file_id)
230
def annotate_iter(self, file_id,
231
default_revision=revision.CURRENT_REVISION):
232
"""See Tree.annotate_iter"""
233
text_key = (file_id, self.get_file_revision(file_id))
234
annotator = self._repository.texts.get_annotator()
235
annotations = annotator.annotate_flat(text_key)
236
return [(key[-1], line) for key, line in annotations]
239
class InterCHKRevisionTree(tree.InterTree):
240
"""Fast path optimiser for RevisionTrees with CHK inventories."""
243
def is_compatible(source, target):
244
if (isinstance(source, RevisionTree)
245
and isinstance(target, RevisionTree)):
247
# Only CHK inventories have id_to_entry attribute
248
source.inventory.id_to_entry
249
target.inventory.id_to_entry
251
except AttributeError:
255
def iter_changes(self, include_unchanged=False,
256
specific_files=None, pb=None, extra_trees=[],
257
require_versioned=True, want_unversioned=False):
258
lookup_trees = [self.source]
260
lookup_trees.extend(extra_trees)
261
# The ids of items we need to examine to insure delta consistency.
262
precise_file_ids = set()
263
discarded_changes = {}
264
if specific_files == []:
265
specific_file_ids = []
267
specific_file_ids = self.target.paths2ids(specific_files,
268
lookup_trees, require_versioned=require_versioned)
269
# FIXME: It should be possible to delegate include_unchanged handling
270
# to CHKInventory.iter_changes and do a better job there -- vila
272
changed_file_ids = set()
273
for result in self.target.inventory.iter_changes(self.source.inventory):
274
if specific_file_ids is not None:
276
if file_id not in specific_file_ids:
277
# A change from the whole tree that we don't want to show yet.
278
# We may find that we need to show it for delta consistency, so
280
discarded_changes[result[0]] = result
282
new_parent_id = result[4][1]
283
precise_file_ids.add(new_parent_id)
285
changed_file_ids.add(result[0])
286
if specific_file_ids is not None:
287
for result in self._handle_precise_ids(precise_file_ids,
288
changed_file_ids, discarded_changes=discarded_changes):
290
if include_unchanged:
291
# CHKMap avoid being O(tree), so we go to O(tree) only if
293
# Now walk the whole inventory, excluding the already yielded
295
changed_file_ids = set(changed_file_ids)
296
for relpath, entry in self.target.inventory.iter_entries():
297
if (specific_file_ids is not None
298
and not entry.file_id in specific_file_ids):
300
if not entry.file_id in changed_file_ids:
301
yield (entry.file_id,
302
(relpath, relpath), # Not renamed
303
False, # Not modified
304
(True, True), # Still versioned
305
(entry.parent_id, entry.parent_id),
306
(entry.name, entry.name),
307
(entry.kind, entry.kind),
308
(entry.executable, entry.executable))
311
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
