394
388
changed_kind = set(self._removed_contents)
395
389
changed_kind.intersection_update(self._new_contents)
396
390
changed_kind.difference_update(new_ids)
397
changed_kind = (t for t in changed_kind
398
if self.tree_kind(t) != self.final_kind(t))
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
399
393
new_ids.update(changed_kind)
400
394
return sorted(FinalPaths(self).get_paths(new_ids))
402
396
def final_kind(self, trans_id):
403
397
"""Determine the final file kind, after any changes applied.
405
:return: None if the file does not exist/has no contents. (It is
406
conceivable that a path would be created without the corresponding
407
contents insertion command)
399
Raises NoSuchFile if the file does not exist/has no contents.
400
(It is conceivable that a path would be created without the
401
corresponding contents insertion command)
409
403
if trans_id in self._new_contents:
410
404
return self._new_contents[trans_id]
411
405
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
414
408
return self.tree_kind(trans_id)
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
644
if (self._new_name, self._new_parent) == ({}, {}):
668
646
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))
647
name_ids = [(self.final_name(t), t) for t in children]
648
if not self._case_sensitive_target:
649
name_ids = [(n.lower(), t) for n, t in name_ids]
679
652
last_trans_id = None
680
653
for name, trans_id in name_ids:
681
kind = self.final_kind(trans_id)
655
kind = self.final_kind(trans_id)
682
658
file_id = self.final_file_id(trans_id)
683
659
if kind is None and file_id is None:
793
780
self.create_symlink(target, trans_id)
796
def new_orphan(self, trans_id, parent_id):
797
"""Schedule an item to be orphaned.
799
When a directory is about to be removed, its children, if they are not
800
versioned are moved out of the way: they don't have a parent anymore.
802
:param trans_id: The trans_id of the existing item.
803
:param parent_id: The parent trans_id of the item.
805
raise NotImplementedError(self.new_orphan)
807
def _get_potential_orphans(self, dir_id):
808
"""Find the potential orphans in a directory.
810
A directory can't be safely deleted if there are versioned files in it.
811
If all the contained files are unversioned then they can be orphaned.
813
The 'None' return value means that the directory contains at least one
814
versioned file and should not be deleted.
816
:param dir_id: The directory trans id.
818
:return: A list of the orphan trans ids or None if at least one
819
versioned file is present.
822
# Find the potential orphans, stop if one item should be kept
823
for c in self.by_parent()[dir_id]:
824
if self.final_file_id(c) is None:
827
# We have a versioned file here, searching for orphans is
833
783
def _affected_ids(self):
834
784
"""Return the set of transform ids affected by the transform"""
835
785
trans_ids = set(self._removed_id)
975
928
return _PreviewTree(self)
977
def commit(self, branch, message, merge_parents=None, strict=False,
978
timestamp=None, timezone=None, committer=None, authors=None,
979
revprops=None, revision_id=None):
930
def commit(self, branch, message, merge_parents=None, strict=False):
980
931
"""Commit the result of this TreeTransform to a branch.
982
933
:param branch: The branch to commit to.
983
934
:param message: The message to attach to the commit.
984
:param merge_parents: Additional parent revision-ids specified by
986
:param strict: If True, abort the commit if there are unversioned
988
:param timestamp: if not None, seconds-since-epoch for the time and
989
date. (May be a float.)
990
:param timezone: Optional timezone for timestamp, as an offset in
992
:param committer: Optional committer in email-id format.
993
(e.g. "J Random Hacker <jrandom@example.com>")
994
:param authors: Optional list of authors in email-id format.
995
:param revprops: Optional dictionary of revision properties.
996
:param revision_id: Optional revision id. (Specifying a revision-id
997
may reduce performance for some non-native formats.)
935
:param merge_parents: Additional parents specified by pending merges.
998
936
:return: The revision_id of the revision committed.
1000
938
self._check_malformed()
1342
1274
del self._limbo_children_names[trans_id]
1343
1275
delete_any(self._limbo_name(trans_id))
1345
def new_orphan(self, trans_id, parent_id):
1346
# FIXME: There is no tree config, so we use the branch one (it's weird
1347
# to define it this way as orphaning can only occur in a working tree,
1348
# but that's all we have (for now). It will find the option in
1349
# locations.conf or bazaar.conf though) -- vila 20100916
1350
conf = self._tree.branch.get_config()
1351
conf_var_name = 'bzr.transform.orphan_policy'
1352
orphan_policy = conf.get_user_option(conf_var_name)
1353
default_policy = orphaning_registry.default_key
1354
if orphan_policy is None:
1355
orphan_policy = default_policy
1356
if orphan_policy not in orphaning_registry:
1357
trace.warning('%s (from %s) is not a known policy, defaulting to %s'
1358
% (orphan_policy, conf_var_name, default_policy))
1359
orphan_policy = default_policy
1360
handle_orphan = orphaning_registry.get(orphan_policy)
1361
handle_orphan(self, trans_id, parent_id)
1364
class OrphaningError(errors.BzrError):
1366
# Only bugs could lead to such exception being seen by the user
1367
internal_error = True
1368
_fmt = "Error while orphaning %s in %s directory"
1370
def __init__(self, orphan, parent):
1371
errors.BzrError.__init__(self)
1372
self.orphan = orphan
1373
self.parent = parent
1376
class OrphaningForbidden(OrphaningError):
1378
_fmt = "Policy: %s doesn't allow creating orphans."
1380
def __init__(self, policy):
1381
errors.BzrError.__init__(self)
1382
self.policy = policy
1385
def move_orphan(tt, orphan_id, parent_id):
1386
"""See TreeTransformBase.new_orphan.
1388
This creates a new orphan in the `bzr-orphans` dir at the root of the
1391
:param tt: The TreeTransform orphaning `trans_id`.
1393
:param orphan_id: The trans id that should be orphaned.
1395
:param parent_id: The orphan parent trans id.
1397
# Add the orphan dir if it doesn't exist
1398
orphan_dir_basename = 'bzr-orphans'
1399
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1400
if tt.final_kind(od_id) is None:
1401
tt.create_directory(od_id)
1402
parent_path = tt._tree_id_paths[parent_id]
1403
# Find a name that doesn't exist yet in the orphan dir
1404
actual_name = tt.final_name(orphan_id)
1405
new_name = tt._available_backup_name(actual_name, od_id)
1406
tt.adjust_path(new_name, od_id, orphan_id)
1407
trace.warning('%s has been orphaned in %s'
1408
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1411
def refuse_orphan(tt, orphan_id, parent_id):
1412
"""See TreeTransformBase.new_orphan.
1414
This refuses to create orphan, letting the caller handle the conflict.
1416
raise OrphaningForbidden('never')
1419
orphaning_registry = registry.Registry()
1420
orphaning_registry.register(
1421
'conflict', refuse_orphan,
1422
'Leave orphans in place and create a conflict on the directory.')
1423
orphaning_registry.register(
1424
'move', move_orphan,
1425
'Move orphans into the bzr-orphans directory.')
1426
orphaning_registry._set_default_key('conflict')
1429
1278
class TreeTransform(DiskTreeTransform):
1430
1279
"""Represent a tree transformation.
1548
1397
def tree_kind(self, trans_id):
1549
1398
"""Determine the file kind in the working tree.
1551
:returns: The file kind or None if the file does not exist
1400
Raises NoSuchFile if the file does not exist
1553
1402
path = self._tree_id_paths.get(trans_id)
1554
1403
if path is None:
1404
raise NoSuchFile(None)
1557
1406
return file_kind(self._tree.abspath(path))
1558
except errors.NoSuchFile:
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1561
1413
def _set_mode(self, trans_id, mode_id, typefunc):
1562
1414
"""Set the mode of new file contents.
2450
2298
precomputed_delta = []
2452
2300
precomputed_delta = None
2453
# Check if tree inventory has content. If so, we populate
2454
# existing_files with the directory content. If there are no
2455
# entries we skip populating existing_files as its not used.
2456
# This improves performance and unncessary work on large
2457
# directory trees. (#501307)
2459
existing_files = set()
2460
for dir, files in wt.walkdirs():
2461
existing_files.update(f[0] for f in files)
2462
2301
for num, (tree_path, entry) in \
2463
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2464
2303
pb.update("Building tree", num - len(deferred_contents), total)
2584
2423
for child in tt.iter_tree_children(old_parent):
2585
2424
tt.adjust_path(tt.final_name(child), new_parent, child)
2588
2426
def _reparent_transform_children(tt, old_parent, new_parent):
2589
2427
by_parent = tt.by_parent()
2590
2428
for child in by_parent[old_parent]:
2591
2429
tt.adjust_path(tt.final_name(child), new_parent, child)
2592
2430
return by_parent[old_parent]
2595
2432
def _content_match(tree, entry, file_id, kind, target_path):
2596
2433
if entry.kind != kind:
2598
2435
if entry.kind == "directory":
2600
2437
if entry.kind == "file":
2601
f = file(target_path, 'rb')
2603
if tree.get_file_text(file_id) == f.read():
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2607
2440
elif entry.kind == "symlink":
2608
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2661
2494
raise errors.BadFileKindError(name, kind)
2497
@deprecated_function(deprecated_in((1, 9, 0)))
2498
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
"""Create new file contents according to an inventory entry.
2501
DEPRECATED. Use create_from_tree instead.
2503
if entry.kind == "file":
2505
lines = tree.get_file(entry.file_id).readlines()
2506
tt.create_file(lines, trans_id, mode_id=mode_id)
2507
elif entry.kind == "symlink":
2508
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2509
elif entry.kind == "directory":
2510
tt.create_directory(trans_id)
2664
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2665
2514
filter_tree_path=None):
2666
2515
"""Create new file contents according to tree contents.
2697
2546
tt.set_executability(entry.executable, trans_id)
2700
@deprecated_function(deprecated_in((2, 3, 0)))
2701
2549
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2702
2550
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2705
@deprecated_function(deprecated_in((2, 3, 0)))
2706
2553
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2707
2554
"""Produce a backup-style name that appears to be available"""
2708
2555
def name_gen():
2829
2676
tt.delete_contents(trans_id)
2830
2677
elif kind[1] is not None:
2831
2678
parent_trans_id = tt.trans_id_file_id(parent[0])
2832
backup_name = tt._available_backup_name(
2833
name[0], parent_trans_id)
2679
by_parent = tt.by_parent()
2680
backup_name = _get_backup_name(name[0], by_parent,
2681
parent_trans_id, tt)
2834
2682
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2835
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2836
2684
if versioned == (True, True):
2960
2808
elif c_type == 'missing parent':
2961
2809
trans_id = conflict[1]
2962
if trans_id in tt._removed_contents:
2963
cancel_deletion = True
2964
orphans = tt._get_potential_orphans(trans_id)
2966
cancel_deletion = False
2967
# All children are orphans
2970
tt.new_orphan(o, trans_id)
2971
except OrphaningError:
2972
# Something bad happened so we cancel the directory
2973
# deletion which will leave it in place with a
2974
# conflict. The user can deal with it from there.
2975
# Note that this also catch the case where we don't
2976
# want to create orphans and leave the directory in
2978
cancel_deletion = True
2981
# Cancel the directory deletion
2982
tt.cancel_deletion(trans_id)
2983
new_conflicts.add(('deleting parent', 'Not deleting',
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
2988
2817
tt.final_name(trans_id)
3071
2900
def rename(self, from_, to):
3072
2901
"""Rename a file from one path to another."""
3074
os.rename(from_, to)
2903
osutils.rename(from_, to)
3075
2904
except OSError, e:
3076
2905
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3077
2906
raise errors.FileExists(to, str(e))
3078
# normal OSError doesn't include filenames so it's hard to see where
3079
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3080
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
3081
2908
self.past_renames.append((from_, to))
3083
2910
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
