~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 (
22
    osutils,
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
23
    revision,
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
24
    symbol_versioning,
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
25
    )
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
26
from bzrlib.tree import Tree
27
28
29
class RevisionTree(Tree):
30
    """Tree viewing a previous revision.
31
32
    File text can be retrieved from the text store.
33
    """
34
    
35
    def __init__(self, branch, inv, revision_id):
36
        # for compatability the 'branch' parameter has not been renamed to 
37
        # repository at this point. However, we should change RevisionTree's
38
        # construction to always be via Repository and not via direct 
39
        # construction - this will mean that we can change the constructor
40
        # with much less chance of breaking client code.
41
        self._repository = branch
42
        self._weave_store = branch.weave_store
43
        self._inventory = inv
2249.5.13 by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
44
        self._revision_id = osutils.safe_revision_id(revision_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
45
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
46
    def supports_tree_reference(self):
47
        return True
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
60
        
61
    def get_revision_id(self):
62
        """Return the revision id associated with this tree."""
63
        return self._revision_id
64
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
65
    @symbol_versioning.deprecated_method(symbol_versioning.zero_nineteen)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
66
    def get_weave(self, file_id):
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
67
        return self._get_weave(file_id)
68
69
    def _get_weave(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
70
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
71
        return self._weave_store.get_weave(file_id,
72
                self._repository.get_transaction())
73
74
    def get_file_lines(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
75
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
76
        ie = self._inventory[file_id]
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
77
        weave = self._get_weave(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
78
        return weave.get_lines(ie.revision)
79
80
    def get_file_text(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
81
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
82
        return ''.join(self.get_file_lines(file_id))
83
84
    def get_file(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
85
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
86
        return StringIO(self.get_file_text(file_id))
87
1551.15.46 by Aaron Bentley
Move plan merge to tree
88
    def annotate_iter(self, file_id,
89
                      default_revision=revision.CURRENT_REVISION):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
90
        """See Tree.annotate_iter"""
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
91
        file_id = osutils.safe_file_id(file_id)
1551.15.50 by Aaron Bentley
Deprecate RevisionTree.get_weave
92
        w = self._get_weave(file_id)
1551.9.18 by Aaron Bentley
Updates from review comments
93
        return w.annotate_iter(self.inventory[file_id].revision)
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
94
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
95
    def get_file_size(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
96
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
97
        return self._inventory[file_id].text_size
98
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
99
    def get_file_sha1(self, file_id, path=None, stat_value=None):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
100
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
101
        ie = self._inventory[file_id]
102
        if ie.kind == "file":
103
            return ie.text_sha1
104
        return None
105
106
    def get_file_mtime(self, file_id, path=None):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
107
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
108
        ie = self._inventory[file_id]
109
        revision = self._repository.get_revision(ie.revision)
110
        return revision.timestamp
111
112
    def is_executable(self, file_id, path=None):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
113
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
114
        ie = self._inventory[file_id]
115
        if ie.kind != "file":
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
116
            return None
117
        return ie.executable
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
118
119
    def has_filename(self, filename):
120
        return bool(self.inventory.path2id(filename))
121
1910.2.56 by Aaron Bentley
More work on bundles
122
    def list_files(self, include_root=False):
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
123
        # The only files returned by this are those from the version
124
        entries = self.inventory.iter_entries()
125
        # skip the root for compatability with the current apis.
1731.1.52 by Aaron Bentley
Merge from bzr.dev
126
        if self.inventory.root is not None and not include_root:
1910.2.56 by Aaron Bentley
More work on bundles
127
            # skip the root for compatability with the current apis.
1731.1.33 by Aaron Bentley
Revert no-special-root changes
128
            entries.next()
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
129
        for path, entry in entries:
130
            yield path, 'V', entry.kind, entry.file_id, entry
131
132
    def get_symlink_target(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
133
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
134
        ie = self._inventory[file_id]
135
        return ie.symlink_target;
136
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.
137
    def get_reference_revision(self, file_id, path=None):
138
        return self.inventory[file_id].reference_revision
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
139
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
140
    def get_root_id(self):
141
        if self.inventory.root:
142
            return self.inventory.root.file_id
143
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
144
    def kind(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
145
        file_id = osutils.safe_file_id(file_id)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
146
        return self._inventory[file_id].kind
147
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
148
    def _comparison_data(self, entry, path):
149
        if entry is None:
2012.1.15 by Aaron Bentley
Minor tweaks
150
            return None, False, None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
151
        return entry.kind, entry.executable, None
152
153
    def _file_size(self, entry, stat_value):
154
        assert entry.text_size is not None
155
        return entry.text_size
156
1551.15.46 by Aaron Bentley
Move plan merge to tree
157
    def _get_ancestors(self, default_revision):
158
        return set(self._repository.get_ancestry(self._revision_id,
159
                                                 topo_sorted=False))
160
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
161
    def lock_read(self):
162
        self._repository.lock_read()
163
2255.2.119 by Robert Collins
Give RevisionTree a repr method.
164
    def __repr__(self):
165
        return '<%s instance at %x, rev_id=%r>' % (
166
            self.__class__.__name__, id(self), self._revision_id)
167
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
168
    def unlock(self):
169
        self._repository.unlock()
170
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
171
    def walkdirs(self, prefix=""):
172
        _directory = 'directory'
173
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
174
        top_id = inv.path2id(prefix)
175
        if top_id is None:
176
            pending = []
177
        else:
178
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
179
        while pending:
180
            dirblock = []
181
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
182
            # 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
183
            if currentdir[0]:
184
                relroot = currentdir[0] + '/'
185
            else:
186
                relroot = ""
187
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
188
            entry = inv[currentdir[4]]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
189
            for name, child in entry.sorted_children():
190
                toppath = relroot + name
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
191
                dirblock.append((toppath, name, child.kind, None,
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
192
                    child.file_id, child.kind
193
                    ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
194
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
195
            # push the user specified dirs from dirblock
196
            for dir in reversed(dirblock):
197
                if dir[2] == _directory:
198
                    pending.append(dir)