~bzr-pqm/bzr/bzr.dev

2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
1
# Copyright (C) 2005, 2007 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,
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
23
    osutils,
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
24
    revision,
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
25
    symbol_versioning,
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
26
    tree,
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
27
    )
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
28
29
30
class RevisionTree(tree.Tree):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
31
    """Tree viewing a previous revision.
32
33
    File text can be retrieved from the text store.
34
    """
3008.1.13 by Michael Hudson
merge bzr.dev
35
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
36
    def __init__(self, branch, inv, revision_id):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
37
        # for compatability the 'branch' parameter has not been renamed to
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
38
        # repository at this point. However, we should change RevisionTree's
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
39
        # construction to always be via Repository and not via direct
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
40
        # construction - this will mean that we can change the constructor
41
        # with much less chance of breaking client code.
42
        self._repository = branch
43
        self._inventory = inv
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
44
        self._revision_id = revision_id
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
45
        self._rules_searcher = None
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
46
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
47
    def supports_tree_reference(self):
4370.3.2 by Ian Clatworthy
apply jam's review feedback
48
        return getattr(self._repository._format, "supports_tree_reference",
49
            False)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
50
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
51
    def get_parent_ids(self):
52
        """See Tree.get_parent_ids.
53
54
        A RevisionTree's parents match the revision graph.
55
        """
1908.11.3 by Robert Collins
Merge bzr.dev
56
        if self._revision_id in (None, revision.NULL_REVISION):
57
            parent_ids = []
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
58
        else:
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
59
            parent_ids = self._repository.get_revision(
60
                self._revision_id).parent_ids
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
61
        return parent_ids
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
62
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
63
    def get_revision_id(self):
64
        """Return the revision id associated with this tree."""
65
        return self._revision_id
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
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
74
    def iter_files_bytes(self, desired_files):
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.
75
        """See Tree.iter_files_bytes.
2708.1.4 by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes
76
77
        This version is implemented on top of Repository.extract_files_bytes"""
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
78
        repo_desired_files = [(f, self.inventory[f].revision, i)
79
                              for f, i in desired_files]
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.
80
        try:
81
            for result in self._repository.iter_files_bytes(repo_desired_files):
82
                yield result
83
        except errors.RevisionNotPresent, e:
84
            raise errors.NoSuchFile(e.revision_id)
2708.1.4 by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes
85
1551.15.46 by Aaron Bentley
Move plan merge to tree
86
    def annotate_iter(self, file_id,
87
                      default_revision=revision.CURRENT_REVISION):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
88
        """See Tree.annotate_iter"""
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.
89
        text_key = (file_id, self.inventory[file_id].revision)
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
90
        annotator = self._repository.texts.get_annotator()
91
        annotations = annotator.annotate_flat(text_key)
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.
92
        return [(key[-1], line) for key, line in annotations]
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
93
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
94
    def get_file_size(self, file_id):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
95
        """See Tree.get_file_size"""
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
96
        return self._inventory[file_id].text_size
97
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
98
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
99
        ie = self._inventory[file_id]
100
        if ie.kind == "file":
101
            return ie.text_sha1
102
        return None
103
104
    def get_file_mtime(self, file_id, path=None):
105
        ie = self._inventory[file_id]
106
        revision = self._repository.get_revision(ie.revision)
107
        return revision.timestamp
108
109
    def is_executable(self, file_id, path=None):
110
        ie = self._inventory[file_id]
111
        if ie.kind != "file":
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
112
            return None
113
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
114
115
    def has_filename(self, filename):
116
        return bool(self.inventory.path2id(filename))
117
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
118
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
119
        # 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
120
        inv = self.inventory
121
        if from_dir is None:
122
            from_dir_id = None
123
        else:
124
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
125
            if from_dir_id is None:
126
                # Directory not versioned
127
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
128
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
129
        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
130
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
131
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
132
        for path, entry in entries:
133
            yield path, 'V', entry.kind, entry.file_id, entry
134
135
    def get_symlink_target(self, file_id):
136
        ie = self._inventory[file_id]
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
137
        # Inventories store symlink targets in unicode
138
        return ie.symlink_target
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
139
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.
140
    def get_reference_revision(self, file_id, path=None):
141
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
142
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
143
    def get_root_id(self):
144
        if self.inventory.root:
145
            return self.inventory.root.file_id
146
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
147
    def kind(self, file_id):
148
        return self._inventory[file_id].kind
149
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
150
    def path_content_summary(self, path):
151
        """See Tree.path_content_summary."""
152
        id = self.inventory.path2id(path)
153
        if id is None:
154
            return ('missing', None, None, None)
155
        entry = self._inventory[id]
156
        kind = entry.kind
157
        if kind == 'file':
158
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
159
        elif kind == 'symlink':
160
            return (kind, None, None, entry.symlink_target)
161
        else:
162
            return (kind, None, None, None)
163
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
164
    def _comparison_data(self, entry, path):
165
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
166
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
167
        return entry.kind, entry.executable, None
168
169
    def _file_size(self, entry, stat_value):
170
        return entry.text_size
171
1551.15.46 by Aaron Bentley
Move plan merge to tree
172
    def _get_ancestors(self, default_revision):
173
        return set(self._repository.get_ancestry(self._revision_id,
174
                                                 topo_sorted=False))
175
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
176
    def lock_read(self):
177
        self._repository.lock_read()
178
2255.2.119 by Robert Collins
Give RevisionTree a repr method.
179
    def __repr__(self):
180
        return '<%s instance at %x, rev_id=%r>' % (
181
            self.__class__.__name__, id(self), self._revision_id)
182
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
183
    def unlock(self):
184
        self._repository.unlock()
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
215
    def _get_rules_searcher(self, default_searcher):
216
        """See Tree._get_rules_searcher."""
217
        if self._rules_searcher is None:
218
            self._rules_searcher = super(RevisionTree,
219
                self)._get_rules_searcher(default_searcher)
220
        return self._rules_searcher
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
221
222
223
class InterCHKRevisionTree(tree.InterTree):
224
    """Fast path optimiser for RevisionTrees with CHK inventories."""
225
226
    @staticmethod
227
    def is_compatible(source, target):
228
        if (isinstance(source, RevisionTree)
229
            and isinstance(target, RevisionTree)):
230
            try:
231
                # Only CHK inventories have id_to_entry attribute
232
                source.inventory.id_to_entry
233
                target.inventory.id_to_entry
234
                return True
235
            except AttributeError:
236
                pass
237
        return False
238
239
    def iter_changes(self, include_unchanged=False,
240
                     specific_files=None, pb=None, extra_trees=[],
241
                     require_versioned=True, want_unversioned=False):
242
        lookup_trees = [self.source]
243
        if extra_trees:
244
             lookup_trees.extend(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
245
        # The ids of items we need to examine to insure delta consistency.
246
        precise_file_ids = set()
247
        discarded_changes = {}
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
248
        if specific_files == []:
249
            specific_file_ids = []
250
        else:
251
            specific_file_ids = self.target.paths2ids(specific_files,
252
                lookup_trees, require_versioned=require_versioned)
253
        # FIXME: It should be possible to delegate include_unchanged handling
254
        # to CHKInventory.iter_changes and do a better job there -- vila
255
        # 20090304
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
256
        changed_file_ids = set()
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
257
        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.
258
            if specific_file_ids is not None:
259
                file_id = result[0]
260
                if file_id not in specific_file_ids:
261
                    # A change from the whole tree that we don't want to show yet.
262
                    # We may find that we need to show it for delta consistency, so
263
                    # stash it.
264
                    discarded_changes[result[0]] = result
265
                    continue
266
                new_parent_id = result[4][1]
267
                precise_file_ids.add(new_parent_id)
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
268
            yield result
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
269
            changed_file_ids.add(result[0])
270
        if specific_file_ids is not None:
271
            for result in self._handle_precise_ids(precise_file_ids,
272
                changed_file_ids, discarded_changes=discarded_changes):
273
                yield result
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
274
        if include_unchanged:
275
            # CHKMap avoid being O(tree), so we go to O(tree) only if
276
            # required to.
277
            # Now walk the whole inventory, excluding the already yielded
278
            # file ids
279
            changed_file_ids = set(changed_file_ids)
280
            for relpath, entry in self.target.inventory.iter_entries():
281
                if (specific_file_ids is not None
282
                    and not entry.file_id in specific_file_ids):
283
                    continue
284
                if not entry.file_id in changed_file_ids:
285
                    yield (entry.file_id,
286
                           (relpath, relpath), # Not renamed
287
                           False, # Not modified
288
                           (True, True), # Still  versioned
289
                           (entry.parent_id, entry.parent_id),
290
                           (entry.name, entry.name),
291
                           (entry.kind, entry.kind),
292
                           (entry.executable, entry.executable))
293
294
295
tree.InterTree.register_optimiser(InterCHKRevisionTree)