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
self._revision_id = osutils.safe_revision_id(revision_id)
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
@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))
84
def get_file(self, file_id):
85
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):
86
72
return StringIO(self.get_file_text(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)
88
86
def annotate_iter(self, file_id,
89
87
default_revision=revision.CURRENT_REVISION):
90
88
"""See Tree.annotate_iter"""
91
file_id = osutils.safe_file_id(file_id)
92
w = self._get_weave(file_id)
93
return w.annotate_iter(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]
95
93
def get_file_size(self, file_id):
96
file_id = osutils.safe_file_id(file_id)
94
"""See Tree.get_file_size"""
97
95
return self._inventory[file_id].text_size
99
97
def get_file_sha1(self, file_id, path=None, stat_value=None):
100
file_id = osutils.safe_file_id(file_id)
101
98
ie = self._inventory[file_id]
102
99
if ie.kind == "file":
103
100
return ie.text_sha1
106
103
def get_file_mtime(self, file_id, path=None):
107
file_id = osutils.safe_file_id(file_id)
108
104
ie = self._inventory[file_id]
109
105
revision = self._repository.get_revision(ie.revision)
110
106
return revision.timestamp
112
108
def is_executable(self, file_id, path=None):
113
file_id = osutils.safe_file_id(file_id)
114
109
ie = self._inventory[file_id]
115
110
if ie.kind != "file":
130
125
yield path, 'V', entry.kind, entry.file_id, entry
132
127
def get_symlink_target(self, file_id):
133
file_id = osutils.safe_file_id(file_id)
134
128
ie = self._inventory[file_id]
135
return ie.symlink_target;
129
# Inventories store symlink targets in unicode
130
return ie.symlink_target
137
132
def get_reference_revision(self, file_id, path=None):
138
133
return self.inventory[file_id].reference_revision
142
137
return self.inventory.root.file_id
144
139
def kind(self, file_id):
145
file_id = osutils.safe_file_id(file_id)
146
140
return self._inventory[file_id].kind
142
def path_content_summary(self, path):
143
"""See Tree.path_content_summary."""
144
id = self.inventory.path2id(path)
146
return ('missing', None, None, None)
147
entry = self._inventory[id]
150
return (kind, entry.text_size, entry.executable, entry.text_sha1)
151
elif kind == 'symlink':
152
return (kind, None, None, entry.symlink_target)
154
return (kind, None, None, None)
148
156
def _comparison_data(self, entry, path):
149
157
if entry is None:
150
158
return None, False, None
151
159
return entry.kind, entry.executable, None
153
161
def _file_size(self, entry, stat_value):
154
assert entry.text_size is not None
155
162
return entry.text_size
157
164
def _get_ancestors(self, default_revision):
196
203
for dir in reversed(dirblock):
197
204
if dir[2] == _directory:
198
205
pending.append(dir)
207
def _get_rules_searcher(self, default_searcher):
208
"""See Tree._get_rules_searcher."""
209
if self._rules_searcher is None:
210
self._rules_searcher = super(RevisionTree,
211
self)._get_rules_searcher(default_searcher)
212
return self._rules_searcher
215
class InterCHKRevisionTree(tree.InterTree):
216
"""Fast path optimiser for RevisionTrees with CHK inventories."""
219
def is_compatible(source, target):
220
if (isinstance(source, RevisionTree)
221
and isinstance(target, RevisionTree)):
223
# Only CHK inventories have id_to_entry attribute
224
source.inventory.id_to_entry
225
target.inventory.id_to_entry
227
except AttributeError:
231
def iter_changes(self, include_unchanged=False,
232
specific_files=None, pb=None, extra_trees=[],
233
require_versioned=True, want_unversioned=False):
234
lookup_trees = [self.source]
236
lookup_trees.extend(extra_trees)
237
if specific_files == []:
238
specific_file_ids = []
240
specific_file_ids = self.target.paths2ids(specific_files,
241
lookup_trees, require_versioned=require_versioned)
243
# FIXME: It should be possible to delegate include_unchanged handling
244
# to CHKInventory.iter_changes and do a better job there -- vila
246
if include_unchanged:
247
changed_file_ids = []
248
for result in self.target.inventory.iter_changes(self.source.inventory):
249
if (specific_file_ids is not None
250
and not result[0] in specific_file_ids):
251
# CHKMap.iter_changes is clean and fast. Better filter out
252
# the specific files *after* it did its job.
255
if include_unchanged:
256
# Keep track of yielded results (cheaper than building the
258
changed_file_ids.append(result[0])
259
if include_unchanged:
260
# CHKMap avoid being O(tree), so we go to O(tree) only if
262
# Now walk the whole inventory, excluding the already yielded
264
changed_file_ids = set(changed_file_ids)
265
for relpath, entry in self.target.inventory.iter_entries():
266
if (specific_file_ids is not None
267
and not entry.file_id in specific_file_ids):
269
if not entry.file_id in changed_file_ids:
270
yield (entry.file_id,
271
(relpath, relpath), # Not renamed
272
False, # Not modified
273
(True, True), # Still versioned
274
(entry.parent_id, entry.parent_id),
275
(entry.name, entry.name),
276
(entry.kind, entry.kind),
277
(entry.executable, entry.executable))
280
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
