1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
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.
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.
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
19
from stat import S_ISREG, S_IEXEC
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
30
revision as _mod_revision,
33
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
34
ReusingTransform, NotVersionedError, CantMoveRoot,
35
ExistingLimbo, ImmortalLimbo, NoFinalPath,
37
from bzrlib.inventory import InventoryEntry
38
from bzrlib.osutils import (
48
from bzrlib.progress import DummyProgress, ProgressPhase
49
from bzrlib.symbol_versioning import (
52
from bzrlib.trace import mutter, warning
53
from bzrlib import tree
55
import bzrlib.urlutils as urlutils
58
ROOT_PARENT = "root-parent"
61
def unique_add(map, key, value):
63
raise DuplicateKey(key=key)
67
class _TransformResults(object):
68
def __init__(self, modified_paths, rename_count):
70
self.modified_paths = modified_paths
71
self.rename_count = rename_count
74
class TreeTransformBase(object):
75
"""The base class for TreeTransform and TreeTransformBase"""
77
def __init__(self, tree, limbodir, pb=DummyProgress(),
81
:param tree: The tree that will be transformed, but not necessarily
83
:param limbodir: A directory where new files can be stored until
84
they are installed in their proper places
85
:param pb: A ProgressBar indicating how much progress is being made
86
:param case_sensitive: If True, the target of the transform is
87
case sensitive, not just case preserving.
91
self._limbodir = limbodir
92
self._deletiondir = None
94
# mapping of trans_id -> new basename
96
# mapping of trans_id -> new parent trans_id
98
# mapping of trans_id with new contents -> new file_kind
99
self._new_contents = {}
100
# A mapping of transform ids to their limbo filename
101
self._limbo_files = {}
102
# A mapping of transform ids to a set of the transform ids of children
103
# that their limbo directory has
104
self._limbo_children = {}
105
# Map transform ids to maps of child filename to child transform id
106
self._limbo_children_names = {}
107
# List of transform ids that need to be renamed from limbo into place
108
self._needs_rename = set()
109
# Set of trans_ids whose contents will be removed
110
self._removed_contents = set()
111
# Mapping of trans_id -> new execute-bit value
112
self._new_executability = {}
113
# Mapping of trans_id -> new tree-reference value
114
self._new_reference_revision = {}
115
# Mapping of trans_id -> new file_id
117
# Mapping of old file-id -> trans_id
118
self._non_present_ids = {}
119
# Mapping of new file_id -> trans_id
121
# Set of file_ids that will be removed
122
self._removed_id = set()
123
# Mapping of path in old tree -> trans_id
124
self._tree_path_ids = {}
125
# Mapping trans_id -> path in old tree
126
self._tree_id_paths = {}
127
# Cache of realpath results, to speed up canonical_path
129
# Cache of relpath results, to speed up canonical_path
131
# The trans_id that will be used as the tree root
132
root_id = tree.get_root_id()
133
if root_id is not None:
134
self._new_root = self.trans_id_tree_file_id(root_id)
136
self._new_root = None
137
# Indictor of whether the transform has been applied
141
# Whether the target is case sensitive
142
self._case_sensitive_target = case_sensitive
143
# A counter of how many files have been renamed
144
self.rename_count = 0
146
def __get_root(self):
147
return self._new_root
149
root = property(__get_root)
152
"""Release the working tree lock, if held, clean up limbo dir.
154
This is required if apply has not been invoked, but can be invoked
157
if self._tree is None:
160
entries = [(self._limbo_name(t), t, k) for t, k in
161
self._new_contents.iteritems()]
162
entries.sort(reverse=True)
163
for path, trans_id, kind in entries:
164
if kind == "directory":
169
os.rmdir(self._limbodir)
171
# We don't especially care *why* the dir is immortal.
172
raise ImmortalLimbo(self._limbodir)
174
if self._deletiondir is not None:
175
os.rmdir(self._deletiondir)
177
raise errors.ImmortalPendingDeletion(self._deletiondir)
182
def _assign_id(self):
183
"""Produce a new tranform id"""
184
new_id = "new-%s" % self._id_number
188
def create_path(self, name, parent):
189
"""Assign a transaction id to a new path"""
190
trans_id = self._assign_id()
191
unique_add(self._new_name, trans_id, name)
192
unique_add(self._new_parent, trans_id, parent)
195
def adjust_path(self, name, parent, trans_id):
196
"""Change the path that is assigned to a transaction id."""
197
if trans_id == self._new_root:
199
previous_parent = self._new_parent.get(trans_id)
200
previous_name = self._new_name.get(trans_id)
201
self._new_name[trans_id] = name
202
self._new_parent[trans_id] = parent
203
if parent == ROOT_PARENT:
204
if self._new_root is not None:
205
raise ValueError("Cannot have multiple roots.")
206
self._new_root = trans_id
207
if (trans_id in self._limbo_files and
208
trans_id not in self._needs_rename):
209
self._rename_in_limbo([trans_id])
210
self._limbo_children[previous_parent].remove(trans_id)
211
del self._limbo_children_names[previous_parent][previous_name]
213
def _rename_in_limbo(self, trans_ids):
214
"""Fix limbo names so that the right final path is produced.
216
This means we outsmarted ourselves-- we tried to avoid renaming
217
these files later by creating them with their final names in their
218
final parents. But now the previous name or parent is no longer
219
suitable, so we have to rename them.
221
Even for trans_ids that have no new contents, we must remove their
222
entries from _limbo_files, because they are now stale.
224
for trans_id in trans_ids:
225
old_path = self._limbo_files.pop(trans_id)
226
if trans_id not in self._new_contents:
228
new_path = self._limbo_name(trans_id)
229
os.rename(old_path, new_path)
231
def adjust_root_path(self, name, parent):
232
"""Emulate moving the root by moving all children, instead.
234
We do this by undoing the association of root's transaction id with the
235
current tree. This allows us to create a new directory with that
236
transaction id. We unversion the root directory and version the
237
physically new directory, and hope someone versions the tree root
240
old_root = self._new_root
241
old_root_file_id = self.final_file_id(old_root)
242
# force moving all children of root
243
for child_id in self.iter_tree_children(old_root):
244
if child_id != parent:
245
self.adjust_path(self.final_name(child_id),
246
self.final_parent(child_id), child_id)
247
file_id = self.final_file_id(child_id)
248
if file_id is not None:
249
self.unversion_file(child_id)
250
self.version_file(file_id, child_id)
252
# the physical root needs a new transaction id
253
self._tree_path_ids.pop("")
254
self._tree_id_paths.pop(old_root)
255
self._new_root = self.trans_id_tree_file_id(self._tree.get_root_id())
256
if parent == old_root:
257
parent = self._new_root
258
self.adjust_path(name, parent, old_root)
259
self.create_directory(old_root)
260
self.version_file(old_root_file_id, old_root)
261
self.unversion_file(self._new_root)
263
def trans_id_tree_file_id(self, inventory_id):
264
"""Determine the transaction id of a working tree file.
266
This reflects only files that already exist, not ones that will be
267
added by transactions.
269
if inventory_id is None:
270
raise ValueError('None is not a valid file id')
271
path = self._tree.id2path(inventory_id)
272
return self.trans_id_tree_path(path)
274
def trans_id_file_id(self, file_id):
275
"""Determine or set the transaction id associated with a file ID.
276
A new id is only created for file_ids that were never present. If
277
a transaction has been unversioned, it is deliberately still returned.
278
(this will likely lead to an unversioned parent conflict.)
281
raise ValueError('None is not a valid file id')
282
if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
283
return self._r_new_id[file_id]
284
elif file_id in self._tree.inventory:
285
return self.trans_id_tree_file_id(file_id)
286
elif file_id in self._non_present_ids:
287
return self._non_present_ids[file_id]
289
trans_id = self._assign_id()
290
self._non_present_ids[file_id] = trans_id
293
def canonical_path(self, path):
294
"""Get the canonical tree-relative path"""
295
# don't follow final symlinks
296
abs = self._tree.abspath(path)
297
if abs in self._relpaths:
298
return self._relpaths[abs]
299
dirname, basename = os.path.split(abs)
300
if dirname not in self._realpaths:
301
self._realpaths[dirname] = os.path.realpath(dirname)
302
dirname = self._realpaths[dirname]
303
abs = pathjoin(dirname, basename)
304
if dirname in self._relpaths:
305
relpath = pathjoin(self._relpaths[dirname], basename)
306
relpath = relpath.rstrip('/\\')
308
relpath = self._tree.relpath(abs)
309
self._relpaths[abs] = relpath
312
def trans_id_tree_path(self, path):
313
"""Determine (and maybe set) the transaction ID for a tree path."""
314
path = self.canonical_path(path)
315
if path not in self._tree_path_ids:
316
self._tree_path_ids[path] = self._assign_id()
317
self._tree_id_paths[self._tree_path_ids[path]] = path
318
return self._tree_path_ids[path]
320
def get_tree_parent(self, trans_id):
321
"""Determine id of the parent in the tree."""
322
path = self._tree_id_paths[trans_id]
325
return self.trans_id_tree_path(os.path.dirname(path))
327
def create_file(self, contents, trans_id, mode_id=None):
328
"""Schedule creation of a new file.
332
Contents is an iterator of strings, all of which will be written
333
to the target destination.
335
New file takes the permissions of any existing file with that id,
336
unless mode_id is specified.
338
name = self._limbo_name(trans_id)
342
unique_add(self._new_contents, trans_id, 'file')
344
# Clean up the file, it never got registered so
345
# TreeTransform.finalize() won't clean it up.
350
f.writelines(contents)
353
self._set_mode(trans_id, mode_id, S_ISREG)
355
def _set_mode(self, trans_id, mode_id, typefunc):
356
"""Set the mode of new file contents.
357
The mode_id is the existing file to get the mode from (often the same
358
as trans_id). The operation is only performed if there's a mode match
359
according to typefunc.
364
old_path = self._tree_id_paths[mode_id]
368
mode = os.stat(self._tree.abspath(old_path)).st_mode
370
if e.errno in (errno.ENOENT, errno.ENOTDIR):
371
# Either old_path doesn't exist, or the parent of the
372
# target is not a directory (but will be one eventually)
373
# Either way, we know it doesn't exist *right now*
374
# See also bug #248448
379
os.chmod(self._limbo_name(trans_id), mode)
381
def create_hardlink(self, path, trans_id):
382
"""Schedule creation of a hard link"""
383
name = self._limbo_name(trans_id)
387
if e.errno != errno.EPERM:
389
raise errors.HardLinkNotSupported(path)
391
unique_add(self._new_contents, trans_id, 'file')
393
# Clean up the file, it never got registered so
394
# TreeTransform.finalize() won't clean it up.
398
def create_directory(self, trans_id):
399
"""Schedule creation of a new directory.
401
See also new_directory.
403
os.mkdir(self._limbo_name(trans_id))
404
unique_add(self._new_contents, trans_id, 'directory')
406
def create_symlink(self, target, trans_id):
407
"""Schedule creation of a new symbolic link.
409
target is a bytestring.
410
See also new_symlink.
413
os.symlink(target, self._limbo_name(trans_id))
414
unique_add(self._new_contents, trans_id, 'symlink')
417
path = FinalPaths(self).get_path(trans_id)
420
raise UnableCreateSymlink(path=path)
422
def cancel_creation(self, trans_id):
423
"""Cancel the creation of new file contents."""
424
del self._new_contents[trans_id]
425
children = self._limbo_children.get(trans_id)
426
# if this is a limbo directory with children, move them before removing
428
if children is not None:
429
self._rename_in_limbo(children)
430
del self._limbo_children[trans_id]
431
del self._limbo_children_names[trans_id]
432
delete_any(self._limbo_name(trans_id))
434
def delete_contents(self, trans_id):
435
"""Schedule the contents of a path entry for deletion"""
436
self.tree_kind(trans_id)
437
self._removed_contents.add(trans_id)
439
def cancel_deletion(self, trans_id):
440
"""Cancel a scheduled deletion"""
441
self._removed_contents.remove(trans_id)
443
def unversion_file(self, trans_id):
444
"""Schedule a path entry to become unversioned"""
445
self._removed_id.add(trans_id)
447
def delete_versioned(self, trans_id):
448
"""Delete and unversion a versioned file"""
449
self.delete_contents(trans_id)
450
self.unversion_file(trans_id)
452
def set_executability(self, executability, trans_id):
453
"""Schedule setting of the 'execute' bit
454
To unschedule, set to None
456
if executability is None:
457
del self._new_executability[trans_id]
459
unique_add(self._new_executability, trans_id, executability)
461
def set_tree_reference(self, revision_id, trans_id):
462
"""Set the reference associated with a directory"""
463
unique_add(self._new_reference_revision, trans_id, revision_id)
465
def version_file(self, file_id, trans_id):
466
"""Schedule a file to become versioned."""
469
unique_add(self._new_id, trans_id, file_id)
470
unique_add(self._r_new_id, file_id, trans_id)
472
def cancel_versioning(self, trans_id):
473
"""Undo a previous versioning of a file"""
474
file_id = self._new_id[trans_id]
475
del self._new_id[trans_id]
476
del self._r_new_id[file_id]
478
def new_paths(self, filesystem_only=False):
479
"""Determine the paths of all new and changed files.
481
:param filesystem_only: if True, only calculate values for files
482
that require renames or execute bit changes.
486
stale_ids = self._needs_rename.difference(self._new_name)
487
stale_ids.difference_update(self._new_parent)
488
stale_ids.difference_update(self._new_contents)
489
stale_ids.difference_update(self._new_id)
490
needs_rename = self._needs_rename.difference(stale_ids)
491
id_sets = (needs_rename, self._new_executability)
493
id_sets = (self._new_name, self._new_parent, self._new_contents,
494
self._new_id, self._new_executability)
495
for id_set in id_sets:
496
new_ids.update(id_set)
497
return sorted(FinalPaths(self).get_paths(new_ids))
499
def _inventory_altered(self):
500
"""Get the trans_ids and paths of files needing new inv entries."""
502
for id_set in [self._new_name, self._new_parent, self._new_id,
503
self._new_executability]:
504
new_ids.update(id_set)
505
changed_kind = set(self._removed_contents)
506
changed_kind.intersection_update(self._new_contents)
507
changed_kind.difference_update(new_ids)
508
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
510
new_ids.update(changed_kind)
511
return sorted(FinalPaths(self).get_paths(new_ids))
513
def tree_kind(self, trans_id):
514
"""Determine the file kind in the working tree.
516
Raises NoSuchFile if the file does not exist
518
path = self._tree_id_paths.get(trans_id)
520
raise NoSuchFile(None)
522
return file_kind(self._tree.abspath(path))
524
if e.errno != errno.ENOENT:
527
raise NoSuchFile(path)
529
def final_kind(self, trans_id):
530
"""Determine the final file kind, after any changes applied.
532
Raises NoSuchFile if the file does not exist/has no contents.
533
(It is conceivable that a path would be created without the
534
corresponding contents insertion command)
536
if trans_id in self._new_contents:
537
return self._new_contents[trans_id]
538
elif trans_id in self._removed_contents:
539
raise NoSuchFile(None)
541
return self.tree_kind(trans_id)
543
def tree_file_id(self, trans_id):
544
"""Determine the file id associated with the trans_id in the tree"""
546
path = self._tree_id_paths[trans_id]
548
# the file is a new, unversioned file, or invalid trans_id
550
# the file is old; the old id is still valid
551
if self._new_root == trans_id:
552
return self._tree.get_root_id()
553
return self._tree.inventory.path2id(path)
555
def final_file_id(self, trans_id):
556
"""Determine the file id after any changes are applied, or None.
558
None indicates that the file will not be versioned after changes are
562
return self._new_id[trans_id]
564
if trans_id in self._removed_id:
566
return self.tree_file_id(trans_id)
568
def inactive_file_id(self, trans_id):
569
"""Return the inactive file_id associated with a transaction id.
570
That is, the one in the tree or in non_present_ids.
571
The file_id may actually be active, too.
573
file_id = self.tree_file_id(trans_id)
574
if file_id is not None:
576
for key, value in self._non_present_ids.iteritems():
577
if value == trans_id:
580
def final_parent(self, trans_id):
581
"""Determine the parent file_id, after any changes are applied.
583
ROOT_PARENT is returned for the tree root.
586
return self._new_parent[trans_id]
588
return self.get_tree_parent(trans_id)
590
def final_name(self, trans_id):
591
"""Determine the final filename, after all changes are applied."""
593
return self._new_name[trans_id]
596
return os.path.basename(self._tree_id_paths[trans_id])
598
raise NoFinalPath(trans_id, self)
601
"""Return a map of parent: children for known parents.
603
Only new paths and parents of tree files with assigned ids are used.
606
items = list(self._new_parent.iteritems())
607
items.extend((t, self.final_parent(t)) for t in
608
self._tree_id_paths.keys())
609
for trans_id, parent_id in items:
610
if parent_id not in by_parent:
611
by_parent[parent_id] = set()
612
by_parent[parent_id].add(trans_id)
615
def path_changed(self, trans_id):
616
"""Return True if a trans_id's path has changed."""
617
return (trans_id in self._new_name) or (trans_id in self._new_parent)
619
def new_contents(self, trans_id):
620
return (trans_id in self._new_contents)
622
def find_conflicts(self):
623
"""Find any violations of inventory or filesystem invariants"""
624
if self._done is True:
625
raise ReusingTransform()
627
# ensure all children of all existent parents are known
628
# all children of non-existent parents are known, by definition.
629
self._add_tree_children()
630
by_parent = self.by_parent()
631
conflicts.extend(self._unversioned_parents(by_parent))
632
conflicts.extend(self._parent_loops())
633
conflicts.extend(self._duplicate_entries(by_parent))
634
conflicts.extend(self._duplicate_ids())
635
conflicts.extend(self._parent_type_conflicts(by_parent))
636
conflicts.extend(self._improper_versioning())
637
conflicts.extend(self._executability_conflicts())
638
conflicts.extend(self._overwrite_conflicts())
641
def _add_tree_children(self):
642
"""Add all the children of all active parents to the known paths.
644
Active parents are those which gain children, and those which are
645
removed. This is a necessary first step in detecting conflicts.
647
parents = self.by_parent().keys()
648
parents.extend([t for t in self._removed_contents if
649
self.tree_kind(t) == 'directory'])
650
for trans_id in self._removed_id:
651
file_id = self.tree_file_id(trans_id)
652
if file_id is not None:
653
if self._tree.inventory[file_id].kind == 'directory':
654
parents.append(trans_id)
655
elif self.tree_kind(trans_id) == 'directory':
656
parents.append(trans_id)
658
for parent_id in parents:
659
# ensure that all children are registered with the transaction
660
list(self.iter_tree_children(parent_id))
662
def iter_tree_children(self, parent_id):
663
"""Iterate through the entry's tree children, if any"""
665
path = self._tree_id_paths[parent_id]
669
children = os.listdir(self._tree.abspath(path))
671
if not (osutils._is_error_enotdir(e)
672
or e.errno in (errno.ENOENT, errno.ESRCH)):
676
for child in children:
677
childpath = joinpath(path, child)
678
if self._tree.is_control_filename(childpath):
680
yield self.trans_id_tree_path(childpath)
682
def has_named_child(self, by_parent, parent_id, name):
684
children = by_parent[parent_id]
687
for child in children:
688
if self.final_name(child) == name:
691
path = self._tree_id_paths[parent_id]
694
childpath = joinpath(path, name)
695
child_id = self._tree_path_ids.get(childpath)
697
return lexists(self._tree.abspath(childpath))
699
if self.final_parent(child_id) != parent_id:
701
if child_id in self._removed_contents:
702
# XXX What about dangling file-ids?
707
def _parent_loops(self):
708
"""No entry should be its own ancestor"""
710
for trans_id in self._new_parent:
713
while parent_id is not ROOT_PARENT:
716
parent_id = self.final_parent(parent_id)
719
if parent_id == trans_id:
720
conflicts.append(('parent loop', trans_id))
721
if parent_id in seen:
725
def _unversioned_parents(self, by_parent):
726
"""If parent directories are versioned, children must be versioned."""
728
for parent_id, children in by_parent.iteritems():
729
if parent_id is ROOT_PARENT:
731
if self.final_file_id(parent_id) is not None:
733
for child_id in children:
734
if self.final_file_id(child_id) is not None:
735
conflicts.append(('unversioned parent', parent_id))
739
def _improper_versioning(self):
740
"""Cannot version a file with no contents, or a bad type.
742
However, existing entries with no contents are okay.
745
for trans_id in self._new_id.iterkeys():
747
kind = self.final_kind(trans_id)
749
conflicts.append(('versioning no contents', trans_id))
751
if not InventoryEntry.versionable_kind(kind):
752
conflicts.append(('versioning bad kind', trans_id, kind))
755
def _executability_conflicts(self):
756
"""Check for bad executability changes.
758
Only versioned files may have their executability set, because
759
1. only versioned entries can have executability under windows
760
2. only files can be executable. (The execute bit on a directory
761
does not indicate searchability)
764
for trans_id in self._new_executability:
765
if self.final_file_id(trans_id) is None:
766
conflicts.append(('unversioned executability', trans_id))
769
non_file = self.final_kind(trans_id) != "file"
773
conflicts.append(('non-file executability', trans_id))
776
def _overwrite_conflicts(self):
777
"""Check for overwrites (not permitted on Win32)"""
779
for trans_id in self._new_contents:
781
self.tree_kind(trans_id)
784
if trans_id not in self._removed_contents:
785
conflicts.append(('overwrite', trans_id,
786
self.final_name(trans_id)))
789
def _duplicate_entries(self, by_parent):
790
"""No directory may have two entries with the same name."""
792
if (self._new_name, self._new_parent) == ({}, {}):
794
for children in by_parent.itervalues():
795
name_ids = [(self.final_name(t), t) for t in children]
796
if not self._case_sensitive_target:
797
name_ids = [(n.lower(), t) for n, t in name_ids]
801
for name, trans_id in name_ids:
803
kind = self.final_kind(trans_id)
806
file_id = self.final_file_id(trans_id)
807
if kind is None and file_id is None:
809
if name == last_name:
810
conflicts.append(('duplicate', last_trans_id, trans_id,
813
last_trans_id = trans_id
816
def _duplicate_ids(self):
817
"""Each inventory id may only be used once"""
819
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
821
all_ids = self._tree.all_file_ids()
822
active_tree_ids = all_ids.difference(removed_tree_ids)
823
for trans_id, file_id in self._new_id.iteritems():
824
if file_id in active_tree_ids:
825
old_trans_id = self.trans_id_tree_file_id(file_id)
826
conflicts.append(('duplicate id', old_trans_id, trans_id))
829
def _parent_type_conflicts(self, by_parent):
830
"""parents must have directory 'contents'."""
832
for parent_id, children in by_parent.iteritems():
833
if parent_id is ROOT_PARENT:
835
if not self._any_contents(children):
837
for child in children:
839
self.final_kind(child)
843
kind = self.final_kind(parent_id)
847
conflicts.append(('missing parent', parent_id))
848
elif kind != "directory":
849
conflicts.append(('non-directory parent', parent_id))
852
def _any_contents(self, trans_ids):
853
"""Return true if any of the trans_ids, will have contents."""
854
for trans_id in trans_ids:
856
kind = self.final_kind(trans_id)
862
def _limbo_name(self, trans_id):
863
"""Generate the limbo name of a file"""
864
limbo_name = self._limbo_files.get(trans_id)
865
if limbo_name is not None:
867
parent = self._new_parent.get(trans_id)
868
# if the parent directory is already in limbo (e.g. when building a
869
# tree), choose a limbo name inside the parent, to reduce further
871
use_direct_path = False
872
if self._new_contents.get(parent) == 'directory':
873
filename = self._new_name.get(trans_id)
874
if filename is not None:
875
if parent not in self._limbo_children:
876
self._limbo_children[parent] = set()
877
self._limbo_children_names[parent] = {}
878
use_direct_path = True
879
# the direct path can only be used if no other file has
880
# already taken this pathname, i.e. if the name is unused, or
881
# if it is already associated with this trans_id.
882
elif self._case_sensitive_target:
883
if (self._limbo_children_names[parent].get(filename)
884
in (trans_id, None)):
885
use_direct_path = True
887
for l_filename, l_trans_id in\
888
self._limbo_children_names[parent].iteritems():
889
if l_trans_id == trans_id:
891
if l_filename.lower() == filename.lower():
894
use_direct_path = True
897
limbo_name = pathjoin(self._limbo_files[parent], filename)
898
self._limbo_children[parent].add(trans_id)
899
self._limbo_children_names[parent][filename] = trans_id
901
limbo_name = pathjoin(self._limbodir, trans_id)
902
self._needs_rename.add(trans_id)
903
self._limbo_files[trans_id] = limbo_name
906
def _set_executability(self, path, trans_id):
907
"""Set the executability of versioned files """
908
if supports_executable():
909
new_executability = self._new_executability[trans_id]
910
abspath = self._tree.abspath(path)
911
current_mode = os.stat(abspath).st_mode
912
if new_executability:
915
to_mode = current_mode | (0100 & ~umask)
916
# Enable x-bit for others only if they can read it.
917
if current_mode & 0004:
918
to_mode |= 0001 & ~umask
919
if current_mode & 0040:
920
to_mode |= 0010 & ~umask
922
to_mode = current_mode & ~0111
923
os.chmod(abspath, to_mode)
925
def _new_entry(self, name, parent_id, file_id):
926
"""Helper function to create a new filesystem entry."""
927
trans_id = self.create_path(name, parent_id)
928
if file_id is not None:
929
self.version_file(file_id, trans_id)
932
def new_file(self, name, parent_id, contents, file_id=None,
934
"""Convenience method to create files.
936
name is the name of the file to create.
937
parent_id is the transaction id of the parent directory of the file.
938
contents is an iterator of bytestrings, which will be used to produce
940
:param file_id: The inventory ID of the file, if it is to be versioned.
941
:param executable: Only valid when a file_id has been supplied.
943
trans_id = self._new_entry(name, parent_id, file_id)
944
# TODO: rather than scheduling a set_executable call,
945
# have create_file create the file with the right mode.
946
self.create_file(contents, trans_id)
947
if executable is not None:
948
self.set_executability(executable, trans_id)
951
def new_directory(self, name, parent_id, file_id=None):
952
"""Convenience method to create directories.
954
name is the name of the directory to create.
955
parent_id is the transaction id of the parent directory of the
957
file_id is the inventory ID of the directory, if it is to be versioned.
959
trans_id = self._new_entry(name, parent_id, file_id)
960
self.create_directory(trans_id)
963
def new_symlink(self, name, parent_id, target, file_id=None):
964
"""Convenience method to create symbolic link.
966
name is the name of the symlink to create.
967
parent_id is the transaction id of the parent directory of the symlink.
968
target is a bytestring of the target of the symlink.
969
file_id is the inventory ID of the file, if it is to be versioned.
971
trans_id = self._new_entry(name, parent_id, file_id)
972
self.create_symlink(target, trans_id)
975
def _affected_ids(self):
976
"""Return the set of transform ids affected by the transform"""
977
trans_ids = set(self._removed_id)
978
trans_ids.update(self._new_id.keys())
979
trans_ids.update(self._removed_contents)
980
trans_ids.update(self._new_contents.keys())
981
trans_ids.update(self._new_executability.keys())
982
trans_ids.update(self._new_name.keys())
983
trans_ids.update(self._new_parent.keys())
986
def _get_file_id_maps(self):
987
"""Return mapping of file_ids to trans_ids in the to and from states"""
988
trans_ids = self._affected_ids()
991
# Build up two dicts: trans_ids associated with file ids in the
992
# FROM state, vs the TO state.
993
for trans_id in trans_ids:
994
from_file_id = self.tree_file_id(trans_id)
995
if from_file_id is not None:
996
from_trans_ids[from_file_id] = trans_id
997
to_file_id = self.final_file_id(trans_id)
998
if to_file_id is not None:
999
to_trans_ids[to_file_id] = trans_id
1000
return from_trans_ids, to_trans_ids
1002
def _from_file_data(self, from_trans_id, from_versioned, file_id):
1003
"""Get data about a file in the from (tree) state
1005
Return a (name, parent, kind, executable) tuple
1007
from_path = self._tree_id_paths.get(from_trans_id)
1009
# get data from working tree if versioned
1010
from_entry = self._tree.inventory[file_id]
1011
from_name = from_entry.name
1012
from_parent = from_entry.parent_id
1015
if from_path is None:
1016
# File does not exist in FROM state
1020
# File exists, but is not versioned. Have to use path-
1022
from_name = os.path.basename(from_path)
1023
tree_parent = self.get_tree_parent(from_trans_id)
1024
from_parent = self.tree_file_id(tree_parent)
1025
if from_path is not None:
1026
from_kind, from_executable, from_stats = \
1027
self._tree._comparison_data(from_entry, from_path)
1030
from_executable = False
1031
return from_name, from_parent, from_kind, from_executable
1033
def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
1034
"""Get data about a file in the to (target) state
1036
Return a (name, parent, kind, executable) tuple
1038
to_name = self.final_name(to_trans_id)
1040
to_kind = self.final_kind(to_trans_id)
1043
to_parent = self.final_file_id(self.final_parent(to_trans_id))
1044
if to_trans_id in self._new_executability:
1045
to_executable = self._new_executability[to_trans_id]
1046
elif to_trans_id == from_trans_id:
1047
to_executable = from_executable
1049
to_executable = False
1050
return to_name, to_parent, to_kind, to_executable
1052
def iter_changes(self):
1053
"""Produce output in the same format as Tree.iter_changes.
1055
Will produce nonsensical results if invoked while inventory/filesystem
1056
conflicts (as reported by TreeTransform.find_conflicts()) are present.
1058
This reads the Transform, but only reproduces changes involving a
1059
file_id. Files that are not versioned in either of the FROM or TO
1060
states are not reflected.
1062
final_paths = FinalPaths(self)
1063
from_trans_ids, to_trans_ids = self._get_file_id_maps()
1065
# Now iterate through all active file_ids
1066
for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()):
1068
from_trans_id = from_trans_ids.get(file_id)
1069
# find file ids, and determine versioning state
1070
if from_trans_id is None:
1071
from_versioned = False
1072
from_trans_id = to_trans_ids[file_id]
1074
from_versioned = True
1075
to_trans_id = to_trans_ids.get(file_id)
1076
if to_trans_id is None:
1077
to_versioned = False
1078
to_trans_id = from_trans_id
1082
from_name, from_parent, from_kind, from_executable = \
1083
self._from_file_data(from_trans_id, from_versioned, file_id)
1085
to_name, to_parent, to_kind, to_executable = \
1086
self._to_file_data(to_trans_id, from_trans_id, from_executable)
1088
if not from_versioned:
1091
from_path = self._tree_id_paths.get(from_trans_id)
1092
if not to_versioned:
1095
to_path = final_paths.get_path(to_trans_id)
1096
if from_kind != to_kind:
1098
elif to_kind in ('file', 'symlink') and (
1099
to_trans_id != from_trans_id or
1100
to_trans_id in self._new_contents):
1102
if (not modified and from_versioned == to_versioned and
1103
from_parent==to_parent and from_name == to_name and
1104
from_executable == to_executable):
1106
results.append((file_id, (from_path, to_path), modified,
1107
(from_versioned, to_versioned),
1108
(from_parent, to_parent),
1109
(from_name, to_name),
1110
(from_kind, to_kind),
1111
(from_executable, to_executable)))
1112
return iter(sorted(results, key=lambda x:x[1]))
1114
def get_preview_tree(self):
1115
"""Return a tree representing the result of the transform.
1117
This tree only supports the subset of Tree functionality required
1118
by show_diff_trees. It must only be compared to tt._tree.
1120
return _PreviewTree(self)
1123
class TreeTransform(TreeTransformBase):
1124
"""Represent a tree transformation.
1126
This object is designed to support incremental generation of the transform,
1129
However, it gives optimum performance when parent directories are created
1130
before their contents. The transform is then able to put child files
1131
directly in their parent directory, avoiding later renames.
1133
It is easy to produce malformed transforms, but they are generally
1134
harmless. Attempting to apply a malformed transform will cause an
1135
exception to be raised before any modifications are made to the tree.
1137
Many kinds of malformed transforms can be corrected with the
1138
resolve_conflicts function. The remaining ones indicate programming error,
1139
such as trying to create a file with no path.
1141
Two sets of file creation methods are supplied. Convenience methods are:
1146
These are composed of the low-level methods:
1148
* create_file or create_directory or create_symlink
1152
Transform/Transaction ids
1153
-------------------------
1154
trans_ids are temporary ids assigned to all files involved in a transform.
1155
It's possible, even common, that not all files in the Tree have trans_ids.
1157
trans_ids are used because filenames and file_ids are not good enough
1158
identifiers; filenames change, and not all files have file_ids. File-ids
1159
are also associated with trans-ids, so that moving a file moves its
1162
trans_ids are only valid for the TreeTransform that generated them.
1166
Limbo is a temporary directory use to hold new versions of files.
1167
Files are added to limbo by create_file, create_directory, create_symlink,
1168
and their convenience variants (new_*). Files may be removed from limbo
1169
using cancel_creation. Files are renamed from limbo into their final
1170
location as part of TreeTransform.apply
1172
Limbo must be cleaned up, by either calling TreeTransform.apply or
1173
calling TreeTransform.finalize.
1175
Files are placed into limbo inside their parent directories, where
1176
possible. This reduces subsequent renames, and makes operations involving
1177
lots of files faster. This optimization is only possible if the parent
1178
directory is created *before* creating any of its children, so avoid
1179
creating children before parents, where possible.
1183
This temporary directory is used by _FileMover for storing files that are
1184
about to be deleted. In case of rollback, the files will be restored.
1185
FileMover does not delete files until it is sure that a rollback will not
1188
def __init__(self, tree, pb=DummyProgress()):
1189
"""Note: a tree_write lock is taken on the tree.
1191
Use TreeTransform.finalize() to release the lock (can be omitted if
1192
TreeTransform.apply() called).
1194
tree.lock_tree_write()
1197
limbodir = urlutils.local_path_from_url(
1198
tree._transport.abspath('limbo'))
1202
if e.errno == errno.EEXIST:
1203
raise ExistingLimbo(limbodir)
1204
deletiondir = urlutils.local_path_from_url(
1205
tree._transport.abspath('pending-deletion'))
1207
os.mkdir(deletiondir)
1209
if e.errno == errno.EEXIST:
1210
raise errors.ExistingPendingDeletion(deletiondir)
1215
TreeTransformBase.__init__(self, tree, limbodir, pb,
1216
tree.case_sensitive)
1217
self._deletiondir = deletiondir
1219
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1220
"""Apply all changes to the inventory and filesystem.
1222
If filesystem or inventory conflicts are present, MalformedTransform
1225
If apply succeeds, finalize is not necessary.
1227
:param no_conflicts: if True, the caller guarantees there are no
1228
conflicts, so no check is made.
1229
:param precomputed_delta: An inventory delta to use instead of
1231
:param _mover: Supply an alternate FileMover, for testing
1233
if not no_conflicts:
1234
conflicts = self.find_conflicts()
1235
if len(conflicts) != 0:
1236
raise MalformedTransform(conflicts=conflicts)
1237
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1239
if precomputed_delta is None:
1240
child_pb.update('Apply phase', 0, 2)
1241
inventory_delta = self._generate_inventory_delta()
1244
inventory_delta = precomputed_delta
1247
mover = _FileMover()
1251
child_pb.update('Apply phase', 0 + offset, 2 + offset)
1252
self._apply_removals(mover)
1253
child_pb.update('Apply phase', 1 + offset, 2 + offset)
1254
modified_paths = self._apply_insertions(mover)
1259
mover.apply_deletions()
1262
self._tree.apply_inventory_delta(inventory_delta)
1265
return _TransformResults(modified_paths, self.rename_count)
1267
def _generate_inventory_delta(self):
1268
"""Generate an inventory delta for the current transform."""
1269
inventory_delta = []
1270
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1271
new_paths = self._inventory_altered()
1272
total_entries = len(new_paths) + len(self._removed_id)
1274
for num, trans_id in enumerate(self._removed_id):
1276
child_pb.update('removing file', num, total_entries)
1277
if trans_id == self._new_root:
1278
file_id = self._tree.get_root_id()
1280
file_id = self.tree_file_id(trans_id)
1281
# File-id isn't really being deleted, just moved
1282
if file_id in self._r_new_id:
1284
path = self._tree_id_paths[trans_id]
1285
inventory_delta.append((path, None, file_id, None))
1286
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1288
entries = self._tree.iter_entries_by_dir(
1289
new_path_file_ids.values())
1290
old_paths = dict((e.file_id, p) for p, e in entries)
1292
for num, (path, trans_id) in enumerate(new_paths):
1294
child_pb.update('adding file',
1295
num + len(self._removed_id), total_entries)
1296
file_id = new_path_file_ids[trans_id]
1301
kind = self.final_kind(trans_id)
1303
kind = self._tree.stored_kind(file_id)
1304
parent_trans_id = self.final_parent(trans_id)
1305
parent_file_id = new_path_file_ids.get(parent_trans_id)
1306
if parent_file_id is None:
1307
parent_file_id = self.final_file_id(parent_trans_id)
1308
if trans_id in self._new_reference_revision:
1309
new_entry = inventory.TreeReference(
1311
self._new_name[trans_id],
1312
self.final_file_id(self._new_parent[trans_id]),
1313
None, self._new_reference_revision[trans_id])
1315
new_entry = inventory.make_entry(kind,
1316
self.final_name(trans_id),
1317
parent_file_id, file_id)
1318
old_path = old_paths.get(new_entry.file_id)
1319
new_executability = self._new_executability.get(trans_id)
1320
if new_executability is not None:
1321
new_entry.executable = new_executability
1322
inventory_delta.append(
1323
(old_path, path, new_entry.file_id, new_entry))
1326
return inventory_delta
1328
def _apply_removals(self, mover):
1329
"""Perform tree operations that remove directory/inventory names.
1331
That is, delete files that are to be deleted, and put any files that
1332
need renaming into limbo. This must be done in strict child-to-parent
1335
If inventory_delta is None, no inventory delta generation is performed.
1337
tree_paths = list(self._tree_path_ids.iteritems())
1338
tree_paths.sort(reverse=True)
1339
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1341
for num, data in enumerate(tree_paths):
1342
path, trans_id = data
1343
child_pb.update('removing file', num, len(tree_paths))
1344
full_path = self._tree.abspath(path)
1345
if trans_id in self._removed_contents:
1346
mover.pre_delete(full_path, os.path.join(self._deletiondir,
1348
elif trans_id in self._new_name or trans_id in \
1351
mover.rename(full_path, self._limbo_name(trans_id))
1353
if e.errno != errno.ENOENT:
1356
self.rename_count += 1
1360
def _apply_insertions(self, mover):
1361
"""Perform tree operations that insert directory/inventory names.
1363
That is, create any files that need to be created, and restore from
1364
limbo any files that needed renaming. This must be done in strict
1365
parent-to-child order.
1367
If inventory_delta is None, no inventory delta is calculated, and
1368
no list of modified paths is returned.
1370
new_paths = self.new_paths(filesystem_only=True)
1372
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1374
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1376
for num, (path, trans_id) in enumerate(new_paths):
1378
child_pb.update('adding file', num, len(new_paths))
1379
full_path = self._tree.abspath(path)
1380
if trans_id in self._needs_rename:
1382
mover.rename(self._limbo_name(trans_id), full_path)
1384
# We may be renaming a dangling inventory id
1385
if e.errno != errno.ENOENT:
1388
self.rename_count += 1
1389
if (trans_id in self._new_contents or
1390
self.path_changed(trans_id)):
1391
if trans_id in self._new_contents:
1392
modified_paths.append(full_path)
1393
if trans_id in self._new_executability:
1394
self._set_executability(path, trans_id)
1397
self._new_contents.clear()
1398
return modified_paths
1401
class TransformPreview(TreeTransformBase):
1402
"""A TreeTransform for generating preview trees.
1404
Unlike TreeTransform, this version works when the input tree is a
1405
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1406
unversioned files in the input tree.
1409
def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1411
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1412
TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1414
def canonical_path(self, path):
1417
def tree_kind(self, trans_id):
1418
path = self._tree_id_paths.get(trans_id)
1420
raise NoSuchFile(None)
1421
file_id = self._tree.path2id(path)
1422
return self._tree.kind(file_id)
1424
def _set_mode(self, trans_id, mode_id, typefunc):
1425
"""Set the mode of new file contents.
1426
The mode_id is the existing file to get the mode from (often the same
1427
as trans_id). The operation is only performed if there's a mode match
1428
according to typefunc.
1430
# is it ok to ignore this? probably
1433
def iter_tree_children(self, parent_id):
1434
"""Iterate through the entry's tree children, if any"""
1436
path = self._tree_id_paths[parent_id]
1439
file_id = self.tree_file_id(parent_id)
1442
children = getattr(self._tree.inventory[file_id], 'children', {})
1443
for child in children:
1444
childpath = joinpath(path, child)
1445
yield self.trans_id_tree_path(childpath)
1448
class _PreviewTree(tree.Tree):
1449
"""Partial implementation of Tree to support show_diff_trees"""
1451
def __init__(self, transform):
1452
self._transform = transform
1453
self._final_paths = FinalPaths(transform)
1454
self.__by_parent = None
1455
self._parent_ids = []
1457
def _changes(self, file_id):
1458
for changes in self._transform.iter_changes():
1459
if changes[0] == file_id:
1462
def _content_change(self, file_id):
1463
"""Return True if the content of this file changed"""
1464
changes = self._changes(file_id)
1465
# changes[2] is true if the file content changed. See
1466
# InterTree.iter_changes.
1467
return (changes is not None and changes[2])
1469
def _get_repository(self):
1470
repo = getattr(self._transform._tree, '_repository', None)
1472
repo = self._transform._tree.branch.repository
1475
def _iter_parent_trees(self):
1476
for revision_id in self.get_parent_ids():
1478
yield self.revision_tree(revision_id)
1479
except errors.NoSuchRevisionInTree:
1480
yield self._get_repository().revision_tree(revision_id)
1482
def _get_file_revision(self, file_id, vf, tree_revision):
1483
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1484
self._iter_parent_trees()]
1485
vf.add_lines((file_id, tree_revision), parent_keys,
1486
self.get_file(file_id).readlines())
1487
repo = self._get_repository()
1488
base_vf = repo.texts
1489
if base_vf not in vf.fallback_versionedfiles:
1490
vf.fallback_versionedfiles.append(base_vf)
1491
return tree_revision
1493
def _stat_limbo_file(self, file_id):
1494
trans_id = self._transform.trans_id_file_id(file_id)
1495
name = self._transform._limbo_name(trans_id)
1496
return os.lstat(name)
1499
def _by_parent(self):
1500
if self.__by_parent is None:
1501
self.__by_parent = self._transform.by_parent()
1502
return self.__by_parent
1504
def _comparison_data(self, entry, path):
1505
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
1506
if kind == 'missing':
1510
file_id = self._transform.final_file_id(self._path2trans_id(path))
1511
executable = self.is_executable(file_id, path)
1512
return kind, executable, None
1514
def lock_read(self):
1515
# Perhaps in theory, this should lock the TreeTransform?
1522
def inventory(self):
1523
"""This Tree does not use inventory as its backing data."""
1524
raise NotImplementedError(_PreviewTree.inventory)
1526
def get_root_id(self):
1527
return self._transform.final_file_id(self._transform.root)
1529
def all_file_ids(self):
1530
tree_ids = set(self._transform._tree.all_file_ids())
1531
tree_ids.difference_update(self._transform.tree_file_id(t)
1532
for t in self._transform._removed_id)
1533
tree_ids.update(self._transform._new_id.values())
1537
return iter(self.all_file_ids())
1539
def has_id(self, file_id):
1540
if file_id in self._transform._r_new_id:
1542
elif file_id in self._transform._removed_id:
1545
return self._transform._tree.has_id(file_id)
1547
def _path2trans_id(self, path):
1548
segments = splitpath(path)
1549
cur_parent = self._transform.root
1550
for cur_segment in segments:
1551
for child in self._all_children(cur_parent):
1552
if self._transform.final_name(child) == cur_segment:
1559
def path2id(self, path):
1560
return self._transform.final_file_id(self._path2trans_id(path))
1562
def id2path(self, file_id):
1563
trans_id = self._transform.trans_id_file_id(file_id)
1565
return self._final_paths._determine_path(trans_id)
1567
raise errors.NoSuchId(self, file_id)
1569
def _all_children(self, trans_id):
1570
children = set(self._transform.iter_tree_children(trans_id))
1571
# children in the _new_parent set are provided by _by_parent.
1572
children.difference_update(self._transform._new_parent.keys())
1573
children.update(self._by_parent.get(trans_id, []))
1576
def iter_children(self, file_id):
1577
trans_id = self._transform.trans_id_file_id(file_id)
1578
for child_trans_id in self._all_children(trans_id):
1579
yield self._transform.final_file_id(child_trans_id)
1582
possible_extras = set(self._transform.trans_id_tree_path(p) for p
1583
in self._transform._tree.extras())
1584
possible_extras.update(self._transform._new_contents)
1585
possible_extras.update(self._transform._removed_id)
1586
for trans_id in possible_extras:
1587
if self._transform.final_file_id(trans_id) is None:
1588
yield self._final_paths._determine_path(trans_id)
1590
def _make_inv_entries(self, ordered_entries, specific_file_ids):
1591
for trans_id, parent_file_id in ordered_entries:
1592
file_id = self._transform.final_file_id(trans_id)
1595
if (specific_file_ids is not None
1596
and file_id not in specific_file_ids):
1599
kind = self._transform.final_kind(trans_id)
1601
kind = self._transform._tree.stored_kind(file_id)
1602
new_entry = inventory.make_entry(
1604
self._transform.final_name(trans_id),
1605
parent_file_id, file_id)
1606
yield new_entry, trans_id
1608
def _list_files_by_dir(self):
1609
todo = [ROOT_PARENT]
1611
while len(todo) > 0:
1613
parent_file_id = self._transform.final_file_id(parent)
1614
children = list(self._all_children(parent))
1615
paths = dict(zip(children, self._final_paths.get_paths(children)))
1616
children.sort(key=paths.get)
1617
todo.extend(reversed(children))
1618
for trans_id in children:
1619
ordered_ids.append((trans_id, parent_file_id))
1622
def iter_entries_by_dir(self, specific_file_ids=None):
1623
# This may not be a maximally efficient implementation, but it is
1624
# reasonably straightforward. An implementation that grafts the
1625
# TreeTransform changes onto the tree's iter_entries_by_dir results
1626
# might be more efficient, but requires tricky inferences about stack
1628
ordered_ids = self._list_files_by_dir()
1629
for entry, trans_id in self._make_inv_entries(ordered_ids,
1631
yield unicode(self._final_paths.get_path(trans_id)), entry
1633
def list_files(self, include_root=False):
1634
"""See Tree.list_files."""
1635
# XXX This should behave like WorkingTree.list_files, but is really
1636
# more like RevisionTree.list_files.
1637
for path, entry in self.iter_entries_by_dir():
1638
if entry.name == '' and not include_root:
1640
yield path, 'V', entry.kind, entry.file_id, entry
1642
def kind(self, file_id):
1643
trans_id = self._transform.trans_id_file_id(file_id)
1644
return self._transform.final_kind(trans_id)
1646
def stored_kind(self, file_id):
1647
trans_id = self._transform.trans_id_file_id(file_id)
1649
return self._transform._new_contents[trans_id]
1651
return self._transform._tree.stored_kind(file_id)
1653
def get_file_mtime(self, file_id, path=None):
1654
"""See Tree.get_file_mtime"""
1655
if not self._content_change(file_id):
1656
return self._transform._tree.get_file_mtime(file_id, path)
1657
return self._stat_limbo_file(file_id).st_mtime
1659
def _file_size(self, entry, stat_value):
1660
return self.get_file_size(entry.file_id)
1662
def get_file_size(self, file_id):
1663
"""See Tree.get_file_size"""
1664
if self.kind(file_id) == 'file':
1665
return self._transform._tree.get_file_size(file_id)
1669
def get_file_sha1(self, file_id, path=None, stat_value=None):
1670
trans_id = self._transform.trans_id_file_id(file_id)
1671
kind = self._transform._new_contents.get(trans_id)
1673
return self._transform._tree.get_file_sha1(file_id)
1675
fileobj = self.get_file(file_id)
1677
return sha_file(fileobj)
1681
def is_executable(self, file_id, path=None):
1684
trans_id = self._transform.trans_id_file_id(file_id)
1686
return self._transform._new_executability[trans_id]
1688
return self._transform._tree.is_executable(file_id, path)
1690
def path_content_summary(self, path):
1691
trans_id = self._path2trans_id(path)
1692
tt = self._transform
1693
tree_path = tt._tree_id_paths.get(trans_id)
1694
kind = tt._new_contents.get(trans_id)
1696
if tree_path is None or trans_id in tt._removed_contents:
1697
return 'missing', None, None, None
1698
summary = tt._tree.path_content_summary(tree_path)
1699
kind, size, executable, link_or_sha1 = summary
1702
limbo_name = tt._limbo_name(trans_id)
1703
if trans_id in tt._new_reference_revision:
1704
kind = 'tree-reference'
1706
statval = os.lstat(limbo_name)
1707
size = statval.st_size
1708
if not supports_executable():
1711
executable = statval.st_mode & S_IEXEC
1715
if kind == 'symlink':
1716
link_or_sha1 = os.readlink(limbo_name)
1717
if supports_executable():
1718
executable = tt._new_executability.get(trans_id, executable)
1719
return kind, size, executable, link_or_sha1
1721
def iter_changes(self, from_tree, include_unchanged=False,
1722
specific_files=None, pb=None, extra_trees=None,
1723
require_versioned=True, want_unversioned=False):
1724
"""See InterTree.iter_changes.
1726
This implementation does not support include_unchanged, specific_files,
1727
or want_unversioned. extra_trees, require_versioned, and pb are
1730
if from_tree is not self._transform._tree:
1731
return tree.InterTree(from_tree, self).iter_changes(
1732
include_unchanged=include_unchanged,
1733
specific_files=specific_files,
1735
extra_trees=extra_trees,
1736
require_versioned=require_versioned,
1737
want_unversioned=want_unversioned)
1738
if include_unchanged:
1739
raise ValueError('include_unchanged is not supported')
1740
if specific_files is not None:
1741
raise ValueError('specific_files is not supported')
1742
if want_unversioned:
1743
raise ValueError('want_unversioned is not supported')
1744
return self._transform.iter_changes()
1746
def get_file(self, file_id, path=None):
1747
"""See Tree.get_file"""
1748
if not self._content_change(file_id):
1749
return self._transform._tree.get_file(file_id, path)
1750
trans_id = self._transform.trans_id_file_id(file_id)
1751
name = self._transform._limbo_name(trans_id)
1752
return open(name, 'rb')
1754
def get_file_text(self, file_id):
1755
text_file = self.get_file(file_id)
1757
return text_file.read()
1761
def annotate_iter(self, file_id,
1762
default_revision=_mod_revision.CURRENT_REVISION):
1763
changes = self._changes(file_id)
1767
changed_content, versioned, kind = (changes[2], changes[3],
1771
get_old = (kind[0] == 'file' and versioned[0])
1773
old_annotation = self._transform._tree.annotate_iter(file_id,
1774
default_revision=default_revision)
1778
return old_annotation
1779
if not changed_content:
1780
return old_annotation
1781
return annotate.reannotate([old_annotation],
1782
self.get_file(file_id).readlines(),
1785
def get_symlink_target(self, file_id):
1786
"""See Tree.get_symlink_target"""
1787
if not self._content_change(file_id):
1788
return self._transform._tree.get_symlink_target(file_id)
1789
trans_id = self._transform.trans_id_file_id(file_id)
1790
name = self._transform._limbo_name(trans_id)
1791
return os.readlink(name)
1793
def walkdirs(self, prefix=''):
1794
pending = [self._transform.root]
1795
while len(pending) > 0:
1796
parent_id = pending.pop()
1799
prefix = prefix.rstrip('/')
1800
parent_path = self._final_paths.get_path(parent_id)
1801
parent_file_id = self._transform.final_file_id(parent_id)
1802
for child_id in self._all_children(parent_id):
1803
path_from_root = self._final_paths.get_path(child_id)
1804
basename = self._transform.final_name(child_id)
1805
file_id = self._transform.final_file_id(child_id)
1807
kind = self._transform.final_kind(child_id)
1808
versioned_kind = kind
1811
versioned_kind = self._transform._tree.stored_kind(file_id)
1812
if versioned_kind == 'directory':
1813
subdirs.append(child_id)
1814
children.append((path_from_root, basename, kind, None,
1815
file_id, versioned_kind))
1817
if parent_path.startswith(prefix):
1818
yield (parent_path, parent_file_id), children
1819
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
1822
def get_parent_ids(self):
1823
return self._parent_ids
1825
def set_parent_ids(self, parent_ids):
1826
self._parent_ids = parent_ids
1828
def get_revision_tree(self, revision_id):
1829
return self._transform._tree.get_revision_tree(revision_id)
1832
def joinpath(parent, child):
1833
"""Join tree-relative paths, handling the tree root specially"""
1834
if parent is None or parent == "":
1837
return pathjoin(parent, child)
1840
class FinalPaths(object):
1841
"""Make path calculation cheap by memoizing paths.
1843
The underlying tree must not be manipulated between calls, or else
1844
the results will likely be incorrect.
1846
def __init__(self, transform):
1847
object.__init__(self)
1848
self._known_paths = {}
1849
self.transform = transform
1851
def _determine_path(self, trans_id):
1852
if trans_id == self.transform.root:
1854
name = self.transform.final_name(trans_id)
1855
parent_id = self.transform.final_parent(trans_id)
1856
if parent_id == self.transform.root:
1859
return pathjoin(self.get_path(parent_id), name)
1861
def get_path(self, trans_id):
1862
"""Find the final path associated with a trans_id"""
1863
if trans_id not in self._known_paths:
1864
self._known_paths[trans_id] = self._determine_path(trans_id)
1865
return self._known_paths[trans_id]
1867
def get_paths(self, trans_ids):
1868
return [(self.get_path(t), t) for t in trans_ids]
1872
def topology_sorted_ids(tree):
1873
"""Determine the topological order of the ids in a tree"""
1874
file_ids = list(tree)
1875
file_ids.sort(key=tree.id2path)
1879
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
1880
delta_from_tree=False):
1881
"""Create working tree for a branch, using a TreeTransform.
1883
This function should be used on empty trees, having a tree root at most.
1884
(see merge and revert functionality for working with existing trees)
1886
Existing files are handled like so:
1888
- Existing bzrdirs take precedence over creating new items. They are
1889
created as '%s.diverted' % name.
1890
- Otherwise, if the content on disk matches the content we are building,
1891
it is silently replaced.
1892
- Otherwise, conflict resolution will move the old file to 'oldname.moved'.
1894
:param tree: The tree to convert wt into a copy of
1895
:param wt: The working tree that files will be placed into
1896
:param accelerator_tree: A tree which can be used for retrieving file
1897
contents more quickly than tree itself, i.e. a workingtree. tree
1898
will be used for cases where accelerator_tree's content is different.
1899
:param hardlink: If true, hard-link files to accelerator_tree, where
1900
possible. accelerator_tree must implement abspath, i.e. be a
1902
:param delta_from_tree: If true, build_tree may use the input Tree to
1903
generate the inventory delta.
1905
wt.lock_tree_write()
1909
if accelerator_tree is not None:
1910
accelerator_tree.lock_read()
1912
return _build_tree(tree, wt, accelerator_tree, hardlink,
1915
if accelerator_tree is not None:
1916
accelerator_tree.unlock()
1923
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
1924
"""See build_tree."""
1925
for num, _unused in enumerate(wt.all_file_ids()):
1926
if num > 0: # more than just a root
1927
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1928
existing_files = set()
1929
for dir, files in wt.walkdirs():
1930
existing_files.update(f[0] for f in files)
1932
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1933
pp = ProgressPhase("Build phase", 2, top_pb)
1934
if tree.inventory.root is not None:
1935
# This is kind of a hack: we should be altering the root
1936
# as part of the regular tree shape diff logic.
1937
# The conditional test here is to avoid doing an
1938
# expensive operation (flush) every time the root id
1939
# is set within the tree, nor setting the root and thus
1940
# marking the tree as dirty, because we use two different
1941
# idioms here: tree interfaces and inventory interfaces.
1942
if wt.get_root_id() != tree.get_root_id():
1943
wt.set_root_id(tree.get_root_id())
1945
tt = TreeTransform(wt)
1949
file_trans_id[wt.get_root_id()] = \
1950
tt.trans_id_tree_file_id(wt.get_root_id())
1951
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1953
deferred_contents = []
1955
total = len(tree.inventory)
1957
precomputed_delta = []
1959
precomputed_delta = None
1960
for num, (tree_path, entry) in \
1961
enumerate(tree.inventory.iter_entries_by_dir()):
1962
pb.update("Building tree", num - len(deferred_contents), total)
1963
if entry.parent_id is None:
1966
file_id = entry.file_id
1968
precomputed_delta.append((None, tree_path, file_id, entry))
1969
if tree_path in existing_files:
1970
target_path = wt.abspath(tree_path)
1971
kind = file_kind(target_path)
1972
if kind == "directory":
1974
bzrdir.BzrDir.open(target_path)
1975
except errors.NotBranchError:
1979
if (file_id not in divert and
1980
_content_match(tree, entry, file_id, kind,
1982
tt.delete_contents(tt.trans_id_tree_path(tree_path))
1983
if kind == 'directory':
1985
parent_id = file_trans_id[entry.parent_id]
1986
if entry.kind == 'file':
1987
# We *almost* replicate new_by_entry, so that we can defer
1988
# getting the file text, and get them all at once.
1989
trans_id = tt.create_path(entry.name, parent_id)
1990
file_trans_id[file_id] = trans_id
1991
tt.version_file(file_id, trans_id)
1992
executable = tree.is_executable(file_id, tree_path)
1994
tt.set_executability(executable, trans_id)
1995
deferred_contents.append((file_id, trans_id))
1997
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2000
new_trans_id = file_trans_id[file_id]
2001
old_parent = tt.trans_id_tree_path(tree_path)
2002
_reparent_children(tt, old_parent, new_trans_id)
2003
offset = num + 1 - len(deferred_contents)
2004
_create_files(tt, tree, deferred_contents, pb, offset,
2005
accelerator_tree, hardlink)
2009
divert_trans = set(file_trans_id[f] for f in divert)
2010
resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
2011
raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
2012
if len(raw_conflicts) > 0:
2013
precomputed_delta = None
2014
conflicts = cook_conflicts(raw_conflicts, tt)
2015
for conflict in conflicts:
2018
wt.add_conflicts(conflicts)
2019
except errors.UnsupportedOperation:
2021
result = tt.apply(no_conflicts=True,
2022
precomputed_delta=precomputed_delta)
2029
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2031
total = len(desired_files) + offset
2032
if accelerator_tree is None:
2033
new_desired_files = desired_files
2035
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2036
unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2037
in iter if not (c or e[0] != e[1]))
2038
new_desired_files = []
2040
for file_id, trans_id in desired_files:
2041
accelerator_path = unchanged.get(file_id)
2042
if accelerator_path is None:
2043
new_desired_files.append((file_id, trans_id))
2045
pb.update('Adding file contents', count + offset, total)
2047
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2050
contents = accelerator_tree.get_file(file_id, accelerator_path)
2052
tt.create_file(contents, trans_id)
2057
for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
2058
new_desired_files)):
2059
tt.create_file(contents, trans_id)
2060
pb.update('Adding file contents', count + offset, total)
2063
def _reparent_children(tt, old_parent, new_parent):
2064
for child in tt.iter_tree_children(old_parent):
2065
tt.adjust_path(tt.final_name(child), new_parent, child)
2067
def _reparent_transform_children(tt, old_parent, new_parent):
2068
by_parent = tt.by_parent()
2069
for child in by_parent[old_parent]:
2070
tt.adjust_path(tt.final_name(child), new_parent, child)
2071
return by_parent[old_parent]
2073
def _content_match(tree, entry, file_id, kind, target_path):
2074
if entry.kind != kind:
2076
if entry.kind == "directory":
2078
if entry.kind == "file":
2079
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2081
elif entry.kind == "symlink":
2082
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2087
def resolve_checkout(tt, conflicts, divert):
2088
new_conflicts = set()
2089
for c_type, conflict in ((c[0], c) for c in conflicts):
2090
# Anything but a 'duplicate' would indicate programmer error
2091
if c_type != 'duplicate':
2092
raise AssertionError(c_type)
2093
# Now figure out which is new and which is old
2094
if tt.new_contents(conflict[1]):
2095
new_file = conflict[1]
2096
old_file = conflict[2]
2098
new_file = conflict[2]
2099
old_file = conflict[1]
2101
# We should only get here if the conflict wasn't completely
2103
final_parent = tt.final_parent(old_file)
2104
if new_file in divert:
2105
new_name = tt.final_name(old_file)+'.diverted'
2106
tt.adjust_path(new_name, final_parent, new_file)
2107
new_conflicts.add((c_type, 'Diverted to',
2108
new_file, old_file))
2110
new_name = tt.final_name(old_file)+'.moved'
2111
tt.adjust_path(new_name, final_parent, old_file)
2112
new_conflicts.add((c_type, 'Moved existing file to',
2113
old_file, new_file))
2114
return new_conflicts
2117
def new_by_entry(tt, entry, parent_id, tree):
2118
"""Create a new file according to its inventory entry"""
2122
contents = tree.get_file(entry.file_id).readlines()
2123
executable = tree.is_executable(entry.file_id)
2124
return tt.new_file(name, parent_id, contents, entry.file_id,
2126
elif kind in ('directory', 'tree-reference'):
2127
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2128
if kind == 'tree-reference':
2129
tt.set_tree_reference(entry.reference_revision, trans_id)
2131
elif kind == 'symlink':
2132
target = tree.get_symlink_target(entry.file_id)
2133
return tt.new_symlink(name, parent_id, target, entry.file_id)
2135
raise errors.BadFileKindError(name, kind)
2138
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2139
"""Create new file contents according to an inventory entry."""
2140
if entry.kind == "file":
2142
lines = tree.get_file(entry.file_id).readlines()
2143
tt.create_file(lines, trans_id, mode_id=mode_id)
2144
elif entry.kind == "symlink":
2145
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2146
elif entry.kind == "directory":
2147
tt.create_directory(trans_id)
2150
def create_entry_executability(tt, entry, trans_id):
2151
"""Set the executability of a trans_id according to an inventory entry"""
2152
if entry.kind == "file":
2153
tt.set_executability(entry.executable, trans_id)
2156
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2157
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2160
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2161
"""Produce a backup-style name that appears to be available"""
2165
yield "%s.~%d~" % (name, counter)
2167
for new_name in name_gen():
2168
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2172
def _entry_changes(file_id, entry, working_tree):
2173
"""Determine in which ways the inventory entry has changed.
2175
Returns booleans: has_contents, content_mod, meta_mod
2176
has_contents means there are currently contents, but they differ
2177
contents_mod means contents need to be modified
2178
meta_mod means the metadata needs to be modified
2180
cur_entry = working_tree.inventory[file_id]
2182
working_kind = working_tree.kind(file_id)
2185
has_contents = False
2188
if has_contents is True:
2189
if entry.kind != working_kind:
2190
contents_mod, meta_mod = True, False
2192
cur_entry._read_tree_state(working_tree.id2path(file_id),
2194
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2195
cur_entry._forget_tree_state()
2196
return has_contents, contents_mod, meta_mod
2199
def revert(working_tree, target_tree, filenames, backups=False,
2200
pb=DummyProgress(), change_reporter=None):
2201
"""Revert a working tree's contents to those of a target tree."""
2202
target_tree.lock_read()
2203
tt = TreeTransform(working_tree, pb)
2205
pp = ProgressPhase("Revert phase", 3, pb)
2206
conflicts, merge_modified = _prepare_revert_transform(
2207
working_tree, target_tree, tt, filenames, backups, pp)
2209
change_reporter = delta._ChangeReporter(
2210
unversioned_filter=working_tree.is_ignored)
2211
delta.report_changes(tt.iter_changes(), change_reporter)
2212
for conflict in conflicts:
2216
working_tree.set_merge_modified(merge_modified)
2218
target_tree.unlock()
2224
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2225
backups, pp, basis_tree=None,
2226
merge_modified=None):
2228
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2230
if merge_modified is None:
2231
merge_modified = working_tree.merge_modified()
2232
merge_modified = _alter_files(working_tree, target_tree, tt,
2233
child_pb, filenames, backups,
2234
merge_modified, basis_tree)
2238
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2240
raw_conflicts = resolve_conflicts(tt, child_pb,
2241
lambda t, c: conflict_pass(t, c, target_tree))
2244
conflicts = cook_conflicts(raw_conflicts, tt)
2245
return conflicts, merge_modified
2248
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2249
backups, merge_modified, basis_tree=None):
2250
if basis_tree is not None:
2251
basis_tree.lock_read()
2252
change_list = target_tree.iter_changes(working_tree,
2253
specific_files=specific_files, pb=pb)
2254
if target_tree.get_root_id() is None:
2260
for id_num, (file_id, path, changed_content, versioned, parent, name,
2261
kind, executable) in enumerate(change_list):
2262
if skip_root and file_id[0] is not None and parent[0] is None:
2264
trans_id = tt.trans_id_file_id(file_id)
2267
keep_content = False
2268
if kind[0] == 'file' and (backups or kind[1] is None):
2269
wt_sha1 = working_tree.get_file_sha1(file_id)
2270
if merge_modified.get(file_id) != wt_sha1:
2271
# acquire the basis tree lazily to prevent the
2272
# expense of accessing it when it's not needed ?
2273
# (Guessing, RBC, 200702)
2274
if basis_tree is None:
2275
basis_tree = working_tree.basis_tree()
2276
basis_tree.lock_read()
2277
if file_id in basis_tree:
2278
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2280
elif kind[1] is None and not versioned[1]:
2282
if kind[0] is not None:
2283
if not keep_content:
2284
tt.delete_contents(trans_id)
2285
elif kind[1] is not None:
2286
parent_trans_id = tt.trans_id_file_id(parent[0])
2287
by_parent = tt.by_parent()
2288
backup_name = _get_backup_name(name[0], by_parent,
2289
parent_trans_id, tt)
2290
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2291
new_trans_id = tt.create_path(name[0], parent_trans_id)
2292
if versioned == (True, True):
2293
tt.unversion_file(trans_id)
2294
tt.version_file(file_id, new_trans_id)
2295
# New contents should have the same unix perms as old
2298
trans_id = new_trans_id
2299
if kind[1] in ('directory', 'tree-reference'):
2300
tt.create_directory(trans_id)
2301
if kind[1] == 'tree-reference':
2302
revision = target_tree.get_reference_revision(file_id,
2304
tt.set_tree_reference(revision, trans_id)
2305
elif kind[1] == 'symlink':
2306
tt.create_symlink(target_tree.get_symlink_target(file_id),
2308
elif kind[1] == 'file':
2309
deferred_files.append((file_id, (trans_id, mode_id)))
2310
if basis_tree is None:
2311
basis_tree = working_tree.basis_tree()
2312
basis_tree.lock_read()
2313
new_sha1 = target_tree.get_file_sha1(file_id)
2314
if (file_id in basis_tree and new_sha1 ==
2315
basis_tree.get_file_sha1(file_id)):
2316
if file_id in merge_modified:
2317
del merge_modified[file_id]
2319
merge_modified[file_id] = new_sha1
2321
# preserve the execute bit when backing up
2322
if keep_content and executable[0] == executable[1]:
2323
tt.set_executability(executable[1], trans_id)
2324
elif kind[1] is not None:
2325
raise AssertionError(kind[1])
2326
if versioned == (False, True):
2327
tt.version_file(file_id, trans_id)
2328
if versioned == (True, False):
2329
tt.unversion_file(trans_id)
2330
if (name[1] is not None and
2331
(name[0] != name[1] or parent[0] != parent[1])):
2332
if name[1] == '' and parent[1] is None:
2333
parent_trans = ROOT_PARENT
2335
parent_trans = tt.trans_id_file_id(parent[1])
2336
tt.adjust_path(name[1], parent_trans, trans_id)
2337
if executable[0] != executable[1] and kind[1] == "file":
2338
tt.set_executability(executable[1], trans_id)
2339
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2341
tt.create_file(bytes, trans_id, mode_id)
2343
if basis_tree is not None:
2345
return merge_modified
2348
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2349
"""Make many conflict-resolution attempts, but die if they fail"""
2350
if pass_func is None:
2351
pass_func = conflict_pass
2352
new_conflicts = set()
2355
pb.update('Resolution pass', n+1, 10)
2356
conflicts = tt.find_conflicts()
2357
if len(conflicts) == 0:
2358
return new_conflicts
2359
new_conflicts.update(pass_func(tt, conflicts))
2360
raise MalformedTransform(conflicts=conflicts)
2365
def conflict_pass(tt, conflicts, path_tree=None):
2366
"""Resolve some classes of conflicts.
2368
:param tt: The transform to resolve conflicts in
2369
:param conflicts: The conflicts to resolve
2370
:param path_tree: A Tree to get supplemental paths from
2372
new_conflicts = set()
2373
for c_type, conflict in ((c[0], c) for c in conflicts):
2374
if c_type == 'duplicate id':
2375
tt.unversion_file(conflict[1])
2376
new_conflicts.add((c_type, 'Unversioned existing file',
2377
conflict[1], conflict[2], ))
2378
elif c_type == 'duplicate':
2379
# files that were renamed take precedence
2380
final_parent = tt.final_parent(conflict[1])
2381
if tt.path_changed(conflict[1]):
2382
existing_file, new_file = conflict[2], conflict[1]
2384
existing_file, new_file = conflict[1], conflict[2]
2385
new_name = tt.final_name(existing_file)+'.moved'
2386
tt.adjust_path(new_name, final_parent, existing_file)
2387
new_conflicts.add((c_type, 'Moved existing file to',
2388
existing_file, new_file))
2389
elif c_type == 'parent loop':
2390
# break the loop by undoing one of the ops that caused the loop
2392
while not tt.path_changed(cur):
2393
cur = tt.final_parent(cur)
2394
new_conflicts.add((c_type, 'Cancelled move', cur,
2395
tt.final_parent(cur),))
2396
tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2398
elif c_type == 'missing parent':
2399
trans_id = conflict[1]
2401
tt.cancel_deletion(trans_id)
2402
new_conflicts.add(('deleting parent', 'Not deleting',
2407
tt.final_name(trans_id)
2409
if path_tree is not None:
2410
file_id = tt.final_file_id(trans_id)
2412
file_id = tt.inactive_file_id(trans_id)
2413
entry = path_tree.inventory[file_id]
2414
# special-case the other tree root (move its
2415
# children to current root)
2416
if entry.parent_id is None:
2418
moved = _reparent_transform_children(
2419
tt, trans_id, tt.root)
2421
new_conflicts.add((c_type, 'Moved to root',
2424
parent_trans_id = tt.trans_id_file_id(
2426
tt.adjust_path(entry.name, parent_trans_id,
2429
tt.create_directory(trans_id)
2430
new_conflicts.add((c_type, 'Created directory', trans_id))
2431
elif c_type == 'unversioned parent':
2432
file_id = tt.inactive_file_id(conflict[1])
2433
# special-case the other tree root (move its children instead)
2434
if path_tree and file_id in path_tree:
2435
if path_tree.inventory[file_id].parent_id is None:
2437
tt.version_file(file_id, conflict[1])
2438
new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
2439
elif c_type == 'non-directory parent':
2440
parent_id = conflict[1]
2441
parent_parent = tt.final_parent(parent_id)
2442
parent_name = tt.final_name(parent_id)
2443
parent_file_id = tt.final_file_id(parent_id)
2444
new_parent_id = tt.new_directory(parent_name + '.new',
2445
parent_parent, parent_file_id)
2446
_reparent_transform_children(tt, parent_id, new_parent_id)
2447
if parent_file_id is not None:
2448
tt.unversion_file(parent_id)
2449
new_conflicts.add((c_type, 'Created directory', new_parent_id))
2450
elif c_type == 'versioning no contents':
2451
tt.cancel_versioning(conflict[1])
2452
return new_conflicts
2455
def cook_conflicts(raw_conflicts, tt):
2456
"""Generate a list of cooked conflicts, sorted by file path"""
2457
from bzrlib.conflicts import Conflict
2458
conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
2459
return sorted(conflict_iter, key=Conflict.sort_key)
2462
def iter_cook_conflicts(raw_conflicts, tt):
2463
from bzrlib.conflicts import Conflict
2465
for conflict in raw_conflicts:
2466
c_type = conflict[0]
2467
action = conflict[1]
2468
modified_path = fp.get_path(conflict[2])
2469
modified_id = tt.final_file_id(conflict[2])
2470
if len(conflict) == 3:
2471
yield Conflict.factory(c_type, action=action, path=modified_path,
2472
file_id=modified_id)
2475
conflicting_path = fp.get_path(conflict[3])
2476
conflicting_id = tt.final_file_id(conflict[3])
2477
yield Conflict.factory(c_type, action=action, path=modified_path,
2478
file_id=modified_id,
2479
conflict_path=conflicting_path,
2480
conflict_file_id=conflicting_id)
2483
class _FileMover(object):
2484
"""Moves and deletes files for TreeTransform, tracking operations"""
2487
self.past_renames = []
2488
self.pending_deletions = []
2490
def rename(self, from_, to):
2491
"""Rename a file from one path to another. Functions like os.rename"""
2493
os.rename(from_, to)
2495
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2496
raise errors.FileExists(to, str(e))
2498
self.past_renames.append((from_, to))
2500
def pre_delete(self, from_, to):
2501
"""Rename a file out of the way and mark it for deletion.
2503
Unlike os.unlink, this works equally well for files and directories.
2504
:param from_: The current file path
2505
:param to: A temporary path for the file
2507
self.rename(from_, to)
2508
self.pending_deletions.append(to)
2511
"""Reverse all renames that have been performed"""
2512
for from_, to in reversed(self.past_renames):
2513
os.rename(to, from_)
2514
# after rollback, don't reuse _FileMover
2516
pending_deletions = None
2518
def apply_deletions(self):
2519
"""Apply all marked deletions"""
2520
for path in self.pending_deletions:
2522
# after apply_deletions, don't reuse _FileMover
2524
pending_deletions = None
added
removed
bzrlib/transform.py
