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
28
class RevisionTree(tree.Tree):
21
from bzrlib.tree import Tree
24
class RevisionTree(Tree):
29
25
"""Tree viewing a previous revision.
31
27
File text can be retrieved from the text store.
29
TODO: Some kind of `__repr__` method, but a good one
30
probably means knowing the branch and revision number,
31
or at least passing a description to the constructor.
34
34
def __init__(self, branch, inv, revision_id):
35
# for compatability the 'branch' parameter has not been renamed to
35
# for compatability the 'branch' parameter has not been renamed to
36
36
# repository at this point. However, we should change RevisionTree's
37
# construction to always be via Repository and not via direct
37
# construction to always be via Repository and not via direct
38
38
# construction - this will mean that we can change the constructor
39
39
# with much less chance of breaking client code.
40
40
self._repository = branch
41
self._weave_store = branch.weave_store
41
42
self._inventory = inv
42
43
self._revision_id = revision_id
43
self._rules_searcher = None
45
def supports_tree_reference(self):
46
return getattr(self._repository._format, "supports_tree_reference",
49
45
def get_parent_ids(self):
50
46
"""See Tree.get_parent_ids.
52
48
A RevisionTree's parents match the revision graph.
54
if self._revision_id in (None, revision.NULL_REVISION):
50
if self._revision_id not in (None, 'null:'):
57
51
parent_ids = self._repository.get_revision(
58
52
self._revision_id).parent_ids
61
57
def get_revision_id(self):
62
58
"""Return the revision id associated with this tree."""
63
59
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)
69
def get_file(self, file_id, path=None):
61
def get_weave(self, file_id):
62
return self._weave_store.get_weave(file_id,
63
self._repository.get_transaction())
65
def get_file_lines(self, file_id):
66
ie = self._inventory[file_id]
67
weave = self.get_weave(file_id)
68
return weave.get_lines(ie.revision)
70
def get_file_text(self, file_id):
71
return ''.join(self.get_file_lines(file_id))
73
def get_file(self, file_id):
70
74
return StringIO(self.get_file_text(file_id))
72
def iter_files_bytes(self, desired_files):
73
"""See Tree.iter_files_bytes.
75
This version is implemented on top of Repository.extract_files_bytes"""
76
repo_desired_files = [(f, self.inventory[f].revision, i)
77
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)
84
def annotate_iter(self, file_id,
85
default_revision=revision.CURRENT_REVISION):
86
"""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]
92
76
def get_file_size(self, file_id):
93
"""See Tree.get_file_size"""
94
77
return self._inventory[file_id].text_size
96
def get_file_sha1(self, file_id, path=None, stat_value=None):
79
def get_file_sha1(self, file_id, path=None):
97
80
ie = self._inventory[file_id]
98
81
if ie.kind == "file":
99
82
return ie.text_sha1
102
85
def get_file_mtime(self, file_id, path=None):
103
86
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))
87
revision = self._repository.get_revision(ie.revision)
108
88
return revision.timestamp
110
90
def is_executable(self, file_id, path=None):
111
91
ie = self._inventory[file_id]
112
92
if ie.kind != "file":
94
return self._inventory[file_id].executable
116
96
def has_filename(self, filename):
117
97
return bool(self.inventory.path2id(filename))
119
def list_files(self, include_root=False, from_dir=None, recursive=True):
99
def list_files(self, include_root=False):
120
100
# 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:
101
entries = self.inventory.iter_entries()
102
# skip the root for compatability with the current apis.
103
if self.inventory.root is not None and not include_root:
131
104
# skip the root for compatability with the current apis.
133
106
for path, entry in entries:
136
109
def get_symlink_target(self, file_id):
137
110
ie = self._inventory[file_id]
138
# Inventories store symlink targets in unicode
139
return ie.symlink_target
141
def get_reference_revision(self, file_id, path=None):
142
return self.inventory[file_id].reference_revision
144
def get_root_id(self):
145
if self.inventory.root:
146
return self.inventory.root.file_id
111
return ie.symlink_target;
148
113
def kind(self, file_id):
149
114
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
def _comparison_data(self, entry, path):
167
return None, False, None
168
return entry.kind, entry.executable, None
170
def _file_size(self, entry, stat_value):
171
return entry.text_size
173
def _get_ancestors(self, default_revision):
174
return set(self._repository.get_ancestry(self._revision_id,
177
116
def lock_read(self):
178
117
self._repository.lock_read()
181
return '<%s instance at %x, rev_id=%r>' % (
182
self.__class__.__name__, id(self), self._revision_id)
184
119
def unlock(self):
185
120
self._repository.unlock()
187
def walkdirs(self, prefix=""):
188
_directory = 'directory'
190
top_id = inv.path2id(prefix)
194
pending = [(prefix, '', _directory, None, top_id, None)]
197
currentdir = pending.pop()
198
# 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
200
relroot = currentdir[0] + '/'
203
# FIXME: stash the node in pending
204
entry = inv[currentdir[4]]
205
for name, child in entry.sorted_children():
206
toppath = relroot + name
207
dirblock.append((toppath, name, child.kind, None,
208
child.file_id, child.kind
210
yield (currentdir[0], entry.file_id), dirblock
211
# push the user specified dirs from dirblock
212
for dir in reversed(dirblock):
213
if dir[2] == _directory:
216
def _get_rules_searcher(self, default_searcher):
217
"""See Tree._get_rules_searcher."""
218
if self._rules_searcher is None:
219
self._rules_searcher = super(RevisionTree,
220
self)._get_rules_searcher(default_searcher)
221
return self._rules_searcher
224
class InterCHKRevisionTree(tree.InterTree):
225
"""Fast path optimiser for RevisionTrees with CHK inventories."""
228
def is_compatible(source, target):
229
if (isinstance(source, RevisionTree)
230
and isinstance(target, RevisionTree)):
232
# Only CHK inventories have id_to_entry attribute
233
source.inventory.id_to_entry
234
target.inventory.id_to_entry
236
except AttributeError:
240
def iter_changes(self, include_unchanged=False,
241
specific_files=None, pb=None, extra_trees=[],
242
require_versioned=True, want_unversioned=False):
243
lookup_trees = [self.source]
245
lookup_trees.extend(extra_trees)
246
# The ids of items we need to examine to insure delta consistency.
247
precise_file_ids = set()
248
discarded_changes = {}
249
if specific_files == []:
250
specific_file_ids = []
252
specific_file_ids = self.target.paths2ids(specific_files,
253
lookup_trees, require_versioned=require_versioned)
254
# FIXME: It should be possible to delegate include_unchanged handling
255
# to CHKInventory.iter_changes and do a better job there -- vila
257
changed_file_ids = set()
258
for result in self.target.inventory.iter_changes(self.source.inventory):
259
if specific_file_ids is not None:
261
if file_id not in specific_file_ids:
262
# A change from the whole tree that we don't want to show yet.
263
# We may find that we need to show it for delta consistency, so
265
discarded_changes[result[0]] = result
267
new_parent_id = result[4][1]
268
precise_file_ids.add(new_parent_id)
270
changed_file_ids.add(result[0])
271
if specific_file_ids is not None:
272
for result in self._handle_precise_ids(precise_file_ids,
273
changed_file_ids, discarded_changes=discarded_changes):
275
if include_unchanged:
276
# CHKMap avoid being O(tree), so we go to O(tree) only if
278
# Now walk the whole inventory, excluding the already yielded
280
changed_file_ids = set(changed_file_ids)
281
for relpath, entry in self.target.inventory.iter_entries():
282
if (specific_file_ids is not None
283
and not entry.file_id in specific_file_ids):
285
if not entry.file_id in changed_file_ids:
286
yield (entry.file_id,
287
(relpath, relpath), # Not renamed
288
False, # Not modified
289
(True, True), # Still versioned
290
(entry.parent_id, entry.parent_id),
291
(entry.name, entry.name),
292
(entry.kind, entry.kind),
293
(entry.executable, entry.executable))
296
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
