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 (
26
from bzrlib.tree import Tree
29
class RevisionTree(Tree):
30
class RevisionTree(tree.Tree):
30
31
"""Tree viewing a previous revision.
32
33
File text can be retrieved from the text store.
35
36
def __init__(self, branch, inv, revision_id):
36
# for compatability the 'branch' parameter has not been renamed to
37
# for compatability the 'branch' parameter has not been renamed to
37
38
# repository at this point. However, we should change RevisionTree's
38
# construction to always be via Repository and not via direct
39
# construction to always be via Repository and not via direct
39
40
# construction - this will mean that we can change the constructor
40
41
# with much less chance of breaking client code.
41
42
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
46
47
def supports_tree_reference(self):
48
return getattr(self._repository._format, "supports_tree_reference",
49
51
def get_parent_ids(self):
50
52
"""See Tree.get_parent_ids.
57
59
parent_ids = self._repository.get_revision(
58
60
self._revision_id).parent_ids
61
63
def get_revision_id(self):
62
64
"""Return the revision id associated with this tree."""
63
65
return self._revision_id
65
def _get_weave(self, 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
ie = self._inventory[file_id]
71
weave = self._get_weave(file_id)
72
return weave.get_lines(ie.revision)
74
def get_file_text(self, file_id):
75
return ''.join(self.get_file_lines(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)
77
71
def get_file(self, file_id, path=None):
78
72
return StringIO(self.get_file_text(file_id))
80
74
def iter_files_bytes(self, desired_files):
81
"""See Tree.extract_files_bytes.
75
"""See Tree.iter_files_bytes.
83
77
This version is implemented on top of Repository.extract_files_bytes"""
84
78
repo_desired_files = [(f, self.inventory[f].revision, i)
85
79
for f, i in desired_files]
86
return self._repository.iter_files_bytes(repo_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)
88
86
def annotate_iter(self, file_id,
89
87
default_revision=revision.CURRENT_REVISION):
90
88
"""See Tree.annotate_iter"""
91
w = self._get_weave(file_id)
92
return w.annotate(self.inventory[file_id].revision)
89
text_key = (file_id, self.inventory[file_id].revision)
90
annotations = self._repository.texts.annotate(text_key)
91
return [(key[-1], line) for key, line in annotations]
94
93
def get_file_size(self, file_id):
95
94
"""See Tree.get_file_size"""
115
114
def has_filename(self, filename):
116
115
return bool(self.inventory.path2id(filename))
118
def list_files(self, include_root=False):
117
def list_files(self, include_root=False, from_dir=None, recursive=True):
119
118
# The only files returned by this are those from the version
120
entries = self.inventory.iter_entries()
121
# skip the root for compatability with the current apis.
122
if self.inventory.root is not None and not include_root:
123
from_dir_id = inv.path2id(from_dir)
124
if from_dir_id is None:
125
# Directory not versioned
127
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
128
if inv.root is not None and not include_root and from_dir is None:
123
129
# skip the root for compatability with the current apis.
125
131
for path, entry in entries:
203
210
for dir in reversed(dirblock):
204
211
if dir[2] == _directory:
205
212
pending.append(dir)
214
def _get_rules_searcher(self, default_searcher):
215
"""See Tree._get_rules_searcher."""
216
if self._rules_searcher is None:
217
self._rules_searcher = super(RevisionTree,
218
self)._get_rules_searcher(default_searcher)
219
return self._rules_searcher
222
class InterCHKRevisionTree(tree.InterTree):
223
"""Fast path optimiser for RevisionTrees with CHK inventories."""
226
def is_compatible(source, target):
227
if (isinstance(source, RevisionTree)
228
and isinstance(target, RevisionTree)):
230
# Only CHK inventories have id_to_entry attribute
231
source.inventory.id_to_entry
232
target.inventory.id_to_entry
234
except AttributeError:
238
def iter_changes(self, include_unchanged=False,
239
specific_files=None, pb=None, extra_trees=[],
240
require_versioned=True, want_unversioned=False):
241
lookup_trees = [self.source]
243
lookup_trees.extend(extra_trees)
244
if specific_files == []:
245
specific_file_ids = []
247
specific_file_ids = self.target.paths2ids(specific_files,
248
lookup_trees, require_versioned=require_versioned)
250
# FIXME: It should be possible to delegate include_unchanged handling
251
# to CHKInventory.iter_changes and do a better job there -- vila
253
if include_unchanged:
254
changed_file_ids = []
255
for result in self.target.inventory.iter_changes(self.source.inventory):
256
if (specific_file_ids is not None
257
and not result[0] in specific_file_ids):
258
# CHKMap.iter_changes is clean and fast. Better filter out
259
# the specific files *after* it did its job.
262
if include_unchanged:
263
# Keep track of yielded results (cheaper than building the
265
changed_file_ids.append(result[0])
266
if include_unchanged:
267
# CHKMap avoid being O(tree), so we go to O(tree) only if
269
# Now walk the whole inventory, excluding the already yielded
271
changed_file_ids = set(changed_file_ids)
272
for relpath, entry in self.target.inventory.iter_entries():
273
if (specific_file_ids is not None
274
and not entry.file_id in specific_file_ids):
276
if not entry.file_id in changed_file_ids:
277
yield (entry.file_id,
278
(relpath, relpath), # Not renamed
279
False, # Not modified
280
(True, True), # Still versioned
281
(entry.parent_id, entry.parent_id),
282
(entry.name, entry.name),
283
(entry.kind, entry.kind),
284
(entry.executable, entry.executable))
287
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
