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 (
30
class RevisionTree(tree.Tree):
26
from bzrlib.tree import Tree
29
class RevisionTree(Tree):
31
30
"""Tree viewing a previous revision.
33
32
File text can be retrieved from the text store.
36
35
def __init__(self, branch, inv, revision_id):
37
# for compatability the 'branch' parameter has not been renamed to
36
# for compatability the 'branch' parameter has not been renamed to
38
37
# repository at this point. However, we should change RevisionTree's
39
# construction to always be via Repository and not via direct
38
# construction to always be via Repository and not via direct
40
39
# construction - this will mean that we can change the constructor
41
40
# with much less chance of breaking client code.
42
41
self._repository = branch
42
self._weave_store = branch.weave_store
43
43
self._inventory = inv
44
44
self._revision_id = revision_id
45
self._rules_searcher = None
47
46
def supports_tree_reference(self):
48
return getattr(self._repository._format, "supports_tree_reference",
51
49
def get_parent_ids(self):
52
50
"""See Tree.get_parent_ids.
59
57
parent_ids = self._repository.get_revision(
60
58
self._revision_id).parent_ids
63
61
def get_revision_id(self):
64
62
"""Return the revision id associated with this tree."""
65
63
return self._revision_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)
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
return self._weave_store.get_weave(file_id,
71
self._repository.get_transaction())
73
def get_file_lines(self, file_id):
74
ie = self._inventory[file_id]
75
weave = self._get_weave(file_id)
76
return weave.get_lines(ie.revision)
78
def get_file_text(self, file_id):
79
return ''.join(self.get_file_lines(file_id))
71
81
def get_file(self, file_id, path=None):
72
82
return StringIO(self.get_file_text(file_id))
74
84
def iter_files_bytes(self, desired_files):
75
"""See Tree.iter_files_bytes.
85
"""See Tree.extract_files_bytes.
77
87
This version is implemented on top of Repository.extract_files_bytes"""
78
88
repo_desired_files = [(f, self.inventory[f].revision, i)
79
89
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)
90
return self._repository.iter_files_bytes(repo_desired_files)
86
92
def annotate_iter(self, file_id,
87
93
default_revision=revision.CURRENT_REVISION):
88
94
"""See Tree.annotate_iter"""
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]
95
w = self._get_weave(file_id)
96
return w.annotate(self.inventory[file_id].revision)
94
98
def get_file_size(self, file_id):
95
"""See Tree.get_file_size"""
96
99
return self._inventory[file_id].text_size
98
101
def get_file_sha1(self, file_id, path=None, stat_value=None):
115
118
def has_filename(self, filename):
116
119
return bool(self.inventory.path2id(filename))
118
def list_files(self, include_root=False, from_dir=None, recursive=True):
121
def list_files(self, include_root=False):
119
122
# The only files returned by this are those from the version
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:
123
entries = self.inventory.iter_entries()
124
# skip the root for compatability with the current apis.
125
if self.inventory.root is not None and not include_root:
130
126
# skip the root for compatability with the current apis.
132
128
for path, entry in entries:
211
207
for dir in reversed(dirblock):
212
208
if dir[2] == _directory:
213
209
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
