~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,
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
26
    )
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
27
from bzrlib.tree import Tree
28
29
30
class RevisionTree(Tree):
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):
48
        return True
49
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
50
    def get_parent_ids(self):
51
        """See Tree.get_parent_ids.
52
53
        A RevisionTree's parents match the revision graph.
54
        """
1908.11.3 by Robert Collins
Merge bzr.dev
55
        if self._revision_id in (None, revision.NULL_REVISION):
56
            parent_ids = []
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
57
        else:
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
58
            parent_ids = self._repository.get_revision(
59
                self._revision_id).parent_ids
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
60
        return parent_ids
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
61
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
62
    def get_revision_id(self):
63
        """Return the revision id associated with this tree."""
64
        return self._revision_id
65
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
66
    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.
67
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
68
        return ''.join(content)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
69
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
70
    def get_file(self, file_id, path=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
71
        return StringIO(self.get_file_text(file_id))
72
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
73
    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.
74
        """See Tree.iter_files_bytes.
2708.1.4 by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes
75
76
        This version is implemented on top of Repository.extract_files_bytes"""
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
77
        repo_desired_files = [(f, self.inventory[f].revision, i)
78
                              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.
79
        try:
80
            for result in self._repository.iter_files_bytes(repo_desired_files):
81
                yield result
82
        except errors.RevisionNotPresent, e:
83
            raise errors.NoSuchFile(e.revision_id)
2708.1.4 by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes
84
1551.15.46 by Aaron Bentley
Move plan merge to tree
85
    def annotate_iter(self, file_id,
86
                      default_revision=revision.CURRENT_REVISION):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
87
        """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.
88
        text_key = (file_id, self.inventory[file_id].revision)
89
        annotations = self._repository.texts.annotate(text_key)
90
        return [(key[-1], line) for key, line in annotations]
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
91
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
92
    def get_file_size(self, file_id):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
93
        """See Tree.get_file_size"""
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
94
        return self._inventory[file_id].text_size
95
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
96
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
97
        ie = self._inventory[file_id]
98
        if ie.kind == "file":
99
            return ie.text_sha1
100
        return None
101
102
    def get_file_mtime(self, file_id, path=None):
103
        ie = self._inventory[file_id]
104
        revision = self._repository.get_revision(ie.revision)
105
        return revision.timestamp
106
107
    def is_executable(self, file_id, path=None):
108
        ie = self._inventory[file_id]
109
        if ie.kind != "file":
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
110
            return None
111
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
112
113
    def has_filename(self, filename):
114
        return bool(self.inventory.path2id(filename))
115
1910.2.56 by Aaron Bentley
More work on bundles
116
    def list_files(self, include_root=False):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
117
        # The only files returned by this are those from the version
118
        entries = self.inventory.iter_entries()
119
        # skip the root for compatability with the current apis.
1731.1.52 by Aaron Bentley
Merge from bzr.dev
120
        if self.inventory.root is not None and not include_root:
1910.2.56 by Aaron Bentley
More work on bundles
121
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
122
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
123
        for path, entry in entries:
124
            yield path, 'V', entry.kind, entry.file_id, entry
125
126
    def get_symlink_target(self, file_id):
127
        ie = self._inventory[file_id]
128
        return ie.symlink_target;
129
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.
130
    def get_reference_revision(self, file_id, path=None):
131
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
132
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
133
    def get_root_id(self):
134
        if self.inventory.root:
135
            return self.inventory.root.file_id
136
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
137
    def kind(self, file_id):
138
        return self._inventory[file_id].kind
139
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
140
    def path_content_summary(self, path):
141
        """See Tree.path_content_summary."""
142
        id = self.inventory.path2id(path)
143
        if id is None:
144
            return ('missing', None, None, None)
145
        entry = self._inventory[id]
146
        kind = entry.kind
147
        if kind == 'file':
148
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
149
        elif kind == 'symlink':
150
            return (kind, None, None, entry.symlink_target)
151
        else:
152
            return (kind, None, None, None)
153
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
154
    def _comparison_data(self, entry, path):
155
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
156
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
157
        return entry.kind, entry.executable, None
158
159
    def _file_size(self, entry, stat_value):
160
        return entry.text_size
161
1551.15.46 by Aaron Bentley
Move plan merge to tree
162
    def _get_ancestors(self, default_revision):
163
        return set(self._repository.get_ancestry(self._revision_id,
164
                                                 topo_sorted=False))
165
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
166
    def lock_read(self):
167
        self._repository.lock_read()
168
2255.2.119 by Robert Collins
Give RevisionTree a repr method.
169
    def __repr__(self):
170
        return '<%s instance at %x, rev_id=%r>' % (
171
            self.__class__.__name__, id(self), self._revision_id)
172
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
173
    def unlock(self):
174
        self._repository.unlock()
175
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
176
    def walkdirs(self, prefix=""):
177
        _directory = 'directory'
178
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
179
        top_id = inv.path2id(prefix)
180
        if top_id is None:
181
            pending = []
182
        else:
183
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
184
        while pending:
185
            dirblock = []
186
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
187
            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
188
            if currentdir[0]:
189
                relroot = currentdir[0] + '/'
190
            else:
191
                relroot = ""
192
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
193
            entry = inv[currentdir[4]]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
194
            for name, child in entry.sorted_children():
195
                toppath = relroot + name
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
196
                dirblock.append((toppath, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
197
                    child.file_id, child.kind
198
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
199
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
200
            # push the user specified dirs from dirblock
201
            for dir in reversed(dirblock):
202
                if dir[2] == _directory:
203
                    pending.append(dir)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
204
205
    def _get_rules_searcher(self, default_searcher):
206
        """See Tree._get_rules_searcher."""
207
        if self._rules_searcher is None:
208
            self._rules_searcher = super(RevisionTree,
209
                self)._get_rules_searcher(default_searcher)
210
        return self._rules_searcher