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):
25
from bzrlib.tree import Tree
28
class RevisionTree(Tree):
31
29
"""Tree viewing a previous revision.
33
31
File text can be retrieved from the text store.
36
34
def __init__(self, branch, inv, revision_id):
37
# for compatability the 'branch' parameter has not been renamed to
35
# for compatability the 'branch' parameter has not been renamed to
38
36
# repository at this point. However, we should change RevisionTree's
39
# construction to always be via Repository and not via direct
37
# construction to always be via Repository and not via direct
40
38
# construction - this will mean that we can change the constructor
41
39
# with much less chance of breaking client code.
42
40
self._repository = branch
41
self._weave_store = branch.weave_store
43
42
self._inventory = inv
44
self._revision_id = revision_id
45
self._rules_searcher = None
43
self._revision_id = osutils.safe_revision_id(revision_id)
47
45
def supports_tree_reference(self):
58
56
parent_ids = self._repository.get_revision(
59
57
self._revision_id).parent_ids
62
60
def get_revision_id(self):
63
61
"""Return the revision id associated with this tree."""
64
62
return self._revision_id
66
def get_file_text(self, file_id, path=None):
67
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
68
return ''.join(content)
70
def get_file(self, file_id, path=None):
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)
71
81
return StringIO(self.get_file_text(file_id))
73
def iter_files_bytes(self, desired_files):
74
"""See Tree.iter_files_bytes.
76
This version is implemented on top of Repository.extract_files_bytes"""
77
repo_desired_files = [(f, self.inventory[f].revision, i)
78
for f, i in desired_files]
80
for result in self._repository.iter_files_bytes(repo_desired_files):
82
except errors.RevisionNotPresent, e:
83
raise errors.NoSuchFile(e.revision_id)
85
def annotate_iter(self, file_id,
86
default_revision=revision.CURRENT_REVISION):
83
def annotate_iter(self, file_id):
87
84
"""See Tree.annotate_iter"""
88
text_key = (file_id, self.inventory[file_id].revision)
89
annotations = self._repository.texts.annotate(text_key)
90
return [(key[-1], line) for key, line in annotations]
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)
92
89
def get_file_size(self, file_id):
93
"""See Tree.get_file_size"""
90
file_id = osutils.safe_file_id(file_id)
94
91
return self._inventory[file_id].text_size
96
93
def get_file_sha1(self, file_id, path=None, stat_value=None):
94
file_id = osutils.safe_file_id(file_id)
97
95
ie = self._inventory[file_id]
98
96
if ie.kind == "file":
99
97
return ie.text_sha1
102
100
def get_file_mtime(self, file_id, path=None):
101
file_id = osutils.safe_file_id(file_id)
103
102
ie = self._inventory[file_id]
104
103
revision = self._repository.get_revision(ie.revision)
105
104
return revision.timestamp
107
106
def is_executable(self, file_id, path=None):
107
file_id = osutils.safe_file_id(file_id)
108
108
ie = self._inventory[file_id]
109
109
if ie.kind != "file":
135
136
return self.inventory.root.file_id
137
138
def kind(self, file_id):
139
file_id = osutils.safe_file_id(file_id)
138
140
return self._inventory[file_id].kind
140
def path_content_summary(self, path):
141
"""See Tree.path_content_summary."""
142
id = self.inventory.path2id(path)
144
return ('missing', None, None, None)
145
entry = self._inventory[id]
148
return (kind, entry.text_size, entry.executable, entry.text_sha1)
149
elif kind == 'symlink':
150
return (kind, None, None, entry.symlink_target)
152
return (kind, None, None, None)
154
142
def _comparison_data(self, entry, path):
155
143
if entry is None:
156
144
return None, False, None
157
145
return entry.kind, entry.executable, None
159
147
def _file_size(self, entry, stat_value):
148
assert entry.text_size is not None
160
149
return entry.text_size
162
def _get_ancestors(self, default_revision):
163
return set(self._repository.get_ancestry(self._revision_id,
166
151
def lock_read(self):
167
152
self._repository.lock_read()
201
186
for dir in reversed(dirblock):
202
187
if dir[2] == _directory:
203
188
pending.append(dir)
205
def _get_rules_searcher(self, default_searcher):
206
"""See Tree._get_rules_searcher."""
207
if self._rules_searcher is None:
208
self._rules_searcher = super(RevisionTree,
209
self)._get_rules_searcher(default_searcher)
210
return self._rules_searcher
213
class InterCHKRevisionTree(tree.InterTree):
214
"""Fast path optimiser for RevisionTrees with CHK inventories."""
217
def is_compatible(source, target):
218
if (isinstance(source, RevisionTree)
219
and isinstance(target, RevisionTree)):
221
# Only CHK inventories have id_to_entry attribute
222
source.inventory.id_to_entry
223
target.inventory.id_to_entry
225
except AttributeError:
229
def iter_changes(self, include_unchanged=False,
230
specific_files=None, pb=None, extra_trees=[],
231
require_versioned=True, want_unversioned=False):
232
lookup_trees = [self.source]
234
lookup_trees.extend(extra_trees)
235
if specific_files == []:
236
specific_file_ids = []
238
specific_file_ids = self.target.paths2ids(specific_files,
239
lookup_trees, require_versioned=require_versioned)
241
# FIXME: It should be possible to delegate include_unchanged handling
242
# to CHKInventory.iter_changes and do a better job there -- vila
244
if include_unchanged:
245
changed_file_ids = []
246
for result in self.target.inventory.iter_changes(self.source.inventory):
247
if (specific_file_ids is not None
248
and not result[0] in specific_file_ids):
249
# CHKMap.iter_changes is clean and fast. Better filter out
250
# the specific files *after* it did its job.
253
if include_unchanged:
254
# Keep track of yielded results (cheaper than building the
256
changed_file_ids.append(result[0])
257
if include_unchanged:
258
# CHKMap avoid being O(tree), so we go to O(tree) only if
260
# Now walk the whole inventory, excluding the already yielded
262
changed_file_ids = set(changed_file_ids)
263
for relpath, entry in self.target.inventory.iter_entries():
264
if (specific_file_ids is not None
265
and not entry.file_id in specific_file_ids):
267
if not entry.file_id in changed_file_ids:
268
yield (entry.file_id,
269
(relpath, relpath), # Not renamed
270
False, # Not modified
271
(True, True), # Still versioned
272
(entry.parent_id, entry.parent_id),
273
(entry.name, entry.name),
274
(entry.kind, entry.kind),
275
(entry.executable, entry.executable))
278
tree.InterTree.register_optimiser(InterCHKRevisionTree)
added
removed
bzrlib/revisiontree.py
