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 (
25
from bzrlib.tree import Tree
28
class RevisionTree(Tree):
28
class RevisionTree(tree.Tree):
29
29
"""Tree viewing a previous revision.
31
31
File text can be retrieved from the text store.
34
def __init__(self, branch, inv, revision_id):
35
# for compatability the 'branch' parameter has not been renamed to
36
# repository at this point. However, we should change RevisionTree's
37
# construction to always be via Repository and not via direct
38
# construction - this will mean that we can change the constructor
39
# with much less chance of breaking client code.
40
self._repository = branch
41
self._weave_store = branch.weave_store
43
self._revision_id = osutils.safe_revision_id(revision_id)
34
def __init__(self, repository, revision_id):
35
self._repository = repository
36
self._revision_id = revision_id
37
self._rules_searcher = None
39
def has_versioned_directories(self):
40
"""See `Tree.has_versioned_directories`."""
41
return self._repository._format.supports_versioned_directories
45
43
def supports_tree_reference(self):
44
return getattr(self._repository._format, "supports_tree_reference",
48
47
def get_parent_ids(self):
49
48
"""See Tree.get_parent_ids.
56
55
parent_ids = self._repository.get_revision(
57
56
self._revision_id).parent_ids
60
59
def get_revision_id(self):
61
60
"""Return the revision id associated with this tree."""
62
61
return self._revision_id
64
def get_weave(self, file_id):
65
file_id = osutils.safe_file_id(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
file_id = osutils.safe_file_id(file_id)
71
ie = self._inventory[file_id]
72
weave = self.get_weave(file_id)
73
return weave.get_lines(ie.revision)
75
def get_file_text(self, file_id):
76
file_id = osutils.safe_file_id(file_id)
77
return ''.join(self.get_file_lines(file_id))
79
def get_file(self, file_id):
80
file_id = osutils.safe_file_id(file_id)
63
def get_file_revision(self, file_id, path=None):
64
"""Return the revision id in which a file was last changed."""
65
raise NotImplementedError(self.get_file_revision)
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):
81
72
return StringIO(self.get_file_text(file_id))
83
def annotate_iter(self, file_id):
84
"""See Tree.annotate_iter"""
85
file_id = osutils.safe_file_id(file_id)
86
w = self.get_weave(file_id)
87
return w.annotate_iter(self.inventory[file_id].revision)
75
return self._repository.is_locked()
78
self._repository.lock_read()
82
return '<%s instance at %x, rev_id=%r>' % (
83
self.__class__.__name__, id(self), self._revision_id)
86
self._repository.unlock()
88
def _get_rules_searcher(self, default_searcher):
89
"""See Tree._get_rules_searcher."""
90
if self._rules_searcher is None:
91
self._rules_searcher = super(RevisionTree,
92
self)._get_rules_searcher(default_searcher)
93
return self._rules_searcher
96
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
98
def __init__(self, repository, inv, revision_id):
99
RevisionTree.__init__(self, repository, revision_id)
100
self._inventory = inv
102
def get_file_mtime(self, file_id, path=None):
103
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))
108
return revision.timestamp
89
110
def get_file_size(self, file_id):
90
file_id = osutils.safe_file_id(file_id)
91
111
return self._inventory[file_id].text_size
93
113
def get_file_sha1(self, file_id, path=None, stat_value=None):
94
file_id = osutils.safe_file_id(file_id)
95
114
ie = self._inventory[file_id]
96
115
if ie.kind == "file":
97
116
return ie.text_sha1
100
def get_file_mtime(self, file_id, path=None):
101
file_id = osutils.safe_file_id(file_id)
119
def get_file_revision(self, file_id, path=None):
102
120
ie = self._inventory[file_id]
103
revision = self._repository.get_revision(ie.revision)
104
return revision.timestamp
106
123
def is_executable(self, file_id, path=None):
107
file_id = osutils.safe_file_id(file_id)
108
124
ie = self._inventory[file_id]
109
125
if ie.kind != "file":
111
127
return ie.executable
113
129
def has_filename(self, filename):
114
130
return bool(self.inventory.path2id(filename))
116
def list_files(self, include_root=False):
132
def list_files(self, include_root=False, from_dir=None, recursive=True):
117
133
# The only files returned by this are those from the version
118
entries = self.inventory.iter_entries()
119
# skip the root for compatability with the current apis.
120
if self.inventory.root is not None and not include_root:
138
from_dir_id = inv.path2id(from_dir)
139
if from_dir_id is None:
140
# Directory not versioned
142
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
143
if inv.root is not None and not include_root and from_dir is None:
121
144
# skip the root for compatability with the current apis.
123
146
for path, entry in entries:
124
147
yield path, 'V', entry.kind, entry.file_id, entry
126
def get_symlink_target(self, file_id):
127
file_id = osutils.safe_file_id(file_id)
149
def get_symlink_target(self, file_id, path=None):
128
150
ie = self._inventory[file_id]
129
return ie.symlink_target;
151
# Inventories store symlink targets in unicode
152
return ie.symlink_target
131
154
def get_reference_revision(self, file_id, path=None):
132
155
return self.inventory[file_id].reference_revision
136
159
return self.inventory.root.file_id
138
161
def kind(self, file_id):
139
file_id = osutils.safe_file_id(file_id)
140
162
return self._inventory[file_id].kind
164
def path_content_summary(self, path):
165
"""See Tree.path_content_summary."""
166
id = self.inventory.path2id(path)
168
return ('missing', None, None, None)
169
entry = self._inventory[id]
172
return (kind, entry.text_size, entry.executable, entry.text_sha1)
173
elif kind == 'symlink':
174
return (kind, None, None, entry.symlink_target)
176
return (kind, None, None, None)
142
178
def _comparison_data(self, entry, path):
143
179
if entry is None:
144
180
return None, False, None
145
181
return entry.kind, entry.executable, None
147
183
def _file_size(self, entry, stat_value):
148
assert entry.text_size is not None
149
184
return entry.text_size
152
self._repository.lock_read()
155
return '<%s instance at %x, rev_id=%r>' % (
156
self.__class__.__name__, id(self), self._revision_id)
159
self._repository.unlock()
161
186
def walkdirs(self, prefix=""):
162
187
_directory = 'directory'
163
188
inv = self.inventory
186
211
for dir in reversed(dirblock):
187
212
if dir[2] == _directory:
188
213
pending.append(dir)
215
def iter_files_bytes(self, desired_files):
216
"""See Tree.iter_files_bytes.
218
This version is implemented on top of Repository.extract_files_bytes"""
219
repo_desired_files = [(f, self.get_file_revision(f), i)
220
for f, i in desired_files]
222
for result in self._repository.iter_files_bytes(repo_desired_files):
224
except errors.RevisionNotPresent, e:
225
raise errors.NoSuchFile(e.revision_id)
227
def annotate_iter(self, file_id,
228
default_revision=revision.CURRENT_REVISION):
229
"""See Tree.annotate_iter"""
230
text_key = (file_id, self.get_file_revision(file_id))
231
annotator = self._repository.texts.get_annotator()
232
annotations = annotator.annotate_flat(text_key)
233
return [(key[-1], line) for key, line in annotations]
236
class InterCHKRevisionTree(tree.InterTree):
237
"""Fast path optimiser for RevisionTrees with CHK inventories."""
240
def is_compatible(source, target):
241
if (isinstance(source, RevisionTree)
242
and isinstance(target, RevisionTree)):
244
# Only CHK inventories have id_to_entry attribute
245
source.inventory.id_to_entry
246
target.inventory.id_to_entry
248
except AttributeError:
252
def iter_changes(self, include_unchanged=False,
253
specific_files=None, pb=None, extra_trees=[],
254
require_versioned=True, want_unversioned=False):
255
lookup_trees = [self.source]
257
lookup_trees.extend(extra_trees)
258
# The ids of items we need to examine to insure delta consistency.
259
precise_file_ids = set()
260
discarded_changes = {}
261
if specific_files == []:
262
specific_file_ids = []
264
specific_file_ids = self.target.paths2ids(specific_files,
265
lookup_trees, require_versioned=require_versioned)
266
# FIXME: It should be possible to delegate include_unchanged handling
267
# to CHKInventory.iter_changes and do a better job there -- vila
269
changed_file_ids = set()
270
for result in self.target.inventory.iter_changes(self.source.inventory):
271
if specific_file_ids is not None:
273
if file_id not in specific_file_ids:
274
# A change from the whole tree that we don't want to show yet.
275
# We may find that we need to show it for delta consistency, so
277
discarded_changes[result[0]] = result
279
new_parent_id = result[4][1]
280
precise_file_ids.add(new_parent_id)
282
changed_file_ids.add(result[0])
283
if specific_file_ids is not None:
284
for result in self._handle_precise_ids(precise_file_ids,
285
changed_file_ids, discarded_changes=discarded_changes):
287
if include_unchanged:
288
# CHKMap avoid being O(tree), so we go to O(tree) only if
290
# Now walk the whole inventory, excluding the already yielded
292
changed_file_ids = set(changed_file_ids)
293
for relpath, entry in self.target.inventory.iter_entries():
294
if (specific_file_ids is not None
295
and not entry.file_id in specific_file_ids):
297
if not entry.file_id in changed_file_ids:
298
yield (entry.file_id,
299
(relpath, relpath), # Not renamed
300
False, # Not modified
301
(True, True), # Still versioned
302
(entry.parent_id, entry.parent_id),
303
(entry.name, entry.name),
304
(entry.kind, entry.kind),
305
(entry.executable, entry.executable))
308
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
