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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""RevisionTree - a Tree implementation backed by repository data for a revision."""
19
19
from cStringIO import StringIO
21
21
from bzrlib import (
25
from bzrlib.tree import Tree
28
class RevisionTree(Tree):
30
class RevisionTree(tree.Tree):
29
31
"""Tree viewing a previous revision.
31
33
File text can be retrieved from the text store.
34
36
def __init__(self, branch, inv, revision_id):
35
# for compatability the 'branch' parameter has not been renamed to
37
# for compatability the 'branch' parameter has not been renamed to
36
38
# repository at this point. However, we should change RevisionTree's
37
# construction to always be via Repository and not via direct
39
# construction to always be via Repository and not via direct
38
40
# construction - this will mean that we can change the constructor
39
41
# with much less chance of breaking client code.
40
42
self._repository = branch
41
self._weave_store = branch.weave_store
42
43
self._inventory = inv
43
self._revision_id = osutils.safe_revision_id(revision_id)
44
self._revision_id = revision_id
45
self._rules_searcher = None
47
def supports_tree_reference(self):
48
return getattr(self._repository._format, "supports_tree_reference",
45
51
def get_parent_ids(self):
46
52
"""See Tree.get_parent_ids.
53
59
parent_ids = self._repository.get_revision(
54
60
self._revision_id).parent_ids
57
63
def get_revision_id(self):
58
64
"""Return the revision id associated with this tree."""
59
65
return self._revision_id
61
def get_weave(self, file_id):
62
file_id = osutils.safe_file_id(file_id)
63
return self._weave_store.get_weave(file_id,
64
self._repository.get_transaction())
66
def get_file_lines(self, file_id):
67
file_id = osutils.safe_file_id(file_id)
68
ie = self._inventory[file_id]
69
weave = self.get_weave(file_id)
70
return weave.get_lines(ie.revision)
72
def get_file_text(self, file_id):
73
file_id = osutils.safe_file_id(file_id)
74
return ''.join(self.get_file_lines(file_id))
76
def get_file(self, file_id):
77
file_id = osutils.safe_file_id(file_id)
67
def get_file_text(self, file_id, path=None):
68
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
69
return ''.join(content)
71
def get_file(self, file_id, path=None):
78
72
return StringIO(self.get_file_text(file_id))
80
def annotate_iter(self, file_id):
74
def iter_files_bytes(self, desired_files):
75
"""See Tree.iter_files_bytes.
77
This version is implemented on top of Repository.extract_files_bytes"""
78
repo_desired_files = [(f, self.inventory[f].revision, i)
79
for f, i in desired_files]
81
for result in self._repository.iter_files_bytes(repo_desired_files):
83
except errors.RevisionNotPresent, e:
84
raise errors.NoSuchFile(e.revision_id)
86
def annotate_iter(self, file_id,
87
default_revision=revision.CURRENT_REVISION):
81
88
"""See Tree.annotate_iter"""
82
file_id = osutils.safe_file_id(file_id)
83
w = self.get_weave(file_id)
84
return w.annotate_iter(self.inventory[file_id].revision)
89
text_key = (file_id, self.inventory[file_id].revision)
90
annotator = self._repository.texts.get_annotator()
91
annotations = annotator.annotate_flat(text_key)
92
return [(key[-1], line) for key, line in annotations]
86
94
def get_file_size(self, file_id):
87
file_id = osutils.safe_file_id(file_id)
95
"""See Tree.get_file_size"""
88
96
return self._inventory[file_id].text_size
90
98
def get_file_sha1(self, file_id, path=None, stat_value=None):
91
file_id = osutils.safe_file_id(file_id)
92
99
ie = self._inventory[file_id]
93
100
if ie.kind == "file":
94
101
return ie.text_sha1
97
104
def get_file_mtime(self, file_id, path=None):
98
file_id = osutils.safe_file_id(file_id)
99
105
ie = self._inventory[file_id]
100
106
revision = self._repository.get_revision(ie.revision)
101
107
return revision.timestamp
103
109
def is_executable(self, file_id, path=None):
104
file_id = osutils.safe_file_id(file_id)
105
110
ie = self._inventory[file_id]
106
111
if ie.kind != "file":
110
115
def has_filename(self, filename):
111
116
return bool(self.inventory.path2id(filename))
113
def list_files(self, include_root=False):
118
def list_files(self, include_root=False, from_dir=None, recursive=True):
114
119
# The only files returned by this are those from the version
115
entries = self.inventory.iter_entries()
116
# skip the root for compatability with the current apis.
117
if self.inventory.root is not None and not include_root:
124
from_dir_id = inv.path2id(from_dir)
125
if from_dir_id is None:
126
# Directory not versioned
128
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
129
if inv.root is not None and not include_root and from_dir is None:
118
130
# skip the root for compatability with the current apis.
120
132
for path, entry in entries:
121
133
yield path, 'V', entry.kind, entry.file_id, entry
123
135
def get_symlink_target(self, file_id):
124
file_id = osutils.safe_file_id(file_id)
125
136
ie = self._inventory[file_id]
126
return ie.symlink_target;
137
# Inventories store symlink targets in unicode
138
return ie.symlink_target
140
def get_reference_revision(self, file_id, path=None):
141
return self.inventory[file_id].reference_revision
143
def get_root_id(self):
144
if self.inventory.root:
145
return self.inventory.root.file_id
128
147
def kind(self, file_id):
129
file_id = osutils.safe_file_id(file_id)
130
148
return self._inventory[file_id].kind
150
def path_content_summary(self, path):
151
"""See Tree.path_content_summary."""
152
id = self.inventory.path2id(path)
154
return ('missing', None, None, None)
155
entry = self._inventory[id]
158
return (kind, entry.text_size, entry.executable, entry.text_sha1)
159
elif kind == 'symlink':
160
return (kind, None, None, entry.symlink_target)
162
return (kind, None, None, None)
132
164
def _comparison_data(self, entry, path):
133
165
if entry is None:
134
166
return None, False, None
135
167
return entry.kind, entry.executable, None
137
169
def _file_size(self, entry, stat_value):
138
assert entry.text_size is not None
139
170
return entry.text_size
172
def _get_ancestors(self, default_revision):
173
return set(self._repository.get_ancestry(self._revision_id,
141
176
def lock_read(self):
142
177
self._repository.lock_read()
176
211
for dir in reversed(dirblock):
177
212
if dir[2] == _directory:
178
213
pending.append(dir)
215
def _get_rules_searcher(self, default_searcher):
216
"""See Tree._get_rules_searcher."""
217
if self._rules_searcher is None:
218
self._rules_searcher = super(RevisionTree,
219
self)._get_rules_searcher(default_searcher)
220
return self._rules_searcher
223
class InterCHKRevisionTree(tree.InterTree):
224
"""Fast path optimiser for RevisionTrees with CHK inventories."""
227
def is_compatible(source, target):
228
if (isinstance(source, RevisionTree)
229
and isinstance(target, RevisionTree)):
231
# Only CHK inventories have id_to_entry attribute
232
source.inventory.id_to_entry
233
target.inventory.id_to_entry
235
except AttributeError:
239
def iter_changes(self, include_unchanged=False,
240
specific_files=None, pb=None, extra_trees=[],
241
require_versioned=True, want_unversioned=False):
242
lookup_trees = [self.source]
244
lookup_trees.extend(extra_trees)
245
# The ids of items we need to examine to insure delta consistency.
246
precise_file_ids = set()
247
discarded_changes = {}
248
if specific_files == []:
249
specific_file_ids = []
251
specific_file_ids = self.target.paths2ids(specific_files,
252
lookup_trees, require_versioned=require_versioned)
253
# FIXME: It should be possible to delegate include_unchanged handling
254
# to CHKInventory.iter_changes and do a better job there -- vila
256
changed_file_ids = set()
257
for result in self.target.inventory.iter_changes(self.source.inventory):
258
if specific_file_ids is not None:
260
if file_id not in specific_file_ids:
261
# A change from the whole tree that we don't want to show yet.
262
# We may find that we need to show it for delta consistency, so
264
discarded_changes[result[0]] = result
266
new_parent_id = result[4][1]
267
precise_file_ids.add(new_parent_id)
269
changed_file_ids.add(result[0])
270
if specific_file_ids is not None:
271
for result in self._handle_precise_ids(precise_file_ids,
272
changed_file_ids, discarded_changes=discarded_changes):
274
if include_unchanged:
275
# CHKMap avoid being O(tree), so we go to O(tree) only if
277
# Now walk the whole inventory, excluding the already yielded
279
changed_file_ids = set(changed_file_ids)
280
for relpath, entry in self.target.inventory.iter_entries():
281
if (specific_file_ids is not None
282
and not entry.file_id in specific_file_ids):
284
if not entry.file_id in changed_file_ids:
285
yield (entry.file_id,
286
(relpath, relpath), # Not renamed
287
False, # Not modified
288
(True, True), # Still versioned
289
(entry.parent_id, entry.parent_id),
290
(entry.name, entry.name),
291
(entry.kind, entry.kind),
292
(entry.executable, entry.executable))
295
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
