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, |
2249.5.13
by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids. |
24 |
)
|
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
25 |
from bzrlib.tree import Tree |
26 |
||
27 |
||
28 |
class RevisionTree(Tree): |
|
29 |
"""Tree viewing a previous revision.
|
|
30 |
||
31 |
File text can be retrieved from the text store.
|
|
32 |
||
33 |
TODO: Some kind of `__repr__` method, but a good one
|
|
34 |
probably means knowing the branch and revision number,
|
|
35 |
or at least passing a description to the constructor.
|
|
36 |
"""
|
|
37 |
||
38 |
def __init__(self, branch, inv, revision_id): |
|
39 |
# for compatability the 'branch' parameter has not been renamed to
|
|
40 |
# repository at this point. However, we should change RevisionTree's
|
|
41 |
# construction to always be via Repository and not via direct
|
|
42 |
# construction - this will mean that we can change the constructor
|
|
43 |
# with much less chance of breaking client code.
|
|
44 |
self._repository = branch |
|
45 |
self._weave_store = branch.weave_store |
|
46 |
self._inventory = inv |
|
2249.5.13
by John Arbash Meinel
Finish auditing Repository, and fix generate_ids to always generate utf8 ids. |
47 |
self._revision_id = osutils.safe_revision_id(revision_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
48 |
|
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 |
||
65 |
def get_weave(self, file_id): |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
66 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
67 |
return self._weave_store.get_weave(file_id, |
68 |
self._repository.get_transaction()) |
|
69 |
||
70 |
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 |
71 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
72 |
ie = self._inventory[file_id] |
73 |
weave = self.get_weave(file_id) |
|
74 |
return weave.get_lines(ie.revision) |
|
75 |
||
76 |
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 |
77 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
78 |
return ''.join(self.get_file_lines(file_id)) |
79 |
||
80 |
def get_file(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 StringIO(self.get_file_text(file_id)) |
83 |
||
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
84 |
def annotate_iter(self, file_id): |
85 |
"""See Tree.annotate_iter"""
|
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
86 |
file_id = osutils.safe_file_id(file_id) |
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
87 |
w = self.get_weave(file_id) |
1551.9.18
by Aaron Bentley
Updates from review comments |
88 |
return w.annotate_iter(self.inventory[file_id].revision) |
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
89 |
|
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
90 |
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 |
91 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
92 |
return self._inventory[file_id].text_size |
93 |
||
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
94 |
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 |
95 |
file_id = osutils.safe_file_id(file_id) |
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): |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
102 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
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): |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
108 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
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 |
||
1910.2.56
by Aaron Bentley
More work on bundles |
117 |
def list_files(self, include_root=False): |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
118 |
# The only files returned by this are those from the version
|
119 |
entries = self.inventory.iter_entries() |
|
120 |
# skip the root for compatability with the current apis.
|
|
1731.1.52
by Aaron Bentley
Merge from bzr.dev |
121 |
if self.inventory.root is not None and not include_root: |
1910.2.56
by Aaron Bentley
More work on bundles |
122 |
# skip the root for compatability with the current apis.
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
123 |
entries.next() |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
124 |
for path, entry in entries: |
125 |
yield path, 'V', entry.kind, entry.file_id, entry |
|
126 |
||
127 |
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 |
128 |
file_id = osutils.safe_file_id(file_id) |
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
129 |
ie = self._inventory[file_id] |
130 |
return ie.symlink_target; |
|
131 |
||
132 |
def kind(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 |
return self._inventory[file_id].kind |
135 |
||
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
136 |
def _comparison_data(self, entry, path): |
137 |
if entry is None: |
|
2012.1.15
by Aaron Bentley
Minor tweaks |
138 |
return None, False, None |
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
139 |
return entry.kind, entry.executable, None |
140 |
||
141 |
def _file_size(self, entry, stat_value): |
|
142 |
assert entry.text_size is not None |
|
143 |
return entry.text_size |
|
144 |
||
1852.7.1
by Robert Collins
Move RevisionTree out of tree.py. |
145 |
def lock_read(self): |
146 |
self._repository.lock_read() |
|
147 |
||
148 |
def unlock(self): |
|
149 |
self._repository.unlock() |
|
150 |
||
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
151 |
def walkdirs(self, prefix=""): |
152 |
_directory = 'directory' |
|
153 |
inv = self.inventory |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
154 |
top_id = inv.path2id(prefix) |
155 |
if top_id is None: |
|
156 |
pending = [] |
|
157 |
else: |
|
158 |
pending = [(prefix, '', _directory, None, top_id, None)] |
|
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
159 |
while pending: |
160 |
dirblock = [] |
|
161 |
currentdir = pending.pop() |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
162 |
# 0 - relpath, 1- basename, 2- kind, 3- stat, id, v-kind
|
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
163 |
if currentdir[0]: |
164 |
relroot = currentdir[0] + '/' |
|
165 |
else: |
|
166 |
relroot = "" |
|
167 |
# FIXME: stash the node in pending
|
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
168 |
entry = inv[currentdir[4]] |
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
169 |
for name, child in entry.sorted_children(): |
170 |
toppath = relroot + name |
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
171 |
dirblock.append((toppath, name, child.kind, None, |
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
172 |
child.file_id, child.kind |
173 |
))
|
|
1852.15.10
by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful. |
174 |
yield (currentdir[0], entry.file_id), dirblock |
1852.15.3
by Robert Collins
Add a first-cut Tree.walkdirs method. |
175 |
# push the user specified dirs from dirblock
|
176 |
for dir in reversed(dirblock): |
|
177 |
if dir[2] == _directory: |
|
178 |
pending.append(dir) |