~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):
4202.1.1 by John Arbash Meinel
Update Repository.iter_files_bytes() to return an iterable of bytestrings.
68
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
69
        return ''.join(content)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
70
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
71
    def get_file(self, file_id, path=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
72
        return StringIO(self.get_file_text(file_id))
73
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
74
    def is_locked(self):
75
        return self._repository.is_locked()
76
77
    def lock_read(self):
78
        self._repository.lock_read()
79
        return self
80
81
    def __repr__(self):
82
        return '<%s instance at %x, rev_id=%r>' % (
83
            self.__class__.__name__, id(self), self._revision_id)
84
85
    def unlock(self):
86
        self._repository.unlock()
87
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
94
95
96
class InventoryRevisionTree(RevisionTree,tree.InventoryTree):
97
98
    def __init__(self, repository, inv, revision_id):
99
        RevisionTree.__init__(self, repository, revision_id)
100
        self._inventory = inv
101
102
    def get_file_mtime(self, file_id, path=None):
103
        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.
104
        try:
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
105
            revision = self._repository.get_revision(ie.revision)
106
        except errors.NoSuchRevision:
107
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
108
        return revision.timestamp
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
109
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
110
    def get_file_size(self, file_id):
111
        return self._inventory[file_id].text_size
112
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
113
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
114
        ie = self._inventory[file_id]
115
        if ie.kind == "file":
116
            return ie.text_sha1
117
        return None
118
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
119
    def get_file_revision(self, file_id, path=None):
120
        ie = self._inventory[file_id]
121
        return ie.revision
122
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
123
    def is_executable(self, file_id, path=None):
124
        ie = self._inventory[file_id]
125
        if ie.kind != "file":
5050.57.1 by Aaron Bentley
Make is_executable treat symlinks and directories the same across tree types.
126
            return False
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
127
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
128
129
    def has_filename(self, filename):
130
        return bool(self.inventory.path2id(filename))
131
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
132
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
133
        # 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
134
        inv = self.inventory
135
        if from_dir is None:
136
            from_dir_id = None
137
        else:
138
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
139
            if from_dir_id is None:
140
                # Directory not versioned
141
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
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:
1910.2.56 by Aaron Bentley
More work on bundles
144
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
145
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
146
        for path, entry in entries:
147
            yield path, 'V', entry.kind, entry.file_id, entry
148
5858.1.1 by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target.
149
    def get_symlink_target(self, file_id, path=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
150
        ie = self._inventory[file_id]
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
151
        # Inventories store symlink targets in unicode
152
        return ie.symlink_target
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
153
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.
154
    def get_reference_revision(self, file_id, path=None):
155
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
156
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
157
    def get_root_id(self):
158
        if self.inventory.root:
159
            return self.inventory.root.file_id
160
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
161
    def kind(self, file_id):
162
        return self._inventory[file_id].kind
163
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
164
    def path_content_summary(self, path):
165
        """See Tree.path_content_summary."""
166
        id = self.inventory.path2id(path)
167
        if id is None:
168
            return ('missing', None, None, None)
169
        entry = self._inventory[id]
170
        kind = entry.kind
171
        if kind == 'file':
172
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
173
        elif kind == 'symlink':
174
            return (kind, None, None, entry.symlink_target)
175
        else:
176
            return (kind, None, None, None)
177
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
178
    def _comparison_data(self, entry, path):
179
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
180
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
181
        return entry.kind, entry.executable, None
182
183
    def _file_size(self, entry, stat_value):
184
        return entry.text_size
185
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
186
    def walkdirs(self, prefix=""):
187
        _directory = 'directory'
188
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
189
        top_id = inv.path2id(prefix)
190
        if top_id is None:
191
            pending = []
192
        else:
193
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
194
        while pending:
195
            dirblock = []
196
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
197
            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
198
            if currentdir[0]:
199
                relroot = currentdir[0] + '/'
200
            else:
201
                relroot = ""
202
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
203
            entry = inv[currentdir[4]]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
204
            for name, child in entry.sorted_children():
205
                toppath = relroot + name
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
206
                dirblock.append((toppath, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
207
                    child.file_id, child.kind
208
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
209
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
210
            # push the user specified dirs from dirblock
211
            for dir in reversed(dirblock):
212
                if dir[2] == _directory:
213
                    pending.append(dir)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
214
5793.2.2 by Jelmer Vernooij
Split inventory-specific code out of RevisionTree into InventoryRevisionTree.
215
    def iter_files_bytes(self, desired_files):
216
        """See Tree.iter_files_bytes.
217
218
        This version is implemented on top of Repository.extract_files_bytes"""
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
219
        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.
220
                              for f, i in desired_files]
221
        try:
222
            for result in self._repository.iter_files_bytes(repo_desired_files):
223
                yield result
224
        except errors.RevisionNotPresent, e:
225
            raise errors.NoSuchFile(e.revision_id)
226
227
    def annotate_iter(self, file_id,
228
                      default_revision=revision.CURRENT_REVISION):
229
        """See Tree.annotate_iter"""
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
230
        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.
231
        annotator = self._repository.texts.get_annotator()
232
        annotations = annotator.annotate_flat(text_key)
233
        return [(key[-1], line) for key, line in annotations]
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
234
235
236
class InterCHKRevisionTree(tree.InterTree):
237
    """Fast path optimiser for RevisionTrees with CHK inventories."""
238
239
    @staticmethod
240
    def is_compatible(source, target):
241
        if (isinstance(source, RevisionTree)
242
            and isinstance(target, RevisionTree)):
243
            try:
244
                # Only CHK inventories have id_to_entry attribute
245
                source.inventory.id_to_entry
246
                target.inventory.id_to_entry
247
                return True
248
            except AttributeError:
249
                pass
250
        return False
251
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]
256
        if extra_trees:
257
             lookup_trees.extend(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
258
        # The ids of items we need to examine to insure delta consistency.
259
        precise_file_ids = set()
260
        discarded_changes = {}
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
261
        if specific_files == []:
262
            specific_file_ids = []
263
        else:
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
268
        # 20090304
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
269
        changed_file_ids = set()
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
270
        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.
271
            if specific_file_ids is not None:
272
                file_id = result[0]
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
276
                    # stash it.
277
                    discarded_changes[result[0]] = result
278
                    continue
279
                new_parent_id = result[4][1]
280
                precise_file_ids.add(new_parent_id)
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
281
            yield result
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
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):
286
                yield result
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
287
        if include_unchanged:
288
            # CHKMap avoid being O(tree), so we go to O(tree) only if
289
            # required to.
290
            # Now walk the whole inventory, excluding the already yielded
291
            # file ids
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):
296
                    continue
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))
306
307
308
tree.InterTree.register_optimiser(InterCHKRevisionTree)