~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
6110.6.1 by Jelmer Vernooij
Add Tree.has_versioned_directories.
39
    def has_versioned_directories(self):
40
        """See `Tree.has_versioned_directories`."""
41
        return self._repository._format.supports_versioned_directories
42
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
43
    def supports_tree_reference(self):
4370.3.2 by Ian Clatworthy
apply jam's review feedback
44
        return getattr(self._repository._format, "supports_tree_reference",
45
            False)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
46
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
47
    def get_parent_ids(self):
48
        """See Tree.get_parent_ids.
49
50
        A RevisionTree's parents match the revision graph.
51
        """
1908.11.3 by Robert Collins
Merge bzr.dev
52
        if self._revision_id in (None, revision.NULL_REVISION):
53
            parent_ids = []
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
54
        else:
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
55
            parent_ids = self._repository.get_revision(
56
                self._revision_id).parent_ids
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
57
        return parent_ids
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
58
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
59
    def get_revision_id(self):
60
        """Return the revision id associated with this tree."""
61
        return self._revision_id
62
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
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)
66
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
67
    def get_file_text(self, file_id, path=None):
6280.10.14 by Jelmer Vernooij
cope with slightly different behaviour.
68
        for (identifier, content) in self.iter_files_bytes([(file_id, None)]):
69
            ret = "".join(content)
70
        return ret
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
71
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
72
    def get_file(self, file_id, path=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
73
        return StringIO(self.get_file_text(file_id))
74
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
75
    def is_locked(self):
76
        return self._repository.is_locked()
77
78
    def lock_read(self):
79
        self._repository.lock_read()
80
        return self
81
82
    def __repr__(self):
83
        return '<%s instance at %x, rev_id=%r>' % (
84
            self.__class__.__name__, id(self), self._revision_id)
85
86
    def unlock(self):
87
        self._repository.unlock()
88
89
    def _get_rules_searcher(self, default_searcher):
90
        """See Tree._get_rules_searcher."""
91
        if self._rules_searcher is None:
92
            self._rules_searcher = super(RevisionTree,
93
                self)._get_rules_searcher(default_searcher)
94
        return self._rules_searcher
95
96
97
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
98
99
    def __init__(self, repository, inv, revision_id):
100
        RevisionTree.__init__(self, repository, revision_id)
101
        self._inventory = inv
102
103
    def get_file_mtime(self, file_id, path=None):
104
        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.
105
        try:
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
106
            revision = self._repository.get_revision(ie.revision)
107
        except errors.NoSuchRevision:
108
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
109
        return revision.timestamp
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
110
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
111
    def get_file_size(self, file_id):
112
        return self._inventory[file_id].text_size
113
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
114
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
115
        ie = self._inventory[file_id]
116
        if ie.kind == "file":
117
            return ie.text_sha1
118
        return None
119
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
120
    def get_file_revision(self, file_id, path=None):
121
        ie = self._inventory[file_id]
122
        return ie.revision
123
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
124
    def is_executable(self, file_id, path=None):
125
        ie = self._inventory[file_id]
126
        if ie.kind != "file":
5050.57.1 by Aaron Bentley
Make is_executable treat symlinks and directories the same across tree types.
127
            return False
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
128
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
129
130
    def has_filename(self, filename):
131
        return bool(self.inventory.path2id(filename))
132
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
133
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
134
        # 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
135
        inv = self.inventory
136
        if from_dir is None:
137
            from_dir_id = None
138
        else:
139
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
140
            if from_dir_id is None:
141
                # Directory not versioned
142
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
143
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
144
        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
145
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
146
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
147
        for path, entry in entries:
148
            yield path, 'V', entry.kind, entry.file_id, entry
149
5858.1.1 by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target.
150
    def get_symlink_target(self, file_id, path=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
151
        ie = self._inventory[file_id]
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
152
        # Inventories store symlink targets in unicode
153
        return ie.symlink_target
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
154
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.
155
    def get_reference_revision(self, file_id, path=None):
156
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
157
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
158
    def get_root_id(self):
159
        if self.inventory.root:
160
            return self.inventory.root.file_id
161
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
162
    def kind(self, file_id):
163
        return self._inventory[file_id].kind
164
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
165
    def path_content_summary(self, path):
166
        """See Tree.path_content_summary."""
167
        id = self.inventory.path2id(path)
168
        if id is None:
169
            return ('missing', None, None, None)
170
        entry = self._inventory[id]
171
        kind = entry.kind
172
        if kind == 'file':
173
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
174
        elif kind == 'symlink':
175
            return (kind, None, None, entry.symlink_target)
176
        else:
177
            return (kind, None, None, None)
178
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
179
    def _comparison_data(self, entry, path):
180
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
181
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
182
        return entry.kind, entry.executable, None
183
184
    def _file_size(self, entry, stat_value):
185
        return entry.text_size
186
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
187
    def walkdirs(self, prefix=""):
188
        _directory = 'directory'
189
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
190
        top_id = inv.path2id(prefix)
191
        if top_id is None:
192
            pending = []
193
        else:
194
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
195
        while pending:
196
            dirblock = []
197
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
198
            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
199
            if currentdir[0]:
200
                relroot = currentdir[0] + '/'
201
            else:
202
                relroot = ""
203
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
204
            entry = inv[currentdir[4]]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
205
            for name, child in entry.sorted_children():
206
                toppath = relroot + name
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
207
                dirblock.append((toppath, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
208
                    child.file_id, child.kind
209
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
210
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
211
            # push the user specified dirs from dirblock
212
            for dir in reversed(dirblock):
213
                if dir[2] == _directory:
214
                    pending.append(dir)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
215
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
216
    def iter_files_bytes(self, desired_files):
217
        """See Tree.iter_files_bytes.
218
6280.10.17 by Jelmer Vernooij
Fix NoSuchFile error message, method name of Repository.iter_file_bytes.
219
        This version is implemented on top of Repository.iter_files_bytes"""
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
220
        repo_desired_files = [(f, self.get_file_revision(f), i)
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
221
                              for f, i in desired_files]
222
        try:
223
            for result in self._repository.iter_files_bytes(repo_desired_files):
224
                yield result
225
        except errors.RevisionNotPresent, e:
6280.10.17 by Jelmer Vernooij
Fix NoSuchFile error message, method name of Repository.iter_file_bytes.
226
            raise errors.NoSuchFile(e.file_id)
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
227
228
    def annotate_iter(self, file_id,
229
                      default_revision=revision.CURRENT_REVISION):
230
        """See Tree.annotate_iter"""
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
231
        text_key = (file_id, self.get_file_revision(file_id))
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
232
        annotator = self._repository.texts.get_annotator()
233
        annotations = annotator.annotate_flat(text_key)
234
        return [(key[-1], line) for key, line in annotations]
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
235
236
237
class InterCHKRevisionTree(tree.InterTree):
238
    """Fast path optimiser for RevisionTrees with CHK inventories."""
239
240
    @staticmethod
241
    def is_compatible(source, target):
242
        if (isinstance(source, RevisionTree)
243
            and isinstance(target, RevisionTree)):
244
            try:
245
                # Only CHK inventories have id_to_entry attribute
246
                source.inventory.id_to_entry
247
                target.inventory.id_to_entry
248
                return True
249
            except AttributeError:
250
                pass
251
        return False
252
253
    def iter_changes(self, include_unchanged=False,
254
                     specific_files=None, pb=None, extra_trees=[],
255
                     require_versioned=True, want_unversioned=False):
256
        lookup_trees = [self.source]
257
        if extra_trees:
258
             lookup_trees.extend(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
259
        # The ids of items we need to examine to insure delta consistency.
260
        precise_file_ids = set()
261
        discarded_changes = {}
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
262
        if specific_files == []:
263
            specific_file_ids = []
264
        else:
265
            specific_file_ids = self.target.paths2ids(specific_files,
266
                lookup_trees, require_versioned=require_versioned)
267
        # FIXME: It should be possible to delegate include_unchanged handling
268
        # to CHKInventory.iter_changes and do a better job there -- vila
269
        # 20090304
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
270
        changed_file_ids = set()
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
271
        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.
272
            if specific_file_ids is not None:
273
                file_id = result[0]
274
                if file_id not in specific_file_ids:
275
                    # A change from the whole tree that we don't want to show yet.
276
                    # We may find that we need to show it for delta consistency, so
277
                    # stash it.
278
                    discarded_changes[result[0]] = result
279
                    continue
280
                new_parent_id = result[4][1]
281
                precise_file_ids.add(new_parent_id)
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
282
            yield result
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
283
            changed_file_ids.add(result[0])
284
        if specific_file_ids is not None:
285
            for result in self._handle_precise_ids(precise_file_ids,
286
                changed_file_ids, discarded_changes=discarded_changes):
287
                yield result
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
288
        if include_unchanged:
289
            # CHKMap avoid being O(tree), so we go to O(tree) only if
290
            # required to.
291
            # Now walk the whole inventory, excluding the already yielded
292
            # file ids
293
            changed_file_ids = set(changed_file_ids)
294
            for relpath, entry in self.target.inventory.iter_entries():
295
                if (specific_file_ids is not None
296
                    and not entry.file_id in specific_file_ids):
297
                    continue
298
                if not entry.file_id in changed_file_ids:
299
                    yield (entry.file_id,
300
                           (relpath, relpath), # Not renamed
301
                           False, # Not modified
302
                           (True, True), # Still  versioned
303
                           (entry.parent_id, entry.parent_id),
304
                           (entry.name, entry.name),
305
                           (entry.kind, entry.kind),
306
                           (entry.executable, entry.executable))
307
308
309
tree.InterTree.register_optimiser(InterCHKRevisionTree)