1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
1 |
# Copyright (C) 2006 Canonical Ltd
|
2 |
||
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
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 |
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
19 |
from stat import S_ISREG |
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
20 |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
21 |
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile, |
1534.7.162
by Aaron Bentley
Handle failures creating/deleting the Limbo directory |
22 |
ReusingTransform, NotVersionedError, CantMoveRoot, |
23 |
ExistingLimbo, ImmortalLimbo) |
|
1534.7.106
by Aaron Bentley
Cleaned up imports, added copyright statements |
24 |
from bzrlib.inventory import InventoryEntry |
1558.12.9
by Aaron Bentley
Handle resolving conflicts with directories properly |
25 |
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists, |
26 |
delete_any) |
|
1551.2.34
by Aaron Bentley
Refactored the revert phases |
27 |
from bzrlib.progress import DummyProgress, ProgressPhase |
1534.7.173
by Aaron Bentley
Added conflict warnings to revert |
28 |
from bzrlib.trace import mutter, warning |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
29 |
import bzrlib.ui |
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
30 |
|
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
31 |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
32 |
ROOT_PARENT = "root-parent" |
33 |
||
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
34 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
35 |
def unique_add(map, key, value): |
36 |
if key in map: |
|
1534.7.5
by Aaron Bentley
Got unique_add under test |
37 |
raise DuplicateKey(key=key) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
38 |
map[key] = value |
39 |
||
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
40 |
|
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
41 |
class _TransformResults(object): |
42 |
def __init__(self, modified_paths): |
|
43 |
object.__init__(self) |
|
44 |
self.modified_paths = modified_paths |
|
45 |
||
46 |
||
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
47 |
class TreeTransform(object): |
1534.7.179
by Aaron Bentley
Added Transform docs |
48 |
"""Represent a tree transformation.
|
49 |
|
|
50 |
This object is designed to support incremental generation of the transform,
|
|
51 |
in any order.
|
|
52 |
|
|
53 |
It is easy to produce malformed transforms, but they are generally
|
|
54 |
harmless. Attempting to apply a malformed transform will cause an
|
|
55 |
exception to be raised before any modifications are made to the tree.
|
|
56 |
||
57 |
Many kinds of malformed transforms can be corrected with the
|
|
58 |
resolve_conflicts function. The remaining ones indicate programming error,
|
|
59 |
such as trying to create a file with no path.
|
|
60 |
||
61 |
Two sets of file creation methods are supplied. Convenience methods are:
|
|
62 |
* new_file
|
|
63 |
* new_directory
|
|
64 |
* new_symlink
|
|
65 |
||
66 |
These are composed of the low-level methods:
|
|
67 |
* create_path
|
|
68 |
* create_file or create_directory or create_symlink
|
|
69 |
* version_file
|
|
70 |
* set_executability
|
|
71 |
"""
|
|
1534.9.1
by Aaron Bentley
Added progress bars to merge |
72 |
def __init__(self, tree, pb=DummyProgress()): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
73 |
"""Note: a write lock is taken on the tree.
|
74 |
|
|
75 |
Use TreeTransform.finalize() to release the lock
|
|
76 |
"""
|
|
77 |
object.__init__(self) |
|
78 |
self._tree = tree |
|
79 |
self._tree.lock_write() |
|
1534.7.162
by Aaron Bentley
Handle failures creating/deleting the Limbo directory |
80 |
try: |
81 |
control_files = self._tree._control_files |
|
82 |
self._limbodir = control_files.controlfilename('limbo') |
|
83 |
try: |
|
84 |
os.mkdir(self._limbodir) |
|
85 |
except OSError, e: |
|
86 |
if e.errno == errno.EEXIST: |
|
87 |
raise ExistingLimbo(self._limbodir) |
|
88 |
except: |
|
89 |
self._tree.unlock() |
|
90 |
raise
|
|
91 |
||
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
92 |
self._id_number = 0 |
93 |
self._new_name = {} |
|
94 |
self._new_parent = {} |
|
1534.7.4
by Aaron Bentley
Unified all file types as 'contents' |
95 |
self._new_contents = {} |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
96 |
self._removed_contents = set() |
1534.7.25
by Aaron Bentley
Added set_executability |
97 |
self._new_executability = {} |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
98 |
self._new_id = {} |
1534.7.143
by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids |
99 |
self._non_present_ids = {} |
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
100 |
self._r_new_id = {} |
1534.7.39
by Aaron Bentley
Ensured that files can be unversioned (de-versioned?) |
101 |
self._removed_id = set() |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
102 |
self._tree_path_ids = {} |
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
103 |
self._tree_id_paths = {} |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
104 |
self._new_root = self.trans_id_tree_file_id(tree.get_root_id()) |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
105 |
self.__done = False |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
106 |
self._pb = pb |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
107 |
|
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
108 |
def __get_root(self): |
109 |
return self._new_root |
|
110 |
||
111 |
root = property(__get_root) |
|
112 |
||
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
113 |
def finalize(self): |
1534.7.157
by Aaron Bentley
Added more docs |
114 |
"""Release the working tree lock, if held, clean up limbo dir."""
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
115 |
if self._tree is None: |
116 |
return
|
|
1534.7.162
by Aaron Bentley
Handle failures creating/deleting the Limbo directory |
117 |
try: |
118 |
for trans_id, kind in self._new_contents.iteritems(): |
|
119 |
path = self._limbo_name(trans_id) |
|
120 |
if kind == "directory": |
|
121 |
os.rmdir(path) |
|
122 |
else: |
|
123 |
os.unlink(path) |
|
124 |
try: |
|
125 |
os.rmdir(self._limbodir) |
|
126 |
except OSError: |
|
127 |
# We don't especially care *why* the dir is immortal.
|
|
128 |
raise ImmortalLimbo(self._limbodir) |
|
129 |
finally: |
|
130 |
self._tree.unlock() |
|
131 |
self._tree = None |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
132 |
|
133 |
def _assign_id(self): |
|
134 |
"""Produce a new tranform id"""
|
|
135 |
new_id = "new-%s" % self._id_number |
|
136 |
self._id_number +=1 |
|
137 |
return new_id |
|
138 |
||
139 |
def create_path(self, name, parent): |
|
140 |
"""Assign a transaction id to a new path"""
|
|
141 |
trans_id = self._assign_id() |
|
142 |
unique_add(self._new_name, trans_id, name) |
|
143 |
unique_add(self._new_parent, trans_id, parent) |
|
144 |
return trans_id |
|
145 |
||
1534.7.6
by Aaron Bentley
Added conflict handling |
146 |
def adjust_path(self, name, parent, trans_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
147 |
"""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 |
148 |
if trans_id == self._new_root: |
149 |
raise CantMoveRoot |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
150 |
self._new_name[trans_id] = name |
151 |
self._new_parent[trans_id] = parent |
|
152 |
||
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
153 |
def adjust_root_path(self, name, parent): |
154 |
"""Emulate moving the root by moving all children, instead.
|
|
155 |
|
|
156 |
We do this by undoing the association of root's transaction id with the
|
|
157 |
current tree. This allows us to create a new directory with that
|
|
1534.7.69
by Aaron Bentley
Got real root moves working |
158 |
transaction id. We unversion the root directory and version the
|
159 |
physically new directory, and hope someone versions the tree root
|
|
160 |
later.
|
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
161 |
"""
|
162 |
old_root = self._new_root |
|
163 |
old_root_file_id = self.final_file_id(old_root) |
|
164 |
# force moving all children of root
|
|
165 |
for child_id in self.iter_tree_children(old_root): |
|
166 |
if child_id != parent: |
|
167 |
self.adjust_path(self.final_name(child_id), |
|
168 |
self.final_parent(child_id), child_id) |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
169 |
file_id = self.final_file_id(child_id) |
170 |
if file_id is not None: |
|
171 |
self.unversion_file(child_id) |
|
172 |
self.version_file(file_id, child_id) |
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
173 |
|
174 |
# the physical root needs a new transaction id
|
|
175 |
self._tree_path_ids.pop("") |
|
176 |
self._tree_id_paths.pop(old_root) |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
177 |
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 |
178 |
if parent == old_root: |
179 |
parent = self._new_root |
|
180 |
self.adjust_path(name, parent, old_root) |
|
181 |
self.create_directory(old_root) |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
182 |
self.version_file(old_root_file_id, old_root) |
183 |
self.unversion_file(self._new_root) |
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
184 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
185 |
def trans_id_tree_file_id(self, inventory_id): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
186 |
"""Determine the transaction id of a working tree file.
|
187 |
|
|
188 |
This reflects only files that already exist, not ones that will be
|
|
189 |
added by transactions.
|
|
190 |
"""
|
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
191 |
path = self._tree.inventory.id2path(inventory_id) |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
192 |
return self.trans_id_tree_path(path) |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
193 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
194 |
def trans_id_file_id(self, file_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
195 |
"""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 |
196 |
A new id is only created for file_ids that were never present. If
|
197 |
a transaction has been unversioned, it is deliberately still returned.
|
|
198 |
(this will likely lead to an unversioned parent conflict.)
|
|
199 |
"""
|
|
200 |
if file_id in self._r_new_id and self._r_new_id[file_id] is not None: |
|
201 |
return self._r_new_id[file_id] |
|
202 |
elif file_id in self._tree.inventory: |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
203 |
return self.trans_id_tree_file_id(file_id) |
1534.7.143
by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids |
204 |
elif file_id in self._non_present_ids: |
205 |
return self._non_present_ids[file_id] |
|
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
206 |
else: |
207 |
trans_id = self._assign_id() |
|
1534.7.143
by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids |
208 |
self._non_present_ids[file_id] = trans_id |
1534.7.75
by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id |
209 |
return trans_id |
210 |
||
1534.7.12
by Aaron Bentley
Added canonical_path function |
211 |
def canonical_path(self, path): |
212 |
"""Get the canonical tree-relative path"""
|
|
213 |
# don't follow final symlinks
|
|
214 |
dirname, basename = os.path.split(self._tree.abspath(path)) |
|
215 |
dirname = os.path.realpath(dirname) |
|
1534.7.166
by Aaron Bentley
Swapped os.path.join for pathjoin everywhere |
216 |
return self._tree.relpath(pathjoin(dirname, basename)) |
1534.7.12
by Aaron Bentley
Added canonical_path function |
217 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
218 |
def trans_id_tree_path(self, path): |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
219 |
"""Determine (and maybe set) the transaction ID for a tree path."""
|
1534.7.12
by Aaron Bentley
Added canonical_path function |
220 |
path = self.canonical_path(path) |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
221 |
if path not in self._tree_path_ids: |
222 |
self._tree_path_ids[path] = self._assign_id() |
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
223 |
self._tree_id_paths[self._tree_path_ids[path]] = path |
1534.7.7
by Aaron Bentley
Added support for all-file path ids |
224 |
return self._tree_path_ids[path] |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
225 |
|
1534.7.16
by Aaron Bentley
Added get_tree_parent |
226 |
def get_tree_parent(self, trans_id): |
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
227 |
"""Determine id of the parent in the tree."""
|
1534.7.16
by Aaron Bentley
Added get_tree_parent |
228 |
path = self._tree_id_paths[trans_id] |
229 |
if path == "": |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
230 |
return ROOT_PARENT |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
231 |
return self.trans_id_tree_path(os.path.dirname(path)) |
1534.7.16
by Aaron Bentley
Added get_tree_parent |
232 |
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
233 |
def create_file(self, contents, trans_id, mode_id=None): |
1534.7.21
by Aaron Bentley
Updated docstrings |
234 |
"""Schedule creation of a new file.
|
235 |
||
236 |
See also new_file.
|
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
237 |
|
238 |
Contents is an iterator of strings, all of which will be written
|
|
1534.7.21
by Aaron Bentley
Updated docstrings |
239 |
to the target destination.
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
240 |
|
241 |
New file takes the permissions of any existing file with that id,
|
|
242 |
unless mode_id is specified.
|
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
243 |
"""
|
1534.7.73
by Aaron Bentley
Changed model again. Now iterator is used immediately. |
244 |
f = file(self._limbo_name(trans_id), 'wb') |
1534.8.1
by Aaron Bentley
Reference files in limbo before their creation is finished, for finalize. |
245 |
unique_add(self._new_contents, trans_id, 'file') |
1534.7.73
by Aaron Bentley
Changed model again. Now iterator is used immediately. |
246 |
for segment in contents: |
247 |
f.write(segment) |
|
248 |
f.close() |
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
249 |
self._set_mode(trans_id, mode_id, S_ISREG) |
250 |
||
251 |
def _set_mode(self, trans_id, mode_id, typefunc): |
|
1534.7.157
by Aaron Bentley
Added more docs |
252 |
"""Set the mode of new file contents.
|
253 |
The mode_id is the existing file to get the mode from (often the same
|
|
254 |
as trans_id). The operation is only performed if there's a mode match
|
|
255 |
according to typefunc.
|
|
256 |
"""
|
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
257 |
if mode_id is None: |
258 |
mode_id = trans_id |
|
259 |
try: |
|
260 |
old_path = self._tree_id_paths[mode_id] |
|
261 |
except KeyError: |
|
262 |
return
|
|
263 |
try: |
|
264 |
mode = os.stat(old_path).st_mode |
|
265 |
except OSError, e: |
|
266 |
if e.errno == errno.ENOENT: |
|
267 |
return
|
|
268 |
else: |
|
269 |
raise
|
|
270 |
if typefunc(mode): |
|
271 |
os.chmod(self._limbo_name(trans_id), mode) |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
272 |
|
1534.7.20
by Aaron Bentley
Added directory handling |
273 |
def create_directory(self, trans_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
274 |
"""Schedule creation of a new directory.
|
275 |
|
|
276 |
See also new_directory.
|
|
277 |
"""
|
|
1534.7.73
by Aaron Bentley
Changed model again. Now iterator is used immediately. |
278 |
os.mkdir(self._limbo_name(trans_id)) |
279 |
unique_add(self._new_contents, trans_id, 'directory') |
|
1534.7.20
by Aaron Bentley
Added directory handling |
280 |
|
1534.7.22
by Aaron Bentley
Added symlink support |
281 |
def create_symlink(self, target, trans_id): |
282 |
"""Schedule creation of a new symbolic link.
|
|
283 |
||
284 |
target is a bytestring.
|
|
285 |
See also new_symlink.
|
|
286 |
"""
|
|
1534.7.73
by Aaron Bentley
Changed model again. Now iterator is used immediately. |
287 |
os.symlink(target, self._limbo_name(trans_id)) |
288 |
unique_add(self._new_contents, trans_id, 'symlink') |
|
1534.7.22
by Aaron Bentley
Added symlink support |
289 |
|
1534.7.129
by Aaron Bentley
Converted test cases to Tree Transform |
290 |
def cancel_creation(self, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
291 |
"""Cancel the creation of new file contents."""
|
1534.7.129
by Aaron Bentley
Converted test cases to Tree Transform |
292 |
del self._new_contents[trans_id] |
1558.12.9
by Aaron Bentley
Handle resolving conflicts with directories properly |
293 |
delete_any(self._limbo_name(trans_id)) |
1534.7.129
by Aaron Bentley
Converted test cases to Tree Transform |
294 |
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
295 |
def delete_contents(self, trans_id): |
296 |
"""Schedule the contents of a path entry for deletion"""
|
|
1534.7.130
by Aaron Bentley
More conflict handling, test porting |
297 |
self.tree_kind(trans_id) |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
298 |
self._removed_contents.add(trans_id) |
299 |
||
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
300 |
def cancel_deletion(self, trans_id): |
301 |
"""Cancel a scheduled deletion"""
|
|
302 |
self._removed_contents.remove(trans_id) |
|
303 |
||
1534.7.39
by Aaron Bentley
Ensured that files can be unversioned (de-versioned?) |
304 |
def unversion_file(self, trans_id): |
305 |
"""Schedule a path entry to become unversioned"""
|
|
306 |
self._removed_id.add(trans_id) |
|
307 |
||
308 |
def delete_versioned(self, trans_id): |
|
309 |
"""Delete and unversion a versioned file"""
|
|
310 |
self.delete_contents(trans_id) |
|
311 |
self.unversion_file(trans_id) |
|
312 |
||
1534.7.25
by Aaron Bentley
Added set_executability |
313 |
def set_executability(self, executability, trans_id): |
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
314 |
"""Schedule setting of the 'execute' bit
|
315 |
To unschedule, set to None
|
|
316 |
"""
|
|
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
317 |
if executability is None: |
318 |
del self._new_executability[trans_id] |
|
319 |
else: |
|
320 |
unique_add(self._new_executability, trans_id, executability) |
|
1534.7.25
by Aaron Bentley
Added set_executability |
321 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
322 |
def version_file(self, file_id, trans_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
323 |
"""Schedule a file to become versioned."""
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
324 |
assert file_id is not None |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
325 |
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 |
326 |
unique_add(self._r_new_id, file_id, trans_id) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
327 |
|
1534.7.105
by Aaron Bentley
Got merge with rename working |
328 |
def cancel_versioning(self, trans_id): |
329 |
"""Undo a previous versioning of a file"""
|
|
330 |
file_id = self._new_id[trans_id] |
|
331 |
del self._new_id[trans_id] |
|
332 |
del self._r_new_id[file_id] |
|
333 |
||
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
334 |
def new_paths(self): |
1534.7.21
by Aaron Bentley
Updated docstrings |
335 |
"""Determine the paths of all new and changed files"""
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
336 |
new_ids = set() |
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
337 |
fp = FinalPaths(self) |
1534.7.4
by Aaron Bentley
Unified all file types as 'contents' |
338 |
for id_set in (self._new_name, self._new_parent, self._new_contents, |
1534.7.25
by Aaron Bentley
Added set_executability |
339 |
self._new_id, self._new_executability): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
340 |
new_ids.update(id_set) |
341 |
new_paths = [(fp.get_path(t), t) for t in new_ids] |
|
342 |
new_paths.sort() |
|
343 |
return new_paths |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
344 |
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
345 |
def tree_kind(self, trans_id): |
1534.7.40
by Aaron Bentley
Updated docs |
346 |
"""Determine the file kind in the working tree.
|
347 |
||
348 |
Raises NoSuchFile if the file does not exist
|
|
349 |
"""
|
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
350 |
path = self._tree_id_paths.get(trans_id) |
351 |
if path is None: |
|
352 |
raise NoSuchFile(None) |
|
353 |
try: |
|
354 |
return file_kind(self._tree.abspath(path)) |
|
355 |
except OSError, e: |
|
356 |
if e.errno != errno.ENOENT: |
|
357 |
raise
|
|
358 |
else: |
|
359 |
raise NoSuchFile(path) |
|
360 |
||
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
361 |
def final_kind(self, trans_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
362 |
"""Determine the final file kind, after any changes applied.
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
363 |
|
364 |
Raises NoSuchFile if the file does not exist/has no contents.
|
|
365 |
(It is conceivable that a path would be created without the
|
|
366 |
corresponding contents insertion command)
|
|
367 |
"""
|
|
368 |
if trans_id in self._new_contents: |
|
1534.7.73
by Aaron Bentley
Changed model again. Now iterator is used immediately. |
369 |
return self._new_contents[trans_id] |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
370 |
elif trans_id in self._removed_contents: |
371 |
raise NoSuchFile(None) |
|
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
372 |
else: |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
373 |
return self.tree_kind(trans_id) |
1534.7.8
by Aaron Bentley
Added TreeTransform.final_kind |
374 |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
375 |
def tree_file_id(self, trans_id): |
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
376 |
"""Determine the file id associated with the trans_id in the tree"""
|
377 |
try: |
|
378 |
path = self._tree_id_paths[trans_id] |
|
379 |
except KeyError: |
|
380 |
# the file is a new, unversioned file, or invalid trans_id
|
|
381 |
return None |
|
382 |
# the file is old; the old id is still valid
|
|
1534.7.68
by Aaron Bentley
Got semi-reasonable root directory renaming working |
383 |
if self._new_root == trans_id: |
384 |
return self._tree.inventory.root.file_id |
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
385 |
return self._tree.inventory.path2id(path) |
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
386 |
|
1534.7.13
by Aaron Bentley
Implemented final_file_id |
387 |
def final_file_id(self, trans_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
388 |
"""Determine the file id after any changes are applied, or None.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
389 |
|
390 |
None indicates that the file will not be versioned after changes are
|
|
391 |
applied.
|
|
392 |
"""
|
|
1534.7.13
by Aaron Bentley
Implemented final_file_id |
393 |
try: |
394 |
# there is a new id for this file
|
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
395 |
assert self._new_id[trans_id] is not None |
1534.7.13
by Aaron Bentley
Implemented final_file_id |
396 |
return self._new_id[trans_id] |
397 |
except KeyError: |
|
1534.7.39
by Aaron Bentley
Ensured that files can be unversioned (de-versioned?) |
398 |
if trans_id in self._removed_id: |
399 |
return None |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
400 |
return self.tree_file_id(trans_id) |
1534.7.13
by Aaron Bentley
Implemented final_file_id |
401 |
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
402 |
def inactive_file_id(self, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
403 |
"""Return the inactive file_id associated with a transaction id.
|
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
404 |
That is, the one in the tree or in non_present_ids.
|
405 |
The file_id may actually be active, too.
|
|
406 |
"""
|
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
407 |
file_id = self.tree_file_id(trans_id) |
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
408 |
if file_id is not None: |
409 |
return file_id |
|
410 |
for key, value in self._non_present_ids.iteritems(): |
|
411 |
if value == trans_id: |
|
412 |
return key |
|
413 |
||
1534.7.17
by Aaron Bentley
Added final_parent function |
414 |
def final_parent(self, trans_id): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
415 |
"""Determine the parent file_id, after any changes are applied.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
416 |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
417 |
ROOT_PARENT is returned for the tree root.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
418 |
"""
|
1534.7.17
by Aaron Bentley
Added final_parent function |
419 |
try: |
420 |
return self._new_parent[trans_id] |
|
421 |
except KeyError: |
|
422 |
return self.get_tree_parent(trans_id) |
|
423 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
424 |
def final_name(self, trans_id): |
1534.7.40
by Aaron Bentley
Updated docs |
425 |
"""Determine the final filename, after all changes are applied."""
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
426 |
try: |
427 |
return self._new_name[trans_id] |
|
428 |
except KeyError: |
|
429 |
return os.path.basename(self._tree_id_paths[trans_id]) |
|
430 |
||
1534.10.28
by Aaron Bentley
Use numbered backup files |
431 |
def by_parent(self): |
1534.7.40
by Aaron Bentley
Updated docs |
432 |
"""Return a map of parent: children for known parents.
|
433 |
|
|
434 |
Only new paths and parents of tree files with assigned ids are used.
|
|
435 |
"""
|
|
1534.7.6
by Aaron Bentley
Added conflict handling |
436 |
by_parent = {} |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
437 |
items = list(self._new_parent.iteritems()) |
1534.7.76
by Aaron Bentley
Fixed final_parent, for the case where finding a parent adds tree id paths. |
438 |
items.extend((t, self.final_parent(t)) for t in |
439 |
self._tree_id_paths.keys()) |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
440 |
for trans_id, parent_id in items: |
1534.7.6
by Aaron Bentley
Added conflict handling |
441 |
if parent_id not in by_parent: |
442 |
by_parent[parent_id] = set() |
|
443 |
by_parent[parent_id].add(trans_id) |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
444 |
return by_parent |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
445 |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
446 |
def path_changed(self, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
447 |
"""Return True if a trans_id's path has changed."""
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
448 |
return trans_id in self._new_name or trans_id in self._new_parent |
449 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
450 |
def find_conflicts(self): |
1534.7.40
by Aaron Bentley
Updated docs |
451 |
"""Find any violations of inventory or filesystem invariants"""
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
452 |
if self.__done is True: |
453 |
raise ReusingTransform() |
|
454 |
conflicts = [] |
|
455 |
# ensure all children of all existent parents are known
|
|
456 |
# all children of non-existent parents are known, by definition.
|
|
457 |
self._add_tree_children() |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
458 |
by_parent = self.by_parent() |
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
459 |
conflicts.extend(self._unversioned_parents(by_parent)) |
1534.7.19
by Aaron Bentley
Added tests for parent loops |
460 |
conflicts.extend(self._parent_loops()) |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
461 |
conflicts.extend(self._duplicate_entries(by_parent)) |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
462 |
conflicts.extend(self._duplicate_ids()) |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
463 |
conflicts.extend(self._parent_type_conflicts(by_parent)) |
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
464 |
conflicts.extend(self._improper_versioning()) |
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
465 |
conflicts.extend(self._executability_conflicts()) |
1534.7.152
by Aaron Bentley
Fixed overwrites |
466 |
conflicts.extend(self._overwrite_conflicts()) |
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
467 |
return conflicts |
468 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
469 |
def _add_tree_children(self): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
470 |
"""Add all the children of all active parents to the known paths.
|
1534.7.40
by Aaron Bentley
Updated docs |
471 |
|
472 |
Active parents are those which gain children, and those which are
|
|
473 |
removed. This is a necessary first step in detecting conflicts.
|
|
474 |
"""
|
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
475 |
parents = self.by_parent().keys() |
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
476 |
parents.extend([t for t in self._removed_contents if |
477 |
self.tree_kind(t) == 'directory']) |
|
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
478 |
for trans_id in self._removed_id: |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
479 |
file_id = self.tree_file_id(trans_id) |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
480 |
if self._tree.inventory[file_id].kind in ('directory', |
481 |
'root_directory'): |
|
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
482 |
parents.append(trans_id) |
483 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
484 |
for parent_id in parents: |
1534.7.67
by Aaron Bentley
Refactored _add_tree_children |
485 |
# ensure that all children are registered with the transaction
|
486 |
list(self.iter_tree_children(parent_id)) |
|
487 |
||
488 |
def iter_tree_children(self, parent_id): |
|
489 |
"""Iterate through the entry's tree children, if any"""
|
|
490 |
try: |
|
491 |
path = self._tree_id_paths[parent_id] |
|
492 |
except KeyError: |
|
493 |
return
|
|
494 |
try: |
|
495 |
children = os.listdir(self._tree.abspath(path)) |
|
496 |
except OSError, e: |
|
1534.7.71
by abentley
All tests pass under Windows |
497 |
if e.errno != errno.ENOENT and e.errno != errno.ESRCH: |
1534.7.67
by Aaron Bentley
Refactored _add_tree_children |
498 |
raise
|
499 |
return
|
|
500 |
||
501 |
for child in children: |
|
502 |
childpath = joinpath(path, child) |
|
1534.7.180
by Aaron Bentley
Merge from mainline |
503 |
if self._tree.is_control_filename(childpath): |
1534.7.67
by Aaron Bentley
Refactored _add_tree_children |
504 |
continue
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
505 |
yield self.trans_id_tree_path(childpath) |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
506 |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
507 |
def has_named_child(self, by_parent, parent_id, name): |
508 |
try: |
|
509 |
children = by_parent[parent_id] |
|
510 |
except KeyError: |
|
511 |
children = [] |
|
512 |
for child in children: |
|
513 |
if self.final_name(child) == name: |
|
514 |
return True |
|
515 |
try: |
|
516 |
path = self._tree_id_paths[parent_id] |
|
517 |
except KeyError: |
|
518 |
return False |
|
519 |
childpath = joinpath(path, name) |
|
520 |
child_id = self._tree_path_ids.get(childpath) |
|
521 |
if child_id is None: |
|
522 |
return lexists(self._tree.abspath(childpath)) |
|
523 |
else: |
|
524 |
if tt.final_parent(child_id) != parent_id: |
|
525 |
return False |
|
526 |
if child_id in tt._removed_contents: |
|
527 |
# XXX What about dangling file-ids?
|
|
528 |
return False |
|
529 |
else: |
|
530 |
return True |
|
531 |
||
1534.7.19
by Aaron Bentley
Added tests for parent loops |
532 |
def _parent_loops(self): |
533 |
"""No entry should be its own ancestor"""
|
|
534 |
conflicts = [] |
|
535 |
for trans_id in self._new_parent: |
|
536 |
seen = set() |
|
537 |
parent_id = trans_id |
|
1534.7.31
by Aaron Bentley
Changed tree root parent to ROOT_PARENT |
538 |
while parent_id is not ROOT_PARENT: |
1534.7.19
by Aaron Bentley
Added tests for parent loops |
539 |
seen.add(parent_id) |
540 |
parent_id = self.final_parent(parent_id) |
|
541 |
if parent_id == trans_id: |
|
542 |
conflicts.append(('parent loop', trans_id)) |
|
543 |
if parent_id in seen: |
|
544 |
break
|
|
545 |
return conflicts |
|
546 |
||
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
547 |
def _unversioned_parents(self, by_parent): |
548 |
"""If parent directories are versioned, children must be versioned."""
|
|
549 |
conflicts = [] |
|
550 |
for parent_id, children in by_parent.iteritems(): |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
551 |
if parent_id is ROOT_PARENT: |
552 |
continue
|
|
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
553 |
if self.final_file_id(parent_id) is not None: |
554 |
continue
|
|
555 |
for child_id in children: |
|
556 |
if self.final_file_id(child_id) is not None: |
|
557 |
conflicts.append(('unversioned parent', parent_id)) |
|
558 |
break; |
|
559 |
return conflicts |
|
560 |
||
561 |
def _improper_versioning(self): |
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
562 |
"""Cannot version a file with no contents, or a bad type.
|
1534.7.15
by Aaron Bentley
Add conflict types related to versioning |
563 |
|
564 |
However, existing entries with no contents are okay.
|
|
565 |
"""
|
|
566 |
conflicts = [] |
|
567 |
for trans_id in self._new_id.iterkeys(): |
|
568 |
try: |
|
569 |
kind = self.final_kind(trans_id) |
|
570 |
except NoSuchFile: |
|
571 |
conflicts.append(('versioning no contents', trans_id)) |
|
572 |
continue
|
|
573 |
if not InventoryEntry.versionable_kind(kind): |
|
1534.7.20
by Aaron Bentley
Added directory handling |
574 |
conflicts.append(('versioning bad kind', trans_id, kind)) |
1534.7.11
by Aaron Bentley
Refactored conflict handling |
575 |
return conflicts |
576 |
||
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
577 |
def _executability_conflicts(self): |
1534.7.40
by Aaron Bentley
Updated docs |
578 |
"""Check for bad executability changes.
|
579 |
|
|
580 |
Only versioned files may have their executability set, because
|
|
581 |
1. only versioned entries can have executability under windows
|
|
582 |
2. only files can be executable. (The execute bit on a directory
|
|
583 |
does not indicate searchability)
|
|
584 |
"""
|
|
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
585 |
conflicts = [] |
586 |
for trans_id in self._new_executability: |
|
587 |
if self.final_file_id(trans_id) is None: |
|
588 |
conflicts.append(('unversioned executability', trans_id)) |
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
589 |
else: |
590 |
try: |
|
591 |
non_file = self.final_kind(trans_id) != "file" |
|
592 |
except NoSuchFile: |
|
593 |
non_file = True |
|
594 |
if non_file is True: |
|
595 |
conflicts.append(('non-file executability', trans_id)) |
|
1534.7.26
by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries |
596 |
return conflicts |
597 |
||
1534.7.152
by Aaron Bentley
Fixed overwrites |
598 |
def _overwrite_conflicts(self): |
599 |
"""Check for overwrites (not permitted on Win32)"""
|
|
600 |
conflicts = [] |
|
601 |
for trans_id in self._new_contents: |
|
602 |
try: |
|
603 |
self.tree_kind(trans_id) |
|
604 |
except NoSuchFile: |
|
605 |
continue
|
|
606 |
if trans_id not in self._removed_contents: |
|
607 |
conflicts.append(('overwrite', trans_id, |
|
608 |
self.final_name(trans_id))) |
|
609 |
return conflicts |
|
610 |
||
1534.7.11
by Aaron Bentley
Refactored conflict handling |
611 |
def _duplicate_entries(self, by_parent): |
612 |
"""No directory may have two entries with the same name."""
|
|
613 |
conflicts = [] |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
614 |
for children in by_parent.itervalues(): |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
615 |
name_ids = [(self.final_name(t), t) for t in children] |
1534.7.6
by Aaron Bentley
Added conflict handling |
616 |
name_ids.sort() |
617 |
last_name = None |
|
618 |
last_trans_id = None |
|
619 |
for name, trans_id in name_ids: |
|
620 |
if name == last_name: |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
621 |
conflicts.append(('duplicate', last_trans_id, trans_id, |
622 |
name)) |
|
1558.7.11
by Aaron Bentley
Avoid spurious conflict on add/delete |
623 |
try: |
624 |
kind = self.final_kind(trans_id) |
|
625 |
except NoSuchFile: |
|
626 |
kind = None |
|
627 |
file_id = self.final_file_id(trans_id) |
|
628 |
if kind is not None or file_id is not None: |
|
629 |
last_name = name |
|
630 |
last_trans_id = trans_id |
|
1534.7.11
by Aaron Bentley
Refactored conflict handling |
631 |
return conflicts |
632 |
||
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
633 |
def _duplicate_ids(self): |
634 |
"""Each inventory id may only be used once"""
|
|
635 |
conflicts = [] |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
636 |
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
637 |
self._removed_id)) |
638 |
active_tree_ids = set((f for f in self._tree.inventory if |
|
639 |
f not in removed_tree_ids)) |
|
640 |
for trans_id, file_id in self._new_id.iteritems(): |
|
641 |
if file_id in active_tree_ids: |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
642 |
old_trans_id = self.trans_id_tree_file_id(file_id) |
1534.7.50
by Aaron Bentley
Detect duplicate inventory ids |
643 |
conflicts.append(('duplicate id', old_trans_id, trans_id)) |
644 |
return conflicts |
|
645 |
||
1534.7.11
by Aaron Bentley
Refactored conflict handling |
646 |
def _parent_type_conflicts(self, by_parent): |
647 |
"""parents must have directory 'contents'."""
|
|
648 |
conflicts = [] |
|
1534.7.37
by Aaron Bentley
Allowed removed dirs to have content-free children. |
649 |
for parent_id, children in by_parent.iteritems(): |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
650 |
if parent_id is ROOT_PARENT: |
651 |
continue
|
|
1534.7.37
by Aaron Bentley
Allowed removed dirs to have content-free children. |
652 |
if not self._any_contents(children): |
653 |
continue
|
|
654 |
for child in children: |
|
655 |
try: |
|
656 |
self.final_kind(child) |
|
657 |
except NoSuchFile: |
|
658 |
continue
|
|
1534.7.10
by Aaron Bentley
Implemented missing parent and non-directory parent conflicts |
659 |
try: |
660 |
kind = self.final_kind(parent_id) |
|
661 |
except NoSuchFile: |
|
662 |
kind = None |
|
663 |
if kind is None: |
|
664 |
conflicts.append(('missing parent', parent_id)) |
|
665 |
elif kind != "directory": |
|
666 |
conflicts.append(('non-directory parent', parent_id)) |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
667 |
return conflicts |
1534.7.37
by Aaron Bentley
Allowed removed dirs to have content-free children. |
668 |
|
669 |
def _any_contents(self, trans_ids): |
|
670 |
"""Return true if any of the trans_ids, will have contents."""
|
|
671 |
for trans_id in trans_ids: |
|
672 |
try: |
|
673 |
kind = self.final_kind(trans_id) |
|
674 |
except NoSuchFile: |
|
675 |
continue
|
|
676 |
return True |
|
677 |
return False |
|
1534.7.6
by Aaron Bentley
Added conflict handling |
678 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
679 |
def apply(self): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
680 |
"""Apply all changes to the inventory and filesystem.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
681 |
|
682 |
If filesystem or inventory conflicts are present, MalformedTransform
|
|
683 |
will be thrown.
|
|
684 |
"""
|
|
1534.7.49
by Aaron Bentley
Printed conflicts in MalformedTransform |
685 |
conflicts = self.find_conflicts() |
686 |
if len(conflicts) != 0: |
|
687 |
raise MalformedTransform(conflicts=conflicts) |
|
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
688 |
limbo_inv = {} |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
689 |
inv = self._tree.inventory |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
690 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
691 |
try: |
|
692 |
child_pb.update('Apply phase', 0, 2) |
|
693 |
self._apply_removals(inv, limbo_inv) |
|
694 |
child_pb.update('Apply phase', 1, 2) |
|
695 |
modified_paths = self._apply_insertions(inv, limbo_inv) |
|
696 |
finally: |
|
697 |
child_pb.finished() |
|
1534.7.35
by Aaron Bentley
Got file renaming working |
698 |
self._tree._write_inventory(inv) |
699 |
self.__done = True |
|
1534.7.59
by Aaron Bentley
Simplified tests |
700 |
self.finalize() |
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
701 |
return _TransformResults(modified_paths) |
1534.7.35
by Aaron Bentley
Got file renaming working |
702 |
|
1534.7.72
by Aaron Bentley
Moved new content generation to pre-renames |
703 |
def _limbo_name(self, trans_id): |
704 |
"""Generate the limbo name of a file"""
|
|
1534.7.166
by Aaron Bentley
Swapped os.path.join for pathjoin everywhere |
705 |
return pathjoin(self._limbodir, trans_id) |
1534.7.72
by Aaron Bentley
Moved new content generation to pre-renames |
706 |
|
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
707 |
def _apply_removals(self, inv, limbo_inv): |
1534.7.36
by Aaron Bentley
Added rename tests |
708 |
"""Perform tree operations that remove directory/inventory names.
|
709 |
|
|
710 |
That is, delete files that are to be deleted, and put any files that
|
|
711 |
need renaming into limbo. This must be done in strict child-to-parent
|
|
712 |
order.
|
|
713 |
"""
|
|
1534.7.35
by Aaron Bentley
Got file renaming working |
714 |
tree_paths = list(self._tree_path_ids.iteritems()) |
715 |
tree_paths.sort(reverse=True) |
|
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
716 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
717 |
try: |
|
718 |
for num, data in enumerate(tree_paths): |
|
719 |
path, trans_id = data |
|
720 |
child_pb.update('removing file', num, len(tree_paths)) |
|
721 |
full_path = self._tree.abspath(path) |
|
722 |
if trans_id in self._removed_contents: |
|
1558.12.9
by Aaron Bentley
Handle resolving conflicts with directories properly |
723 |
delete_any(full_path) |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
724 |
elif trans_id in self._new_name or trans_id in \ |
725 |
self._new_parent: |
|
726 |
try: |
|
727 |
os.rename(full_path, self._limbo_name(trans_id)) |
|
728 |
except OSError, e: |
|
729 |
if e.errno != errno.ENOENT: |
|
730 |
raise
|
|
731 |
if trans_id in self._removed_id: |
|
732 |
if trans_id == self._new_root: |
|
733 |
file_id = self._tree.inventory.root.file_id |
|
734 |
else: |
|
735 |
file_id = self.tree_file_id(trans_id) |
|
736 |
del inv[file_id] |
|
737 |
elif trans_id in self._new_name or trans_id in self._new_parent: |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
738 |
file_id = self.tree_file_id(trans_id) |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
739 |
if file_id is not None: |
740 |
limbo_inv[trans_id] = inv[file_id] |
|
741 |
del inv[file_id] |
|
742 |
finally: |
|
743 |
child_pb.finished() |
|
1534.7.34
by Aaron Bentley
Proper conflicts for removals |
744 |
|
1534.7.41
by Aaron Bentley
Got inventory ID movement working |
745 |
def _apply_insertions(self, inv, limbo_inv): |
1534.7.36
by Aaron Bentley
Added rename tests |
746 |
"""Perform tree operations that insert directory/inventory names.
|
747 |
|
|
748 |
That is, create any files that need to be created, and restore from
|
|
749 |
limbo any files that needed renaming. This must be done in strict
|
|
750 |
parent-to-child order.
|
|
751 |
"""
|
|
1534.9.1
by Aaron Bentley
Added progress bars to merge |
752 |
new_paths = self.new_paths() |
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
753 |
modified_paths = [] |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
754 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
755 |
try: |
|
756 |
for num, (path, trans_id) in enumerate(new_paths): |
|
757 |
child_pb.update('adding file', num, len(new_paths)) |
|
1534.7.48
by Aaron Bentley
Ensured we can move/rename dangling inventory entries |
758 |
try: |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
759 |
kind = self._new_contents[trans_id] |
760 |
except KeyError: |
|
761 |
kind = contents = None |
|
762 |
if trans_id in self._new_contents or \ |
|
763 |
self.path_changed(trans_id): |
|
764 |
full_path = self._tree.abspath(path) |
|
765 |
try: |
|
766 |
os.rename(self._limbo_name(trans_id), full_path) |
|
767 |
except OSError, e: |
|
768 |
# We may be renaming a dangling inventory id
|
|
769 |
if e.errno != errno.ENOENT: |
|
770 |
raise
|
|
771 |
if trans_id in self._new_contents: |
|
772 |
modified_paths.append(full_path) |
|
773 |
del self._new_contents[trans_id] |
|
774 |
||
775 |
if trans_id in self._new_id: |
|
776 |
if kind is None: |
|
777 |
kind = file_kind(self._tree.abspath(path)) |
|
778 |
inv.add_path(path, kind, self._new_id[trans_id]) |
|
779 |
elif trans_id in self._new_name or trans_id in\ |
|
780 |
self._new_parent: |
|
781 |
entry = limbo_inv.get(trans_id) |
|
782 |
if entry is not None: |
|
783 |
entry.name = self.final_name(trans_id) |
|
784 |
parent_path = os.path.dirname(path) |
|
785 |
entry.parent_id = \ |
|
786 |
self._tree.inventory.path2id(parent_path) |
|
787 |
inv.add(entry) |
|
788 |
||
789 |
# requires files and inventory entries to be in place
|
|
790 |
if trans_id in self._new_executability: |
|
791 |
self._set_executability(path, inv, trans_id) |
|
792 |
finally: |
|
793 |
child_pb.finished() |
|
1534.7.191
by Aaron Bentley
Got transform.apply to list modified paths |
794 |
return modified_paths |
1534.7.40
by Aaron Bentley
Updated docs |
795 |
|
1534.7.25
by Aaron Bentley
Added set_executability |
796 |
def _set_executability(self, path, inv, trans_id): |
1534.7.40
by Aaron Bentley
Updated docs |
797 |
"""Set the executability of versioned files """
|
1534.7.25
by Aaron Bentley
Added set_executability |
798 |
file_id = inv.path2id(path) |
799 |
new_executability = self._new_executability[trans_id] |
|
800 |
inv[file_id].executable = new_executability |
|
801 |
if supports_executable(): |
|
802 |
abspath = self._tree.abspath(path) |
|
803 |
current_mode = os.stat(abspath).st_mode |
|
804 |
if new_executability: |
|
805 |
umask = os.umask(0) |
|
806 |
os.umask(umask) |
|
807 |
to_mode = current_mode | (0100 & ~umask) |
|
808 |
# Enable x-bit for others only if they can read it.
|
|
809 |
if current_mode & 0004: |
|
810 |
to_mode |= 0001 & ~umask |
|
811 |
if current_mode & 0040: |
|
812 |
to_mode |= 0010 & ~umask |
|
813 |
else: |
|
814 |
to_mode = current_mode & ~0111 |
|
815 |
os.chmod(abspath, to_mode) |
|
816 |
||
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
817 |
def _new_entry(self, name, parent_id, file_id): |
1534.7.21
by Aaron Bentley
Updated docstrings |
818 |
"""Helper function to create a new filesystem entry."""
|
1534.7.2
by Aaron Bentley
Added convenience function |
819 |
trans_id = self.create_path(name, parent_id) |
820 |
if file_id is not None: |
|
821 |
self.version_file(file_id, trans_id) |
|
822 |
return trans_id |
|
823 |
||
1534.7.27
by Aaron Bentley
Added execute bit to new_file method |
824 |
def new_file(self, name, parent_id, contents, file_id=None, |
825 |
executable=None): |
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
826 |
"""Convenience method to create files.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
827 |
|
828 |
name is the name of the file to create.
|
|
829 |
parent_id is the transaction id of the parent directory of the file.
|
|
830 |
contents is an iterator of bytestrings, which will be used to produce
|
|
831 |
the file.
|
|
832 |
file_id is the inventory ID of the file, if it is to be versioned.
|
|
833 |
"""
|
|
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
834 |
trans_id = self._new_entry(name, parent_id, file_id) |
1534.7.20
by Aaron Bentley
Added directory handling |
835 |
self.create_file(contents, trans_id) |
1534.7.27
by Aaron Bentley
Added execute bit to new_file method |
836 |
if executable is not None: |
837 |
self.set_executability(executable, trans_id) |
|
1534.7.20
by Aaron Bentley
Added directory handling |
838 |
return trans_id |
839 |
||
840 |
def new_directory(self, name, parent_id, file_id=None): |
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
841 |
"""Convenience method to create directories.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
842 |
|
843 |
name is the name of the directory to create.
|
|
844 |
parent_id is the transaction id of the parent directory of the
|
|
845 |
directory.
|
|
846 |
file_id is the inventory ID of the directory, if it is to be versioned.
|
|
847 |
"""
|
|
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
848 |
trans_id = self._new_entry(name, parent_id, file_id) |
1534.7.20
by Aaron Bentley
Added directory handling |
849 |
self.create_directory(trans_id) |
850 |
return trans_id |
|
851 |
||
1534.7.22
by Aaron Bentley
Added symlink support |
852 |
def new_symlink(self, name, parent_id, target, file_id=None): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
853 |
"""Convenience method to create symbolic link.
|
1534.7.22
by Aaron Bentley
Added symlink support |
854 |
|
855 |
name is the name of the symlink to create.
|
|
856 |
parent_id is the transaction id of the parent directory of the symlink.
|
|
857 |
target is a bytestring of the target of the symlink.
|
|
858 |
file_id is the inventory ID of the file, if it is to be versioned.
|
|
859 |
"""
|
|
1534.7.23
by Aaron Bentley
Transform.new_entry -> Transform._new_entry |
860 |
trans_id = self._new_entry(name, parent_id, file_id) |
1534.7.22
by Aaron Bentley
Added symlink support |
861 |
self.create_symlink(target, trans_id) |
862 |
return trans_id |
|
863 |
||
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
864 |
def joinpath(parent, child): |
1534.7.40
by Aaron Bentley
Updated docs |
865 |
"""Join tree-relative paths, handling the tree root specially"""
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
866 |
if parent is None or parent == "": |
867 |
return child |
|
868 |
else: |
|
1534.7.166
by Aaron Bentley
Swapped os.path.join for pathjoin everywhere |
869 |
return pathjoin(parent, child) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
870 |
|
1534.7.167
by Aaron Bentley
PEP8 and comment cleanups |
871 |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
872 |
class FinalPaths(object): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
873 |
"""Make path calculation cheap by memoizing paths.
|
1534.7.21
by Aaron Bentley
Updated docstrings |
874 |
|
875 |
The underlying tree must not be manipulated between calls, or else
|
|
876 |
the results will likely be incorrect.
|
|
877 |
"""
|
|
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
878 |
def __init__(self, transform): |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
879 |
object.__init__(self) |
880 |
self._known_paths = {} |
|
1534.7.33
by Aaron Bentley
Fixed naming |
881 |
self.transform = transform |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
882 |
|
883 |
def _determine_path(self, trans_id): |
|
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
884 |
if trans_id == self.transform.root: |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
885 |
return "" |
1534.7.33
by Aaron Bentley
Fixed naming |
886 |
name = self.transform.final_name(trans_id) |
887 |
parent_id = self.transform.final_parent(trans_id) |
|
1534.7.132
by Aaron Bentley
Got cooked conflicts working |
888 |
if parent_id == self.transform.root: |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
889 |
return name |
890 |
else: |
|
1534.7.166
by Aaron Bentley
Swapped os.path.join for pathjoin everywhere |
891 |
return pathjoin(self.get_path(parent_id), name) |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
892 |
|
893 |
def get_path(self, trans_id): |
|
1534.7.157
by Aaron Bentley
Added more docs |
894 |
"""Find the final path associated with a trans_id"""
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
895 |
if trans_id not in self._known_paths: |
896 |
self._known_paths[trans_id] = self._determine_path(trans_id) |
|
897 |
return self._known_paths[trans_id] |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
898 |
|
1534.7.30
by Aaron Bentley
Factored out topological id sorting |
899 |
def topology_sorted_ids(tree): |
1534.7.40
by Aaron Bentley
Updated docs |
900 |
"""Determine the topological order of the ids in a tree"""
|
1534.7.30
by Aaron Bentley
Factored out topological id sorting |
901 |
file_ids = list(tree) |
902 |
file_ids.sort(key=tree.id2path) |
|
903 |
return file_ids |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
904 |
|
1534.7.165
by Aaron Bentley
Switched to build_tree instead of revert |
905 |
def build_tree(tree, wt): |
1534.7.40
by Aaron Bentley
Updated docs |
906 |
"""Create working tree for a branch, using a Transaction."""
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
907 |
file_trans_id = {} |
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
908 |
top_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
909 |
pp = ProgressPhase("Build phase", 2, top_pb) |
|
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
910 |
tt = TreeTransform(wt) |
911 |
try: |
|
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
912 |
pp.next_phase() |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
913 |
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_file_id(wt.get_root_id()) |
1534.7.30
by Aaron Bentley
Factored out topological id sorting |
914 |
file_ids = topology_sorted_ids(tree) |
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
915 |
pb = bzrlib.ui.ui_factory.nested_progress_bar() |
916 |
try: |
|
917 |
for num, file_id in enumerate(file_ids): |
|
918 |
pb.update("Building tree", num, len(file_ids)) |
|
919 |
entry = tree.inventory[file_id] |
|
920 |
if entry.parent_id is None: |
|
921 |
continue
|
|
922 |
if entry.parent_id not in file_trans_id: |
|
923 |
raise repr(entry.parent_id) |
|
924 |
parent_id = file_trans_id[entry.parent_id] |
|
925 |
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id, |
|
926 |
tree) |
|
927 |
finally: |
|
928 |
pb.finished() |
|
929 |
pp.next_phase() |
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
930 |
tt.apply() |
931 |
finally: |
|
932 |
tt.finalize() |
|
1558.11.1
by Aaron Bentley
Progress indicator for tree builts |
933 |
top_pb.finished() |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
934 |
|
935 |
def new_by_entry(tt, entry, parent_id, tree): |
|
1534.7.157
by Aaron Bentley
Added more docs |
936 |
"""Create a new file according to its inventory entry"""
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
937 |
name = entry.name |
938 |
kind = entry.kind |
|
939 |
if kind == 'file': |
|
1534.7.79
by Aaron Bentley
Stopped calling get_file_lines on WorkingTree |
940 |
contents = tree.get_file(entry.file_id).readlines() |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
941 |
executable = tree.is_executable(entry.file_id) |
942 |
return tt.new_file(name, parent_id, contents, entry.file_id, |
|
943 |
executable) |
|
944 |
elif kind == 'directory': |
|
1534.7.54
by Aaron Bentley
Fixed thinko |
945 |
return tt.new_directory(name, parent_id, entry.file_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
946 |
elif kind == 'symlink': |
1534.7.183
by Aaron Bentley
Fixed build_tree with symlinks |
947 |
target = tree.get_symlink_target(entry.file_id) |
948 |
return tt.new_symlink(name, parent_id, target, entry.file_id) |
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
949 |
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
950 |
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None): |
1534.7.157
by Aaron Bentley
Added more docs |
951 |
"""Create new file contents according to an inventory entry."""
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
952 |
if entry.kind == "file": |
1534.7.97
by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict |
953 |
if lines == None: |
954 |
lines = tree.get_file(entry.file_id).readlines() |
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
955 |
tt.create_file(lines, trans_id, mode_id=mode_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
956 |
elif entry.kind == "symlink": |
1534.7.101
by Aaron Bentley
Got conflicts on symlinks working properly |
957 |
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
958 |
elif entry.kind == "directory": |
1534.7.51
by Aaron Bentley
New approach to revert |
959 |
tt.create_directory(trans_id) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
960 |
|
1534.7.89
by Aaron Bentley
Handle all content types in three-way |
961 |
def create_entry_executability(tt, entry, trans_id): |
1534.7.157
by Aaron Bentley
Added more docs |
962 |
"""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 |
963 |
if entry.kind == "file": |
964 |
tt.set_executability(entry.executable, trans_id) |
|
1534.7.47
by Aaron Bentley
Started work on 'revert' |
965 |
|
1534.7.157
by Aaron Bentley
Added more docs |
966 |
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
967 |
def find_interesting(working_tree, target_tree, filenames): |
1534.7.157
by Aaron Bentley
Added more docs |
968 |
"""Find the ids corresponding to specified filenames."""
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
969 |
if not filenames: |
970 |
interesting_ids = None |
|
971 |
else: |
|
972 |
interesting_ids = set() |
|
1534.7.118
by Aaron Bentley
Dirty merge of the mainline |
973 |
for tree_path in filenames: |
1558.12.7
by Aaron Bentley
Fixed revert with missing files |
974 |
not_found = True |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
975 |
for tree in (working_tree, target_tree): |
976 |
file_id = tree.inventory.path2id(tree_path) |
|
977 |
if file_id is not None: |
|
978 |
interesting_ids.add(file_id) |
|
979 |
not_found = False |
|
1558.12.7
by Aaron Bentley
Fixed revert with missing files |
980 |
if not_found: |
981 |
raise NotVersionedError(path=tree_path) |
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
982 |
return interesting_ids |
983 |
||
984 |
||
1534.7.56
by Aaron Bentley
Implemented the backup file detritus |
985 |
def change_entry(tt, file_id, working_tree, target_tree, |
1534.10.28
by Aaron Bentley
Use numbered backup files |
986 |
trans_id_file_id, backups, trans_id, by_parent): |
1534.7.157
by Aaron Bentley
Added more docs |
987 |
"""Replace a file_id's contents with those from a target tree."""
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
988 |
e_trans_id = trans_id_file_id(file_id) |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
989 |
entry = target_tree.inventory[file_id] |
990 |
has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, |
|
991 |
working_tree) |
|
992 |
if contents_mod: |
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
993 |
mode_id = e_trans_id |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
994 |
if has_contents: |
1534.7.56
by Aaron Bentley
Implemented the backup file detritus |
995 |
if not backups: |
996 |
tt.delete_contents(e_trans_id) |
|
997 |
else: |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
998 |
parent_trans_id = trans_id_file_id(entry.parent_id) |
1534.10.28
by Aaron Bentley
Use numbered backup files |
999 |
backup_name = get_backup_name(entry, by_parent, |
1000 |
parent_trans_id, tt) |
|
1001 |
tt.adjust_path(backup_name, parent_trans_id, e_trans_id) |
|
1534.7.56
by Aaron Bentley
Implemented the backup file detritus |
1002 |
tt.unversion_file(e_trans_id) |
1003 |
e_trans_id = tt.create_path(entry.name, parent_trans_id) |
|
1004 |
tt.version_file(file_id, e_trans_id) |
|
1005 |
trans_id[file_id] = e_trans_id |
|
1534.7.117
by Aaron Bentley
Simplified permission handling of existing files in transform. |
1006 |
create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id) |
1534.7.89
by Aaron Bentley
Handle all content types in three-way |
1007 |
create_entry_executability(tt, entry, e_trans_id) |
1008 |
||
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1009 |
elif meta_mod: |
1534.7.58
by abentley
Fixed executability bug |
1010 |
tt.set_executability(entry.executable, e_trans_id) |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1011 |
if tt.final_name(e_trans_id) != entry.name: |
1012 |
adjust_path = True |
|
1013 |
else: |
|
1014 |
parent_id = tt.final_parent(e_trans_id) |
|
1015 |
parent_file_id = tt.final_file_id(parent_id) |
|
1016 |
if parent_file_id != entry.parent_id: |
|
1017 |
adjust_path = True |
|
1018 |
else: |
|
1019 |
adjust_path = False |
|
1020 |
if adjust_path: |
|
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
1021 |
parent_trans_id = trans_id_file_id(entry.parent_id) |
1534.7.56
by Aaron Bentley
Implemented the backup file detritus |
1022 |
tt.adjust_path(entry.name, parent_trans_id, e_trans_id) |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1023 |
|
1024 |
||
1534.10.28
by Aaron Bentley
Use numbered backup files |
1025 |
def get_backup_name(entry, by_parent, parent_trans_id, tt): |
1026 |
"""Produce a backup-style name that appears to be available"""
|
|
1027 |
def name_gen(): |
|
1028 |
counter = 1 |
|
1029 |
while True: |
|
1534.10.29
by Aaron Bentley
Fixed backup numbering to match GNU standard better |
1030 |
yield "%s.~%d~" % (entry.name, counter) |
1534.10.28
by Aaron Bentley
Use numbered backup files |
1031 |
counter += 1 |
1032 |
for name in name_gen(): |
|
1033 |
if not tt.has_named_child(by_parent, parent_trans_id, name): |
|
1034 |
return name |
|
1035 |
||
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1036 |
def _entry_changes(file_id, entry, working_tree): |
1534.7.156
by Aaron Bentley
PEP8 fixes |
1037 |
"""Determine in which ways the inventory entry has changed.
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1038 |
|
1039 |
Returns booleans: has_contents, content_mod, meta_mod
|
|
1040 |
has_contents means there are currently contents, but they differ
|
|
1041 |
contents_mod means contents need to be modified
|
|
1042 |
meta_mod means the metadata needs to be modified
|
|
1043 |
"""
|
|
1044 |
cur_entry = working_tree.inventory[file_id] |
|
1045 |
try: |
|
1046 |
working_kind = working_tree.kind(file_id) |
|
1047 |
has_contents = True |
|
1048 |
except OSError, e: |
|
1049 |
if e.errno != errno.ENOENT: |
|
1050 |
raise
|
|
1051 |
has_contents = False |
|
1052 |
contents_mod = True |
|
1053 |
meta_mod = False |
|
1054 |
if has_contents is True: |
|
1055 |
real_e_kind = entry.kind |
|
1056 |
if real_e_kind == 'root_directory': |
|
1057 |
real_e_kind = 'directory' |
|
1058 |
if real_e_kind != working_kind: |
|
1059 |
contents_mod, meta_mod = True, False |
|
1060 |
else: |
|
1061 |
cur_entry._read_tree_state(working_tree.id2path(file_id), |
|
1062 |
working_tree) |
|
1063 |
contents_mod, meta_mod = entry.detect_changes(cur_entry) |
|
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
1064 |
cur_entry._forget_tree_state() |
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1065 |
return has_contents, contents_mod, meta_mod |
1066 |
||
1534.7.56
by Aaron Bentley
Implemented the backup file detritus |
1067 |
|
1534.9.4
by Aaron Bentley
Added progress bars to revert. |
1068 |
def revert(working_tree, target_tree, filenames, backups=False, |
1069 |
pb=DummyProgress()): |
|
1534.7.157
by Aaron Bentley
Added more docs |
1070 |
"""Revert a working tree's contents to those of a target tree."""
|
1534.7.55
by Aaron Bentley
Fixed up the change detection |
1071 |
interesting_ids = find_interesting(working_tree, target_tree, filenames) |
1072 |
def interesting(file_id): |
|
1073 |
return interesting_ids is None or file_id in interesting_ids |
|
1074 |
||
1534.9.7
by Aaron Bentley
Show progress bars in revert |
1075 |
tt = TreeTransform(working_tree, pb) |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
1076 |
try: |
1558.3.3
by Aaron Bentley
Fix error handling for merge_modified |
1077 |
merge_modified = working_tree.merge_modified() |
1534.7.51
by Aaron Bentley
New approach to revert |
1078 |
trans_id = {} |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
1079 |
def trans_id_file_id(file_id): |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
1080 |
try: |
1534.7.51
by Aaron Bentley
New approach to revert |
1081 |
return trans_id[file_id] |
1534.7.47
by Aaron Bentley
Started work on 'revert' |
1082 |
except KeyError: |
1534.7.181
by Aaron Bentley
Renamed a bunch of functions |
1083 |
return tt.trans_id_tree_file_id(file_id) |
1534.7.51
by Aaron Bentley
New approach to revert |
1084 |
|
1551.2.34
by Aaron Bentley
Refactored the revert phases |
1085 |
pp = ProgressPhase("Revert phase", 4, pb) |
1086 |
pp.next_phase() |
|
1534.9.4
by Aaron Bentley
Added progress bars to revert. |
1087 |
sorted_interesting = [i for i in topology_sorted_ids(target_tree) if |
1088 |
interesting(i)] |
|
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
1089 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
1090 |
try: |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
1091 |
by_parent = tt.by_parent() |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
1092 |
for id_num, file_id in enumerate(sorted_interesting): |
1093 |
child_pb.update("Reverting file", id_num+1, |
|
1094 |
len(sorted_interesting)) |
|
1095 |
if file_id not in working_tree.inventory: |
|
1096 |
entry = target_tree.inventory[file_id] |
|
1097 |
parent_id = trans_id_file_id(entry.parent_id) |
|
1098 |
e_trans_id = new_by_entry(tt, entry, parent_id, target_tree) |
|
1099 |
trans_id[file_id] = e_trans_id |
|
1100 |
else: |
|
1101 |
backup_this = backups |
|
1102 |
if file_id in merge_modified: |
|
1103 |
backup_this = False |
|
1104 |
del merge_modified[file_id] |
|
1105 |
change_entry(tt, file_id, working_tree, target_tree, |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
1106 |
trans_id_file_id, backup_this, trans_id, |
1107 |
by_parent) |
|
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
1108 |
finally: |
1109 |
child_pb.finished() |
|
1551.2.34
by Aaron Bentley
Refactored the revert phases |
1110 |
pp.next_phase() |
1534.9.5
by Aaron Bentley
Merged dangling inventory fix |
1111 |
wt_interesting = [i for i in working_tree.inventory if interesting(i)] |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
1112 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
1113 |
try: |
|
1114 |
for id_num, file_id in enumerate(wt_interesting): |
|
1115 |
child_pb.update("New file check", id_num+1, |
|
1116 |
len(sorted_interesting)) |
|
1117 |
if file_id not in target_tree: |
|
1118 |
trans_id = tt.trans_id_tree_file_id(file_id) |
|
1119 |
tt.unversion_file(trans_id) |
|
1120 |
if file_id in merge_modified: |
|
1121 |
tt.delete_contents(trans_id) |
|
1122 |
del merge_modified[file_id] |
|
1123 |
finally: |
|
1124 |
child_pb.finished() |
|
1551.2.34
by Aaron Bentley
Refactored the revert phases |
1125 |
pp.next_phase() |
1551.2.31
by Aaron Bentley
Got merge and revert using nested pbs |
1126 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
1127 |
try: |
|
1128 |
raw_conflicts = resolve_conflicts(tt, child_pb) |
|
1129 |
finally: |
|
1130 |
child_pb.finished() |
|
1558.7.13
by Aaron Bentley
WorkingTree.revert returns conflicts |
1131 |
conflicts = cook_conflicts(raw_conflicts, tt) |
1534.10.27
by Aaron Bentley
Merge from mainline |
1132 |
for conflict in conflicts: |
1534.10.24
by Aaron Bentley
Eliminated conflicts_to_strings, made remove_files a ConflictList member |
1133 |
warning(conflict) |
1551.2.34
by Aaron Bentley
Refactored the revert phases |
1134 |
pp.next_phase() |
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
1135 |
tt.apply() |
1534.7.193
by Aaron Bentley
Stopped revert from preserving file contents produced by merges |
1136 |
working_tree.set_merge_modified({}) |
1534.7.28
by Aaron Bentley
Nearly-working build_tree replacement |
1137 |
finally: |
1138 |
tt.finalize() |
|
1534.9.4
by Aaron Bentley
Added progress bars to revert. |
1139 |
pb.clear() |
1558.7.13
by Aaron Bentley
WorkingTree.revert returns conflicts |
1140 |
return conflicts |
1534.7.51
by Aaron Bentley
New approach to revert |
1141 |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
1142 |
|
1534.9.1
by Aaron Bentley
Added progress bars to merge |
1143 |
def resolve_conflicts(tt, pb=DummyProgress()): |
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
1144 |
"""Make many conflict-resolution attempts, but die if they fail"""
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1145 |
new_conflicts = set() |
1534.9.1
by Aaron Bentley
Added progress bars to merge |
1146 |
try: |
1147 |
for n in range(10): |
|
1148 |
pb.update('Resolution pass', n+1, 10) |
|
1149 |
conflicts = tt.find_conflicts() |
|
1150 |
if len(conflicts) == 0: |
|
1151 |
return new_conflicts |
|
1152 |
new_conflicts.update(conflict_pass(tt, conflicts)) |
|
1153 |
raise MalformedTransform(conflicts=conflicts) |
|
1154 |
finally: |
|
1155 |
pb.clear() |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
1156 |
|
1157 |
||
1158 |
def conflict_pass(tt, conflicts): |
|
1534.7.157
by Aaron Bentley
Added more docs |
1159 |
"""Resolve some classes of conflicts."""
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1160 |
new_conflicts = set() |
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
1161 |
for c_type, conflict in ((c[0], c) for c in conflicts): |
1162 |
if c_type == 'duplicate id': |
|
1534.7.51
by Aaron Bentley
New approach to revert |
1163 |
tt.unversion_file(conflict[1]) |
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1164 |
new_conflicts.add((c_type, 'Unversioned existing file', |
1165 |
conflict[1], conflict[2], )) |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
1166 |
elif c_type == 'duplicate': |
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
1167 |
# files that were renamed take precedence
|
1168 |
new_name = tt.final_name(conflict[1])+'.moved' |
|
1169 |
final_parent = tt.final_parent(conflict[1]) |
|
1170 |
if tt.path_changed(conflict[1]): |
|
1171 |
tt.adjust_path(new_name, final_parent, conflict[2]) |
|
1534.7.171
by Aaron Bentley
Implemented stringifying filesystem conflicts |
1172 |
new_conflicts.add((c_type, 'Moved existing file to', |
1173 |
conflict[2], conflict[1])) |
|
1534.7.57
by Aaron Bentley
Enhanced conflict resolution. |
1174 |
else: |
1175 |
tt.adjust_path(new_name, final_parent, conflict[1]) |
|
1534.7.171
by Aaron Bentley
Implemented stringifying filesystem conflicts |
1176 |
new_conflicts.add((c_type, 'Moved existing file to', |
1177 |
conflict[1], conflict[2])) |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
1178 |
elif c_type == 'parent loop': |
1179 |
# break the loop by undoing one of the ops that caused the loop
|
|
1180 |
cur = conflict[1] |
|
1181 |
while not tt.path_changed(cur): |
|
1182 |
cur = tt.final_parent(cur) |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1183 |
new_conflicts.add((c_type, 'Cancelled move', cur, |
1184 |
tt.final_parent(cur),)) |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
1185 |
tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur) |
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1186 |
|
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
1187 |
elif c_type == 'missing parent': |
1534.7.128
by Aaron Bentley
Got missing contents test working |
1188 |
trans_id = conflict[1] |
1189 |
try: |
|
1190 |
tt.cancel_deletion(trans_id) |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1191 |
new_conflicts.add((c_type, 'Not deleting', trans_id)) |
1534.7.128
by Aaron Bentley
Got missing contents test working |
1192 |
except KeyError: |
1193 |
tt.create_directory(trans_id) |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1194 |
new_conflicts.add((c_type, 'Created directory.', trans_id)) |
1534.7.61
by Aaron Bentley
Handled parent loops, missing parents, unversioned parents |
1195 |
elif c_type == 'unversioned parent': |
1534.7.148
by Aaron Bentley
Handled the remaining file versioning case |
1196 |
tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1]) |
1534.7.171
by Aaron Bentley
Implemented stringifying filesystem conflicts |
1197 |
new_conflicts.add((c_type, 'Versioned directory', conflict[1])) |
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1198 |
return new_conflicts |
1199 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1200 |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1201 |
def cook_conflicts(raw_conflicts, tt): |
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1202 |
"""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 |
1203 |
from bzrlib.conflicts import Conflict |
1204 |
conflict_iter = iter_cook_conflicts(raw_conflicts, tt) |
|
1205 |
return sorted(conflict_iter, key=Conflict.sort_key) |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1206 |
|
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1207 |
|
1208 |
def iter_cook_conflicts(raw_conflicts, tt): |
|
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
1209 |
from bzrlib.conflicts import Conflict |
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1210 |
fp = FinalPaths(tt) |
1534.7.169
by Aaron Bentley
Add filesystem/inventory conflicts to conflict output |
1211 |
for conflict in raw_conflicts: |
1212 |
c_type = conflict[0] |
|
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1213 |
action = conflict[1] |
1214 |
modified_path = fp.get_path(conflict[2]) |
|
1215 |
modified_id = tt.final_file_id(conflict[2]) |
|
1216 |
if len(conflict) == 3: |
|
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
1217 |
yield Conflict.factory(c_type, action=action, path=modified_path, |
1218 |
file_id=modified_id) |
|
1219 |
||
1534.7.170
by Aaron Bentley
Cleaned up filesystem conflict handling |
1220 |
else: |
1221 |
conflicting_path = fp.get_path(conflict[3]) |
|
1222 |
conflicting_id = tt.final_file_id(conflict[3]) |
|
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
1223 |
yield Conflict.factory(c_type, action=action, path=modified_path, |
1224 |
file_id=modified_id, |
|
1225 |
conflict_path=conflicting_path, |
|
1226 |
conflict_file_id=conflicting_id) |