4454.3.60
by John Arbash Meinel
Update copyright |
1 |
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
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
|
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
16 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
17 |
import os |
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
18 |
import errno |
3363.2.27
by Aaron Bentley
Make path_content_summary a core API |
19 |
from stat import S_ISREG, S_IEXEC |
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
20 |
|
1551.11.12
by Aaron Bentley
Changes from review |
21 |
from bzrlib.lazy_import import lazy_import |
22 |
lazy_import(globals(), """ |
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
23 |
from bzrlib import (
|
3363.2.33
by Aaron Bentley
Implement PreviewTree.annotate_iter |
24 |
annotate,
|
2694.5.4
by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py. |
25 |
bencode,
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
26 |
bzrdir,
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
27 |
delta,
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
28 |
errors,
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
29 |
inventory,
|
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
30 |
multiparent,
|
3596.2.6
by John Arbash Meinel
Turns out that osutils wasn't imported directly into transform |
31 |
osutils,
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
32 |
revision as _mod_revision,
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
33 |
)
|
1551.11.12
by Aaron Bentley
Changes from review |
34 |
""") |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
35 |
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile, |
1534.7.162
by Aaron Bentley
Handle failures creating/deleting the Limbo directory |
36 |
ReusingTransform, NotVersionedError, CantMoveRoot, |
3006.2.1
by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows) |
37 |
ExistingLimbo, ImmortalLimbo, NoFinalPath, |
38 |
UnableCreateSymlink) |
|
3368.2.19
by Ian Clatworthy
first round of changes from abentley's review |
39 |
from bzrlib.filters import filtered_output_bytes, ContentFilterContext |
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
40 |
from bzrlib.inventory import InventoryEntry |
3363.2.19
by Aaron Bentley
Make PreviewTree.path2id correct |
41 |
from bzrlib.osutils import ( |
42 |
delete_any, |
|
43 |
file_kind, |
|
44 |
has_symlinks, |
|
45 |
lexists, |
|
46 |
pathjoin, |
|
3363.15.4
by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly |
47 |
sha_file, |
3363.2.19
by Aaron Bentley
Make PreviewTree.path2id correct |
48 |
splitpath, |
49 |
supports_executable, |
|
50 |
)
|
|
1551.2.34
by Aaron Bentley
Refactored the revert phases |
51 |
from bzrlib.progress import DummyProgress, ProgressPhase |
2687.2.1
by Martin Pool
Rename upcoming release from 0.19 to 0.90 |
52 |
from bzrlib.symbol_versioning import ( |
53 |
deprecated_function, |
|
3363.17.26
by Aaron Bentley
Deprecate create_by_entry |
54 |
deprecated_in, |
2687.2.1
by Martin Pool
Rename upcoming release from 0.19 to 0.90 |
55 |
)
|
1534.7.173
by Aaron Bentley
Added conflict warnings to revert |
56 |
from bzrlib.trace import mutter, warning |
1551.7.14
by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees |
57 |
from bzrlib import tree |
2255.2.152
by Martin Pool
(broken) merge aaron's workingtree format changes |
58 |
import bzrlib.ui |
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
59 |
import bzrlib.urlutils as urlutils |
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
60 |
|
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
61 |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
62 |
ROOT_PARENT = "root-parent" |
63 |
||
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
64 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
65 |
def unique_add(map, key, value): |
66 |
if key in map: |
|
1534.7.5
by Aaron Bentley
Got unique_add under test |
67 |
raise DuplicateKey(key=key) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
68 |
map[key] = value |
69 |
||
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
70 |
|
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
71 |
class _TransformResults(object): |
2502.1.5
by Aaron Bentley
Cleanup |
72 |
def __init__(self, modified_paths, rename_count): |
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
73 |
object.__init__(self) |
74 |
self.modified_paths = modified_paths |
|
2502.1.5
by Aaron Bentley
Cleanup |
75 |
self.rename_count = rename_count |
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
76 |
|
77 |
||
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
78 |
class TreeTransformBase(object): |
4354.5.4
by Aaron Bentley
Update docs |
79 |
"""The base class for TreeTransform and its kin."""
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
80 |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
81 |
def __init__(self, tree, pb=DummyProgress(), |
3008.1.15
by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree |
82 |
case_sensitive=True): |
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
83 |
"""Constructor.
|
84 |
||
85 |
:param tree: The tree that will be transformed, but not necessarily
|
|
86 |
the output tree.
|
|
4463.1.1
by Martin Pool
Update docstrings for recent progress changes |
87 |
:param pb: A ProgressTask indicating how much progress is being made
|
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
88 |
:param case_sensitive: If True, the target of the transform is
|
89 |
case sensitive, not just case preserving.
|
|
90 |
"""
|
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
91 |
object.__init__(self) |
92 |
self._tree = tree |
|
93 |
self._id_number = 0 |
|
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
94 |
# mapping of trans_id -> new basename
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
95 |
self._new_name = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
96 |
# mapping of trans_id -> new parent trans_id
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
97 |
self._new_parent = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
98 |
# mapping of trans_id with new contents -> new file_kind
|
1534.7.4
by Aaron Bentley
Unified all file types as 'contents' |
99 |
self._new_contents = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
100 |
# Set of trans_ids whose contents will be removed
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
101 |
self._removed_contents = set() |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
102 |
# Mapping of trans_id -> new execute-bit value
|
1534.7.25
by Aaron Bentley
Added set_executability |
103 |
self._new_executability = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
104 |
# Mapping of trans_id -> new tree-reference value
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
105 |
self._new_reference_revision = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
106 |
# Mapping of trans_id -> new file_id
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
107 |
self._new_id = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
108 |
# Mapping of old file-id -> trans_id
|
1534.7.143
by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids |
109 |
self._non_present_ids = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
110 |
# Mapping of new file_id -> trans_id
|
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
111 |
self._r_new_id = {} |
3981.1.1
by Robert Collins
Fix bug 319790 - unshelve of deleted paths failing. |
112 |
# Set of trans_ids that will be removed
|
1534.7.39
by Aaron Bentley
Ensured that files can be unversioned (de-versioned?) |
113 |
self._removed_id = set() |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
114 |
# Mapping of path in old tree -> trans_id
|
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
115 |
self._tree_path_ids = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
116 |
# Mapping trans_id -> path in old tree
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
117 |
self._tree_id_paths = {} |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
118 |
# The trans_id that will be used as the tree root
|
3363.2.16
by Aaron Bentley
Fix root directory creation |
119 |
root_id = tree.get_root_id() |
120 |
if root_id is not None: |
|
121 |
self._new_root = self.trans_id_tree_file_id(root_id) |
|
122 |
else: |
|
123 |
self._new_root = None |
|
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
124 |
# Indictor of whether the transform has been applied
|
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
125 |
self._done = False |
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
126 |
# A progress bar
|
1534.9.1
by Aaron Bentley
Added progress bars to merge |
127 |
self._pb = pb |
3008.1.15
by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree |
128 |
# Whether the target is case sensitive
|
129 |
self._case_sensitive_target = case_sensitive |
|
1551.19.1
by Aaron Bentley
Documentation update for TreeTransform, suggested by Michael Hudson |
130 |
# A counter of how many files have been renamed
|
2502.1.1
by Aaron Bentley
Ensure renames only root children are renamed when building trees |
131 |
self.rename_count = 0 |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
132 |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
133 |
def finalize(self): |
134 |
"""Release the working tree lock, if held.
|
|
135 |
||
136 |
This is required if apply has not been invoked, but can be invoked
|
|
137 |
even after apply.
|
|
138 |
"""
|
|
139 |
if self._tree is None: |
|
140 |
return
|
|
141 |
self._tree.unlock() |
|
142 |
self._tree = None |
|
143 |
||
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
144 |
def __get_root(self): |
145 |
return self._new_root |
|
146 |
||
147 |
root = property(__get_root) |
|
148 |
||
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
149 |
def _assign_id(self): |
150 |
"""Produce a new tranform id"""
|
|
151 |
new_id = "new-%s" % self._id_number |
|
152 |
self._id_number +=1 |
|
153 |
return new_id |
|
154 |
||
155 |
def create_path(self, name, parent): |
|
156 |
"""Assign a transaction id to a new path"""
|
|
157 |
trans_id = self._assign_id() |
|
158 |
unique_add(self._new_name, trans_id, name) |
|
159 |
unique_add(self._new_parent, trans_id, parent) |
|
160 |
return trans_id |
|
161 |
||
1534.7.6
by Aaron Bentley
Added conflict handling |
162 |
def adjust_path(self, name, parent, trans_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
163 |
"""Change the path that is assigned to a transaction id."""
|
1534.7.66
by Aaron Bentley
Ensured we don't accidentally move the root directory |
164 |
if trans_id == self._new_root: |
165 |
raise CantMoveRoot |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
166 |
self._new_name[trans_id] = name |
167 |
self._new_parent[trans_id] = parent |
|
3363.10.1
by Aaron Bentley
Fixes for adjust_path and path2id |
168 |
if parent == ROOT_PARENT: |
169 |
if self._new_root is not None: |
|
170 |
raise ValueError("Cannot have multiple roots.") |
|
171 |
self._new_root = trans_id |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
172 |
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
173 |
def adjust_root_path(self, name, parent): |
174 |
"""Emulate moving the root by moving all children, instead.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
175 |
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
176 |
We do this by undoing the association of root's transaction id with the
|
177 |
current tree. This allows us to create a new directory with that
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
178 |
transaction id. We unversion the root directory and version the
|
1534.7.69
by Aaron Bentley
Got real root moves working |
179 |
physically new directory, and hope someone versions the tree root
|
180 |
later.
|
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
181 |
"""
|
182 |
old_root = self._new_root |
|
183 |
old_root_file_id = self.final_file_id(old_root) |
|
184 |
# force moving all children of root
|
|
185 |
for child_id in self.iter_tree_children(old_root): |
|
186 |
if child_id != parent: |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
187 |
self.adjust_path(self.final_name(child_id), |
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
188 |
self.final_parent(child_id), child_id) |
1534.7.69
by Aaron Bentley
Got real root moves working |
189 |
file_id = self.final_file_id(child_id) |
190 |
if file_id is not None: |
|
191 |
self.unversion_file(child_id) |
|
192 |
self.version_file(file_id, child_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
193 |
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
194 |
# the physical root needs a new transaction id
|
195 |
self._tree_path_ids.pop("") |
|
196 |
self._tree_id_paths.pop(old_root) |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
197 |
self._new_root = self.trans_id_tree_file_id(self._tree.get_root_id()) |
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
198 |
if parent == old_root: |
199 |
parent = self._new_root |
|
200 |
self.adjust_path(name, parent, old_root) |
|
201 |
self.create_directory(old_root) |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
202 |
self.version_file(old_root_file_id, old_root) |
203 |
self.unversion_file(self._new_root) |
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
204 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
205 |
def trans_id_tree_file_id(self, inventory_id): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
206 |
"""Determine the transaction id of a working tree file.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
207 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
208 |
This reflects only files that already exist, not ones that will be
|
209 |
added by transactions.
|
|
210 |
"""
|
|
3363.2.16
by Aaron Bentley
Fix root directory creation |
211 |
if inventory_id is None: |
212 |
raise ValueError('None is not a valid file id') |
|
3146.8.1
by Aaron Bentley
Fix two tree.inventory uses in checkout |
213 |
path = self._tree.id2path(inventory_id) |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
214 |
return self.trans_id_tree_path(path) |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
215 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
216 |
def trans_id_file_id(self, file_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
217 |
"""Determine or set the transaction id associated with a file ID.
|
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
218 |
A new id is only created for file_ids that were never present. If
|
219 |
a transaction has been unversioned, it is deliberately still returned.
|
|
220 |
(this will likely lead to an unversioned parent conflict.)
|
|
221 |
"""
|
|
3363.2.16
by Aaron Bentley
Fix root directory creation |
222 |
if file_id is None: |
223 |
raise ValueError('None is not a valid file id') |
|
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
224 |
if file_id in self._r_new_id and self._r_new_id[file_id] is not None: |
225 |
return self._r_new_id[file_id] |
|
226 |
else: |
|
3363.17.1
by Aaron Bentley
Avoid inventory for merge and transform code |
227 |
try: |
228 |
self._tree.iter_entries_by_dir([file_id]).next() |
|
229 |
except StopIteration: |
|
230 |
if file_id in self._non_present_ids: |
|
231 |
return self._non_present_ids[file_id] |
|
232 |
else: |
|
233 |
trans_id = self._assign_id() |
|
234 |
self._non_present_ids[file_id] = trans_id |
|
235 |
return trans_id |
|
236 |
else: |
|
237 |
return self.trans_id_tree_file_id(file_id) |
|
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
238 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
239 |
def trans_id_tree_path(self, path): |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
240 |
"""Determine (and maybe set) the transaction ID for a tree path."""
|
1534.7.12
by Aaron Bentley
Added canonical_path function |
241 |
path = self.canonical_path(path) |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
242 |
if path not in self._tree_path_ids: |
243 |
self._tree_path_ids[path] = self._assign_id() |
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
244 |
self._tree_id_paths[self._tree_path_ids[path]] = path |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
245 |
return self._tree_path_ids[path] |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
246 |
|
1534.7.16
by Aaron Bentley
Added get_tree_parent |
247 |
def get_tree_parent(self, trans_id): |
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
248 |
"""Determine id of the parent in the tree."""
|
1534.7.16
by Aaron Bentley
Added get_tree_parent |
249 |
path = self._tree_id_paths[trans_id] |
250 |
if path == "": |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
251 |
return ROOT_PARENT |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
252 |
return self.trans_id_tree_path(os.path.dirname(path)) |
1534.7.16
by Aaron Bentley
Added get_tree_parent |
253 |
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
254 |
def delete_contents(self, trans_id): |
255 |
"""Schedule the contents of a path entry for deletion"""
|
|
1534.7.130
by Aaron Bentley
More conflict handling, test porting |
256 |
self.tree_kind(trans_id) |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
257 |
self._removed_contents.add(trans_id) |
258 |
||
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
259 |
def cancel_deletion(self, trans_id): |
260 |
"""Cancel a scheduled deletion"""
|
|
261 |
self._removed_contents.remove(trans_id) |
|
262 |
||
1534.7.39
by Aaron Bentley
Ensured that files can be unversioned (de-versioned?) |
263 |
def unversion_file(self, trans_id): |
264 |
"""Schedule a path entry to become unversioned"""
|
|
265 |
self._removed_id.add(trans_id) |
|
266 |
||
267 |
def delete_versioned(self, trans_id): |
|
268 |
"""Delete and unversion a versioned file"""
|
|
269 |
self.delete_contents(trans_id) |
|
270 |
self.unversion_file(trans_id) |
|
271 |
||
1534.7.25
by Aaron Bentley
Added set_executability |
272 |
def set_executability(self, executability, trans_id): |
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
273 |
"""Schedule setting of the 'execute' bit
|
274 |
To unschedule, set to None
|
|
275 |
"""
|
|
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
276 |
if executability is None: |
277 |
del self._new_executability[trans_id] |
|
278 |
else: |
|
279 |
unique_add(self._new_executability, trans_id, executability) |
|
1534.7.25
by Aaron Bentley
Added set_executability |
280 |
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
281 |
def set_tree_reference(self, revision_id, trans_id): |
282 |
"""Set the reference associated with a directory"""
|
|
283 |
unique_add(self._new_reference_revision, trans_id, revision_id) |
|
284 |
||
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
285 |
def version_file(self, file_id, trans_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
286 |
"""Schedule a file to become versioned."""
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
287 |
if file_id is None: |
288 |
raise ValueError() |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
289 |
unique_add(self._new_id, trans_id, file_id) |
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
290 |
unique_add(self._r_new_id, file_id, trans_id) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
291 |
|
1534.7.105
by Aaron Bentley
Got merge with rename working |
292 |
def cancel_versioning(self, trans_id): |
293 |
"""Undo a previous versioning of a file"""
|
|
294 |
file_id = self._new_id[trans_id] |
|
295 |
del self._new_id[trans_id] |
|
296 |
del self._r_new_id[file_id] |
|
297 |
||
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
298 |
def new_paths(self, filesystem_only=False): |
299 |
"""Determine the paths of all new and changed files.
|
|
300 |
||
3453.2.11
by Aaron Bentley
Updates from review |
301 |
:param filesystem_only: if True, only calculate values for files
|
302 |
that require renames or execute bit changes.
|
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
303 |
"""
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
304 |
new_ids = set() |
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
305 |
if filesystem_only: |
3619.2.11
by Aaron Bentley
Tweak new_paths logic |
306 |
stale_ids = self._needs_rename.difference(self._new_name) |
307 |
stale_ids.difference_update(self._new_parent) |
|
308 |
stale_ids.difference_update(self._new_contents) |
|
309 |
stale_ids.difference_update(self._new_id) |
|
310 |
needs_rename = self._needs_rename.difference(stale_ids) |
|
3619.2.10
by Aaron Bentley
Compensate for stale entries in TT._needs_rename |
311 |
id_sets = (needs_rename, self._new_executability) |
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
312 |
else: |
313 |
id_sets = (self._new_name, self._new_parent, self._new_contents, |
|
314 |
self._new_id, self._new_executability) |
|
315 |
for id_set in id_sets: |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
316 |
new_ids.update(id_set) |
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
317 |
return sorted(FinalPaths(self).get_paths(new_ids)) |
1534.7.6
by Aaron Bentley
Added conflict handling |
318 |
|
3619.2.6
by Aaron Bentley
More tweaking |
319 |
def _inventory_altered(self): |
320 |
"""Get the trans_ids and paths of files needing new inv entries."""
|
|
3619.2.5
by Aaron Bentley
Reduce set tests |
321 |
new_ids = set() |
3619.2.6
by Aaron Bentley
More tweaking |
322 |
for id_set in [self._new_name, self._new_parent, self._new_id, |
323 |
self._new_executability]: |
|
3619.2.5
by Aaron Bentley
Reduce set tests |
324 |
new_ids.update(id_set) |
325 |
changed_kind = set(self._removed_contents) |
|
326 |
changed_kind.intersection_update(self._new_contents) |
|
327 |
changed_kind.difference_update(new_ids) |
|
328 |
changed_kind = (t for t in changed_kind if self.tree_kind(t) != |
|
329 |
self.final_kind(t)) |
|
330 |
new_ids.update(changed_kind) |
|
331 |
return sorted(FinalPaths(self).get_paths(new_ids)) |
|
332 |
||
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
333 |
def final_kind(self, trans_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
334 |
"""Determine the final file kind, after any changes applied.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
335 |
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
336 |
Raises NoSuchFile if the file does not exist/has no contents.
|
337 |
(It is conceivable that a path would be created without the
|
|
338 |
corresponding contents insertion command)
|
|
339 |
"""
|
|
340 |
if trans_id in self._new_contents: |
|
1534.7.73
by Aaron Bentley
Changed model again. Now iterator is used immediately. |
341 |
return self._new_contents[trans_id] |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
342 |
elif trans_id in self._removed_contents: |
343 |
raise NoSuchFile(None) |
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
344 |
else: |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
345 |
return self.tree_kind(trans_id) |
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
346 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
347 |
def tree_file_id(self, trans_id): |
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
348 |
"""Determine the file id associated with the trans_id in the tree"""
|
349 |
try: |
|
350 |
path = self._tree_id_paths[trans_id] |
|
351 |
except KeyError: |
|
352 |
# the file is a new, unversioned file, or invalid trans_id
|
|
353 |
return None |
|
354 |
# the file is old; the old id is still valid
|
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
355 |
if self._new_root == trans_id: |
2946.3.3
by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('') |
356 |
return self._tree.get_root_id() |
3363.17.5
by Aaron Bentley
Update merge to not use inventory |
357 |
return self._tree.path2id(path) |
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
358 |
|
1534.7.13
by Aaron Bentley
Implemented final_file_id |
359 |
def final_file_id(self, trans_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
360 |
"""Determine the file id after any changes are applied, or None.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
361 |
|
1534.7.21
by Aaron Bentley
Updated docstrings |
362 |
None indicates that the file will not be versioned after changes are
|
363 |
applied.
|
|
364 |
"""
|
|
1534.7.13
by Aaron Bentley
Implemented final_file_id |
365 |
try: |
366 |
return self._new_id[trans_id] |
|
367 |
except KeyError: |
|
1534.7.39
by Aaron Bentley
Ensured that files can be unversioned (de-versioned?) |
368 |
if trans_id in self._removed_id: |
369 |
return None |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
370 |
return self.tree_file_id(trans_id) |
1534.7.13
by Aaron Bentley
Implemented final_file_id |
371 |
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
372 |
def inactive_file_id(self, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
373 |
"""Return the inactive file_id associated with a transaction id.
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
374 |
That is, the one in the tree or in non_present_ids.
|
375 |
The file_id may actually be active, too.
|
|
376 |
"""
|
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
377 |
file_id = self.tree_file_id(trans_id) |
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
378 |
if file_id is not None: |
379 |
return file_id |
|
380 |
for key, value in self._non_present_ids.iteritems(): |
|
381 |
if value == trans_id: |
|
382 |
return key |
|
383 |
||
1534.7.17
by Aaron Bentley
Added final_parent function |
384 |
def final_parent(self, trans_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
385 |
"""Determine the parent file_id, after any changes are applied.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
386 |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
387 |
ROOT_PARENT is returned for the tree root.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
388 |
"""
|
1534.7.17
by Aaron Bentley
Added final_parent function |
389 |
try: |
390 |
return self._new_parent[trans_id] |
|
391 |
except KeyError: |
|
392 |
return self.get_tree_parent(trans_id) |
|
393 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
394 |
def final_name(self, trans_id): |
1534.7.40
by Aaron Bentley
Updated docs |
395 |
"""Determine the final filename, after all changes are applied."""
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
396 |
try: |
397 |
return self._new_name[trans_id] |
|
398 |
except KeyError: |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
399 |
try: |
400 |
return os.path.basename(self._tree_id_paths[trans_id]) |
|
401 |
except KeyError: |
|
402 |
raise NoFinalPath(trans_id, self) |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
403 |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
404 |
def by_parent(self): |
1534.7.40
by Aaron Bentley
Updated docs |
405 |
"""Return a map of parent: children for known parents.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
406 |
|
1534.7.40
by Aaron Bentley
Updated docs |
407 |
Only new paths and parents of tree files with assigned ids are used.
|
408 |
"""
|
|
1534.7.6
by Aaron Bentley
Added conflict handling |
409 |
by_parent = {} |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
410 |
items = list(self._new_parent.iteritems()) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
411 |
items.extend((t, self.final_parent(t)) for t in |
1534.7.76
by Aaron Bentley
Fixed final_parent, for the case where finding a parent adds tree id paths. |
412 |
self._tree_id_paths.keys()) |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
413 |
for trans_id, parent_id in items: |
1534.7.6
by Aaron Bentley
Added conflict handling |
414 |
if parent_id not in by_parent: |
415 |
by_parent[parent_id] = set() |
|
416 |
by_parent[parent_id].add(trans_id) |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
417 |
return by_parent |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
418 |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
419 |
def path_changed(self, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
420 |
"""Return True if a trans_id's path has changed."""
|
1711.9.11
by John Arbash Meinel
change return foo in bar to return (foo in bar) |
421 |
return (trans_id in self._new_name) or (trans_id in self._new_parent) |
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
422 |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
423 |
def new_contents(self, trans_id): |
424 |
return (trans_id in self._new_contents) |
|
425 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
426 |
def find_conflicts(self): |
1534.7.40
by Aaron Bentley
Updated docs |
427 |
"""Find any violations of inventory or filesystem invariants"""
|
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
428 |
if self._done is True: |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
429 |
raise ReusingTransform() |
430 |
conflicts = [] |
|
431 |
# ensure all children of all existent parents are known
|
|
432 |
# all children of non-existent parents are known, by definition.
|
|
433 |
self._add_tree_children() |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
434 |
by_parent = self.by_parent() |
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
435 |
conflicts.extend(self._unversioned_parents(by_parent)) |
1534.7.19
by Aaron Bentley
Added tests for parent loops |
436 |
conflicts.extend(self._parent_loops()) |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
437 |
conflicts.extend(self._duplicate_entries(by_parent)) |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
438 |
conflicts.extend(self._duplicate_ids()) |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
439 |
conflicts.extend(self._parent_type_conflicts(by_parent)) |
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
440 |
conflicts.extend(self._improper_versioning()) |
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
441 |
conflicts.extend(self._executability_conflicts()) |
1534.7.152
by Aaron Bentley
Fixed overwrites |
442 |
conflicts.extend(self._overwrite_conflicts()) |
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
443 |
return conflicts |
444 |
||
4526.8.6
by Aaron Bentley
Check for malformed transforms before committing. |
445 |
def _check_malformed(self): |
446 |
conflicts = self.find_conflicts() |
|
447 |
if len(conflicts) != 0: |
|
448 |
raise MalformedTransform(conflicts=conflicts) |
|
449 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
450 |
def _add_tree_children(self): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
451 |
"""Add all the children of all active parents to the known paths.
|
1534.7.40
by Aaron Bentley
Updated docs |
452 |
|
453 |
Active parents are those which gain children, and those which are
|
|
454 |
removed. This is a necessary first step in detecting conflicts.
|
|
455 |
"""
|
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
456 |
parents = self.by_parent().keys() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
457 |
parents.extend([t for t in self._removed_contents if |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
458 |
self.tree_kind(t) == 'directory']) |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
459 |
for trans_id in self._removed_id: |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
460 |
file_id = self.tree_file_id(trans_id) |
3144.4.2
by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390) |
461 |
if file_id is not None: |
462 |
if self._tree.inventory[file_id].kind == 'directory': |
|
463 |
parents.append(trans_id) |
|
464 |
elif self.tree_kind(trans_id) == 'directory': |
|
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
465 |
parents.append(trans_id) |
466 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
467 |
for parent_id in parents: |
1534.7.67
by Aaron Bentley
Refactored _add_tree_children |
468 |
# ensure that all children are registered with the transaction
|
469 |
list(self.iter_tree_children(parent_id)) |
|
470 |
||
1534.10.28
by Aaron Bentley
Use numbered backup files |
471 |
def has_named_child(self, by_parent, parent_id, name): |
472 |
try: |
|
473 |
children = by_parent[parent_id] |
|
474 |
except KeyError: |
|
475 |
children = [] |
|
476 |
for child in children: |
|
477 |
if self.final_name(child) == name: |
|
478 |
return True |
|
479 |
try: |
|
480 |
path = self._tree_id_paths[parent_id] |
|
481 |
except KeyError: |
|
482 |
return False |
|
483 |
childpath = joinpath(path, name) |
|
484 |
child_id = self._tree_path_ids.get(childpath) |
|
485 |
if child_id is None: |
|
486 |
return lexists(self._tree.abspath(childpath)) |
|
487 |
else: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
488 |
if self.final_parent(child_id) != parent_id: |
1534.10.28
by Aaron Bentley
Use numbered backup files |
489 |
return False |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
490 |
if child_id in self._removed_contents: |
1534.10.28
by Aaron Bentley
Use numbered backup files |
491 |
# XXX What about dangling file-ids?
|
492 |
return False |
|
493 |
else: |
|
494 |
return True |
|
495 |
||
1534.7.19
by Aaron Bentley
Added tests for parent loops |
496 |
def _parent_loops(self): |
497 |
"""No entry should be its own ancestor"""
|
|
498 |
conflicts = [] |
|
499 |
for trans_id in self._new_parent: |
|
500 |
seen = set() |
|
501 |
parent_id = trans_id |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
502 |
while parent_id is not ROOT_PARENT: |
1534.7.19
by Aaron Bentley
Added tests for parent loops |
503 |
seen.add(parent_id) |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
504 |
try: |
505 |
parent_id = self.final_parent(parent_id) |
|
506 |
except KeyError: |
|
507 |
break
|
|
1534.7.19
by Aaron Bentley
Added tests for parent loops |
508 |
if parent_id == trans_id: |
509 |
conflicts.append(('parent loop', trans_id)) |
|
510 |
if parent_id in seen: |
|
511 |
break
|
|
512 |
return conflicts |
|
513 |
||
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
514 |
def _unversioned_parents(self, by_parent): |
515 |
"""If parent directories are versioned, children must be versioned."""
|
|
516 |
conflicts = [] |
|
517 |
for parent_id, children in by_parent.iteritems(): |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
518 |
if parent_id is ROOT_PARENT: |
519 |
continue
|
|
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
520 |
if self.final_file_id(parent_id) is not None: |
521 |
continue
|
|
522 |
for child_id in children: |
|
523 |
if self.final_file_id(child_id) is not None: |
|
524 |
conflicts.append(('unversioned parent', parent_id)) |
|
525 |
break; |
|
526 |
return conflicts |
|
527 |
||
528 |
def _improper_versioning(self): |
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
529 |
"""Cannot version a file with no contents, or a bad type.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
530 |
|
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
531 |
However, existing entries with no contents are okay.
|
532 |
"""
|
|
533 |
conflicts = [] |
|
534 |
for trans_id in self._new_id.iterkeys(): |
|
535 |
try: |
|
536 |
kind = self.final_kind(trans_id) |
|
537 |
except NoSuchFile: |
|
538 |
conflicts.append(('versioning no contents', trans_id)) |
|
539 |
continue
|
|
540 |
if not InventoryEntry.versionable_kind(kind): |
|
1534.7.20
by Aaron Bentley
Added directory handling |
541 |
conflicts.append(('versioning bad kind', trans_id, kind)) |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
542 |
return conflicts |
543 |
||
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
544 |
def _executability_conflicts(self): |
1534.7.40
by Aaron Bentley
Updated docs |
545 |
"""Check for bad executability changes.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
546 |
|
1534.7.40
by Aaron Bentley
Updated docs |
547 |
Only versioned files may have their executability set, because
|
548 |
1. only versioned entries can have executability under windows
|
|
549 |
2. only files can be executable. (The execute bit on a directory
|
|
550 |
does not indicate searchability)
|
|
551 |
"""
|
|
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
552 |
conflicts = [] |
553 |
for trans_id in self._new_executability: |
|
554 |
if self.final_file_id(trans_id) is None: |
|
555 |
conflicts.append(('unversioned executability', trans_id)) |
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
556 |
else: |
557 |
try: |
|
558 |
non_file = self.final_kind(trans_id) != "file" |
|
559 |
except NoSuchFile: |
|
560 |
non_file = True |
|
561 |
if non_file is True: |
|
562 |
conflicts.append(('non-file executability', trans_id)) |
|
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
563 |
return conflicts |
564 |
||
1534.7.152
by Aaron Bentley
Fixed overwrites |
565 |
def _overwrite_conflicts(self): |
566 |
"""Check for overwrites (not permitted on Win32)"""
|
|
567 |
conflicts = [] |
|
568 |
for trans_id in self._new_contents: |
|
569 |
try: |
|
570 |
self.tree_kind(trans_id) |
|
571 |
except NoSuchFile: |
|
572 |
continue
|
|
573 |
if trans_id not in self._removed_contents: |
|
574 |
conflicts.append(('overwrite', trans_id, |
|
575 |
self.final_name(trans_id))) |
|
576 |
return conflicts |
|
577 |
||
1534.7.11
by Aaron Bentley
Refactored conflict handling |
578 |
def _duplicate_entries(self, by_parent): |
579 |
"""No directory may have two entries with the same name."""
|
|
580 |
conflicts = [] |
|
2590.2.16
by Aaron Bentley
Shortcut duplicate_entries conflict check if no new names introduced |
581 |
if (self._new_name, self._new_parent) == ({}, {}): |
582 |
return conflicts |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
583 |
for children in by_parent.itervalues(): |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
584 |
name_ids = [(self.final_name(t), t) for t in children] |
3008.1.15
by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree |
585 |
if not self._case_sensitive_target: |
3034.4.1
by Aaron Bentley
Start handling case-insensitivity |
586 |
name_ids = [(n.lower(), t) for n, t in name_ids] |
1534.7.6
by Aaron Bentley
Added conflict handling |
587 |
name_ids.sort() |
588 |
last_name = None |
|
589 |
last_trans_id = None |
|
590 |
for name, trans_id in name_ids: |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
591 |
try: |
592 |
kind = self.final_kind(trans_id) |
|
593 |
except NoSuchFile: |
|
594 |
kind = None |
|
595 |
file_id = self.final_file_id(trans_id) |
|
596 |
if kind is None and file_id is None: |
|
597 |
continue
|
|
1534.7.6
by Aaron Bentley
Added conflict handling |
598 |
if name == last_name: |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
599 |
conflicts.append(('duplicate', last_trans_id, trans_id, |
600 |
name)) |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
601 |
last_name = name |
602 |
last_trans_id = trans_id |
|
1534.7.11
by Aaron Bentley
Refactored conflict handling |
603 |
return conflicts |
604 |
||
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
605 |
def _duplicate_ids(self): |
606 |
"""Each inventory id may only be used once"""
|
|
607 |
conflicts = [] |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
608 |
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
609 |
self._removed_id)) |
3146.8.16
by Aaron Bentley
Updates from review |
610 |
all_ids = self._tree.all_file_ids() |
611 |
active_tree_ids = all_ids.difference(removed_tree_ids) |
|
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
612 |
for trans_id, file_id in self._new_id.iteritems(): |
613 |
if file_id in active_tree_ids: |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
614 |
old_trans_id = self.trans_id_tree_file_id(file_id) |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
615 |
conflicts.append(('duplicate id', old_trans_id, trans_id)) |
616 |
return conflicts |
|
617 |
||
1534.7.11
by Aaron Bentley
Refactored conflict handling |
618 |
def _parent_type_conflicts(self, by_parent): |
619 |
"""parents must have directory 'contents'."""
|
|
620 |
conflicts = [] |
|
1534.7.37
by Aaron Bentley
Allowed removed dirs to have content-free children. |
621 |
for parent_id, children in by_parent.iteritems(): |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
622 |
if parent_id is ROOT_PARENT: |
623 |
continue
|
|
1534.7.37
by Aaron Bentley
Allowed removed dirs to have content-free children. |
624 |
if not self._any_contents(children): |
625 |
continue
|
|
626 |
for child in children: |
|
627 |
try: |
|
628 |
self.final_kind(child) |
|
629 |
except NoSuchFile: |
|
630 |
continue
|
|
1534.7.10
by Aaron Bentley
Implemented missing parent and non-directory parent conflicts |
631 |
try: |
632 |
kind = self.final_kind(parent_id) |
|
633 |
except NoSuchFile: |
|
634 |
kind = None |
|
635 |
if kind is None: |
|
636 |
conflicts.append(('missing parent', parent_id)) |
|
637 |
elif kind != "directory": |
|
638 |
conflicts.append(('non-directory parent', parent_id)) |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
639 |
return conflicts |
1534.7.37
by Aaron Bentley
Allowed removed dirs to have content-free children. |
640 |
|
641 |
def _any_contents(self, trans_ids): |
|
642 |
"""Return true if any of the trans_ids, will have contents."""
|
|
643 |
for trans_id in trans_ids: |
|
644 |
try: |
|
645 |
kind = self.final_kind(trans_id) |
|
646 |
except NoSuchFile: |
|
647 |
continue
|
|
648 |
return True |
|
649 |
return False |
|
1534.7.35
by Aaron Bentley
Got file renaming working |
650 |
|
3619.2.8
by Aaron Bentley
Reorganize execute-bit handling |
651 |
def _set_executability(self, path, trans_id): |
1534.7.40
by Aaron Bentley
Updated docs |
652 |
"""Set the executability of versioned files """
|
1534.7.25
by Aaron Bentley
Added set_executability |
653 |
if supports_executable(): |
3619.2.8
by Aaron Bentley
Reorganize execute-bit handling |
654 |
new_executability = self._new_executability[trans_id] |
1534.7.25
by Aaron Bentley
Added set_executability |
655 |
abspath = self._tree.abspath(path) |
656 |
current_mode = os.stat(abspath).st_mode |
|
657 |
if new_executability: |
|
658 |
umask = os.umask(0) |
|
659 |
os.umask(umask) |
|
660 |
to_mode = current_mode | (0100 & ~umask) |
|
661 |
# Enable x-bit for others only if they can read it.
|
|
662 |
if current_mode & 0004: |
|
663 |
to_mode |= 0001 & ~umask |
|
664 |
if current_mode & 0040: |
|
665 |
to_mode |= 0010 & ~umask |
|
666 |
else: |
|
667 |
to_mode = current_mode & ~0111 |
|
668 |
os.chmod(abspath, to_mode) |
|
669 |
||
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
670 |
def _new_entry(self, name, parent_id, file_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
671 |
"""Helper function to create a new filesystem entry."""
|
1534.7.2
by Aaron Bentley
Added convenience function |
672 |
trans_id = self.create_path(name, parent_id) |
673 |
if file_id is not None: |
|
674 |
self.version_file(file_id, trans_id) |
|
675 |
return trans_id |
|
676 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
677 |
def new_file(self, name, parent_id, contents, file_id=None, |
1534.7.27
by Aaron Bentley
Added execute bit to new_file method |
678 |
executable=None): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
679 |
"""Convenience method to create files.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
680 |
|
1534.7.21
by Aaron Bentley
Updated docstrings |
681 |
name is the name of the file to create.
|
682 |
parent_id is the transaction id of the parent directory of the file.
|
|
683 |
contents is an iterator of bytestrings, which will be used to produce
|
|
684 |
the file.
|
|
1740.2.4
by Aaron Bentley
Update transform tests and docs |
685 |
:param file_id: The inventory ID of the file, if it is to be versioned.
|
686 |
:param executable: Only valid when a file_id has been supplied.
|
|
1534.7.21
by Aaron Bentley
Updated docstrings |
687 |
"""
|
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
688 |
trans_id = self._new_entry(name, parent_id, file_id) |
1740.2.4
by Aaron Bentley
Update transform tests and docs |
689 |
# TODO: rather than scheduling a set_executable call,
|
690 |
# have create_file create the file with the right mode.
|
|
1534.7.20
by Aaron Bentley
Added directory handling |
691 |
self.create_file(contents, trans_id) |
1534.7.27
by Aaron Bentley
Added execute bit to new_file method |
692 |
if executable is not None: |
693 |
self.set_executability(executable, trans_id) |
|
1534.7.20
by Aaron Bentley
Added directory handling |
694 |
return trans_id |
695 |
||
696 |
def new_directory(self, name, parent_id, file_id=None): |
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
697 |
"""Convenience method to create directories.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
698 |
|
699 |
name is the name of the directory to create.
|
|
700 |
parent_id is the transaction id of the parent directory of the
|
|
701 |
directory.
|
|
702 |
file_id is the inventory ID of the directory, if it is to be versioned.
|
|
703 |
"""
|
|
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
704 |
trans_id = self._new_entry(name, parent_id, file_id) |
1534.7.20
by Aaron Bentley
Added directory handling |
705 |
self.create_directory(trans_id) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
706 |
return trans_id |
1534.7.20
by Aaron Bentley
Added directory handling |
707 |
|
1534.7.22
by Aaron Bentley
Added symlink support |
708 |
def new_symlink(self, name, parent_id, target, file_id=None): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
709 |
"""Convenience method to create symbolic link.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
710 |
|
1534.7.22
by Aaron Bentley
Added symlink support |
711 |
name is the name of the symlink to create.
|
712 |
parent_id is the transaction id of the parent directory of the symlink.
|
|
713 |
target is a bytestring of the target of the symlink.
|
|
714 |
file_id is the inventory ID of the file, if it is to be versioned.
|
|
715 |
"""
|
|
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
716 |
trans_id = self._new_entry(name, parent_id, file_id) |
1534.7.22
by Aaron Bentley
Added symlink support |
717 |
self.create_symlink(target, trans_id) |
718 |
return trans_id |
|
719 |
||
1551.11.12
by Aaron Bentley
Changes from review |
720 |
def _affected_ids(self): |
721 |
"""Return the set of transform ids affected by the transform"""
|
|
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
722 |
trans_ids = set(self._removed_id) |
723 |
trans_ids.update(self._new_id.keys()) |
|
1551.11.2
by Aaron Bentley
Get kind change detection working for iter_changes |
724 |
trans_ids.update(self._removed_contents) |
725 |
trans_ids.update(self._new_contents.keys()) |
|
726 |
trans_ids.update(self._new_executability.keys()) |
|
727 |
trans_ids.update(self._new_name.keys()) |
|
728 |
trans_ids.update(self._new_parent.keys()) |
|
1551.11.12
by Aaron Bentley
Changes from review |
729 |
return trans_ids |
730 |
||
731 |
def _get_file_id_maps(self): |
|
732 |
"""Return mapping of file_ids to trans_ids in the to and from states"""
|
|
733 |
trans_ids = self._affected_ids() |
|
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
734 |
from_trans_ids = {} |
735 |
to_trans_ids = {} |
|
736 |
# Build up two dicts: trans_ids associated with file ids in the
|
|
737 |
# FROM state, vs the TO state.
|
|
738 |
for trans_id in trans_ids: |
|
739 |
from_file_id = self.tree_file_id(trans_id) |
|
740 |
if from_file_id is not None: |
|
741 |
from_trans_ids[from_file_id] = trans_id |
|
742 |
to_file_id = self.final_file_id(trans_id) |
|
743 |
if to_file_id is not None: |
|
744 |
to_trans_ids[to_file_id] = trans_id |
|
1551.11.12
by Aaron Bentley
Changes from review |
745 |
return from_trans_ids, to_trans_ids |
746 |
||
747 |
def _from_file_data(self, from_trans_id, from_versioned, file_id): |
|
748 |
"""Get data about a file in the from (tree) state
|
|
749 |
||
750 |
Return a (name, parent, kind, executable) tuple
|
|
751 |
"""
|
|
752 |
from_path = self._tree_id_paths.get(from_trans_id) |
|
753 |
if from_versioned: |
|
754 |
# get data from working tree if versioned
|
|
3363.17.5
by Aaron Bentley
Update merge to not use inventory |
755 |
from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1] |
1551.11.12
by Aaron Bentley
Changes from review |
756 |
from_name = from_entry.name |
757 |
from_parent = from_entry.parent_id |
|
758 |
else: |
|
759 |
from_entry = None |
|
760 |
if from_path is None: |
|
761 |
# File does not exist in FROM state
|
|
762 |
from_name = None |
|
763 |
from_parent = None |
|
764 |
else: |
|
765 |
# File exists, but is not versioned. Have to use path-
|
|
766 |
# splitting stuff
|
|
767 |
from_name = os.path.basename(from_path) |
|
768 |
tree_parent = self.get_tree_parent(from_trans_id) |
|
769 |
from_parent = self.tree_file_id(tree_parent) |
|
770 |
if from_path is not None: |
|
771 |
from_kind, from_executable, from_stats = \ |
|
772 |
self._tree._comparison_data(from_entry, from_path) |
|
773 |
else: |
|
774 |
from_kind = None |
|
775 |
from_executable = False |
|
776 |
return from_name, from_parent, from_kind, from_executable |
|
777 |
||
778 |
def _to_file_data(self, to_trans_id, from_trans_id, from_executable): |
|
779 |
"""Get data about a file in the to (target) state
|
|
780 |
||
781 |
Return a (name, parent, kind, executable) tuple
|
|
782 |
"""
|
|
783 |
to_name = self.final_name(to_trans_id) |
|
784 |
try: |
|
785 |
to_kind = self.final_kind(to_trans_id) |
|
786 |
except NoSuchFile: |
|
787 |
to_kind = None |
|
788 |
to_parent = self.final_file_id(self.final_parent(to_trans_id)) |
|
789 |
if to_trans_id in self._new_executability: |
|
790 |
to_executable = self._new_executability[to_trans_id] |
|
791 |
elif to_trans_id == from_trans_id: |
|
792 |
to_executable = from_executable |
|
793 |
else: |
|
794 |
to_executable = False |
|
795 |
return to_name, to_parent, to_kind, to_executable |
|
796 |
||
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
797 |
def iter_changes(self): |
798 |
"""Produce output in the same format as Tree.iter_changes.
|
|
1551.11.12
by Aaron Bentley
Changes from review |
799 |
|
800 |
Will produce nonsensical results if invoked while inventory/filesystem
|
|
801 |
conflicts (as reported by TreeTransform.find_conflicts()) are present.
|
|
802 |
||
803 |
This reads the Transform, but only reproduces changes involving a
|
|
804 |
file_id. Files that are not versioned in either of the FROM or TO
|
|
805 |
states are not reflected.
|
|
806 |
"""
|
|
807 |
final_paths = FinalPaths(self) |
|
808 |
from_trans_ids, to_trans_ids = self._get_file_id_maps() |
|
1551.11.4
by Aaron Bentley
Sort output of Transform.iter_changes by path |
809 |
results = [] |
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
810 |
# Now iterate through all active file_ids
|
811 |
for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()): |
|
1551.11.7
by Aaron Bentley
Stop modified flag bleeding into later changes |
812 |
modified = False |
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
813 |
from_trans_id = from_trans_ids.get(file_id) |
814 |
# find file ids, and determine versioning state
|
|
815 |
if from_trans_id is None: |
|
816 |
from_versioned = False |
|
817 |
from_trans_id = to_trans_ids[file_id] |
|
818 |
else: |
|
819 |
from_versioned = True |
|
820 |
to_trans_id = to_trans_ids.get(file_id) |
|
821 |
if to_trans_id is None: |
|
822 |
to_versioned = False |
|
823 |
to_trans_id = from_trans_id |
|
824 |
else: |
|
825 |
to_versioned = True |
|
1551.11.12
by Aaron Bentley
Changes from review |
826 |
|
827 |
from_name, from_parent, from_kind, from_executable = \ |
|
828 |
self._from_file_data(from_trans_id, from_versioned, file_id) |
|
829 |
||
830 |
to_name, to_parent, to_kind, to_executable = \ |
|
831 |
self._to_file_data(to_trans_id, from_trans_id, from_executable) |
|
832 |
||
2255.7.96
by Robert Collins
Change _iter_changes interface to yield both old and new paths. |
833 |
if not from_versioned: |
834 |
from_path = None |
|
835 |
else: |
|
836 |
from_path = self._tree_id_paths.get(from_trans_id) |
|
837 |
if not to_versioned: |
|
838 |
to_path = None |
|
839 |
else: |
|
840 |
to_path = final_paths.get_path(to_trans_id) |
|
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
841 |
if from_kind != to_kind: |
842 |
modified = True |
|
1551.10.37
by Aaron Bentley
recommit of TreeTransform._iter_changes fix with missing files |
843 |
elif to_kind in ('file', 'symlink') and ( |
1551.11.2
by Aaron Bentley
Get kind change detection working for iter_changes |
844 |
to_trans_id != from_trans_id or |
845 |
to_trans_id in self._new_contents): |
|
846 |
modified = True |
|
847 |
if (not modified and from_versioned == to_versioned and |
|
848 |
from_parent==to_parent and from_name == to_name and |
|
849 |
from_executable == to_executable): |
|
850 |
continue
|
|
2255.7.96
by Robert Collins
Change _iter_changes interface to yield both old and new paths. |
851 |
results.append((file_id, (from_path, to_path), modified, |
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
852 |
(from_versioned, to_versioned), |
1551.11.2
by Aaron Bentley
Get kind change detection working for iter_changes |
853 |
(from_parent, to_parent), |
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
854 |
(from_name, to_name), |
855 |
(from_kind, to_kind), |
|
1551.11.4
by Aaron Bentley
Sort output of Transform.iter_changes by path |
856 |
(from_executable, to_executable))) |
857 |
return iter(sorted(results, key=lambda x:x[1])) |
|
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
858 |
|
4354.4.4
by Aaron Bentley
Simplify by using CommitBuilder directly |
859 |
def get_preview_tree(self): |
3008.1.17
by Aaron Bentley
Test unused parameters of preview_tree._iter_changes |
860 |
"""Return a tree representing the result of the transform.
|
861 |
||
862 |
This tree only supports the subset of Tree functionality required
|
|
863 |
by show_diff_trees. It must only be compared to tt._tree.
|
|
864 |
"""
|
|
4354.4.4
by Aaron Bentley
Simplify by using CommitBuilder directly |
865 |
return _PreviewTree(self) |
3008.1.17
by Aaron Bentley
Test unused parameters of preview_tree._iter_changes |
866 |
|
4526.8.2
by Aaron Bentley
Proved strict commit handling. |
867 |
def commit(self, branch, message, merge_parents=None, strict=False): |
4526.8.1
by Aaron Bentley
Support committing a TreeTransform to a branch. |
868 |
"""Commit the result of this TreeTransform to a branch.
|
869 |
||
870 |
:param branch: The branch to commit to.
|
|
871 |
:param message: The message to attach to the commit.
|
|
872 |
:param merge_parents: Additional parents specified by pending merges.
|
|
873 |
:return: The revision_id of the revision committed.
|
|
874 |
"""
|
|
4526.8.6
by Aaron Bentley
Check for malformed transforms before committing. |
875 |
self._check_malformed() |
4526.8.2
by Aaron Bentley
Proved strict commit handling. |
876 |
if strict: |
877 |
unversioned = set(self._new_contents).difference(set(self._new_id)) |
|
878 |
for trans_id in unversioned: |
|
879 |
if self.final_file_id(trans_id) is None: |
|
880 |
raise errors.StrictCommitFailed() |
|
4526.8.3
by Aaron Bentley
Clean up merge parent handling. |
881 |
|
882 |
revno, last_rev_id = branch.last_revision_info() |
|
883 |
if last_rev_id == _mod_revision.NULL_REVISION: |
|
884 |
if merge_parents is not None: |
|
4526.8.5
by Aaron Bentley
Updates from review. |
885 |
raise ValueError('Cannot supply merge parents for first' |
886 |
' commit.') |
|
4526.8.3
by Aaron Bentley
Clean up merge parent handling. |
887 |
parent_ids = [] |
888 |
else: |
|
889 |
parent_ids = [last_rev_id] |
|
890 |
if merge_parents is not None: |
|
891 |
parent_ids.extend(merge_parents) |
|
4526.8.1
by Aaron Bentley
Support committing a TreeTransform to a branch. |
892 |
if self._tree.get_revision_id() != last_rev_id: |
4526.8.5
by Aaron Bentley
Updates from review. |
893 |
raise ValueError('TreeTransform not based on branch basis: %s' % |
894 |
self._tree.get_revision_id()) |
|
4526.8.1
by Aaron Bentley
Support committing a TreeTransform to a branch. |
895 |
builder = branch.get_commit_builder(parent_ids) |
896 |
preview = self.get_preview_tree() |
|
897 |
list(builder.record_iter_changes(preview, last_rev_id, |
|
898 |
self.iter_changes())) |
|
899 |
builder.finish_inventory() |
|
900 |
revision_id = builder.commit(message) |
|
901 |
branch.set_last_revision_info(revno + 1, revision_id) |
|
902 |
return revision_id |
|
903 |
||
0.13.24
by Aaron Bentley
Update to use Tree.readlines, if possible. |
904 |
def _text_parent(self, trans_id): |
905 |
file_id = self.tree_file_id(trans_id) |
|
906 |
try: |
|
907 |
if file_id is None or self._tree.kind(file_id) != 'file': |
|
908 |
return None |
|
909 |
except errors.NoSuchFile: |
|
910 |
return None |
|
911 |
return file_id |
|
912 |
||
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
913 |
def _get_parents_texts(self, trans_id): |
0.13.9
by Aaron Bentley
Update docs |
914 |
"""Get texts for compression parents of this file."""
|
0.13.24
by Aaron Bentley
Update to use Tree.readlines, if possible. |
915 |
file_id = self._text_parent(trans_id) |
916 |
if file_id is None: |
|
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
917 |
return () |
918 |
return (self._tree.get_file_text(file_id),) |
|
919 |
||
920 |
def _get_parents_lines(self, trans_id): |
|
0.13.9
by Aaron Bentley
Update docs |
921 |
"""Get lines for compression parents of this file."""
|
0.13.24
by Aaron Bentley
Update to use Tree.readlines, if possible. |
922 |
file_id = self._text_parent(trans_id) |
923 |
if file_id is None: |
|
924 |
return () |
|
925 |
return (self._tree.get_file_lines(file_id),) |
|
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
926 |
|
927 |
def serialize(self, serializer): |
|
0.13.9
by Aaron Bentley
Update docs |
928 |
"""Serialize this TreeTransform.
|
929 |
||
930 |
:param serializer: A Serialiser like pack.ContainerSerializer.
|
|
931 |
"""
|
|
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
932 |
new_name = dict((k, v.encode('utf-8')) for k, v in |
933 |
self._new_name.items()) |
|
934 |
new_executability = dict((k, int(v)) for k, v in |
|
935 |
self._new_executability.items()) |
|
936 |
tree_path_ids = dict((k.encode('utf-8'), v) |
|
937 |
for k, v in self._tree_path_ids.items()) |
|
938 |
attribs = { |
|
939 |
'_id_number': self._id_number, |
|
940 |
'_new_name': new_name, |
|
941 |
'_new_parent': self._new_parent, |
|
942 |
'_new_executability': new_executability, |
|
943 |
'_new_id': self._new_id, |
|
944 |
'_tree_path_ids': tree_path_ids, |
|
945 |
'_removed_id': list(self._removed_id), |
|
946 |
'_removed_contents': list(self._removed_contents), |
|
947 |
'_non_present_ids': self._non_present_ids, |
|
948 |
}
|
|
949 |
yield serializer.bytes_record(bencode.bencode(attribs), |
|
950 |
(('attribs',),)) |
|
951 |
for trans_id, kind in self._new_contents.items(): |
|
952 |
if kind == 'file': |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
953 |
lines = osutils.chunks_to_lines( |
954 |
self._read_file_chunks(trans_id)) |
|
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
955 |
parents = self._get_parents_lines(trans_id) |
956 |
mpdiff = multiparent.MultiParent.from_lines(lines, parents) |
|
957 |
content = ''.join(mpdiff.to_patch()) |
|
958 |
if kind == 'directory': |
|
959 |
content = '' |
|
960 |
if kind == 'symlink': |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
961 |
content = self._read_symlink_target(trans_id) |
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
962 |
yield serializer.bytes_record(content, ((trans_id, kind),)) |
963 |
||
964 |
def deserialize(self, records): |
|
0.13.9
by Aaron Bentley
Update docs |
965 |
"""Deserialize a stored TreeTransform.
|
966 |
||
967 |
:param records: An iterable of (names, content) tuples, as per
|
|
968 |
pack.ContainerPushParser.
|
|
969 |
"""
|
|
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
970 |
names, content = records.next() |
971 |
attribs = bencode.bdecode(content) |
|
972 |
self._id_number = attribs['_id_number'] |
|
973 |
self._new_name = dict((k, v.decode('utf-8')) |
|
974 |
for k, v in attribs['_new_name'].items()) |
|
975 |
self._new_parent = attribs['_new_parent'] |
|
976 |
self._new_executability = dict((k, bool(v)) for k, v in |
|
977 |
attribs['_new_executability'].items()) |
|
978 |
self._new_id = attribs['_new_id'] |
|
979 |
self._r_new_id = dict((v, k) for k, v in self._new_id.items()) |
|
980 |
self._tree_path_ids = {} |
|
981 |
self._tree_id_paths = {} |
|
982 |
for bytepath, trans_id in attribs['_tree_path_ids'].items(): |
|
983 |
path = bytepath.decode('utf-8') |
|
984 |
self._tree_path_ids[path] = trans_id |
|
985 |
self._tree_id_paths[trans_id] = path |
|
986 |
self._removed_id = set(attribs['_removed_id']) |
|
987 |
self._removed_contents = set(attribs['_removed_contents']) |
|
988 |
self._non_present_ids = attribs['_non_present_ids'] |
|
989 |
for ((trans_id, kind),), content in records: |
|
990 |
if kind == 'file': |
|
991 |
mpdiff = multiparent.MultiParent.from_patch(content) |
|
992 |
lines = mpdiff.to_lines(self._get_parents_texts(trans_id)) |
|
993 |
self.create_file(lines, trans_id) |
|
994 |
if kind == 'directory': |
|
995 |
self.create_directory(trans_id) |
|
996 |
if kind == 'symlink': |
|
0.13.16
by Aaron Bentley
Add unicode symlink targets to tests |
997 |
self.create_symlink(content.decode('utf-8'), trans_id) |
0.13.8
by Aaron Bentley
Integrate serialization into TreeTransforms |
998 |
|
1551.11.1
by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format |
999 |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1000 |
class DiskTreeTransform(TreeTransformBase): |
1001 |
"""Tree transform storing its contents on disk."""
|
|
1002 |
||
1003 |
def __init__(self, tree, limbodir, pb=DummyProgress(), |
|
1004 |
case_sensitive=True): |
|
1005 |
"""Constructor.
|
|
1006 |
:param tree: The tree that will be transformed, but not necessarily
|
|
1007 |
the output tree.
|
|
1008 |
:param limbodir: A directory where new files can be stored until
|
|
1009 |
they are installed in their proper places
|
|
1010 |
:param pb: A ProgressBar indicating how much progress is being made
|
|
1011 |
:param case_sensitive: If True, the target of the transform is
|
|
1012 |
case sensitive, not just case preserving.
|
|
1013 |
"""
|
|
1014 |
TreeTransformBase.__init__(self, tree, pb, case_sensitive) |
|
1015 |
self._limbodir = limbodir |
|
1016 |
self._deletiondir = None |
|
1017 |
# A mapping of transform ids to their limbo filename
|
|
1018 |
self._limbo_files = {} |
|
1019 |
# A mapping of transform ids to a set of the transform ids of children
|
|
1020 |
# that their limbo directory has
|
|
1021 |
self._limbo_children = {} |
|
1022 |
# Map transform ids to maps of child filename to child transform id
|
|
1023 |
self._limbo_children_names = {} |
|
1024 |
# List of transform ids that need to be renamed from limbo into place
|
|
1025 |
self._needs_rename = set() |
|
1026 |
||
1027 |
def finalize(self): |
|
1028 |
"""Release the working tree lock, if held, clean up limbo dir.
|
|
1029 |
||
1030 |
This is required if apply has not been invoked, but can be invoked
|
|
1031 |
even after apply.
|
|
1032 |
"""
|
|
1033 |
if self._tree is None: |
|
1034 |
return
|
|
1035 |
try: |
|
1036 |
entries = [(self._limbo_name(t), t, k) for t, k in |
|
1037 |
self._new_contents.iteritems()] |
|
1038 |
entries.sort(reverse=True) |
|
1039 |
for path, trans_id, kind in entries: |
|
4440.1.1
by Craig Hewetson
bug fixes for: |
1040 |
delete_any(path) |
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1041 |
try: |
4440.1.1
by Craig Hewetson
bug fixes for: |
1042 |
delete_any(self._limbodir) |
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1043 |
except OSError: |
1044 |
# We don't especially care *why* the dir is immortal.
|
|
1045 |
raise ImmortalLimbo(self._limbodir) |
|
1046 |
try: |
|
1047 |
if self._deletiondir is not None: |
|
4440.1.1
by Craig Hewetson
bug fixes for: |
1048 |
delete_any(self._deletiondir) |
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1049 |
except OSError: |
1050 |
raise errors.ImmortalPendingDeletion(self._deletiondir) |
|
1051 |
finally: |
|
1052 |
TreeTransformBase.finalize(self) |
|
1053 |
||
1054 |
def _limbo_name(self, trans_id): |
|
1055 |
"""Generate the limbo name of a file"""
|
|
1056 |
limbo_name = self._limbo_files.get(trans_id) |
|
1057 |
if limbo_name is not None: |
|
1058 |
return limbo_name |
|
1059 |
parent = self._new_parent.get(trans_id) |
|
1060 |
# if the parent directory is already in limbo (e.g. when building a
|
|
1061 |
# tree), choose a limbo name inside the parent, to reduce further
|
|
1062 |
# renames.
|
|
1063 |
use_direct_path = False |
|
1064 |
if self._new_contents.get(parent) == 'directory': |
|
1065 |
filename = self._new_name.get(trans_id) |
|
1066 |
if filename is not None: |
|
1067 |
if parent not in self._limbo_children: |
|
1068 |
self._limbo_children[parent] = set() |
|
1069 |
self._limbo_children_names[parent] = {} |
|
1070 |
use_direct_path = True |
|
1071 |
# the direct path can only be used if no other file has
|
|
1072 |
# already taken this pathname, i.e. if the name is unused, or
|
|
1073 |
# if it is already associated with this trans_id.
|
|
1074 |
elif self._case_sensitive_target: |
|
1075 |
if (self._limbo_children_names[parent].get(filename) |
|
1076 |
in (trans_id, None)): |
|
1077 |
use_direct_path = True |
|
1078 |
else: |
|
1079 |
for l_filename, l_trans_id in\ |
|
1080 |
self._limbo_children_names[parent].iteritems(): |
|
1081 |
if l_trans_id == trans_id: |
|
1082 |
continue
|
|
1083 |
if l_filename.lower() == filename.lower(): |
|
1084 |
break
|
|
1085 |
else: |
|
1086 |
use_direct_path = True |
|
1087 |
||
1088 |
if use_direct_path: |
|
1089 |
limbo_name = pathjoin(self._limbo_files[parent], filename) |
|
1090 |
self._limbo_children[parent].add(trans_id) |
|
1091 |
self._limbo_children_names[parent][filename] = trans_id |
|
1092 |
else: |
|
1093 |
limbo_name = pathjoin(self._limbodir, trans_id) |
|
1094 |
self._needs_rename.add(trans_id) |
|
1095 |
self._limbo_files[trans_id] = limbo_name |
|
1096 |
return limbo_name |
|
1097 |
||
1098 |
def adjust_path(self, name, parent, trans_id): |
|
1099 |
previous_parent = self._new_parent.get(trans_id) |
|
1100 |
previous_name = self._new_name.get(trans_id) |
|
1101 |
TreeTransformBase.adjust_path(self, name, parent, trans_id) |
|
1102 |
if (trans_id in self._limbo_files and |
|
1103 |
trans_id not in self._needs_rename): |
|
1104 |
self._rename_in_limbo([trans_id]) |
|
1105 |
self._limbo_children[previous_parent].remove(trans_id) |
|
1106 |
del self._limbo_children_names[previous_parent][previous_name] |
|
1107 |
||
1108 |
def _rename_in_limbo(self, trans_ids): |
|
1109 |
"""Fix limbo names so that the right final path is produced.
|
|
1110 |
||
1111 |
This means we outsmarted ourselves-- we tried to avoid renaming
|
|
1112 |
these files later by creating them with their final names in their
|
|
1113 |
final parents. But now the previous name or parent is no longer
|
|
1114 |
suitable, so we have to rename them.
|
|
1115 |
||
1116 |
Even for trans_ids that have no new contents, we must remove their
|
|
1117 |
entries from _limbo_files, because they are now stale.
|
|
1118 |
"""
|
|
1119 |
for trans_id in trans_ids: |
|
1120 |
old_path = self._limbo_files.pop(trans_id) |
|
1121 |
if trans_id not in self._new_contents: |
|
1122 |
continue
|
|
1123 |
new_path = self._limbo_name(trans_id) |
|
1124 |
os.rename(old_path, new_path) |
|
1125 |
||
1126 |
def create_file(self, contents, trans_id, mode_id=None): |
|
1127 |
"""Schedule creation of a new file.
|
|
1128 |
||
1129 |
See also new_file.
|
|
1130 |
||
1131 |
Contents is an iterator of strings, all of which will be written
|
|
1132 |
to the target destination.
|
|
1133 |
||
1134 |
New file takes the permissions of any existing file with that id,
|
|
1135 |
unless mode_id is specified.
|
|
1136 |
"""
|
|
1137 |
name = self._limbo_name(trans_id) |
|
1138 |
f = open(name, 'wb') |
|
1139 |
try: |
|
1140 |
try: |
|
1141 |
unique_add(self._new_contents, trans_id, 'file') |
|
1142 |
except: |
|
1143 |
# Clean up the file, it never got registered so
|
|
1144 |
# TreeTransform.finalize() won't clean it up.
|
|
1145 |
f.close() |
|
1146 |
os.unlink(name) |
|
1147 |
raise
|
|
1148 |
||
1149 |
f.writelines(contents) |
|
1150 |
finally: |
|
1151 |
f.close() |
|
1152 |
self._set_mode(trans_id, mode_id, S_ISREG) |
|
1153 |
||
1154 |
def _read_file_chunks(self, trans_id): |
|
1155 |
cur_file = open(self._limbo_name(trans_id), 'rb') |
|
1156 |
try: |
|
1157 |
return cur_file.readlines() |
|
1158 |
finally: |
|
1159 |
cur_file.close() |
|
1160 |
||
1161 |
def _read_symlink_target(self, trans_id): |
|
1162 |
return os.readlink(self._limbo_name(trans_id)) |
|
1163 |
||
1164 |
def create_hardlink(self, path, trans_id): |
|
1165 |
"""Schedule creation of a hard link"""
|
|
1166 |
name = self._limbo_name(trans_id) |
|
1167 |
try: |
|
1168 |
os.link(path, name) |
|
1169 |
except OSError, e: |
|
1170 |
if e.errno != errno.EPERM: |
|
1171 |
raise
|
|
1172 |
raise errors.HardLinkNotSupported(path) |
|
1173 |
try: |
|
1174 |
unique_add(self._new_contents, trans_id, 'file') |
|
1175 |
except: |
|
1176 |
# Clean up the file, it never got registered so
|
|
1177 |
# TreeTransform.finalize() won't clean it up.
|
|
1178 |
os.unlink(name) |
|
1179 |
raise
|
|
1180 |
||
1181 |
def create_directory(self, trans_id): |
|
1182 |
"""Schedule creation of a new directory.
|
|
1183 |
||
1184 |
See also new_directory.
|
|
1185 |
"""
|
|
1186 |
os.mkdir(self._limbo_name(trans_id)) |
|
1187 |
unique_add(self._new_contents, trans_id, 'directory') |
|
1188 |
||
1189 |
def create_symlink(self, target, trans_id): |
|
1190 |
"""Schedule creation of a new symbolic link.
|
|
1191 |
||
1192 |
target is a bytestring.
|
|
1193 |
See also new_symlink.
|
|
1194 |
"""
|
|
1195 |
if has_symlinks(): |
|
1196 |
os.symlink(target, self._limbo_name(trans_id)) |
|
1197 |
unique_add(self._new_contents, trans_id, 'symlink') |
|
1198 |
else: |
|
1199 |
try: |
|
1200 |
path = FinalPaths(self).get_path(trans_id) |
|
1201 |
except KeyError: |
|
1202 |
path = None |
|
1203 |
raise UnableCreateSymlink(path=path) |
|
1204 |
||
1205 |
def cancel_creation(self, trans_id): |
|
1206 |
"""Cancel the creation of new file contents."""
|
|
1207 |
del self._new_contents[trans_id] |
|
1208 |
children = self._limbo_children.get(trans_id) |
|
1209 |
# if this is a limbo directory with children, move them before removing
|
|
1210 |
# the directory
|
|
1211 |
if children is not None: |
|
1212 |
self._rename_in_limbo(children) |
|
1213 |
del self._limbo_children[trans_id] |
|
1214 |
del self._limbo_children_names[trans_id] |
|
1215 |
delete_any(self._limbo_name(trans_id)) |
|
1216 |
||
1217 |
||
1218 |
class TreeTransform(DiskTreeTransform): |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1219 |
"""Represent a tree transformation.
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1220 |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1221 |
This object is designed to support incremental generation of the transform,
|
1222 |
in any order.
|
|
1223 |
||
1224 |
However, it gives optimum performance when parent directories are created
|
|
1225 |
before their contents. The transform is then able to put child files
|
|
1226 |
directly in their parent directory, avoiding later renames.
|
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1227 |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1228 |
It is easy to produce malformed transforms, but they are generally
|
1229 |
harmless. Attempting to apply a malformed transform will cause an
|
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1230 |
exception to be raised before any modifications are made to the tree.
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1231 |
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1232 |
Many kinds of malformed transforms can be corrected with the
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1233 |
resolve_conflicts function. The remaining ones indicate programming error,
|
1234 |
such as trying to create a file with no path.
|
|
1235 |
||
1236 |
Two sets of file creation methods are supplied. Convenience methods are:
|
|
1237 |
* new_file
|
|
1238 |
* new_directory
|
|
1239 |
* new_symlink
|
|
1240 |
||
1241 |
These are composed of the low-level methods:
|
|
1242 |
* create_path
|
|
1243 |
* create_file or create_directory or create_symlink
|
|
1244 |
* version_file
|
|
1245 |
* set_executability
|
|
3008.1.13
by Michael Hudson
merge bzr.dev |
1246 |
|
1247 |
Transform/Transaction ids
|
|
1248 |
-------------------------
|
|
1249 |
trans_ids are temporary ids assigned to all files involved in a transform.
|
|
1250 |
It's possible, even common, that not all files in the Tree have trans_ids.
|
|
1251 |
||
1252 |
trans_ids are used because filenames and file_ids are not good enough
|
|
1253 |
identifiers; filenames change, and not all files have file_ids. File-ids
|
|
1254 |
are also associated with trans-ids, so that moving a file moves its
|
|
1255 |
file-id.
|
|
1256 |
||
1257 |
trans_ids are only valid for the TreeTransform that generated them.
|
|
1258 |
||
1259 |
Limbo
|
|
1260 |
-----
|
|
1261 |
Limbo is a temporary directory use to hold new versions of files.
|
|
1262 |
Files are added to limbo by create_file, create_directory, create_symlink,
|
|
1263 |
and their convenience variants (new_*). Files may be removed from limbo
|
|
1264 |
using cancel_creation. Files are renamed from limbo into their final
|
|
1265 |
location as part of TreeTransform.apply
|
|
1266 |
||
1267 |
Limbo must be cleaned up, by either calling TreeTransform.apply or
|
|
1268 |
calling TreeTransform.finalize.
|
|
1269 |
||
1270 |
Files are placed into limbo inside their parent directories, where
|
|
1271 |
possible. This reduces subsequent renames, and makes operations involving
|
|
1272 |
lots of files faster. This optimization is only possible if the parent
|
|
1273 |
directory is created *before* creating any of its children, so avoid
|
|
1274 |
creating children before parents, where possible.
|
|
1275 |
||
1276 |
Pending-deletion
|
|
1277 |
----------------
|
|
1278 |
This temporary directory is used by _FileMover for storing files that are
|
|
1279 |
about to be deleted. In case of rollback, the files will be restored.
|
|
1280 |
FileMover does not delete files until it is sure that a rollback will not
|
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1281 |
happen.
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1282 |
"""
|
1283 |
def __init__(self, tree, pb=DummyProgress()): |
|
1284 |
"""Note: a tree_write lock is taken on the tree.
|
|
1285 |
||
1286 |
Use TreeTransform.finalize() to release the lock (can be omitted if
|
|
1287 |
TreeTransform.apply() called).
|
|
1288 |
"""
|
|
1289 |
tree.lock_tree_write() |
|
3008.1.13
by Michael Hudson
merge bzr.dev |
1290 |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1291 |
try: |
1292 |
limbodir = urlutils.local_path_from_url( |
|
3407.2.8
by Martin Pool
Deprecate LockableFiles.controlfilename |
1293 |
tree._transport.abspath('limbo')) |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1294 |
try: |
1295 |
os.mkdir(limbodir) |
|
1296 |
except OSError, e: |
|
1297 |
if e.errno == errno.EEXIST: |
|
1298 |
raise ExistingLimbo(limbodir) |
|
3199.1.5
by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling. |
1299 |
deletiondir = urlutils.local_path_from_url( |
3407.2.8
by Martin Pool
Deprecate LockableFiles.controlfilename |
1300 |
tree._transport.abspath('pending-deletion')) |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1301 |
try: |
3199.1.5
by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling. |
1302 |
os.mkdir(deletiondir) |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1303 |
except OSError, e: |
1304 |
if e.errno == errno.EEXIST: |
|
3199.1.5
by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling. |
1305 |
raise errors.ExistingPendingDeletion(deletiondir) |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1306 |
except: |
1307 |
tree.unlock() |
|
1308 |
raise
|
|
3008.1.13
by Michael Hudson
merge bzr.dev |
1309 |
|
4354.5.2
by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform |
1310 |
# Cache of realpath results, to speed up canonical_path
|
1311 |
self._realpaths = {} |
|
1312 |
# Cache of relpath results, to speed up canonical_path
|
|
1313 |
self._relpaths = {} |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1314 |
DiskTreeTransform.__init__(self, tree, limbodir, pb, |
3008.1.15
by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree |
1315 |
tree.case_sensitive) |
3199.1.5
by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling. |
1316 |
self._deletiondir = deletiondir |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1317 |
|
4354.5.2
by Aaron Bentley
Move WorkingTree-specific code out of BaseTreeTransform |
1318 |
def canonical_path(self, path): |
1319 |
"""Get the canonical tree-relative path"""
|
|
1320 |
# don't follow final symlinks
|
|
1321 |
abs = self._tree.abspath(path) |
|
1322 |
if abs in self._relpaths: |
|
1323 |
return self._relpaths[abs] |
|
1324 |
dirname, basename = os.path.split(abs) |
|
1325 |
if dirname not in self._realpaths: |
|
1326 |
self._realpaths[dirname] = os.path.realpath(dirname) |
|
1327 |
dirname = self._realpaths[dirname] |
|
1328 |
abs = pathjoin(dirname, basename) |
|
1329 |
if dirname in self._relpaths: |
|
1330 |
relpath = pathjoin(self._relpaths[dirname], basename) |
|
1331 |
relpath = relpath.rstrip('/\\') |
|
1332 |
else: |
|
1333 |
relpath = self._tree.relpath(abs) |
|
1334 |
self._relpaths[abs] = relpath |
|
1335 |
return relpath |
|
1336 |
||
1337 |
def tree_kind(self, trans_id): |
|
1338 |
"""Determine the file kind in the working tree.
|
|
1339 |
||
1340 |
Raises NoSuchFile if the file does not exist
|
|
1341 |
"""
|
|
1342 |
path = self._tree_id_paths.get(trans_id) |
|
1343 |
if path is None: |
|
1344 |
raise NoSuchFile(None) |
|
1345 |
try: |
|
1346 |
return file_kind(self._tree.abspath(path)) |
|
1347 |
except OSError, e: |
|
1348 |
if e.errno != errno.ENOENT: |
|
1349 |
raise
|
|
1350 |
else: |
|
1351 |
raise NoSuchFile(path) |
|
1352 |
||
1353 |
def _set_mode(self, trans_id, mode_id, typefunc): |
|
1354 |
"""Set the mode of new file contents.
|
|
1355 |
The mode_id is the existing file to get the mode from (often the same
|
|
1356 |
as trans_id). The operation is only performed if there's a mode match
|
|
1357 |
according to typefunc.
|
|
1358 |
"""
|
|
1359 |
if mode_id is None: |
|
1360 |
mode_id = trans_id |
|
1361 |
try: |
|
1362 |
old_path = self._tree_id_paths[mode_id] |
|
1363 |
except KeyError: |
|
1364 |
return
|
|
1365 |
try: |
|
1366 |
mode = os.stat(self._tree.abspath(old_path)).st_mode |
|
1367 |
except OSError, e: |
|
1368 |
if e.errno in (errno.ENOENT, errno.ENOTDIR): |
|
1369 |
# Either old_path doesn't exist, or the parent of the
|
|
1370 |
# target is not a directory (but will be one eventually)
|
|
1371 |
# Either way, we know it doesn't exist *right now*
|
|
1372 |
# See also bug #248448
|
|
1373 |
return
|
|
1374 |
else: |
|
1375 |
raise
|
|
1376 |
if typefunc(mode): |
|
1377 |
os.chmod(self._limbo_name(trans_id), mode) |
|
1378 |
||
1379 |
def iter_tree_children(self, parent_id): |
|
1380 |
"""Iterate through the entry's tree children, if any"""
|
|
1381 |
try: |
|
1382 |
path = self._tree_id_paths[parent_id] |
|
1383 |
except KeyError: |
|
1384 |
return
|
|
1385 |
try: |
|
1386 |
children = os.listdir(self._tree.abspath(path)) |
|
1387 |
except OSError, e: |
|
1388 |
if not (osutils._is_error_enotdir(e) |
|
1389 |
or e.errno in (errno.ENOENT, errno.ESRCH)): |
|
1390 |
raise
|
|
1391 |
return
|
|
1392 |
||
1393 |
for child in children: |
|
1394 |
childpath = joinpath(path, child) |
|
1395 |
if self._tree.is_control_filename(childpath): |
|
1396 |
continue
|
|
1397 |
yield self.trans_id_tree_path(childpath) |
|
1398 |
||
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
1399 |
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None): |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1400 |
"""Apply all changes to the inventory and filesystem.
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1401 |
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1402 |
If filesystem or inventory conflicts are present, MalformedTransform
|
1403 |
will be thrown.
|
|
1404 |
||
1405 |
If apply succeeds, finalize is not necessary.
|
|
1406 |
||
1407 |
:param no_conflicts: if True, the caller guarantees there are no
|
|
1408 |
conflicts, so no check is made.
|
|
3453.2.11
by Aaron Bentley
Updates from review |
1409 |
:param precomputed_delta: An inventory delta to use instead of
|
1410 |
calculating one.
|
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1411 |
:param _mover: Supply an alternate FileMover, for testing
|
1412 |
"""
|
|
1413 |
if not no_conflicts: |
|
4526.8.6
by Aaron Bentley
Check for malformed transforms before committing. |
1414 |
self._check_malformed() |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1415 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
1416 |
try: |
|
3619.2.7
by Aaron Bentley
Fix progress handling |
1417 |
if precomputed_delta is None: |
1418 |
child_pb.update('Apply phase', 0, 2) |
|
1419 |
inventory_delta = self._generate_inventory_delta() |
|
1420 |
offset = 1 |
|
1421 |
else: |
|
1422 |
inventory_delta = precomputed_delta |
|
1423 |
offset = 0 |
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1424 |
if _mover is None: |
1425 |
mover = _FileMover() |
|
1426 |
else: |
|
1427 |
mover = _mover |
|
1428 |
try: |
|
3619.2.7
by Aaron Bentley
Fix progress handling |
1429 |
child_pb.update('Apply phase', 0 + offset, 2 + offset) |
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1430 |
self._apply_removals(mover) |
3619.2.7
by Aaron Bentley
Fix progress handling |
1431 |
child_pb.update('Apply phase', 1 + offset, 2 + offset) |
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1432 |
modified_paths = self._apply_insertions(mover) |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1433 |
except: |
1434 |
mover.rollback() |
|
1435 |
raise
|
|
1436 |
else: |
|
1437 |
mover.apply_deletions() |
|
1438 |
finally: |
|
1439 |
child_pb.finished() |
|
1440 |
self._tree.apply_inventory_delta(inventory_delta) |
|
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
1441 |
self._done = True |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1442 |
self.finalize() |
1443 |
return _TransformResults(modified_paths, self.rename_count) |
|
1444 |
||
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1445 |
def _generate_inventory_delta(self): |
3619.2.9
by Aaron Bentley
Update docs |
1446 |
"""Generate an inventory delta for the current transform."""
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1447 |
inventory_delta = [] |
1448 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
3619.2.7
by Aaron Bentley
Fix progress handling |
1449 |
new_paths = self._inventory_altered() |
1450 |
total_entries = len(new_paths) + len(self._removed_id) |
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1451 |
try: |
3619.2.2
by Aaron Bentley
Further cleanup |
1452 |
for num, trans_id in enumerate(self._removed_id): |
3619.2.7
by Aaron Bentley
Fix progress handling |
1453 |
if (num % 10) == 0: |
1454 |
child_pb.update('removing file', num, total_entries) |
|
3619.2.2
by Aaron Bentley
Further cleanup |
1455 |
if trans_id == self._new_root: |
1456 |
file_id = self._tree.get_root_id() |
|
1457 |
else: |
|
1458 |
file_id = self.tree_file_id(trans_id) |
|
1459 |
# File-id isn't really being deleted, just moved
|
|
1460 |
if file_id in self._r_new_id: |
|
1461 |
continue
|
|
1462 |
path = self._tree_id_paths[trans_id] |
|
1463 |
inventory_delta.append((path, None, file_id, None)) |
|
3619.2.7
by Aaron Bentley
Fix progress handling |
1464 |
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in |
1465 |
new_paths) |
|
1466 |
entries = self._tree.iter_entries_by_dir( |
|
1467 |
new_path_file_ids.values()) |
|
1468 |
old_paths = dict((e.file_id, p) for p, e in entries) |
|
1469 |
final_kinds = {} |
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1470 |
for num, (path, trans_id) in enumerate(new_paths): |
1471 |
if (num % 10) == 0: |
|
3619.2.7
by Aaron Bentley
Fix progress handling |
1472 |
child_pb.update('adding file', |
1473 |
num + len(self._removed_id), total_entries) |
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1474 |
file_id = new_path_file_ids[trans_id] |
3619.2.2
by Aaron Bentley
Further cleanup |
1475 |
if file_id is None: |
1476 |
continue
|
|
1477 |
needs_entry = False |
|
3619.2.5
by Aaron Bentley
Reduce set tests |
1478 |
try: |
1479 |
kind = self.final_kind(trans_id) |
|
1480 |
except NoSuchFile: |
|
1481 |
kind = self._tree.stored_kind(file_id) |
|
3619.2.4
by Aaron Bentley
Further restructuring |
1482 |
parent_trans_id = self.final_parent(trans_id) |
1483 |
parent_file_id = new_path_file_ids.get(parent_trans_id) |
|
1484 |
if parent_file_id is None: |
|
1485 |
parent_file_id = self.final_file_id(parent_trans_id) |
|
1486 |
if trans_id in self._new_reference_revision: |
|
1487 |
new_entry = inventory.TreeReference( |
|
1488 |
file_id, |
|
1489 |
self._new_name[trans_id], |
|
1490 |
self.final_file_id(self._new_parent[trans_id]), |
|
1491 |
None, self._new_reference_revision[trans_id]) |
|
1492 |
else: |
|
1493 |
new_entry = inventory.make_entry(kind, |
|
1494 |
self.final_name(trans_id), |
|
1495 |
parent_file_id, file_id) |
|
1496 |
old_path = old_paths.get(new_entry.file_id) |
|
3619.2.8
by Aaron Bentley
Reorganize execute-bit handling |
1497 |
new_executability = self._new_executability.get(trans_id) |
1498 |
if new_executability is not None: |
|
1499 |
new_entry.executable = new_executability |
|
3619.2.4
by Aaron Bentley
Further restructuring |
1500 |
inventory_delta.append( |
1501 |
(old_path, path, new_entry.file_id, new_entry)) |
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1502 |
finally: |
1503 |
child_pb.finished() |
|
1504 |
return inventory_delta |
|
1505 |
||
1506 |
def _apply_removals(self, mover): |
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1507 |
"""Perform tree operations that remove directory/inventory names.
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1508 |
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1509 |
That is, delete files that are to be deleted, and put any files that
|
1510 |
need renaming into limbo. This must be done in strict child-to-parent
|
|
1511 |
order.
|
|
3453.2.11
by Aaron Bentley
Updates from review |
1512 |
|
1513 |
If inventory_delta is None, no inventory delta generation is performed.
|
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1514 |
"""
|
1515 |
tree_paths = list(self._tree_path_ids.iteritems()) |
|
1516 |
tree_paths.sort(reverse=True) |
|
1517 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
1518 |
try: |
|
1519 |
for num, data in enumerate(tree_paths): |
|
1520 |
path, trans_id = data |
|
1521 |
child_pb.update('removing file', num, len(tree_paths)) |
|
1522 |
full_path = self._tree.abspath(path) |
|
1523 |
if trans_id in self._removed_contents: |
|
1524 |
mover.pre_delete(full_path, os.path.join(self._deletiondir, |
|
1525 |
trans_id)) |
|
1526 |
elif trans_id in self._new_name or trans_id in \ |
|
1527 |
self._new_parent: |
|
1528 |
try: |
|
1529 |
mover.rename(full_path, self._limbo_name(trans_id)) |
|
1530 |
except OSError, e: |
|
1531 |
if e.errno != errno.ENOENT: |
|
1532 |
raise
|
|
1533 |
else: |
|
1534 |
self.rename_count += 1 |
|
1535 |
finally: |
|
1536 |
child_pb.finished() |
|
1537 |
||
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1538 |
def _apply_insertions(self, mover): |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1539 |
"""Perform tree operations that insert directory/inventory names.
|
3008.1.19
by Aaron Bentley
Remove trailing whitespace |
1540 |
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1541 |
That is, create any files that need to be created, and restore from
|
1542 |
limbo any files that needed renaming. This must be done in strict
|
|
1543 |
parent-to-child order.
|
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
1544 |
|
1545 |
If inventory_delta is None, no inventory delta is calculated, and
|
|
1546 |
no list of modified paths is returned.
|
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1547 |
"""
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1548 |
new_paths = self.new_paths(filesystem_only=True) |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1549 |
modified_paths = [] |
3453.2.2
by Aaron Bentley
Avoid unnecessary file_id lookups |
1550 |
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in |
1551 |
new_paths) |
|
3453.2.1
by Aaron Bentley
Speed up apply_insertions using iter_entries_by_dir instead of id2path |
1552 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1553 |
try: |
1554 |
for num, (path, trans_id) in enumerate(new_paths): |
|
3453.2.1
by Aaron Bentley
Speed up apply_insertions using iter_entries_by_dir instead of id2path |
1555 |
if (num % 10) == 0: |
1556 |
child_pb.update('adding file', num, len(new_paths)) |
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
1557 |
full_path = self._tree.abspath(path) |
1558 |
if trans_id in self._needs_rename: |
|
1559 |
try: |
|
1560 |
mover.rename(self._limbo_name(trans_id), full_path) |
|
1561 |
except OSError, e: |
|
1562 |
# We may be renaming a dangling inventory id
|
|
1563 |
if e.errno != errno.ENOENT: |
|
1564 |
raise
|
|
1565 |
else: |
|
1566 |
self.rename_count += 1 |
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1567 |
if (trans_id in self._new_contents or |
1568 |
self.path_changed(trans_id)): |
|
1569 |
if trans_id in self._new_contents: |
|
1570 |
modified_paths.append(full_path) |
|
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1571 |
if trans_id in self._new_executability: |
3619.2.8
by Aaron Bentley
Reorganize execute-bit handling |
1572 |
self._set_executability(path, trans_id) |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1573 |
finally: |
1574 |
child_pb.finished() |
|
3619.2.1
by Aaron Bentley
Refactor inventory delta generation out of apply_insersions/removals |
1575 |
self._new_contents.clear() |
3008.1.7
by Michael Hudson
move apply and helpers to TreeTransform from TreeTransformBase |
1576 |
return modified_paths |
1577 |
||
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1578 |
|
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1579 |
class TransformPreview(DiskTreeTransform): |
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
1580 |
"""A TreeTransform for generating preview trees.
|
1581 |
||
1582 |
Unlike TreeTransform, this version works when the input tree is a
|
|
1583 |
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
|
|
1584 |
unversioned files in the input tree.
|
|
1585 |
"""
|
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1586 |
|
3008.1.15
by Aaron Bentley
Make case_sensitive an aspect of the transform, not the source tree |
1587 |
def __init__(self, tree, pb=DummyProgress(), case_sensitive=True): |
3199.1.5
by Vincent Ladeuil
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling. |
1588 |
tree.lock_read() |
3638.3.2
by Vincent Ladeuil
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp. |
1589 |
limbodir = osutils.mkdtemp(prefix='bzr-limbo-') |
4354.5.1
by Aaron Bentley
Split out a DiskTreeTransform class that manages Limbo. |
1590 |
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive) |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1591 |
|
1592 |
def canonical_path(self, path): |
|
1593 |
return path |
|
1594 |
||
3008.1.9
by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged |
1595 |
def tree_kind(self, trans_id): |
1596 |
path = self._tree_id_paths.get(trans_id) |
|
3008.2.1
by Aaron Bentley
Ensure conflict resolution works |
1597 |
if path is None: |
1598 |
raise NoSuchFile(None) |
|
3008.1.9
by Michael Hudson
wanton hacking that lets me write an efficient version of get_diff_as_merged |
1599 |
file_id = self._tree.path2id(path) |
1600 |
return self._tree.kind(file_id) |
|
1601 |
||
1602 |
def _set_mode(self, trans_id, mode_id, typefunc): |
|
1603 |
"""Set the mode of new file contents.
|
|
1604 |
The mode_id is the existing file to get the mode from (often the same
|
|
1605 |
as trans_id). The operation is only performed if there's a mode match
|
|
1606 |
according to typefunc.
|
|
1607 |
"""
|
|
1608 |
# is it ok to ignore this? probably
|
|
1609 |
pass
|
|
1610 |
||
1611 |
def iter_tree_children(self, parent_id): |
|
1612 |
"""Iterate through the entry's tree children, if any"""
|
|
3008.2.1
by Aaron Bentley
Ensure conflict resolution works |
1613 |
try: |
1614 |
path = self._tree_id_paths[parent_id] |
|
1615 |
except KeyError: |
|
1616 |
return
|
|
1617 |
file_id = self.tree_file_id(parent_id) |
|
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1618 |
if file_id is None: |
1619 |
return
|
|
3363.17.5
by Aaron Bentley
Update merge to not use inventory |
1620 |
entry = self._tree.iter_entries_by_dir([file_id]).next()[1] |
1621 |
children = getattr(entry, 'children', {}) |
|
3363.2.23
by Aaron Bentley
Fix iter_entries_by_dir ordering |
1622 |
for child in children: |
3008.2.1
by Aaron Bentley
Ensure conflict resolution works |
1623 |
childpath = joinpath(path, child) |
1624 |
yield self.trans_id_tree_path(childpath) |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1625 |
|
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
1626 |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1627 |
class _PreviewTree(tree.Tree): |
3008.1.29
by Aaron Bentley
Add docstrings, rename TT.__doc |
1628 |
"""Partial implementation of Tree to support show_diff_trees"""
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1629 |
|
4354.4.4
by Aaron Bentley
Simplify by using CommitBuilder directly |
1630 |
def __init__(self, transform): |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1631 |
self._transform = transform |
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1632 |
self._final_paths = FinalPaths(transform) |
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1633 |
self.__by_parent = None |
3571.1.1
by Aaron Bentley
Allow set/get of parent_ids in PreviewTree |
1634 |
self._parent_ids = [] |
3363.17.22
by Aaron Bentley
Cache expensive operations |
1635 |
self._all_children_cache = {} |
1636 |
self._path2trans_id_cache = {} |
|
1637 |
self._final_name_cache = {} |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1638 |
|
1639 |
def _changes(self, file_id): |
|
1640 |
for changes in self._transform.iter_changes(): |
|
3363.2.9
by Aaron Bentley
Fix up some refactorings |
1641 |
if changes[0] == file_id: |
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1642 |
return changes |
1643 |
||
1644 |
def _content_change(self, file_id): |
|
3363.3.3
by Aaron Bentley
Updates from review |
1645 |
"""Return True if the content of this file changed"""
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1646 |
changes = self._changes(file_id) |
3363.3.3
by Aaron Bentley
Updates from review |
1647 |
# changes[2] is true if the file content changed. See
|
1648 |
# InterTree.iter_changes.
|
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1649 |
return (changes is not None and changes[2]) |
1650 |
||
3363.9.1
by Aaron Bentley
Implement plan_merge, refactoring various bits |
1651 |
def _get_repository(self): |
1652 |
repo = getattr(self._transform._tree, '_repository', None) |
|
1653 |
if repo is None: |
|
1654 |
repo = self._transform._tree.branch.repository |
|
1655 |
return repo |
|
1656 |
||
1657 |
def _iter_parent_trees(self): |
|
1658 |
for revision_id in self.get_parent_ids(): |
|
1659 |
try: |
|
1660 |
yield self.revision_tree(revision_id) |
|
1661 |
except errors.NoSuchRevisionInTree: |
|
1662 |
yield self._get_repository().revision_tree(revision_id) |
|
1663 |
||
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1664 |
def _get_file_revision(self, file_id, vf, tree_revision): |
3363.9.1
by Aaron Bentley
Implement plan_merge, refactoring various bits |
1665 |
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in |
1666 |
self._iter_parent_trees()] |
|
1667 |
vf.add_lines((file_id, tree_revision), parent_keys, |
|
1668 |
self.get_file(file_id).readlines()) |
|
1669 |
repo = self._get_repository() |
|
1670 |
base_vf = repo.texts |
|
1671 |
if base_vf not in vf.fallback_versionedfiles: |
|
1672 |
vf.fallback_versionedfiles.append(base_vf) |
|
1673 |
return tree_revision |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1674 |
|
3363.2.9
by Aaron Bentley
Fix up some refactorings |
1675 |
def _stat_limbo_file(self, file_id): |
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1676 |
trans_id = self._transform.trans_id_file_id(file_id) |
1677 |
name = self._transform._limbo_name(trans_id) |
|
1678 |
return os.lstat(name) |
|
1679 |
||
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1680 |
@property
|
1681 |
def _by_parent(self): |
|
1682 |
if self.__by_parent is None: |
|
1683 |
self.__by_parent = self._transform.by_parent() |
|
1684 |
return self.__by_parent |
|
1685 |
||
3363.14.1
by Aaron Bentley
Update to support comparison |
1686 |
def _comparison_data(self, entry, path): |
1687 |
kind, size, executable, link_or_sha1 = self.path_content_summary(path) |
|
3363.14.3
by Aaron Bentley
Handle missing files better |
1688 |
if kind == 'missing': |
1689 |
kind = None |
|
1690 |
executable = False |
|
1691 |
else: |
|
1692 |
file_id = self._transform.final_file_id(self._path2trans_id(path)) |
|
1693 |
executable = self.is_executable(file_id, path) |
|
3363.14.1
by Aaron Bentley
Update to support comparison |
1694 |
return kind, executable, None |
1695 |
||
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1696 |
def lock_read(self): |
3008.1.18
by Aaron Bentley
Get supported PreviewTree functionality under test |
1697 |
# Perhaps in theory, this should lock the TreeTransform?
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1698 |
pass
|
1699 |
||
1700 |
def unlock(self): |
|
1701 |
pass
|
|
1702 |
||
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1703 |
@property
|
1704 |
def inventory(self): |
|
1705 |
"""This Tree does not use inventory as its backing data."""
|
|
1706 |
raise NotImplementedError(_PreviewTree.inventory) |
|
1707 |
||
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1708 |
def get_root_id(self): |
1709 |
return self._transform.final_file_id(self._transform.root) |
|
1710 |
||
1711 |
def all_file_ids(self): |
|
3363.2.18
by Aaron Bentley
Implement correct all_file_ids for PreviewTree |
1712 |
tree_ids = set(self._transform._tree.all_file_ids()) |
1713 |
tree_ids.difference_update(self._transform.tree_file_id(t) |
|
1714 |
for t in self._transform._removed_id) |
|
1715 |
tree_ids.update(self._transform._new_id.values()) |
|
1716 |
return tree_ids |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1717 |
|
1718 |
def __iter__(self): |
|
1719 |
return iter(self.all_file_ids()) |
|
1720 |
||
4544.2.1
by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned. |
1721 |
def _has_id(self, file_id, fallback_check): |
3363.12.1
by Aaron Bentley
Remove new implementation of paths2ids, implement has_id |
1722 |
if file_id in self._transform._r_new_id: |
1723 |
return True |
|
3981.1.1
by Robert Collins
Fix bug 319790 - unshelve of deleted paths failing. |
1724 |
elif file_id in set([self._transform.tree_file_id(trans_id) for |
1725 |
trans_id in self._transform._removed_id]): |
|
3363.12.1
by Aaron Bentley
Remove new implementation of paths2ids, implement has_id |
1726 |
return False |
1727 |
else: |
|
4544.2.1
by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned. |
1728 |
return fallback_check(file_id) |
1729 |
||
1730 |
def has_id(self, file_id): |
|
1731 |
return self._has_id(file_id, self._transform._tree.has_id) |
|
1732 |
||
1733 |
def has_or_had_id(self, file_id): |
|
1734 |
return self._has_id(file_id, self._transform._tree.has_or_had_id) |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1735 |
|
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1736 |
def _path2trans_id(self, path): |
3363.17.22
by Aaron Bentley
Cache expensive operations |
1737 |
# We must not use None here, because that is a valid value to store.
|
1738 |
trans_id = self._path2trans_id_cache.get(path, object) |
|
1739 |
if trans_id is not object: |
|
1740 |
return trans_id |
|
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1741 |
segments = splitpath(path) |
3363.2.19
by Aaron Bentley
Make PreviewTree.path2id correct |
1742 |
cur_parent = self._transform.root |
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1743 |
for cur_segment in segments: |
1744 |
for child in self._all_children(cur_parent): |
|
3363.17.22
by Aaron Bentley
Cache expensive operations |
1745 |
final_name = self._final_name_cache.get(child) |
1746 |
if final_name is None: |
|
1747 |
final_name = self._transform.final_name(child) |
|
1748 |
self._final_name_cache[child] = final_name |
|
1749 |
if final_name == cur_segment: |
|
3363.2.19
by Aaron Bentley
Make PreviewTree.path2id correct |
1750 |
cur_parent = child |
1751 |
break
|
|
1752 |
else: |
|
3363.17.22
by Aaron Bentley
Cache expensive operations |
1753 |
self._path2trans_id_cache[path] = None |
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1754 |
return None |
3363.17.22
by Aaron Bentley
Cache expensive operations |
1755 |
self._path2trans_id_cache[path] = cur_parent |
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1756 |
return cur_parent |
3363.2.26
by Aaron Bentley
Get symlinks working |
1757 |
|
3363.2.20
by Aaron Bentley
Split path2id into smaller pieces |
1758 |
def path2id(self, path): |
3363.5.2
by Aaron Bentley
Massive simplification of path2id |
1759 |
return self._transform.final_file_id(self._path2trans_id(path)) |
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1760 |
|
1761 |
def id2path(self, file_id): |
|
1762 |
trans_id = self._transform.trans_id_file_id(file_id) |
|
1763 |
try: |
|
1764 |
return self._final_paths._determine_path(trans_id) |
|
1765 |
except NoFinalPath: |
|
1766 |
raise errors.NoSuchId(self, file_id) |
|
1767 |
||
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1768 |
def _all_children(self, trans_id): |
3363.17.22
by Aaron Bentley
Cache expensive operations |
1769 |
children = self._all_children_cache.get(trans_id) |
1770 |
if children is not None: |
|
1771 |
return children |
|
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1772 |
children = set(self._transform.iter_tree_children(trans_id)) |
1773 |
# children in the _new_parent set are provided by _by_parent.
|
|
1774 |
children.difference_update(self._transform._new_parent.keys()) |
|
1775 |
children.update(self._by_parent.get(trans_id, [])) |
|
3363.17.22
by Aaron Bentley
Cache expensive operations |
1776 |
self._all_children_cache[trans_id] = children |
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1777 |
return children |
1778 |
||
3363.12.2
by Aaron Bentley
Implement tree.iter_children to instead of adjusting InventoryEntry handling |
1779 |
def iter_children(self, file_id): |
1780 |
trans_id = self._transform.trans_id_file_id(file_id) |
|
1781 |
for child_trans_id in self._all_children(trans_id): |
|
1782 |
yield self._transform.final_file_id(child_trans_id) |
|
1783 |
||
3363.13.1
by Aaron Bentley
Implement PreviewTree.extras |
1784 |
def extras(self): |
1785 |
possible_extras = set(self._transform.trans_id_tree_path(p) for p |
|
1786 |
in self._transform._tree.extras()) |
|
3363.13.2
by Aaron Bentley
Test specific cases for PreviewTree.extras |
1787 |
possible_extras.update(self._transform._new_contents) |
3363.13.1
by Aaron Bentley
Implement PreviewTree.extras |
1788 |
possible_extras.update(self._transform._removed_id) |
1789 |
for trans_id in possible_extras: |
|
1790 |
if self._transform.final_file_id(trans_id) is None: |
|
1791 |
yield self._final_paths._determine_path(trans_id) |
|
1792 |
||
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
1793 |
def _make_inv_entries(self, ordered_entries, specific_file_ids=None): |
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1794 |
for trans_id, parent_file_id in ordered_entries: |
1795 |
file_id = self._transform.final_file_id(trans_id) |
|
1796 |
if file_id is None: |
|
1797 |
continue
|
|
1798 |
if (specific_file_ids is not None |
|
1799 |
and file_id not in specific_file_ids): |
|
1800 |
continue
|
|
1801 |
try: |
|
1802 |
kind = self._transform.final_kind(trans_id) |
|
1803 |
except NoSuchFile: |
|
1804 |
kind = self._transform._tree.stored_kind(file_id) |
|
1805 |
new_entry = inventory.make_entry( |
|
1806 |
kind, |
|
1807 |
self._transform.final_name(trans_id), |
|
1808 |
parent_file_id, file_id) |
|
1809 |
yield new_entry, trans_id |
|
1810 |
||
3363.11.1
by Aaron Bentley
Cheap implementation of list_files |
1811 |
def _list_files_by_dir(self): |
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1812 |
todo = [ROOT_PARENT] |
1813 |
ordered_ids = [] |
|
1814 |
while len(todo) > 0: |
|
1815 |
parent = todo.pop() |
|
1816 |
parent_file_id = self._transform.final_file_id(parent) |
|
3363.2.23
by Aaron Bentley
Fix iter_entries_by_dir ordering |
1817 |
children = list(self._all_children(parent)) |
1818 |
paths = dict(zip(children, self._final_paths.get_paths(children))) |
|
1819 |
children.sort(key=paths.get) |
|
3363.5.4
by Aaron Bentley
Fix iteration order of iter_entries_by_dir |
1820 |
todo.extend(reversed(children)) |
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1821 |
for trans_id in children: |
1822 |
ordered_ids.append((trans_id, parent_file_id)) |
|
3363.11.1
by Aaron Bentley
Cheap implementation of list_files |
1823 |
return ordered_ids |
1824 |
||
1825 |
def iter_entries_by_dir(self, specific_file_ids=None): |
|
1826 |
# This may not be a maximally efficient implementation, but it is
|
|
1827 |
# reasonably straightforward. An implementation that grafts the
|
|
1828 |
# TreeTransform changes onto the tree's iter_entries_by_dir results
|
|
1829 |
# might be more efficient, but requires tricky inferences about stack
|
|
1830 |
# position.
|
|
1831 |
ordered_ids = self._list_files_by_dir() |
|
3363.2.21
by Aaron Bentley
Implement iter_entries_by_dir |
1832 |
for entry, trans_id in self._make_inv_entries(ordered_ids, |
1833 |
specific_file_ids): |
|
3363.2.23
by Aaron Bentley
Fix iter_entries_by_dir ordering |
1834 |
yield unicode(self._final_paths.get_path(trans_id)), entry |
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1835 |
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
1836 |
def _iter_entries_for_dir(self, dir_path): |
1837 |
"""Return path, entry for items in a directory without recursing down."""
|
|
1838 |
dir_file_id = self.path2id(dir_path) |
|
1839 |
ordered_ids = [] |
|
1840 |
for file_id in self.iter_children(dir_file_id): |
|
1841 |
trans_id = self._transform.trans_id_file_id(file_id) |
|
1842 |
ordered_ids.append((trans_id, file_id)) |
|
1843 |
for entry, trans_id in self._make_inv_entries(ordered_ids): |
|
1844 |
yield unicode(self._final_paths.get_path(trans_id)), entry |
|
1845 |
||
1846 |
def list_files(self, include_root=False, from_dir=None, recursive=True): |
|
1847 |
"""See WorkingTree.list_files."""
|
|
3363.11.1
by Aaron Bentley
Cheap implementation of list_files |
1848 |
# XXX This should behave like WorkingTree.list_files, but is really
|
1849 |
# more like RevisionTree.list_files.
|
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
1850 |
if recursive: |
1851 |
prefix = None |
|
1852 |
if from_dir: |
|
1853 |
prefix = from_dir + '/' |
|
1854 |
entries = self.iter_entries_by_dir() |
|
1855 |
for path, entry in entries: |
|
1856 |
if entry.name == '' and not include_root: |
|
1857 |
continue
|
|
1858 |
if prefix: |
|
1859 |
if not path.startswith(prefix): |
|
1860 |
continue
|
|
1861 |
path = path[len(prefix):] |
|
1862 |
yield path, 'V', entry.kind, entry.file_id, entry |
|
1863 |
else: |
|
1864 |
if from_dir is None and include_root is True: |
|
1865 |
root_entry = inventory.make_entry('directory', '', |
|
1866 |
ROOT_PARENT, self.get_root_id()) |
|
1867 |
yield '', 'V', 'directory', root_entry.file_id, root_entry |
|
1868 |
entries = self._iter_entries_for_dir(from_dir or '') |
|
1869 |
for path, entry in entries: |
|
1870 |
yield path, 'V', entry.kind, entry.file_id, entry |
|
3363.11.1
by Aaron Bentley
Cheap implementation of list_files |
1871 |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1872 |
def kind(self, file_id): |
1873 |
trans_id = self._transform.trans_id_file_id(file_id) |
|
1874 |
return self._transform.final_kind(trans_id) |
|
1875 |
||
1876 |
def stored_kind(self, file_id): |
|
3363.2.36
by Aaron Bentley
Fix PreviewTree.stored_kind |
1877 |
trans_id = self._transform.trans_id_file_id(file_id) |
1878 |
try: |
|
1879 |
return self._transform._new_contents[trans_id] |
|
1880 |
except KeyError: |
|
1881 |
return self._transform._tree.stored_kind(file_id) |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1882 |
|
1883 |
def get_file_mtime(self, file_id, path=None): |
|
1884 |
"""See Tree.get_file_mtime"""
|
|
1885 |
if not self._content_change(file_id): |
|
1886 |
return self._transform._tree.get_file_mtime(file_id, path) |
|
3363.2.9
by Aaron Bentley
Fix up some refactorings |
1887 |
return self._stat_limbo_file(file_id).st_mtime |
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1888 |
|
3363.14.5
by Aaron Bentley
Add _file_size for comparison |
1889 |
def _file_size(self, entry, stat_value): |
1890 |
return self.get_file_size(entry.file_id) |
|
1891 |
||
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1892 |
def get_file_size(self, file_id): |
3363.3.3
by Aaron Bentley
Updates from review |
1893 |
"""See Tree.get_file_size"""
|
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1894 |
if self.kind(file_id) == 'file': |
1895 |
return self._transform._tree.get_file_size(file_id) |
|
3363.3.3
by Aaron Bentley
Updates from review |
1896 |
else: |
1897 |
return None |
|
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1898 |
|
1899 |
def get_file_sha1(self, file_id, path=None, stat_value=None): |
|
3363.15.4
by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly |
1900 |
trans_id = self._transform.trans_id_file_id(file_id) |
1901 |
kind = self._transform._new_contents.get(trans_id) |
|
1902 |
if kind is None: |
|
1903 |
return self._transform._tree.get_file_sha1(file_id) |
|
1904 |
if kind == 'file': |
|
1905 |
fileobj = self.get_file(file_id) |
|
1906 |
try: |
|
1907 |
return sha_file(fileobj) |
|
1908 |
finally: |
|
1909 |
fileobj.close() |
|
3363.2.7
by Aaron Bentley
Implement alterntative-to-inventory tests |
1910 |
|
1911 |
def is_executable(self, file_id, path=None): |
|
3363.14.8
by Aaron Bentley
Fix more tests |
1912 |
if file_id is None: |
1913 |
return False |
|
3363.2.37
by Aaron Bentley
Fix is_executable |
1914 |
trans_id = self._transform.trans_id_file_id(file_id) |
1915 |
try: |
|
1916 |
return self._transform._new_executability[trans_id] |
|
1917 |
except KeyError: |
|
3363.17.17
by Aaron Bentley
Start testing merging PreviewTree as OTHER |
1918 |
try: |
1919 |
return self._transform._tree.is_executable(file_id, path) |
|
1920 |
except OSError, e: |
|
1921 |
if e.errno == errno.ENOENT: |
|
1922 |
return False |
|
1923 |
raise
|
|
3363.17.18
by Aaron Bentley
Fix is_executable for PreviewTree |
1924 |
except errors.NoSuchId: |
1925 |
return False |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1926 |
|
1927 |
def path_content_summary(self, path): |
|
3363.6.1
by Aaron Bentley
Merge with preview-tree-changed |
1928 |
trans_id = self._path2trans_id(path) |
3363.2.27
by Aaron Bentley
Make path_content_summary a core API |
1929 |
tt = self._transform |
3363.6.1
by Aaron Bentley
Merge with preview-tree-changed |
1930 |
tree_path = tt._tree_id_paths.get(trans_id) |
3363.2.27
by Aaron Bentley
Make path_content_summary a core API |
1931 |
kind = tt._new_contents.get(trans_id) |
1932 |
if kind is None: |
|
3363.6.1
by Aaron Bentley
Merge with preview-tree-changed |
1933 |
if tree_path is None or trans_id in tt._removed_contents: |
3363.2.27
by Aaron Bentley
Make path_content_summary a core API |
1934 |
return 'missing', None, None, None |
1935 |
summary = tt._tree.path_content_summary(tree_path) |
|
1936 |
kind, size, executable, link_or_sha1 = summary |
|
1937 |
else: |
|
1938 |
link_or_sha1 = None |
|
1939 |
limbo_name = tt._limbo_name(trans_id) |
|
1940 |
if trans_id in tt._new_reference_revision: |
|
1941 |
kind = 'tree-reference' |
|
1942 |
if kind == 'file': |
|
1943 |
statval = os.lstat(limbo_name) |
|
1944 |
size = statval.st_size |
|
1945 |
if not supports_executable(): |
|
1946 |
executable = None |
|
1947 |
else: |
|
1948 |
executable = statval.st_mode & S_IEXEC |
|
1949 |
else: |
|
1950 |
size = None |
|
1951 |
executable = None |
|
1952 |
if kind == 'symlink': |
|
4095.3.1
by Vincent Ladeuil
Fix #339055 and #277444 by handling non ascii symlink targets. |
1953 |
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc) |
3363.2.27
by Aaron Bentley
Make path_content_summary a core API |
1954 |
if supports_executable(): |
1955 |
executable = tt._new_executability.get(trans_id, executable) |
|
1956 |
return kind, size, executable, link_or_sha1 |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1957 |
|
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
1958 |
def iter_changes(self, from_tree, include_unchanged=False, |
3008.1.17
by Aaron Bentley
Test unused parameters of preview_tree._iter_changes |
1959 |
specific_files=None, pb=None, extra_trees=None, |
1960 |
require_versioned=True, want_unversioned=False): |
|
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
1961 |
"""See InterTree.iter_changes.
|
3008.1.17
by Aaron Bentley
Test unused parameters of preview_tree._iter_changes |
1962 |
|
3363.19.1
by Aaron Bentley
Make PreviewTree.iter_changes accept all options. |
1963 |
This has a fast path that is only used when the from_tree matches
|
1964 |
the transform tree, and no fancy options are supplied.
|
|
3008.1.17
by Aaron Bentley
Test unused parameters of preview_tree._iter_changes |
1965 |
"""
|
3363.19.1
by Aaron Bentley
Make PreviewTree.iter_changes accept all options. |
1966 |
if (from_tree is not self._transform._tree or include_unchanged or |
1967 |
specific_files or want_unversioned): |
|
3363.14.1
by Aaron Bentley
Update to support comparison |
1968 |
return tree.InterTree(from_tree, self).iter_changes( |
1969 |
include_unchanged=include_unchanged, |
|
1970 |
specific_files=specific_files, |
|
1971 |
pb=pb, |
|
1972 |
extra_trees=extra_trees, |
|
1973 |
require_versioned=require_versioned, |
|
1974 |
want_unversioned=want_unversioned) |
|
3008.1.17
by Aaron Bentley
Test unused parameters of preview_tree._iter_changes |
1975 |
if want_unversioned: |
1976 |
raise ValueError('want_unversioned is not supported') |
|
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
1977 |
return self._transform.iter_changes() |
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
1978 |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1979 |
def get_file(self, file_id, path=None): |
3008.1.20
by Aaron Bentley
Add some docstrings |
1980 |
"""See Tree.get_file"""
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1981 |
if not self._content_change(file_id): |
1982 |
return self._transform._tree.get_file(file_id, path) |
|
3008.1.3
by Aaron Bentley
Support basic diff |
1983 |
trans_id = self._transform.trans_id_file_id(file_id) |
1984 |
name = self._transform._limbo_name(trans_id) |
|
1985 |
return open(name, 'rb') |
|
1986 |
||
4354.4.5
by Aaron Bentley
Ensure Tree.get_file_with_stat is provided. |
1987 |
def get_file_with_stat(self, file_id, path=None): |
4354.4.2
by Aaron Bentley
Allow committing a file add to a PreviewTree. |
1988 |
return self.get_file(file_id, path), None |
1989 |
||
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
1990 |
def annotate_iter(self, file_id, |
1991 |
default_revision=_mod_revision.CURRENT_REVISION): |
|
3363.2.33
by Aaron Bentley
Implement PreviewTree.annotate_iter |
1992 |
changes = self._changes(file_id) |
3363.2.35
by Aaron Bentley
Update to get tests passing |
1993 |
if changes is None: |
1994 |
get_old = True |
|
3363.2.33
by Aaron Bentley
Implement PreviewTree.annotate_iter |
1995 |
else: |
3363.2.35
by Aaron Bentley
Update to get tests passing |
1996 |
changed_content, versioned, kind = (changes[2], changes[3], |
1997 |
changes[6]) |
|
1998 |
if kind[1] is None: |
|
1999 |
return None |
|
2000 |
get_old = (kind[0] == 'file' and versioned[0]) |
|
2001 |
if get_old: |
|
3363.2.33
by Aaron Bentley
Implement PreviewTree.annotate_iter |
2002 |
old_annotation = self._transform._tree.annotate_iter(file_id, |
2003 |
default_revision=default_revision) |
|
3363.2.35
by Aaron Bentley
Update to get tests passing |
2004 |
else: |
2005 |
old_annotation = [] |
|
2006 |
if changes is None: |
|
2007 |
return old_annotation |
|
3363.2.33
by Aaron Bentley
Implement PreviewTree.annotate_iter |
2008 |
if not changed_content: |
2009 |
return old_annotation |
|
4454.3.70
by John Arbash Meinel
Some comments about the PreviewTree.annotate_iter implementation. |
2010 |
# TODO: This is doing something similar to what WT.annotate_iter is
|
2011 |
# doing, however it fails slightly because it doesn't know what
|
|
2012 |
# the *other* revision_id is, so it doesn't know how to give the
|
|
2013 |
# other as the origin for some lines, they all get
|
|
2014 |
# 'default_revision'
|
|
2015 |
# It would be nice to be able to use the new Annotator based
|
|
2016 |
# approach, as well.
|
|
3363.2.33
by Aaron Bentley
Implement PreviewTree.annotate_iter |
2017 |
return annotate.reannotate([old_annotation], |
2018 |
self.get_file(file_id).readlines(), |
|
2019 |
default_revision) |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
2020 |
|
3228.1.1
by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so |
2021 |
def get_symlink_target(self, file_id): |
2022 |
"""See Tree.get_symlink_target"""
|
|
3363.2.29
by Aaron Bentley
Remove unneeded changes |
2023 |
if not self._content_change(file_id): |
2024 |
return self._transform._tree.get_symlink_target(file_id) |
|
3228.1.1
by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so |
2025 |
trans_id = self._transform.trans_id_file_id(file_id) |
3363.2.29
by Aaron Bentley
Remove unneeded changes |
2026 |
name = self._transform._limbo_name(trans_id) |
4241.14.16
by Vincent Ladeuil
Fix _PreviewTree.get_symlink_target for unicode symlinks. |
2027 |
return osutils.readlink(name) |
3228.1.1
by James Henstridge
* Add get_symlink_target() method to bzrlib.transform._PreviewTree, so |
2028 |
|
3363.9.9
by Aaron Bentley
Implement walkdirs in terms of TreeTransform |
2029 |
def walkdirs(self, prefix=''): |
2030 |
pending = [self._transform.root] |
|
2031 |
while len(pending) > 0: |
|
2032 |
parent_id = pending.pop() |
|
2033 |
children = [] |
|
2034 |
subdirs = [] |
|
2035 |
prefix = prefix.rstrip('/') |
|
2036 |
parent_path = self._final_paths.get_path(parent_id) |
|
2037 |
parent_file_id = self._transform.final_file_id(parent_id) |
|
2038 |
for child_id in self._all_children(parent_id): |
|
2039 |
path_from_root = self._final_paths.get_path(child_id) |
|
2040 |
basename = self._transform.final_name(child_id) |
|
3363.9.10
by Aaron Bentley
Handle dangling file-ids correctly |
2041 |
file_id = self._transform.final_file_id(child_id) |
2042 |
try: |
|
2043 |
kind = self._transform.final_kind(child_id) |
|
2044 |
versioned_kind = kind |
|
2045 |
except NoSuchFile: |
|
2046 |
kind = 'unknown' |
|
2047 |
versioned_kind = self._transform._tree.stored_kind(file_id) |
|
2048 |
if versioned_kind == 'directory': |
|
3363.9.9
by Aaron Bentley
Implement walkdirs in terms of TreeTransform |
2049 |
subdirs.append(child_id) |
2050 |
children.append((path_from_root, basename, kind, None, |
|
3363.9.10
by Aaron Bentley
Handle dangling file-ids correctly |
2051 |
file_id, versioned_kind)) |
3363.9.9
by Aaron Bentley
Implement walkdirs in terms of TreeTransform |
2052 |
children.sort() |
2053 |
if parent_path.startswith(prefix): |
|
2054 |
yield (parent_path, parent_file_id), children |
|
2055 |
pending.extend(sorted(subdirs, key=self._final_paths.get_path, |
|
2056 |
reverse=True)) |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
2057 |
|
2058 |
def get_parent_ids(self): |
|
3571.1.1
by Aaron Bentley
Allow set/get of parent_ids in PreviewTree |
2059 |
return self._parent_ids |
2060 |
||
2061 |
def set_parent_ids(self, parent_ids): |
|
2062 |
self._parent_ids = parent_ids |
|
3363.2.4
by Aaron Bentley
Get significant portions of PreviewTree implemented and passing tests |
2063 |
|
2064 |
def get_revision_tree(self, revision_id): |
|
2065 |
return self._transform._tree.get_revision_tree(revision_id) |
|
3008.1.1
by Aaron Bentley
Start work allowing previews of transforms |
2066 |
|
2067 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
2068 |
def joinpath(parent, child): |
1534.7.40
by Aaron Bentley
Updated docs |
2069 |
"""Join tree-relative paths, handling the tree root specially"""
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
2070 |
if parent is None or parent == "": |
2071 |
return child |
|
2072 |
else: |
|
1534.7.166
by Aaron Bentley
Swapped os.path.join for pathjoin everywhere |
2073 |
return pathjoin(parent, child) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2074 |
|
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
2075 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2076 |
class FinalPaths(object): |
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
2077 |
"""Make path calculation cheap by memoizing paths.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
2078 |
|
2079 |
The underlying tree must not be manipulated between calls, or else
|
|
2080 |
the results will likely be incorrect.
|
|
2081 |
"""
|
|
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
2082 |
def __init__(self, transform): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2083 |
object.__init__(self) |
2084 |
self._known_paths = {} |
|
1534.7.33
by Aaron Bentley
Fixed naming |
2085 |
self.transform = transform |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2086 |
|
2087 |
def _determine_path(self, trans_id): |
|
4526.9.23
by Robert Collins
Change the tree transform test_first_commit test to set a root id in the new tree, and workaround an apparent bug in TreeTransform._determine_path. |
2088 |
if (trans_id == self.transform.root or trans_id == ROOT_PARENT): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2089 |
return "" |
1534.7.33
by Aaron Bentley
Fixed naming |
2090 |
name = self.transform.final_name(trans_id) |
2091 |
parent_id = self.transform.final_parent(trans_id) |
|
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
2092 |
if parent_id == self.transform.root: |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2093 |
return name |
2094 |
else: |
|
1534.7.166
by Aaron Bentley
Swapped os.path.join for pathjoin everywhere |
2095 |
return pathjoin(self.get_path(parent_id), name) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2096 |
|
2097 |
def get_path(self, trans_id): |
|
1534.7.157
by Aaron Bentley
Added more docs |
2098 |
"""Find the final path associated with a trans_id"""
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2099 |
if trans_id not in self._known_paths: |
2100 |
self._known_paths[trans_id] = self._determine_path(trans_id) |
|
2101 |
return self._known_paths[trans_id] |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2102 |
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2103 |
def get_paths(self, trans_ids): |
2104 |
return [(self.get_path(t), t) for t in trans_ids] |
|
2105 |
||
2106 |
||
3006.2.2
by Alexander Belchenko
tests added. |
2107 |
|
1534.7.30
by Aaron Bentley
Factored out topological id sorting |
2108 |
def topology_sorted_ids(tree): |
1534.7.40
by Aaron Bentley
Updated docs |
2109 |
"""Determine the topological order of the ids in a tree"""
|
1534.7.30
by Aaron Bentley
Factored out topological id sorting |
2110 |
file_ids = list(tree) |
2111 |
file_ids.sort(key=tree.id2path) |
|
2112 |
return file_ids |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2113 |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2114 |
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2115 |
def build_tree(tree, wt, accelerator_tree=None, hardlink=False, |
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
2116 |
delta_from_tree=False): |
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2117 |
"""Create working tree for a branch, using a TreeTransform.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2118 |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2119 |
This function should be used on empty trees, having a tree root at most.
|
2120 |
(see merge and revert functionality for working with existing trees)
|
|
2121 |
||
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2122 |
Existing files are handled like so:
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2123 |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2124 |
- Existing bzrdirs take precedence over creating new items. They are
|
2125 |
created as '%s.diverted' % name.
|
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2126 |
- Otherwise, if the content on disk matches the content we are building,
|
2127 |
it is silently replaced.
|
|
2128 |
- Otherwise, conflict resolution will move the old file to 'oldname.moved'.
|
|
3123.5.17
by Aaron Bentley
Update docs |
2129 |
|
2130 |
:param tree: The tree to convert wt into a copy of
|
|
2131 |
:param wt: The working tree that files will be placed into
|
|
2132 |
:param accelerator_tree: A tree which can be used for retrieving file
|
|
2133 |
contents more quickly than tree itself, i.e. a workingtree. tree
|
|
2134 |
will be used for cases where accelerator_tree's content is different.
|
|
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2135 |
:param hardlink: If true, hard-link files to accelerator_tree, where
|
3136.1.4
by Aaron Bentley
Avoid id2abspath calls |
2136 |
possible. accelerator_tree must implement abspath, i.e. be a
|
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2137 |
working tree.
|
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
2138 |
:param delta_from_tree: If true, build_tree may use the input Tree to
|
2139 |
generate the inventory delta.
|
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2140 |
"""
|
2255.7.51
by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely. |
2141 |
wt.lock_tree_write() |
2255.7.49
by Robert Collins
Lock trees passed in to build_tree. |
2142 |
try: |
2255.7.51
by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely. |
2143 |
tree.lock_read() |
2255.7.49
by Robert Collins
Lock trees passed in to build_tree. |
2144 |
try: |
3123.5.1
by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree |
2145 |
if accelerator_tree is not None: |
2146 |
accelerator_tree.lock_read() |
|
2147 |
try: |
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2148 |
return _build_tree(tree, wt, accelerator_tree, hardlink, |
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
2149 |
delta_from_tree) |
3123.5.1
by Aaron Bentley
Make build-tree able to use an additional 'accelerator' tree |
2150 |
finally: |
2151 |
if accelerator_tree is not None: |
|
2152 |
accelerator_tree.unlock() |
|
2255.7.49
by Robert Collins
Lock trees passed in to build_tree. |
2153 |
finally: |
2255.7.51
by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely. |
2154 |
tree.unlock() |
2255.7.49
by Robert Collins
Lock trees passed in to build_tree. |
2155 |
finally: |
2255.7.51
by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely. |
2156 |
wt.unlock() |
2255.7.49
by Robert Collins
Lock trees passed in to build_tree. |
2157 |
|
3006.2.2
by Alexander Belchenko
tests added. |
2158 |
|
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
2159 |
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree): |
2255.7.49
by Robert Collins
Lock trees passed in to build_tree. |
2160 |
"""See build_tree."""
|
3146.8.17
by Aaron Bentley
Change to explicit file_id list |
2161 |
for num, _unused in enumerate(wt.all_file_ids()): |
3146.8.16
by Aaron Bentley
Updates from review |
2162 |
if num > 0: # more than just a root |
2163 |
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir) |
|
3453.2.5
by Aaron Bentley
Avoid statting tons of non-existant files when building from scratch |
2164 |
existing_files = set() |
2165 |
for dir, files in wt.walkdirs(): |
|
2166 |
existing_files.update(f[0] for f in files) |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2167 |
file_trans_id = {} |
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2168 |
top_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
2169 |
pp = ProgressPhase("Build phase", 2, top_pb) |
|
2255.2.183
by Martin Pool
add missing _must_be_locked and a better message |
2170 |
if tree.inventory.root is not None: |
2502.1.6
by Aaron Bentley
Update from review comments |
2171 |
# This is kind of a hack: we should be altering the root
|
2172 |
# as part of the regular tree shape diff logic.
|
|
2173 |
# The conditional test here is to avoid doing an
|
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
2174 |
# expensive operation (flush) every time the root id
|
2175 |
# is set within the tree, nor setting the root and thus
|
|
2176 |
# marking the tree as dirty, because we use two different
|
|
2177 |
# idioms here: tree interfaces and inventory interfaces.
|
|
2946.3.3
by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('') |
2178 |
if wt.get_root_id() != tree.get_root_id(): |
2179 |
wt.set_root_id(tree.get_root_id()) |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
2180 |
wt.flush() |
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2181 |
tt = TreeTransform(wt) |
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2182 |
divert = set() |
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2183 |
try: |
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2184 |
pp.next_phase() |
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2185 |
file_trans_id[wt.get_root_id()] = \ |
2186 |
tt.trans_id_tree_file_id(wt.get_root_id()) |
|
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2187 |
pb = bzrlib.ui.ui_factory.nested_progress_bar() |
2188 |
try: |
|
2708.1.2
by Aaron Bentley
Use extract_files_bytes for build_tree |
2189 |
deferred_contents = [] |
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2190 |
num = 0 |
3483.1.1
by Ian Clatworthy
minor _build_tree cleanups |
2191 |
total = len(tree.inventory) |
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
2192 |
if delta_from_tree: |
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2193 |
precomputed_delta = [] |
2194 |
else: |
|
2195 |
precomputed_delta = None |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2196 |
for num, (tree_path, entry) in \ |
2197 |
enumerate(tree.inventory.iter_entries_by_dir()): |
|
3483.1.1
by Ian Clatworthy
minor _build_tree cleanups |
2198 |
pb.update("Building tree", num - len(deferred_contents), total) |
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2199 |
if entry.parent_id is None: |
2200 |
continue
|
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2201 |
reparent = False |
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2202 |
file_id = entry.file_id |
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
2203 |
if delta_from_tree: |
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2204 |
precomputed_delta.append((None, tree_path, file_id, entry)) |
3453.2.5
by Aaron Bentley
Avoid statting tons of non-existant files when building from scratch |
2205 |
if tree_path in existing_files: |
2206 |
target_path = wt.abspath(tree_path) |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2207 |
kind = file_kind(target_path) |
2208 |
if kind == "directory": |
|
2209 |
try: |
|
2210 |
bzrdir.BzrDir.open(target_path) |
|
2211 |
except errors.NotBranchError: |
|
2212 |
pass
|
|
2213 |
else: |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2214 |
divert.add(file_id) |
2215 |
if (file_id not in divert and |
|
2216 |
_content_match(tree, entry, file_id, kind, |
|
2217 |
target_path)): |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2218 |
tt.delete_contents(tt.trans_id_tree_path(tree_path)) |
2219 |
if kind == 'directory': |
|
2220 |
reparent = True |
|
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2221 |
parent_id = file_trans_id[entry.parent_id] |
2708.1.8
by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress |
2222 |
if entry.kind == 'file': |
2708.1.2
by Aaron Bentley
Use extract_files_bytes for build_tree |
2223 |
# We *almost* replicate new_by_entry, so that we can defer
|
2224 |
# getting the file text, and get them all at once.
|
|
2225 |
trans_id = tt.create_path(entry.name, parent_id) |
|
2708.1.8
by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress |
2226 |
file_trans_id[file_id] = trans_id |
3483.1.1
by Ian Clatworthy
minor _build_tree cleanups |
2227 |
tt.version_file(file_id, trans_id) |
2228 |
executable = tree.is_executable(file_id, tree_path) |
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2229 |
if executable: |
2708.1.8
by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress |
2230 |
tt.set_executability(executable, trans_id) |
3368.2.20
by Ian Clatworthy
move filtering up the layers in TreeTransform |
2231 |
trans_data = (trans_id, tree_path) |
3368.2.27
by Ian Clatworthy
merge bzr.dev r3564 |
2232 |
deferred_contents.append((file_id, trans_data)) |
2708.1.2
by Aaron Bentley
Use extract_files_bytes for build_tree |
2233 |
else: |
2234 |
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id, |
|
2235 |
tree) |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2236 |
if reparent: |
2237 |
new_trans_id = file_trans_id[file_id] |
|
2238 |
old_parent = tt.trans_id_tree_path(tree_path) |
|
2239 |
_reparent_children(tt, old_parent, new_trans_id) |
|
3136.1.11
by Aaron Bentley
Updates from review |
2240 |
offset = num + 1 - len(deferred_contents) |
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2241 |
_create_files(tt, tree, deferred_contents, pb, offset, |
2242 |
accelerator_tree, hardlink) |
|
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2243 |
finally: |
2244 |
pb.finished() |
|
2245 |
pp.next_phase() |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2246 |
divert_trans = set(file_trans_id[f] for f in divert) |
2247 |
resolver = lambda t, c: resolve_checkout(t, c, divert_trans) |
|
2248 |
raw_conflicts = resolve_conflicts(tt, pass_func=resolver) |
|
3453.2.4
by Aaron Bentley
Disable fast-path when conflicts are encountered |
2249 |
if len(raw_conflicts) > 0: |
2250 |
precomputed_delta = None |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2251 |
conflicts = cook_conflicts(raw_conflicts, tt) |
2252 |
for conflict in conflicts: |
|
2253 |
warning(conflict) |
|
2254 |
try: |
|
2255 |
wt.add_conflicts(conflicts) |
|
2256 |
except errors.UnsupportedOperation: |
|
2257 |
pass
|
|
3453.2.3
by Aaron Bentley
Enable using a precomputed inventory delta for build_tree. |
2258 |
result = tt.apply(no_conflicts=True, |
2259 |
precomputed_delta=precomputed_delta) |
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2260 |
finally: |
2261 |
tt.finalize() |
|
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
2262 |
top_pb.finished() |
2502.1.5
by Aaron Bentley
Cleanup |
2263 |
return result |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2264 |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2265 |
|
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2266 |
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree, |
2267 |
hardlink): |
|
2268 |
total = len(desired_files) + offset |
|
4208.4.1
by Ian Clatworthy
eol conversion support |
2269 |
wt = tt._tree |
3123.5.5
by Aaron Bentley
Split out _iter_files_bytes_accelerated |
2270 |
if accelerator_tree is None: |
2271 |
new_desired_files = desired_files |
|
2272 |
else: |
|
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
2273 |
iter = accelerator_tree.iter_changes(tree, include_unchanged=True) |
3137.1.1
by Aaron Bentley
Fix build_tree acceleration when file is moved in accelerator_tree |
2274 |
unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e) |
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2275 |
in iter if not (c or e[0] != e[1])) |
3123.5.5
by Aaron Bentley
Split out _iter_files_bytes_accelerated |
2276 |
new_desired_files = [] |
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2277 |
count = 0 |
3368.2.20
by Ian Clatworthy
move filtering up the layers in TreeTransform |
2278 |
for file_id, (trans_id, tree_path) in desired_files: |
3123.5.13
by Aaron Bentley
Accelerate further by using iter_changes |
2279 |
accelerator_path = unchanged.get(file_id) |
3123.5.12
by Aaron Bentley
Try to optimize iter_changes_accelerated |
2280 |
if accelerator_path is None: |
3368.2.20
by Ian Clatworthy
move filtering up the layers in TreeTransform |
2281 |
new_desired_files.append((file_id, (trans_id, tree_path))) |
3123.5.12
by Aaron Bentley
Try to optimize iter_changes_accelerated |
2282 |
continue
|
3136.1.11
by Aaron Bentley
Updates from review |
2283 |
pb.update('Adding file contents', count + offset, total) |
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2284 |
if hardlink: |
3136.1.4
by Aaron Bentley
Avoid id2abspath calls |
2285 |
tt.create_hardlink(accelerator_tree.abspath(accelerator_path), |
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2286 |
trans_id) |
2287 |
else: |
|
2288 |
contents = accelerator_tree.get_file(file_id, accelerator_path) |
|
4208.4.1
by Ian Clatworthy
eol conversion support |
2289 |
if wt.supports_content_filtering(): |
2290 |
filters = wt._content_filter_stack(tree_path) |
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
2291 |
contents = filtered_output_bytes(contents, filters, |
2292 |
ContentFilterContext(tree_path, tree)) |
|
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2293 |
try: |
2294 |
tt.create_file(contents, trans_id) |
|
2295 |
finally: |
|
3368.2.29
by Ian Clatworthy
access rules via get_special_file to fix recursion bug |
2296 |
try: |
2297 |
contents.close() |
|
2298 |
except AttributeError: |
|
2299 |
# after filtering, contents may no longer be file-like
|
|
2300 |
pass
|
|
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2301 |
count += 1 |
2302 |
offset += count |
|
3368.2.20
by Ian Clatworthy
move filtering up the layers in TreeTransform |
2303 |
for count, ((trans_id, tree_path), contents) in enumerate( |
2304 |
tree.iter_files_bytes(new_desired_files)): |
|
4208.4.1
by Ian Clatworthy
eol conversion support |
2305 |
if wt.supports_content_filtering(): |
2306 |
filters = wt._content_filter_stack(tree_path) |
|
3368.2.45
by Ian Clatworthy
add and use supports_content_filtering API |
2307 |
contents = filtered_output_bytes(contents, filters, |
2308 |
ContentFilterContext(tree_path, tree)) |
|
3136.1.2
by Aaron Bentley
Implement hard-linking for build_tree |
2309 |
tt.create_file(contents, trans_id) |
3136.1.11
by Aaron Bentley
Updates from review |
2310 |
pb.update('Adding file contents', count + offset, total) |
3123.5.5
by Aaron Bentley
Split out _iter_files_bytes_accelerated |
2311 |
|
2312 |
||
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2313 |
def _reparent_children(tt, old_parent, new_parent): |
2314 |
for child in tt.iter_tree_children(old_parent): |
|
2315 |
tt.adjust_path(tt.final_name(child), new_parent, child) |
|
2316 |
||
3144.4.2
by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390) |
2317 |
def _reparent_transform_children(tt, old_parent, new_parent): |
2318 |
by_parent = tt.by_parent() |
|
2319 |
for child in by_parent[old_parent]: |
|
2320 |
tt.adjust_path(tt.final_name(child), new_parent, child) |
|
1551.19.32
by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092) |
2321 |
return by_parent[old_parent] |
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2322 |
|
2323 |
def _content_match(tree, entry, file_id, kind, target_path): |
|
2324 |
if entry.kind != kind: |
|
2325 |
return False |
|
2326 |
if entry.kind == "directory": |
|
2327 |
return True |
|
2328 |
if entry.kind == "file": |
|
2329 |
if tree.get_file(file_id).read() == file(target_path, 'rb').read(): |
|
2330 |
return True |
|
2331 |
elif entry.kind == "symlink": |
|
2332 |
if tree.get_symlink_target(file_id) == os.readlink(target_path): |
|
2333 |
return True |
|
2334 |
return False |
|
2335 |
||
2336 |
||
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2337 |
def resolve_checkout(tt, conflicts, divert): |
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2338 |
new_conflicts = set() |
2339 |
for c_type, conflict in ((c[0], c) for c in conflicts): |
|
2340 |
# Anything but a 'duplicate' would indicate programmer error
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
2341 |
if c_type != 'duplicate': |
2342 |
raise AssertionError(c_type) |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2343 |
# Now figure out which is new and which is old
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2344 |
if tt.new_contents(conflict[1]): |
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2345 |
new_file = conflict[1] |
2346 |
old_file = conflict[2] |
|
2347 |
else: |
|
2348 |
new_file = conflict[2] |
|
2349 |
old_file = conflict[1] |
|
2350 |
||
2351 |
# We should only get here if the conflict wasn't completely
|
|
2352 |
# resolved
|
|
2353 |
final_parent = tt.final_parent(old_file) |
|
1966.1.2
by Aaron Bentley
Divert files instead of failing to create them, update from review |
2354 |
if new_file in divert: |
2355 |
new_name = tt.final_name(old_file)+'.diverted' |
|
2356 |
tt.adjust_path(new_name, final_parent, new_file) |
|
2357 |
new_conflicts.add((c_type, 'Diverted to', |
|
2358 |
new_file, old_file)) |
|
2359 |
else: |
|
2360 |
new_name = tt.final_name(old_file)+'.moved' |
|
2361 |
tt.adjust_path(new_name, final_parent, old_file) |
|
2362 |
new_conflicts.add((c_type, 'Moved existing file to', |
|
2363 |
old_file, new_file)) |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2364 |
return new_conflicts |
2365 |
||
2366 |
||
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2367 |
def new_by_entry(tt, entry, parent_id, tree): |
1534.7.157
by Aaron Bentley
Added more docs |
2368 |
"""Create a new file according to its inventory entry"""
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2369 |
name = entry.name |
2370 |
kind = entry.kind |
|
2371 |
if kind == 'file': |
|
1534.7.79
by Aaron Bentley
Stopped calling get_file_lines on WorkingTree |
2372 |
contents = tree.get_file(entry.file_id).readlines() |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2373 |
executable = tree.is_executable(entry.file_id) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2374 |
return tt.new_file(name, parent_id, contents, entry.file_id, |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2375 |
executable) |
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
2376 |
elif kind in ('directory', 'tree-reference'): |
2377 |
trans_id = tt.new_directory(name, parent_id, entry.file_id) |
|
2378 |
if kind == 'tree-reference': |
|
2379 |
tt.set_tree_reference(entry.reference_revision, trans_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2380 |
return trans_id |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2381 |
elif kind == 'symlink': |
1534.7.183
by Aaron Bentley
Fixed build_tree with symlinks |
2382 |
target = tree.get_symlink_target(entry.file_id) |
2383 |
return tt.new_symlink(name, parent_id, target, entry.file_id) |
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
2384 |
else: |
2385 |
raise errors.BadFileKindError(name, kind) |
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2386 |
|
3006.2.2
by Alexander Belchenko
tests added. |
2387 |
|
3363.17.26
by Aaron Bentley
Deprecate create_by_entry |
2388 |
@deprecated_function(deprecated_in((1, 9, 0))) |
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
2389 |
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None): |
3363.17.26
by Aaron Bentley
Deprecate create_by_entry |
2390 |
"""Create new file contents according to an inventory entry.
|
2391 |
||
2392 |
DEPRECATED. Use create_from_tree instead.
|
|
2393 |
"""
|
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2394 |
if entry.kind == "file": |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
2395 |
if lines is None: |
1534.7.97
by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict |
2396 |
lines = tree.get_file(entry.file_id).readlines() |
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
2397 |
tt.create_file(lines, trans_id, mode_id=mode_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2398 |
elif entry.kind == "symlink": |
1534.7.101
by Aaron Bentley
Got conflicts on symlinks working properly |
2399 |
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2400 |
elif entry.kind == "directory": |
1534.7.51
by Aaron Bentley
New approach to revert |
2401 |
tt.create_directory(trans_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2402 |
|
3006.2.2
by Alexander Belchenko
tests added. |
2403 |
|
3363.17.25
by Aaron Bentley
remove get_inventory_entry, replace with create_from_tree |
2404 |
def create_from_tree(tt, trans_id, tree, file_id, bytes=None): |
3363.17.24
by Aaron Bentley
Implement create_by_tree |
2405 |
"""Create new file contents according to tree contents."""
|
2406 |
kind = tree.kind(file_id) |
|
2407 |
if kind == 'directory': |
|
2408 |
tt.create_directory(trans_id) |
|
2409 |
elif kind == "file": |
|
3363.17.25
by Aaron Bentley
remove get_inventory_entry, replace with create_from_tree |
2410 |
if bytes is None: |
2411 |
tree_file = tree.get_file(file_id) |
|
2412 |
try: |
|
2413 |
bytes = tree_file.readlines() |
|
2414 |
finally: |
|
2415 |
tree_file.close() |
|
2416 |
tt.create_file(bytes, trans_id) |
|
3363.17.24
by Aaron Bentley
Implement create_by_tree |
2417 |
elif kind == "symlink": |
2418 |
tt.create_symlink(tree.get_symlink_target(file_id), trans_id) |
|
3363.17.27
by Aaron Bentley
Add default case for create_from_tree |
2419 |
else: |
2420 |
raise AssertionError('Unknown kind %r' % kind) |
|
3363.17.24
by Aaron Bentley
Implement create_by_tree |
2421 |
|
2422 |
||
1534.7.89
by Aaron Bentley
Handle all content types in three-way |
2423 |
def create_entry_executability(tt, entry, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
2424 |
"""Set the executability of a trans_id according to an inventory entry"""
|
1534.7.89
by Aaron Bentley
Handle all content types in three-way |
2425 |
if entry.kind == "file": |
2426 |
tt.set_executability(entry.executable, trans_id) |
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2427 |
|
1534.7.157
by Aaron Bentley
Added more docs |
2428 |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
2429 |
def get_backup_name(entry, by_parent, parent_trans_id, tt): |
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2430 |
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt) |
2431 |
||
2432 |
||
2433 |
def _get_backup_name(name, by_parent, parent_trans_id, tt): |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
2434 |
"""Produce a backup-style name that appears to be available"""
|
2435 |
def name_gen(): |
|
2436 |
counter = 1 |
|
2437 |
while True: |
|
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2438 |
yield "%s.~%d~" % (name, counter) |
1534.10.28
by Aaron Bentley
Use numbered backup files |
2439 |
counter += 1 |
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2440 |
for new_name in name_gen(): |
2441 |
if not tt.has_named_child(by_parent, parent_trans_id, new_name): |
|
2442 |
return new_name |
|
2443 |
||
1534.10.28
by Aaron Bentley
Use numbered backup files |
2444 |
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
2445 |
def _entry_changes(file_id, entry, working_tree): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
2446 |
"""Determine in which ways the inventory entry has changed.
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
2447 |
|
2448 |
Returns booleans: has_contents, content_mod, meta_mod
|
|
2449 |
has_contents means there are currently contents, but they differ
|
|
2450 |
contents_mod means contents need to be modified
|
|
2451 |
meta_mod means the metadata needs to be modified
|
|
2452 |
"""
|
|
2453 |
cur_entry = working_tree.inventory[file_id] |
|
2454 |
try: |
|
2455 |
working_kind = working_tree.kind(file_id) |
|
2456 |
has_contents = True |
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
2457 |
except NoSuchFile: |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
2458 |
has_contents = False |
2459 |
contents_mod = True |
|
2460 |
meta_mod = False |
|
2461 |
if has_contents is True: |
|
1731.1.1
by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty |
2462 |
if entry.kind != working_kind: |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
2463 |
contents_mod, meta_mod = True, False |
2464 |
else: |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2465 |
cur_entry._read_tree_state(working_tree.id2path(file_id), |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
2466 |
working_tree) |
2467 |
contents_mod, meta_mod = entry.detect_changes(cur_entry) |
|
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
2468 |
cur_entry._forget_tree_state() |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
2469 |
return has_contents, contents_mod, meta_mod |
2470 |
||
1534.7.56
by Aaron Bentley
Implemented the backup file detritus |
2471 |
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2472 |
def revert(working_tree, target_tree, filenames, backups=False, |
2225.1.1
by Aaron Bentley
Added revert change display, with tests |
2473 |
pb=DummyProgress(), change_reporter=None): |
1534.7.157
by Aaron Bentley
Added more docs |
2474 |
"""Revert a working tree's contents to those of a target tree."""
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2475 |
target_tree.lock_read() |
1534.9.7
by Aaron Bentley
Show progress bars in revert |
2476 |
tt = TreeTransform(working_tree, pb) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
2477 |
try: |
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2478 |
pp = ProgressPhase("Revert phase", 3, pb) |
3363.2.10
by Aaron Bentley
Refactor _prepare_revert_transform out of revert |
2479 |
conflicts, merge_modified = _prepare_revert_transform( |
2480 |
working_tree, target_tree, tt, filenames, backups, pp) |
|
1551.11.5
by Aaron Bentley
cleanup |
2481 |
if change_reporter: |
1551.10.25
by Aaron Bentley
Make ChangeReporter private |
2482 |
change_reporter = delta._ChangeReporter( |
2255.7.98
by Robert Collins
Merge bzr.dev. |
2483 |
unversioned_filter=working_tree.is_ignored) |
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
2484 |
delta.report_changes(tt.iter_changes(), change_reporter) |
1551.11.6
by Aaron Bentley
Emit change listings before conflict warnings |
2485 |
for conflict in conflicts: |
2486 |
warning(conflict) |
|
2487 |
pp.next_phase() |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2488 |
tt.apply() |
2499.1.1
by Aaron Bentley
Revert does not try to preserve file contents produced by revert |
2489 |
working_tree.set_merge_modified(merge_modified) |
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2490 |
finally: |
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2491 |
target_tree.unlock() |
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
2492 |
tt.finalize() |
1534.9.4
by Aaron Bentley
Added progress bars to revert. |
2493 |
pb.clear() |
1558.7.13
by Aaron Bentley
WorkingTree.revert returns conflicts |
2494 |
return conflicts |
1534.7.51
by Aaron Bentley
New approach to revert |
2495 |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
2496 |
|
3363.2.10
by Aaron Bentley
Refactor _prepare_revert_transform out of revert |
2497 |
def _prepare_revert_transform(working_tree, target_tree, tt, filenames, |
3363.2.17
by Aaron Bentley
Start implementing post-change PreviewTree functionality |
2498 |
backups, pp, basis_tree=None, |
2499 |
merge_modified=None): |
|
3363.2.10
by Aaron Bentley
Refactor _prepare_revert_transform out of revert |
2500 |
pp.next_phase() |
2501 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
2502 |
try: |
|
3363.2.17
by Aaron Bentley
Start implementing post-change PreviewTree functionality |
2503 |
if merge_modified is None: |
2504 |
merge_modified = working_tree.merge_modified() |
|
3363.2.10
by Aaron Bentley
Refactor _prepare_revert_transform out of revert |
2505 |
merge_modified = _alter_files(working_tree, target_tree, tt, |
3363.2.17
by Aaron Bentley
Start implementing post-change PreviewTree functionality |
2506 |
child_pb, filenames, backups, |
2507 |
merge_modified, basis_tree) |
|
3363.2.10
by Aaron Bentley
Refactor _prepare_revert_transform out of revert |
2508 |
finally: |
2509 |
child_pb.finished() |
|
2510 |
pp.next_phase() |
|
2511 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
2512 |
try: |
|
2513 |
raw_conflicts = resolve_conflicts(tt, child_pb, |
|
2514 |
lambda t, c: conflict_pass(t, c, target_tree)) |
|
2515 |
finally: |
|
2516 |
child_pb.finished() |
|
2517 |
conflicts = cook_conflicts(raw_conflicts, tt) |
|
2518 |
return conflicts, merge_modified |
|
2519 |
||
2520 |
||
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2521 |
def _alter_files(working_tree, target_tree, tt, pb, specific_files, |
3363.2.17
by Aaron Bentley
Start implementing post-change PreviewTree functionality |
2522 |
backups, merge_modified, basis_tree=None): |
3363.10.25
by Aaron Bentley
_alter_files locks supplied basis_tree |
2523 |
if basis_tree is not None: |
2524 |
basis_tree.lock_read() |
|
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
2525 |
change_list = target_tree.iter_changes(working_tree, |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2526 |
specific_files=specific_files, pb=pb) |
3363.10.5
by Aaron Bentley
Fix locking issue |
2527 |
if target_tree.get_root_id() is None: |
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2528 |
skip_root = True |
2529 |
else: |
|
2530 |
skip_root = False |
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2531 |
try: |
2708.1.5
by Aaron Bentley
Use Tree.extract_files_bytes in revert |
2532 |
deferred_files = [] |
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2533 |
for id_num, (file_id, path, changed_content, versioned, parent, name, |
2534 |
kind, executable) in enumerate(change_list): |
|
2535 |
if skip_root and file_id[0] is not None and parent[0] is None: |
|
2536 |
continue
|
|
2537 |
trans_id = tt.trans_id_file_id(file_id) |
|
2538 |
mode_id = None |
|
2539 |
if changed_content: |
|
2540 |
keep_content = False |
|
2541 |
if kind[0] == 'file' and (backups or kind[1] is None): |
|
2542 |
wt_sha1 = working_tree.get_file_sha1(file_id) |
|
2543 |
if merge_modified.get(file_id) != wt_sha1: |
|
2502.1.6
by Aaron Bentley
Update from review comments |
2544 |
# acquire the basis tree lazily to prevent the
|
2545 |
# expense of accessing it when it's not needed ?
|
|
2546 |
# (Guessing, RBC, 200702)
|
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2547 |
if basis_tree is None: |
2548 |
basis_tree = working_tree.basis_tree() |
|
2549 |
basis_tree.lock_read() |
|
2550 |
if file_id in basis_tree: |
|
2551 |
if wt_sha1 != basis_tree.get_file_sha1(file_id): |
|
2552 |
keep_content = True |
|
2553 |
elif kind[1] is None and not versioned[1]: |
|
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2554 |
keep_content = True |
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2555 |
if kind[0] is not None: |
2556 |
if not keep_content: |
|
2557 |
tt.delete_contents(trans_id) |
|
2558 |
elif kind[1] is not None: |
|
2559 |
parent_trans_id = tt.trans_id_file_id(parent[0]) |
|
2560 |
by_parent = tt.by_parent() |
|
2561 |
backup_name = _get_backup_name(name[0], by_parent, |
|
2562 |
parent_trans_id, tt) |
|
2563 |
tt.adjust_path(backup_name, parent_trans_id, trans_id) |
|
2564 |
new_trans_id = tt.create_path(name[0], parent_trans_id) |
|
2565 |
if versioned == (True, True): |
|
2566 |
tt.unversion_file(trans_id) |
|
2567 |
tt.version_file(file_id, new_trans_id) |
|
2568 |
# New contents should have the same unix perms as old
|
|
2569 |
# contents
|
|
2570 |
mode_id = trans_id |
|
2571 |
trans_id = new_trans_id |
|
3363.11.3
by Aaron Bentley
Handle adding tree references in revert |
2572 |
if kind[1] in ('directory', 'tree-reference'): |
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2573 |
tt.create_directory(trans_id) |
3363.11.3
by Aaron Bentley
Handle adding tree references in revert |
2574 |
if kind[1] == 'tree-reference': |
2575 |
revision = target_tree.get_reference_revision(file_id, |
|
2576 |
path[1]) |
|
2577 |
tt.set_tree_reference(revision, trans_id) |
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2578 |
elif kind[1] == 'symlink': |
2579 |
tt.create_symlink(target_tree.get_symlink_target(file_id), |
|
2580 |
trans_id) |
|
2581 |
elif kind[1] == 'file': |
|
2708.1.6
by Aaron Bentley
Turn extract_files_bytes into an iterator |
2582 |
deferred_files.append((file_id, (trans_id, mode_id))) |
2499.1.1
by Aaron Bentley
Revert does not try to preserve file contents produced by revert |
2583 |
if basis_tree is None: |
2584 |
basis_tree = working_tree.basis_tree() |
|
2585 |
basis_tree.lock_read() |
|
2586 |
new_sha1 = target_tree.get_file_sha1(file_id) |
|
2587 |
if (file_id in basis_tree and new_sha1 == |
|
2588 |
basis_tree.get_file_sha1(file_id)): |
|
2589 |
if file_id in merge_modified: |
|
2590 |
del merge_modified[file_id] |
|
2591 |
else: |
|
2592 |
merge_modified[file_id] = new_sha1 |
|
2593 |
||
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2594 |
# preserve the execute bit when backing up
|
2595 |
if keep_content and executable[0] == executable[1]: |
|
2596 |
tt.set_executability(executable[1], trans_id) |
|
3376.2.11
by Martin Pool
Compare to None using is/is not not == |
2597 |
elif kind[1] is not None: |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
2598 |
raise AssertionError(kind[1]) |
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2599 |
if versioned == (False, True): |
2600 |
tt.version_file(file_id, trans_id) |
|
2601 |
if versioned == (True, False): |
|
2602 |
tt.unversion_file(trans_id) |
|
3363.2.16
by Aaron Bentley
Fix root directory creation |
2603 |
if (name[1] is not None and |
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2604 |
(name[0] != name[1] or parent[0] != parent[1])): |
3363.2.16
by Aaron Bentley
Fix root directory creation |
2605 |
if name[1] == '' and parent[1] is None: |
2606 |
parent_trans = ROOT_PARENT |
|
2607 |
else: |
|
2608 |
parent_trans = tt.trans_id_file_id(parent[1]) |
|
2609 |
tt.adjust_path(name[1], parent_trans, trans_id) |
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2610 |
if executable[0] != executable[1] and kind[1] == "file": |
2611 |
tt.set_executability(executable[1], trans_id) |
|
2708.1.8
by Aaron Bentley
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress |
2612 |
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes( |
2708.1.6
by Aaron Bentley
Turn extract_files_bytes into an iterator |
2613 |
deferred_files): |
2614 |
tt.create_file(bytes, trans_id, mode_id) |
|
2255.2.53
by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree. |
2615 |
finally: |
2616 |
if basis_tree is not None: |
|
2617 |
basis_tree.unlock() |
|
2499.1.1
by Aaron Bentley
Revert does not try to preserve file contents produced by revert |
2618 |
return merge_modified |
2012.1.12
by Aaron Bentley
Use iter_changes for revert |
2619 |
|
2620 |
||
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2621 |
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None): |
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
2622 |
"""Make many conflict-resolution attempts, but die if they fail"""
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2623 |
if pass_func is None: |
2624 |
pass_func = conflict_pass |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
2625 |
new_conflicts = set() |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
2626 |
try: |
2627 |
for n in range(10): |
|
2628 |
pb.update('Resolution pass', n+1, 10) |
|
2629 |
conflicts = tt.find_conflicts() |
|
2630 |
if len(conflicts) == 0: |
|
2631 |
return new_conflicts |
|
1966.1.1
by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree |
2632 |
new_conflicts.update(pass_func(tt, conflicts)) |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
2633 |
raise MalformedTransform(conflicts=conflicts) |
2634 |
finally: |
|
2635 |
pb.clear() |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
2636 |
|
2637 |
||
2590.2.8
by Aaron Bentley
Restore conflict handling changes |
2638 |
def conflict_pass(tt, conflicts, path_tree=None): |
2639 |
"""Resolve some classes of conflicts.
|
|
2640 |
||
2641 |
:param tt: The transform to resolve conflicts in
|
|
2642 |
:param conflicts: The conflicts to resolve
|
|
2643 |
:param path_tree: A Tree to get supplemental paths from
|
|
2644 |
"""
|
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
2645 |
new_conflicts = set() |
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
2646 |
for c_type, conflict in ((c[0], c) for c in conflicts): |
2647 |
if c_type == 'duplicate id': |
|
1534.7.51
by Aaron Bentley
New approach to revert |
2648 |
tt.unversion_file(conflict[1]) |
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2649 |
new_conflicts.add((c_type, 'Unversioned existing file', |
2650 |
conflict[1], conflict[2], )) |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
2651 |
elif c_type == 'duplicate': |
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
2652 |
# files that were renamed take precedence
|
2653 |
final_parent = tt.final_parent(conflict[1]) |
|
2654 |
if tt.path_changed(conflict[1]): |
|
3034.4.1
by Aaron Bentley
Start handling case-insensitivity |
2655 |
existing_file, new_file = conflict[2], conflict[1] |
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
2656 |
else: |
3034.4.1
by Aaron Bentley
Start handling case-insensitivity |
2657 |
existing_file, new_file = conflict[1], conflict[2] |
2658 |
new_name = tt.final_name(existing_file)+'.moved' |
|
2659 |
tt.adjust_path(new_name, final_parent, existing_file) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2660 |
new_conflicts.add((c_type, 'Moved existing file to', |
3034.4.1
by Aaron Bentley
Start handling case-insensitivity |
2661 |
existing_file, new_file)) |
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
2662 |
elif c_type == 'parent loop': |
2663 |
# break the loop by undoing one of the ops that caused the loop
|
|
2664 |
cur = conflict[1] |
|
2665 |
while not tt.path_changed(cur): |
|
2666 |
cur = tt.final_parent(cur) |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2667 |
new_conflicts.add((c_type, 'Cancelled move', cur, |
2668 |
tt.final_parent(cur),)) |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
2669 |
tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2670 |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
2671 |
elif c_type == 'missing parent': |
1534.7.128
by Aaron Bentley
Got missing contents test working |
2672 |
trans_id = conflict[1] |
2673 |
try: |
|
2674 |
tt.cancel_deletion(trans_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2675 |
new_conflicts.add(('deleting parent', 'Not deleting', |
1551.8.22
by Aaron Bentley
Improve message when OTHER deletes an in-use tree |
2676 |
trans_id)) |
1534.7.128
by Aaron Bentley
Got missing contents test working |
2677 |
except KeyError: |
1551.19.32
by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092) |
2678 |
create = True |
2590.2.8
by Aaron Bentley
Restore conflict handling changes |
2679 |
try: |
2680 |
tt.final_name(trans_id) |
|
2681 |
except NoFinalPath: |
|
1551.19.6
by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory |
2682 |
if path_tree is not None: |
2683 |
file_id = tt.final_file_id(trans_id) |
|
1551.19.32
by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092) |
2684 |
if file_id is None: |
2685 |
file_id = tt.inactive_file_id(trans_id) |
|
1551.19.6
by Aaron Bentley
Revert doesn't crash restoring a file from a deleted directory |
2686 |
entry = path_tree.inventory[file_id] |
1551.19.32
by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092) |
2687 |
# special-case the other tree root (move its
|
2688 |
# children to current root)
|
|
2689 |
if entry.parent_id is None: |
|
2690 |
create=False |
|
2691 |
moved = _reparent_transform_children( |
|
2692 |
tt, trans_id, tt.root) |
|
2693 |
for child in moved: |
|
2694 |
new_conflicts.add((c_type, 'Moved to root', |
|
2695 |
child)) |
|
2696 |
else: |
|
2697 |
parent_trans_id = tt.trans_id_file_id( |
|
2698 |
entry.parent_id) |
|
2699 |
tt.adjust_path(entry.name, parent_trans_id, |
|
2700 |
trans_id) |
|
2701 |
if create: |
|
2702 |
tt.create_directory(trans_id) |
|
2703 |
new_conflicts.add((c_type, 'Created directory', trans_id)) |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
2704 |
elif c_type == 'unversioned parent': |
1551.19.32
by Aaron Bentley
Don't traceback when adding files to a deleted root (abentley, #210092) |
2705 |
file_id = tt.inactive_file_id(conflict[1]) |
2706 |
# special-case the other tree root (move its children instead)
|
|
2707 |
if path_tree and file_id in path_tree: |
|
2708 |
if path_tree.inventory[file_id].parent_id is None: |
|
2709 |
continue
|
|
2710 |
tt.version_file(file_id, conflict[1]) |
|
1534.7.171
by Aaron Bentley
Implemented stringifying filesystem conflicts |
2711 |
new_conflicts.add((c_type, 'Versioned directory', conflict[1])) |
3144.4.2
by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390) |
2712 |
elif c_type == 'non-directory parent': |
2713 |
parent_id = conflict[1] |
|
2714 |
parent_parent = tt.final_parent(parent_id) |
|
2715 |
parent_name = tt.final_name(parent_id) |
|
2716 |
parent_file_id = tt.final_file_id(parent_id) |
|
2717 |
new_parent_id = tt.new_directory(parent_name + '.new', |
|
2718 |
parent_parent, parent_file_id) |
|
2719 |
_reparent_transform_children(tt, parent_id, new_parent_id) |
|
3146.8.19
by Aaron Bentley
Merge with bzr.dev |
2720 |
if parent_file_id is not None: |
2721 |
tt.unversion_file(parent_id) |
|
3144.4.2
by Aaron Bentley
Handle non-directory parent conflicts (abentley, #177390) |
2722 |
new_conflicts.add((c_type, 'Created directory', new_parent_id)) |
3363.10.29
by Aaron Bentley
Treat versioned files with no contents as a conflict |
2723 |
elif c_type == 'versioning no contents': |
2724 |
tt.cancel_versioning(conflict[1]) |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
2725 |
return new_conflicts |
2726 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2727 |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
2728 |
def cook_conflicts(raw_conflicts, tt): |
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2729 |
"""Generate a list of cooked conflicts, sorted by file path"""
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2730 |
from bzrlib.conflicts import Conflict |
2731 |
conflict_iter = iter_cook_conflicts(raw_conflicts, tt) |
|
2732 |
return sorted(conflict_iter, key=Conflict.sort_key) |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2733 |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
2734 |
|
2735 |
def iter_cook_conflicts(raw_conflicts, tt): |
|
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
2736 |
from bzrlib.conflicts import Conflict |
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2737 |
fp = FinalPaths(tt) |
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
2738 |
for conflict in raw_conflicts: |
2739 |
c_type = conflict[0] |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2740 |
action = conflict[1] |
2741 |
modified_path = fp.get_path(conflict[2]) |
|
2742 |
modified_id = tt.final_file_id(conflict[2]) |
|
2743 |
if len(conflict) == 3: |
|
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
2744 |
yield Conflict.factory(c_type, action=action, path=modified_path, |
2745 |
file_id=modified_id) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2746 |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
2747 |
else: |
2748 |
conflicting_path = fp.get_path(conflict[3]) |
|
2749 |
conflicting_id = tt.final_file_id(conflict[3]) |
|
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
2750 |
yield Conflict.factory(c_type, action=action, path=modified_path, |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2751 |
file_id=modified_id, |
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
2752 |
conflict_path=conflicting_path, |
2753 |
conflict_file_id=conflicting_id) |
|
2733.2.1
by Aaron Bentley
Implement FileMover, to support TreeTransform rollback |
2754 |
|
2755 |
||
2756 |
class _FileMover(object): |
|
2733.2.9
by Aaron Bentley
Update docstrings |
2757 |
"""Moves and deletes files for TreeTransform, tracking operations"""
|
2733.2.1
by Aaron Bentley
Implement FileMover, to support TreeTransform rollback |
2758 |
|
2759 |
def __init__(self): |
|
2760 |
self.past_renames = [] |
|
2733.2.5
by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions |
2761 |
self.pending_deletions = [] |
2733.2.1
by Aaron Bentley
Implement FileMover, to support TreeTransform rollback |
2762 |
|
2763 |
def rename(self, from_, to): |
|
2733.2.9
by Aaron Bentley
Update docstrings |
2764 |
"""Rename a file from one path to another. Functions like os.rename"""
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
2765 |
try: |
2766 |
os.rename(from_, to) |
|
2767 |
except OSError, e: |
|
3063.1.3
by Aaron Bentley
Update for Linux |
2768 |
if e.errno in (errno.EEXIST, errno.ENOTEMPTY): |
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
2769 |
raise errors.FileExists(to, str(e)) |
2770 |
raise
|
|
2733.2.1
by Aaron Bentley
Implement FileMover, to support TreeTransform rollback |
2771 |
self.past_renames.append((from_, to)) |
2772 |
||
2733.2.5
by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions |
2773 |
def pre_delete(self, from_, to): |
2733.2.9
by Aaron Bentley
Update docstrings |
2774 |
"""Rename a file out of the way and mark it for deletion.
|
2775 |
||
2776 |
Unlike os.unlink, this works equally well for files and directories.
|
|
2777 |
:param from_: The current file path
|
|
2778 |
:param to: A temporary path for the file
|
|
2779 |
"""
|
|
2733.2.5
by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions |
2780 |
self.rename(from_, to) |
2781 |
self.pending_deletions.append(to) |
|
2782 |
||
2733.2.1
by Aaron Bentley
Implement FileMover, to support TreeTransform rollback |
2783 |
def rollback(self): |
2733.2.9
by Aaron Bentley
Update docstrings |
2784 |
"""Reverse all renames that have been performed"""
|
2733.2.1
by Aaron Bentley
Implement FileMover, to support TreeTransform rollback |
2785 |
for from_, to in reversed(self.past_renames): |
2786 |
os.rename(to, from_) |
|
2733.2.12
by Aaron Bentley
Updates from review |
2787 |
# after rollback, don't reuse _FileMover
|
2788 |
past_renames = None |
|
2789 |
pending_deletions = None |
|
2733.2.5
by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions |
2790 |
|
2791 |
def apply_deletions(self): |
|
2733.2.9
by Aaron Bentley
Update docstrings |
2792 |
"""Apply all marked deletions"""
|
2733.2.5
by Aaron Bentley
Implement FileMover.pre_delete and FileMover.apply_deletions |
2793 |
for path in self.pending_deletions: |
2794 |
delete_any(path) |
|
2733.2.12
by Aaron Bentley
Updates from review |
2795 |
# after apply_deletions, don't reuse _FileMover
|
2796 |
past_renames = None |
|
2797 |
pending_deletions = None |