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
19
from cStringIO import StringIO
21
21
from bzrlib import (
28
class RevisionTree(tree.Tree):
26
from bzrlib.tree import Tree
29
class RevisionTree(Tree):
29
30
"""Tree viewing a previous revision.
31
32
File text can be retrieved from the text store.
34
35
def __init__(self, branch, inv, revision_id):
35
# for compatability the 'branch' parameter has not been renamed to
36
# for compatability the 'branch' parameter has not been renamed to
36
37
# repository at this point. However, we should change RevisionTree's
37
# construction to always be via Repository and not via direct
38
# construction to always be via Repository and not via direct
38
39
# construction - this will mean that we can change the constructor
39
40
# with much less chance of breaking client code.
40
41
self._repository = branch
42
self._weave_store = branch.weave_store
41
43
self._inventory = inv
42
self._revision_id = revision_id
43
self._rules_searcher = None
44
self._revision_id = osutils.safe_revision_id(revision_id)
45
46
def supports_tree_reference(self):
46
return getattr(self._repository._format, "supports_tree_reference",
49
49
def get_parent_ids(self):
50
50
"""See Tree.get_parent_ids.
57
57
parent_ids = self._repository.get_revision(
58
58
self._revision_id).parent_ids
61
61
def get_revision_id(self):
62
62
"""Return the revision id associated with this tree."""
63
63
return self._revision_id
65
def get_file_text(self, file_id, path=None):
66
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
67
return ''.join(content)
65
@symbol_versioning.deprecated_method(symbol_versioning.zero_ninety)
66
def get_weave(self, file_id):
67
return self._get_weave(file_id)
69
def _get_weave(self, file_id):
70
file_id = osutils.safe_file_id(file_id)
71
return self._weave_store.get_weave(file_id,
72
self._repository.get_transaction())
74
def get_file_lines(self, file_id):
75
file_id = osutils.safe_file_id(file_id)
76
ie = self._inventory[file_id]
77
weave = self._get_weave(file_id)
78
return weave.get_lines(ie.revision)
80
def get_file_text(self, file_id):
81
file_id = osutils.safe_file_id(file_id)
82
return ''.join(self.get_file_lines(file_id))
69
84
def get_file(self, file_id, path=None):
85
file_id = osutils.safe_file_id(file_id)
70
86
return StringIO(self.get_file_text(file_id))
72
88
def iter_files_bytes(self, desired_files):
73
"""See Tree.iter_files_bytes.
89
"""See Tree.extract_files_bytes.
75
91
This version is implemented on top of Repository.extract_files_bytes"""
76
92
repo_desired_files = [(f, self.inventory[f].revision, i)
77
93
for f, i in desired_files]
79
for result in self._repository.iter_files_bytes(repo_desired_files):
81
except errors.RevisionNotPresent, e:
82
raise errors.NoSuchFile(e.revision_id)
94
return self._repository.iter_files_bytes(repo_desired_files)
84
96
def annotate_iter(self, file_id,
85
97
default_revision=revision.CURRENT_REVISION):
86
98
"""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]
99
file_id = osutils.safe_file_id(file_id)
100
w = self._get_weave(file_id)
101
return w.annotate_iter(self.inventory[file_id].revision)
92
103
def get_file_size(self, file_id):
93
"""See Tree.get_file_size"""
104
file_id = osutils.safe_file_id(file_id)
94
105
return self._inventory[file_id].text_size
96
107
def get_file_sha1(self, file_id, path=None, stat_value=None):
108
file_id = osutils.safe_file_id(file_id)
97
109
ie = self._inventory[file_id]
98
110
if ie.kind == "file":
99
111
return ie.text_sha1
102
114
def get_file_mtime(self, file_id, path=None):
115
file_id = osutils.safe_file_id(file_id)
103
116
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))
117
revision = self._repository.get_revision(ie.revision)
108
118
return revision.timestamp
110
120
def is_executable(self, file_id, path=None):
121
file_id = osutils.safe_file_id(file_id)
111
122
ie = self._inventory[file_id]
112
123
if ie.kind != "file":
116
127
def has_filename(self, filename):
117
128
return bool(self.inventory.path2id(filename))
119
def list_files(self, include_root=False, from_dir=None, recursive=True):
130
def list_files(self, include_root=False):
120
131
# The only files returned by this are those from the version
125
from_dir_id = inv.path2id(from_dir)
126
if from_dir_id is None:
127
# Directory not versioned
129
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
130
if inv.root is not None and not include_root and from_dir is None:
132
entries = self.inventory.iter_entries()
133
# skip the root for compatability with the current apis.
134
if self.inventory.root is not None and not include_root:
131
135
# skip the root for compatability with the current apis.
133
137
for path, entry in entries:
134
138
yield path, 'V', entry.kind, entry.file_id, entry
136
140
def get_symlink_target(self, file_id):
141
file_id = osutils.safe_file_id(file_id)
137
142
ie = self._inventory[file_id]
138
# Inventories store symlink targets in unicode
139
return ie.symlink_target
143
return ie.symlink_target;
141
145
def get_reference_revision(self, file_id, path=None):
142
146
return self.inventory[file_id].reference_revision
146
150
return self.inventory.root.file_id
148
152
def kind(self, file_id):
153
file_id = osutils.safe_file_id(file_id)
149
154
return self._inventory[file_id].kind
151
def path_content_summary(self, path):
152
"""See Tree.path_content_summary."""
153
id = self.inventory.path2id(path)
155
return ('missing', None, None, None)
156
entry = self._inventory[id]
159
return (kind, entry.text_size, entry.executable, entry.text_sha1)
160
elif kind == 'symlink':
161
return (kind, None, None, entry.symlink_target)
163
return (kind, None, None, None)
165
156
def _comparison_data(self, entry, path):
166
157
if entry is None:
167
158
return None, False, None
168
159
return entry.kind, entry.executable, None
170
161
def _file_size(self, entry, stat_value):
162
assert entry.text_size is not None
171
163
return entry.text_size
173
165
def _get_ancestors(self, default_revision):
174
166
return set(self._repository.get_ancestry(self._revision_id,
175
167
topo_sorted=False))
178
return self._repository.is_locked()
180
169
def lock_read(self):
181
170
self._repository.lock_read()
184
172
def __repr__(self):
185
173
return '<%s instance at %x, rev_id=%r>' % (
216
204
for dir in reversed(dirblock):
217
205
if dir[2] == _directory:
218
206
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
228
class InterCHKRevisionTree(tree.InterTree):
229
"""Fast path optimiser for RevisionTrees with CHK inventories."""
232
def is_compatible(source, target):
233
if (isinstance(source, RevisionTree)
234
and isinstance(target, RevisionTree)):
236
# Only CHK inventories have id_to_entry attribute
237
source.inventory.id_to_entry
238
target.inventory.id_to_entry
240
except AttributeError:
244
def iter_changes(self, include_unchanged=False,
245
specific_files=None, pb=None, extra_trees=[],
246
require_versioned=True, want_unversioned=False):
247
lookup_trees = [self.source]
249
lookup_trees.extend(extra_trees)
250
# The ids of items we need to examine to insure delta consistency.
251
precise_file_ids = set()
252
discarded_changes = {}
253
if specific_files == []:
254
specific_file_ids = []
256
specific_file_ids = self.target.paths2ids(specific_files,
257
lookup_trees, require_versioned=require_versioned)
258
# FIXME: It should be possible to delegate include_unchanged handling
259
# to CHKInventory.iter_changes and do a better job there -- vila
261
changed_file_ids = set()
262
for result in self.target.inventory.iter_changes(self.source.inventory):
263
if specific_file_ids is not None:
265
if file_id not in specific_file_ids:
266
# A change from the whole tree that we don't want to show yet.
267
# We may find that we need to show it for delta consistency, so
269
discarded_changes[result[0]] = result
271
new_parent_id = result[4][1]
272
precise_file_ids.add(new_parent_id)
274
changed_file_ids.add(result[0])
275
if specific_file_ids is not None:
276
for result in self._handle_precise_ids(precise_file_ids,
277
changed_file_ids, discarded_changes=discarded_changes):
279
if include_unchanged:
280
# CHKMap avoid being O(tree), so we go to O(tree) only if
282
# Now walk the whole inventory, excluding the already yielded
284
changed_file_ids = set(changed_file_ids)
285
for relpath, entry in self.target.inventory.iter_entries():
286
if (specific_file_ids is not None
287
and not entry.file_id in specific_file_ids):
289
if not entry.file_id in changed_file_ids:
290
yield (entry.file_id,
291
(relpath, relpath), # Not renamed
292
False, # Not modified
293
(True, True), # Still versioned
294
(entry.parent_id, entry.parent_id),
295
(entry.name, entry.name),
296
(entry.kind, entry.kind),
297
(entry.executable, entry.executable))
300
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
