537
531
# ensure that all children are registered with the transaction
538
532
list(self.iter_tree_children(parent_id))
540
@deprecated_method(deprecated_in((2, 3, 0)))
541
534
def has_named_child(self, by_parent, parent_id, name):
542
return self._has_named_child(
543
name, parent_id, known_children=by_parent.get(parent_id, []))
545
def _has_named_child(self, name, parent_id, known_children):
546
"""Does a parent already have a name child.
548
:param name: The searched for name.
550
:param parent_id: The parent for which the check is made.
552
:param known_children: The already known children. This should have
553
been recently obtained from `self.by_parent.get(parent_id)`
554
(or will be if None is passed).
556
if known_children is None:
557
known_children = self.by_parent().get(parent_id, [])
558
for child in known_children:
536
children = by_parent[parent_id]
539
for child in children:
559
540
if self.final_name(child) == name:
561
parent_path = self._tree_id_paths.get(parent_id, None)
562
if parent_path is None:
563
# No parent... no children
543
path = self._tree_id_paths[parent_id]
565
child_path = joinpath(parent_path, name)
566
child_id = self._tree_path_ids.get(child_path, None)
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
567
548
if child_id is None:
568
# Not known by the tree transform yet, check the filesystem
569
return osutils.lexists(self._tree.abspath(child_path))
549
return lexists(self._tree.abspath(childpath))
571
raise AssertionError('child_id is missing: %s, %s, %s'
572
% (name, parent_id, child_id))
574
def _available_backup_name(self, name, target_id):
575
"""Find an available backup name.
577
:param name: The basename of the file.
579
:param target_id: The directory trans_id where the backup should
582
known_children = self.by_parent().get(target_id, [])
583
return osutils.available_backup_name(
585
lambda base: self._has_named_child(
586
base, target_id, known_children))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
588
559
def _parent_loops(self):
589
560
"""No entry should be its own ancestor"""
666
637
if (self._new_name, self._new_parent) == ({}, {}):
668
639
for children in by_parent.itervalues():
670
for child_tid in children:
671
name = self.final_name(child_tid)
673
# Keep children only if they still exist in the end
674
if not self._case_sensitive_target:
676
name_ids.append((name, child_tid))
640
name_ids = [(self.final_name(t), t) for t in children]
641
if not self._case_sensitive_target:
642
name_ids = [(n.lower(), t) for n, t in name_ids]
679
645
last_trans_id = None
705
671
def _parent_type_conflicts(self, by_parent):
706
"""Children must have a directory parent"""
672
"""parents must have directory 'contents'."""
708
674
for parent_id, children in by_parent.iteritems():
709
675
if parent_id is ROOT_PARENT:
712
for child_id in children:
713
if self.final_kind(child_id) is not None:
677
if not self._any_contents(children):
718
# There is at least a child, so we need an existing directory to
720
679
kind = self.final_kind(parent_id)
722
# The directory will be deleted
723
681
conflicts.append(('missing parent', parent_id))
724
682
elif kind != "directory":
725
# Meh, we need a *directory* to put something in it
726
683
conflicts.append(('non-directory parent', parent_id))
686
def _any_contents(self, trans_ids):
687
"""Return true if any of the trans_ids, will have contents."""
688
for trans_id in trans_ids:
689
if self.final_kind(trans_id) is not None:
729
693
def _set_executability(self, path, trans_id):
730
694
"""Set the executability of versioned files """
731
695
if supports_executable():
795
759
self.create_symlink(target, trans_id)
798
def new_orphan(self, trans_id, parent_id):
799
"""Schedule an item to be orphaned.
801
When a directory is about to be removed, its children, if they are not
802
versioned are moved out of the way: they don't have a parent anymore.
804
:param trans_id: The trans_id of the existing item.
805
:param parent_id: The parent trans_id of the item.
807
raise NotImplementedError(self.new_orphan)
809
def _get_potential_orphans(self, dir_id):
810
"""Find the potential orphans in a directory.
812
A directory can't be safely deleted if there are versioned files in it.
813
If all the contained files are unversioned then they can be orphaned.
815
The 'None' return value means that the directory contains at least one
816
versioned file and should not be deleted.
818
:param dir_id: The directory trans id.
820
:return: A list of the orphan trans ids or None if at least one
821
versioned file is present.
824
# Find the potential orphans, stop if one item should be kept
825
for child_tid in self.by_parent()[dir_id]:
826
if child_tid in self._removed_contents:
827
# The child is removed as part of the transform. Since it was
828
# versioned before, it's not an orphan
830
elif self.final_file_id(child_tid) is None:
831
# The child is not versioned
832
orphans.append(child_tid)
834
# We have a versioned file here, searching for orphans is
840
762
def _affected_ids(self):
841
763
"""Return the set of transform ids affected by the transform"""
842
764
trans_ids = set(self._removed_id)
1349
1271
del self._limbo_children_names[trans_id]
1350
1272
delete_any(self._limbo_name(trans_id))
1352
def new_orphan(self, trans_id, parent_id):
1353
# FIXME: There is no tree config, so we use the branch one (it's weird
1354
# to define it this way as orphaning can only occur in a working tree,
1355
# but that's all we have (for now). It will find the option in
1356
# locations.conf or bazaar.conf though) -- vila 20100916
1357
conf = self._tree.branch.get_config()
1358
conf_var_name = 'bzr.transform.orphan_policy'
1359
orphan_policy = conf.get_user_option(conf_var_name)
1360
default_policy = orphaning_registry.default_key
1361
if orphan_policy is None:
1362
orphan_policy = default_policy
1363
if orphan_policy not in orphaning_registry:
1364
trace.warning('%s (from %s) is not a known policy, defaulting to %s'
1365
% (orphan_policy, conf_var_name, default_policy))
1366
orphan_policy = default_policy
1367
handle_orphan = orphaning_registry.get(orphan_policy)
1368
handle_orphan(self, trans_id, parent_id)
1371
class OrphaningError(errors.BzrError):
1373
# Only bugs could lead to such exception being seen by the user
1374
internal_error = True
1375
_fmt = "Error while orphaning %s in %s directory"
1377
def __init__(self, orphan, parent):
1378
errors.BzrError.__init__(self)
1379
self.orphan = orphan
1380
self.parent = parent
1383
class OrphaningForbidden(OrphaningError):
1385
_fmt = "Policy: %s doesn't allow creating orphans."
1387
def __init__(self, policy):
1388
errors.BzrError.__init__(self)
1389
self.policy = policy
1392
def move_orphan(tt, orphan_id, parent_id):
1393
"""See TreeTransformBase.new_orphan.
1395
This creates a new orphan in the `bzr-orphans` dir at the root of the
1398
:param tt: The TreeTransform orphaning `trans_id`.
1400
:param orphan_id: The trans id that should be orphaned.
1402
:param parent_id: The orphan parent trans id.
1404
# Add the orphan dir if it doesn't exist
1405
orphan_dir_basename = 'bzr-orphans'
1406
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1407
if tt.final_kind(od_id) is None:
1408
tt.create_directory(od_id)
1409
parent_path = tt._tree_id_paths[parent_id]
1410
# Find a name that doesn't exist yet in the orphan dir
1411
actual_name = tt.final_name(orphan_id)
1412
new_name = tt._available_backup_name(actual_name, od_id)
1413
tt.adjust_path(new_name, od_id, orphan_id)
1414
trace.warning('%s has been orphaned in %s'
1415
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1418
def refuse_orphan(tt, orphan_id, parent_id):
1419
"""See TreeTransformBase.new_orphan.
1421
This refuses to create orphan, letting the caller handle the conflict.
1423
raise OrphaningForbidden('never')
1426
orphaning_registry = registry.Registry()
1427
orphaning_registry.register(
1428
'conflict', refuse_orphan,
1429
'Leave orphans in place and create a conflict on the directory.')
1430
orphaning_registry.register(
1431
'move', move_orphan,
1432
'Move orphans into the bzr-orphans directory.')
1433
orphaning_registry._set_default_key('conflict')
1436
1275
class TreeTransform(DiskTreeTransform):
1437
1276
"""Represent a tree transformation.
2591
2427
for child in tt.iter_tree_children(old_parent):
2592
2428
tt.adjust_path(tt.final_name(child), new_parent, child)
2595
2430
def _reparent_transform_children(tt, old_parent, new_parent):
2596
2431
by_parent = tt.by_parent()
2597
2432
for child in by_parent[old_parent]:
2598
2433
tt.adjust_path(tt.final_name(child), new_parent, child)
2599
2434
return by_parent[old_parent]
2602
2436
def _content_match(tree, entry, file_id, kind, target_path):
2603
2437
if entry.kind != kind:
2704
2538
tt.set_executability(entry.executable, trans_id)
2707
@deprecated_function(deprecated_in((2, 3, 0)))
2708
2541
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2709
2542
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2712
@deprecated_function(deprecated_in((2, 3, 0)))
2713
2545
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2714
2546
"""Produce a backup-style name that appears to be available"""
2715
2547
def name_gen():
2836
2668
tt.delete_contents(trans_id)
2837
2669
elif kind[1] is not None:
2838
2670
parent_trans_id = tt.trans_id_file_id(parent[0])
2839
backup_name = tt._available_backup_name(
2840
name[0], parent_trans_id)
2671
by_parent = tt.by_parent()
2672
backup_name = _get_backup_name(name[0], by_parent,
2673
parent_trans_id, tt)
2841
2674
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2842
2675
new_trans_id = tt.create_path(name[0], parent_trans_id)
2843
2676
if versioned == (True, True):
2967
2800
elif c_type == 'missing parent':
2968
2801
trans_id = conflict[1]
2969
if trans_id in tt._removed_contents:
2970
cancel_deletion = True
2971
orphans = tt._get_potential_orphans(trans_id)
2973
cancel_deletion = False
2974
# All children are orphans
2977
tt.new_orphan(o, trans_id)
2978
except OrphaningError:
2979
# Something bad happened so we cancel the directory
2980
# deletion which will leave it in place with a
2981
# conflict. The user can deal with it from there.
2982
# Note that this also catch the case where we don't
2983
# want to create orphans and leave the directory in
2985
cancel_deletion = True
2988
# Cancel the directory deletion
2989
tt.cancel_deletion(trans_id)
2990
new_conflicts.add(('deleting parent', 'Not deleting',
2803
tt.cancel_deletion(trans_id)
2804
new_conflicts.add(('deleting parent', 'Not deleting',
2995
2809
tt.final_name(trans_id)
added
removed
bzrlib/transform.py
