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