/brz/remove-bazaar

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