~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2006-2010 Canonical Ltd
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
16
17
"""RevisionTree - a Tree implementation backed by repository data for a revision."""
18
19
from cStringIO import StringIO
20
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
21
from bzrlib import (
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
22
    errors,
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
23
    revision,
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
24
    tree,
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
25
    )
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
26
27
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
28
class RevisionTree(tree.Tree):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
29
    """Tree viewing a previous revision.
30
31
    File text can be retrieved from the text store.
32
    """
3008.1.13 by Michael Hudson
merge bzr.dev
33
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
34
    def __init__(self, repository, revision_id):
35
        self._repository = repository
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
36
        self._revision_id = revision_id
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
37
        self._rules_searcher = None
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
38
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
39
    def supports_tree_reference(self):
4370.3.2 by Ian Clatworthy
apply jam's review feedback
40
        return getattr(self._repository._format, "supports_tree_reference",
41
            False)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
42
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
43
    def get_parent_ids(self):
44
        """See Tree.get_parent_ids.
45
46
        A RevisionTree's parents match the revision graph.
47
        """
1908.11.3 by Robert Collins
Merge bzr.dev
48
        if self._revision_id in (None, revision.NULL_REVISION):
49
            parent_ids = []
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
50
        else:
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
51
            parent_ids = self._repository.get_revision(
52
                self._revision_id).parent_ids
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
53
        return parent_ids
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
54
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
55
    def get_revision_id(self):
56
        """Return the revision id associated with this tree."""
57
        return self._revision_id
58
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
59
    def get_file_text(self, file_id, path=None):
4202.1.1 by John Arbash Meinel
Update Repository.iter_files_bytes() to return an iterable of bytestrings.
60
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
61
        return ''.join(content)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
62
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
63
    def get_file(self, file_id, path=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
64
        return StringIO(self.get_file_text(file_id))
65
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
66
    def is_locked(self):
67
        return self._repository.is_locked()
68
69
    def lock_read(self):
70
        self._repository.lock_read()
71
        return self
72
73
    def __repr__(self):
74
        return '<%s instance at %x, rev_id=%r>' % (
75
            self.__class__.__name__, id(self), self._revision_id)
76
77
    def unlock(self):
78
        self._repository.unlock()
79
80
    def _get_rules_searcher(self, default_searcher):
81
        """See Tree._get_rules_searcher."""
82
        if self._rules_searcher is None:
83
            self._rules_searcher = super(RevisionTree,
84
                self)._get_rules_searcher(default_searcher)
85
        return self._rules_searcher
86
87
88
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
89
90
    def __init__(self, repository, inv, revision_id):
91
        RevisionTree.__init__(self, repository, revision_id)
92
        self._inventory = inv
93
94
    def get_file_mtime(self, file_id, path=None):
95
        ie = self._inventory[file_id]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
96
        try:
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
97
            revision = self._repository.get_revision(ie.revision)
98
        except errors.NoSuchRevision:
99
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
100
        return revision.timestamp
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
101
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
102
    def get_file_size(self, file_id):
103
        return self._inventory[file_id].text_size
104
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
105
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
106
        ie = self._inventory[file_id]
107
        if ie.kind == "file":
108
            return ie.text_sha1
109
        return None
110
111
    def is_executable(self, file_id, path=None):
112
        ie = self._inventory[file_id]
113
        if ie.kind != "file":
5050.57.1 by Aaron Bentley
Make is_executable treat symlinks and directories the same across tree types.
114
            return False
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
115
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
116
117
    def has_filename(self, filename):
118
        return bool(self.inventory.path2id(filename))
119
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
120
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
121
        # The only files returned by this are those from the version
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
122
        inv = self.inventory
123
        if from_dir is None:
124
            from_dir_id = None
125
        else:
126
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
127
            if from_dir_id is None:
128
                # Directory not versioned
129
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
130
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
131
        if inv.root is not None and not include_root and from_dir is None:
1910.2.56 by Aaron Bentley
More work on bundles
132
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
133
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
134
        for path, entry in entries:
135
            yield path, 'V', entry.kind, entry.file_id, entry
136
137
    def get_symlink_target(self, file_id):
138
        ie = self._inventory[file_id]
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
139
        # Inventories store symlink targets in unicode
140
        return ie.symlink_target
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
141
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
142
    def get_reference_revision(self, file_id, path=None):
143
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
144
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
145
    def get_root_id(self):
146
        if self.inventory.root:
147
            return self.inventory.root.file_id
148
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
149
    def kind(self, file_id):
150
        return self._inventory[file_id].kind
151
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
152
    def path_content_summary(self, path):
153
        """See Tree.path_content_summary."""
154
        id = self.inventory.path2id(path)
155
        if id is None:
156
            return ('missing', None, None, None)
157
        entry = self._inventory[id]
158
        kind = entry.kind
159
        if kind == 'file':
160
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
161
        elif kind == 'symlink':
162
            return (kind, None, None, entry.symlink_target)
163
        else:
164
            return (kind, None, None, None)
165
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
166
    def _comparison_data(self, entry, path):
167
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
168
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
169
        return entry.kind, entry.executable, None
170
171
    def _file_size(self, entry, stat_value):
172
        return entry.text_size
173
1551.15.46 by Aaron Bentley
Move plan merge to tree
174
    def _get_ancestors(self, default_revision):
175
        return set(self._repository.get_ancestry(self._revision_id,
176
                                                 topo_sorted=False))
177
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
178
    def walkdirs(self, prefix=""):
179
        _directory = 'directory'
180
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
181
        top_id = inv.path2id(prefix)
182
        if top_id is None:
183
            pending = []
184
        else:
185
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
186
        while pending:
187
            dirblock = []
188
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
189
            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
190
            if currentdir[0]:
191
                relroot = currentdir[0] + '/'
192
            else:
193
                relroot = ""
194
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
195
            entry = inv[currentdir[4]]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
196
            for name, child in entry.sorted_children():
197
                toppath = relroot + name
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
198
                dirblock.append((toppath, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
199
                    child.file_id, child.kind
200
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
201
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
202
            # push the user specified dirs from dirblock
203
            for dir in reversed(dirblock):
204
                if dir[2] == _directory:
205
                    pending.append(dir)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
206
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
207
    def iter_files_bytes(self, desired_files):
208
        """See Tree.iter_files_bytes.
209
210
        This version is implemented on top of Repository.extract_files_bytes"""
211
        repo_desired_files = [(f, self.inventory[f].revision, i)
212
                              for f, i in desired_files]
213
        try:
214
            for result in self._repository.iter_files_bytes(repo_desired_files):
215
                yield result
216
        except errors.RevisionNotPresent, e:
217
            raise errors.NoSuchFile(e.revision_id)
218
219
    def annotate_iter(self, file_id,
220
                      default_revision=revision.CURRENT_REVISION):
221
        """See Tree.annotate_iter"""
222
        text_key = (file_id, self.inventory[file_id].revision)
223
        annotator = self._repository.texts.get_annotator()
224
        annotations = annotator.annotate_flat(text_key)
225
        return [(key[-1], line) for key, line in annotations]
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
226
227
228
class InterCHKRevisionTree(tree.InterTree):
229
    """Fast path optimiser for RevisionTrees with CHK inventories."""
230
231
    @staticmethod
232
    def is_compatible(source, target):
233
        if (isinstance(source, RevisionTree)
234
            and isinstance(target, RevisionTree)):
235
            try:
236
                # Only CHK inventories have id_to_entry attribute
237
                source.inventory.id_to_entry
238
                target.inventory.id_to_entry
239
                return True
240
            except AttributeError:
241
                pass
242
        return False
243
244
    def iter_changes(self, include_unchanged=False,
245
                     specific_files=None, pb=None, extra_trees=[],
246
                     require_versioned=True, want_unversioned=False):
247
        lookup_trees = [self.source]
248
        if extra_trees:
249
             lookup_trees.extend(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
250
        # The ids of items we need to examine to insure delta consistency.
251
        precise_file_ids = set()
252
        discarded_changes = {}
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
253
        if specific_files == []:
254
            specific_file_ids = []
255
        else:
256
            specific_file_ids = self.target.paths2ids(specific_files,
257
                lookup_trees, require_versioned=require_versioned)
258
        # FIXME: It should be possible to delegate include_unchanged handling
259
        # to CHKInventory.iter_changes and do a better job there -- vila
260
        # 20090304
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
261
        changed_file_ids = set()
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
262
        for result in self.target.inventory.iter_changes(self.source.inventory):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
263
            if specific_file_ids is not None:
264
                file_id = result[0]
265
                if file_id not in specific_file_ids:
266
                    # A change from the whole tree that we don't want to show yet.
267
                    # We may find that we need to show it for delta consistency, so
268
                    # stash it.
269
                    discarded_changes[result[0]] = result
270
                    continue
271
                new_parent_id = result[4][1]
272
                precise_file_ids.add(new_parent_id)
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
273
            yield result
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
274
            changed_file_ids.add(result[0])
275
        if specific_file_ids is not None:
276
            for result in self._handle_precise_ids(precise_file_ids,
277
                changed_file_ids, discarded_changes=discarded_changes):
278
                yield result
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
279
        if include_unchanged:
280
            # CHKMap avoid being O(tree), so we go to O(tree) only if
281
            # required to.
282
            # Now walk the whole inventory, excluding the already yielded
283
            # file ids
284
            changed_file_ids = set(changed_file_ids)
285
            for relpath, entry in self.target.inventory.iter_entries():
286
                if (specific_file_ids is not None
287
                    and not entry.file_id in specific_file_ids):
288
                    continue
289
                if not entry.file_id in changed_file_ids:
290
                    yield (entry.file_id,
291
                           (relpath, relpath), # Not renamed
292
                           False, # Not modified
293
                           (True, True), # Still  versioned
294
                           (entry.parent_id, entry.parent_id),
295
                           (entry.name, entry.name),
296
                           (entry.kind, entry.kind),
297
                           (entry.executable, entry.executable))
298
299
300
tree.InterTree.register_optimiser(InterCHKRevisionTree)