~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)
90
        annotations = self._repository.texts.annotate(text_key)
91
        return [(key[-1], line) for key, line in annotations]
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
92
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
93
    def get_file_size(self, file_id):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
94
        """See Tree.get_file_size"""
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
95
        return self._inventory[file_id].text_size
96
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
97
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
98
        ie = self._inventory[file_id]
99
        if ie.kind == "file":
100
            return ie.text_sha1
101
        return None
102
103
    def get_file_mtime(self, file_id, path=None):
104
        ie = self._inventory[file_id]
105
        revision = self._repository.get_revision(ie.revision)
106
        return revision.timestamp
107
108
    def is_executable(self, file_id, path=None):
109
        ie = self._inventory[file_id]
110
        if ie.kind != "file":
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
111
            return None
112
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
113
114
    def has_filename(self, filename):
115
        return bool(self.inventory.path2id(filename))
116
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
117
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
118
        # 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
119
        inv = self.inventory
120
        if from_dir is None:
121
            from_dir_id = None
122
        else:
123
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
124
            if from_dir_id is None:
125
                # Directory not versioned
126
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
127
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
128
        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
129
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
130
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
131
        for path, entry in entries:
132
            yield path, 'V', entry.kind, entry.file_id, entry
133
134
    def get_symlink_target(self, file_id):
135
        ie = self._inventory[file_id]
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
136
        # Inventories store symlink targets in unicode
137
        return ie.symlink_target
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
138
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.
139
    def get_reference_revision(self, file_id, path=None):
140
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
141
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
142
    def get_root_id(self):
143
        if self.inventory.root:
144
            return self.inventory.root.file_id
145
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
146
    def kind(self, file_id):
147
        return self._inventory[file_id].kind
148
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
149
    def path_content_summary(self, path):
150
        """See Tree.path_content_summary."""
151
        id = self.inventory.path2id(path)
152
        if id is None:
153
            return ('missing', None, None, None)
154
        entry = self._inventory[id]
155
        kind = entry.kind
156
        if kind == 'file':
157
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
158
        elif kind == 'symlink':
159
            return (kind, None, None, entry.symlink_target)
160
        else:
161
            return (kind, None, None, None)
162
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
163
    def _comparison_data(self, entry, path):
164
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
165
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
166
        return entry.kind, entry.executable, None
167
168
    def _file_size(self, entry, stat_value):
169
        return entry.text_size
170
1551.15.46 by Aaron Bentley
Move plan merge to tree
171
    def _get_ancestors(self, default_revision):
172
        return set(self._repository.get_ancestry(self._revision_id,
173
                                                 topo_sorted=False))
174
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
175
    def lock_read(self):
176
        self._repository.lock_read()
177
2255.2.119 by Robert Collins
Give RevisionTree a repr method.
178
    def __repr__(self):
179
        return '<%s instance at %x, rev_id=%r>' % (
180
            self.__class__.__name__, id(self), self._revision_id)
181
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
182
    def unlock(self):
183
        self._repository.unlock()
184
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
185
    def walkdirs(self, prefix=""):
186
        _directory = 'directory'
187
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
188
        top_id = inv.path2id(prefix)
189
        if top_id is None:
190
            pending = []
191
        else:
192
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
193
        while pending:
194
            dirblock = []
195
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
196
            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
197
            if currentdir[0]:
198
                relroot = currentdir[0] + '/'
199
            else:
200
                relroot = ""
201
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
202
            entry = inv[currentdir[4]]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
203
            for name, child in entry.sorted_children():
204
                toppath = relroot + name
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
205
                dirblock.append((toppath, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
206
                    child.file_id, child.kind
207
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
208
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
209
            # push the user specified dirs from dirblock
210
            for dir in reversed(dirblock):
211
                if dir[2] == _directory:
212
                    pending.append(dir)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
213
214
    def _get_rules_searcher(self, default_searcher):
215
        """See Tree._get_rules_searcher."""
216
        if self._rules_searcher is None:
217
            self._rules_searcher = super(RevisionTree,
218
                self)._get_rules_searcher(default_searcher)
219
        return self._rules_searcher
4241.6.7 by Vincent Ladeuil
Add InterCHKRevisionTree
220
221
222
class InterCHKRevisionTree(tree.InterTree):
223
    """Fast path optimiser for RevisionTrees with CHK inventories."""
224
225
    @staticmethod
226
    def is_compatible(source, target):
227
        if (isinstance(source, RevisionTree)
228
            and isinstance(target, RevisionTree)):
229
            try:
230
                # Only CHK inventories have id_to_entry attribute
231
                source.inventory.id_to_entry
232
                target.inventory.id_to_entry
233
                return True
234
            except AttributeError:
235
                pass
236
        return False
237
238
    def iter_changes(self, include_unchanged=False,
239
                     specific_files=None, pb=None, extra_trees=[],
240
                     require_versioned=True, want_unversioned=False):
241
        lookup_trees = [self.source]
242
        if extra_trees:
243
             lookup_trees.extend(extra_trees)
244
        if specific_files == []:
245
            specific_file_ids = []
246
        else:
247
            specific_file_ids = self.target.paths2ids(specific_files,
248
                lookup_trees, require_versioned=require_versioned)
249
250
        # FIXME: It should be possible to delegate include_unchanged handling
251
        # to CHKInventory.iter_changes and do a better job there -- vila
252
        # 20090304
253
        if include_unchanged:
254
            changed_file_ids = []
255
        for result in self.target.inventory.iter_changes(self.source.inventory):
256
            if (specific_file_ids is not None
257
                and not result[0] in specific_file_ids):
258
                # CHKMap.iter_changes is clean and fast. Better filter out
259
                # the specific files *after* it did its job.
260
                continue
261
            yield result
262
            if include_unchanged:
263
                # Keep track of yielded results (cheaper than building the
264
                # whole inventory).
265
                changed_file_ids.append(result[0])
266
        if include_unchanged:
267
            # CHKMap avoid being O(tree), so we go to O(tree) only if
268
            # required to.
269
            # Now walk the whole inventory, excluding the already yielded
270
            # file ids
271
            changed_file_ids = set(changed_file_ids)
272
            for relpath, entry in self.target.inventory.iter_entries():
273
                if (specific_file_ids is not None
274
                    and not entry.file_id in specific_file_ids):
275
                    continue
276
                if not entry.file_id in changed_file_ids:
277
                    yield (entry.file_id,
278
                           (relpath, relpath), # Not renamed
279
                           False, # Not modified
280
                           (True, True), # Still  versioned
281
                           (entry.parent_id, entry.parent_id),
282
                           (entry.name, entry.name),
283
                           (entry.kind, entry.kind),
284
                           (entry.executable, entry.executable))
285
286
287
tree.InterTree.register_optimiser(InterCHKRevisionTree)