388
394
changed_kind = set(self._removed_contents)
389
395
changed_kind.intersection_update(self._new_contents)
390
396
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
397
changed_kind = (t for t in changed_kind
398
if self.tree_kind(t) != self.final_kind(t))
393
399
new_ids.update(changed_kind)
394
400
return sorted(FinalPaths(self).get_paths(new_ids))
396
402
def final_kind(self, trans_id):
397
403
"""Determine the final file kind, after any changes applied.
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)
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)
403
409
if trans_id in self._new_contents:
404
410
return self._new_contents[trans_id]
405
411
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
414
return self.tree_kind(trans_id)
531
537
# ensure that all children are registered with the transaction
532
538
list(self.iter_tree_children(parent_id))
540
@deprecated_method(deprecated_in((2, 3, 0)))
534
541
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
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:
540
559
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
561
parent_path = self._tree_id_paths.get(parent_id, None)
562
if parent_path is None:
563
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
565
child_path = joinpath(parent_path, name)
566
child_id = self._tree_path_ids.get(child_path, None)
548
567
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
568
# Not known by the tree transform yet, check the filesystem
569
return osutils.lexists(self._tree.abspath(child_path))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
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))
559
588
def _parent_loops(self):
560
589
"""No entry should be its own ancestor"""
644
666
if (self._new_name, self._new_parent) == ({}, {}):
646
668
for children in by_parent.itervalues():
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]
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))
652
679
last_trans_id = None
653
680
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
681
kind = self.final_kind(trans_id)
658
682
file_id = self.final_file_id(trans_id)
659
683
if kind is None and file_id is None:
681
705
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
706
"""Children must have a directory parent"""
684
708
for parent_id, children in by_parent.iteritems():
685
709
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
712
for child_id in children:
713
if self.final_kind(child_id) is not None:
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
718
# There is at least a child, so we need an existing directory to
720
kind = self.final_kind(parent_id)
722
# The directory will be deleted
699
723
conflicts.append(('missing parent', parent_id))
700
724
elif kind != "directory":
725
# Meh, we need a *directory* to put something in it
701
726
conflicts.append(('non-directory parent', parent_id))
704
def _any_contents(self, trans_ids):
705
"""Return true if any of the trans_ids, will have contents."""
706
for trans_id in trans_ids:
708
kind = self.final_kind(trans_id)
714
729
def _set_executability(self, path, trans_id):
715
730
"""Set the executability of versioned files """
716
731
if supports_executable():
780
795
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
783
840
def _affected_ids(self):
784
841
"""Return the set of transform ids affected by the transform"""
785
842
trans_ids = set(self._removed_id)
928
982
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
984
def commit(self, branch, message, merge_parents=None, strict=False,
985
timestamp=None, timezone=None, committer=None, authors=None,
986
revprops=None, revision_id=None):
931
987
"""Commit the result of this TreeTransform to a branch.
933
989
:param branch: The branch to commit to.
934
990
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
991
:param merge_parents: Additional parent revision-ids specified by
993
:param strict: If True, abort the commit if there are unversioned
995
:param timestamp: if not None, seconds-since-epoch for the time and
996
date. (May be a float.)
997
:param timezone: Optional timezone for timestamp, as an offset in
999
:param committer: Optional committer in email-id format.
1000
(e.g. "J Random Hacker <jrandom@example.com>")
1001
:param authors: Optional list of authors in email-id format.
1002
:param revprops: Optional dictionary of revision properties.
1003
:param revision_id: Optional revision id. (Specifying a revision-id
1004
may reduce performance for some non-native formats.)
936
1005
:return: The revision_id of the revision committed.
938
1007
self._check_malformed()
1274
1349
del self._limbo_children_names[trans_id]
1275
1350
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')
1278
1436
class TreeTransform(DiskTreeTransform):
1279
1437
"""Represent a tree transformation.
1397
1555
def tree_kind(self, trans_id):
1398
1556
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1558
:returns: The file kind or None if the file does not exist
1402
1560
path = self._tree_id_paths.get(trans_id)
1403
1561
if path is None:
1404
raise NoSuchFile(None)
1406
1564
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1565
except errors.NoSuchFile:
1413
1568
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1569
"""Set the mode of new file contents.
2301
2457
precomputed_delta = []
2303
2459
precomputed_delta = None
2460
# Check if tree inventory has content. If so, we populate
2461
# existing_files with the directory content. If there are no
2462
# entries we skip populating existing_files as its not used.
2463
# This improves performance and unncessary work on large
2464
# directory trees. (#501307)
2466
existing_files = set()
2467
for dir, files in wt.walkdirs():
2468
existing_files.update(f[0] for f in files)
2304
2469
for num, (tree_path, entry) in \
2305
2470
enumerate(tree.inventory.iter_entries_by_dir()):
2306
2471
pb.update("Building tree", num - len(deferred_contents), total)
2426
2591
for child in tt.iter_tree_children(old_parent):
2427
2592
tt.adjust_path(tt.final_name(child), new_parent, child)
2429
2595
def _reparent_transform_children(tt, old_parent, new_parent):
2430
2596
by_parent = tt.by_parent()
2431
2597
for child in by_parent[old_parent]:
2432
2598
tt.adjust_path(tt.final_name(child), new_parent, child)
2433
2599
return by_parent[old_parent]
2435
2602
def _content_match(tree, entry, file_id, kind, target_path):
2436
2603
if entry.kind != kind:
2438
2605
if entry.kind == "directory":
2440
2607
if entry.kind == "file":
2441
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2608
f = file(target_path, 'rb')
2610
if tree.get_file_text(file_id) == f.read():
2443
2614
elif entry.kind == "symlink":
2444
2615
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2497
2668
raise errors.BadFileKindError(name, kind)
2500
@deprecated_function(deprecated_in((1, 9, 0)))
2501
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2502
"""Create new file contents according to an inventory entry.
2504
DEPRECATED. Use create_from_tree instead.
2506
if entry.kind == "file":
2508
lines = tree.get_file(entry.file_id).readlines()
2509
tt.create_file(lines, trans_id, mode_id=mode_id)
2510
elif entry.kind == "symlink":
2511
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2512
elif entry.kind == "directory":
2513
tt.create_directory(trans_id)
2516
2671
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2517
2672
filter_tree_path=None):
2518
2673
"""Create new file contents according to tree contents.
2549
2704
tt.set_executability(entry.executable, trans_id)
2707
@deprecated_function(deprecated_in((2, 3, 0)))
2552
2708
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2553
2709
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2712
@deprecated_function(deprecated_in((2, 3, 0)))
2556
2713
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2557
2714
"""Produce a backup-style name that appears to be available"""
2558
2715
def name_gen():
2679
2836
tt.delete_contents(trans_id)
2680
2837
elif kind[1] is not None:
2681
2838
parent_trans_id = tt.trans_id_file_id(parent[0])
2682
by_parent = tt.by_parent()
2683
backup_name = _get_backup_name(name[0], by_parent,
2684
parent_trans_id, tt)
2839
backup_name = tt._available_backup_name(
2840
name[0], parent_trans_id)
2685
2841
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2686
2842
new_trans_id = tt.create_path(name[0], parent_trans_id)
2687
2843
if versioned == (True, True):
2811
2967
elif c_type == 'missing parent':
2812
2968
trans_id = conflict[1]
2814
tt.cancel_deletion(trans_id)
2815
new_conflicts.add(('deleting parent', 'Not deleting',
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',
2820
2995
tt.final_name(trans_id)
2903
3078
def rename(self, from_, to):
2904
3079
"""Rename a file from one path to another."""
2906
osutils.rename(from_, to)
3081
os.rename(from_, to)
2907
3082
except OSError, e:
2908
3083
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2909
3084
raise errors.FileExists(to, str(e))
3085
# normal OSError doesn't include filenames so it's hard to see where
3086
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3087
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2911
3088
self.past_renames.append((from_, to))
2913
3090
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
