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"""
780
788
self.create_symlink(target, trans_id)
791
def new_orphan(self, trans_id, parent_id):
792
"""Schedule an item to be orphaned.
794
When a directory is about to be removed, its children, if they are not
795
versioned are moved out of the way: they don't have a parent anymore.
797
:param trans_id: The trans_id of the existing item.
798
:param parent_id: The parent trans_id of the item.
800
raise NotImplementedError(self.new_orphan)
802
def _get_potential_orphans(self, dir_id):
803
"""Find the potential orphans in a directory.
805
A directory can't be safely deleted if there are versioned files in it.
806
If all the contained files are unversioned then they can be orphaned.
808
The 'None' return value means that the directory contains at least one
809
versioned file and should not be deleted.
811
:param dir_id: The directory trans id.
813
:return: A list of the orphan trans ids or None if at least one
814
versioned file is present.
817
# Find the potential orphans, stop if one item should be kept
818
for c in self.by_parent()[dir_id]:
819
if self.final_file_id(c) is None:
822
# We have a versioned file here, searching for orphans is
783
828
def _affected_ids(self):
784
829
"""Return the set of transform ids affected by the transform"""
785
830
trans_ids = set(self._removed_id)
928
970
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
972
def commit(self, branch, message, merge_parents=None, strict=False,
973
timestamp=None, timezone=None, committer=None, authors=None,
974
revprops=None, revision_id=None):
931
975
"""Commit the result of this TreeTransform to a branch.
933
977
:param branch: The branch to commit to.
934
978
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
979
:param merge_parents: Additional parent revision-ids specified by
981
:param strict: If True, abort the commit if there are unversioned
983
:param timestamp: if not None, seconds-since-epoch for the time and
984
date. (May be a float.)
985
:param timezone: Optional timezone for timestamp, as an offset in
987
:param committer: Optional committer in email-id format.
988
(e.g. "J Random Hacker <jrandom@example.com>")
989
:param authors: Optional list of authors in email-id format.
990
:param revprops: Optional dictionary of revision properties.
991
:param revision_id: Optional revision id. (Specifying a revision-id
992
may reduce performance for some non-native formats.)
936
993
:return: The revision_id of the revision committed.
938
995
self._check_malformed()
1274
1337
del self._limbo_children_names[trans_id]
1275
1338
delete_any(self._limbo_name(trans_id))
1340
def new_orphan(self, trans_id, parent_id):
1341
# FIXME: There is no tree config, so we use the branch one (it's weird
1342
# to define it this way as orphaning can only occur in a working tree,
1343
# but that's all we have (for now). It will find the option in
1344
# locations,conf or bazaar.conf though) -- vila 20100916
1345
conf = self._tree.branch.get_config()
1346
conf_var_name = 'bzrlib.transform.orphan_policy'
1347
orphan_policy = conf.get_user_option(conf_var_name)
1348
default_policy = orphaning_registry.default_key
1349
if orphan_policy is None:
1350
orphan_policy = default_policy
1351
if orphan_policy not in orphaning_registry:
1352
trace.warning('%s (from %s) is not a known policy, defaulting to %s'
1353
% (orphan_policy, conf_var_name, default_policy))
1354
orphan_policy = default_policy
1355
handle_orphan = orphaning_registry.get(orphan_policy)
1356
handle_orphan(self, trans_id, parent_id)
1359
class OrphaningError(errors.BzrError):
1361
# Only bugs could lead to such exception being seen by the user
1362
internal_error = True
1363
_fmt = "Error while orphaning %s in %s directory"
1365
def __init__(self, orphan, parent):
1366
errors.BzrError.__init__(self)
1367
self.orphan = orphan
1368
self.parent = parent
1371
class OrphaningForbidden(OrphaningError):
1373
_fmt = "Policy: %s doesn't allow creating orphans."
1375
def __init__(self, policy):
1376
errors.BzrError.__init__(self)
1377
self.policy = policy
1380
def move_orphan(tt, orphan_id, parent_id):
1381
"""See TreeTransformBase.new_orphan.
1383
This creates a new orphan in the `bzr-orphans` dir at the root of the
1386
:param tt: The TreeTransform orphaning `trans_id`.
1388
:param orphan_id: The trans id that should be orphaned.
1390
:param parent_id: The orphan parent trans id.
1392
# Add the orphan dir if it doesn't exist
1393
orphan_dir_basename = 'bzr-orphans'
1394
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1395
if tt.final_kind(od_id) is None:
1396
tt.create_directory(od_id)
1397
parent_path = tt._tree_id_paths[parent_id]
1398
# Find a name that doesn't exist yet in the orphan dir
1399
actual_name = tt.final_name(orphan_id)
1400
new_name = tt._available_backup_name(actual_name, od_id)
1401
tt.adjust_path(new_name, od_id, orphan_id)
1402
trace.warning('%s has been orphaned in %s'
1403
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1406
def refuse_orphan(tt, orphan_id, parent_id):
1407
"""See TreeTransformBase.new_orphan.
1409
This refuses to create orphan, letting caller handle the conflict.
1411
raise OrphaningForbidden('never')
1414
orphaning_registry = registry.Registry()
1415
orphaning_registry.register('conflict', refuse_orphan,
1416
'Never create orphans.')
1417
orphaning_registry.register('move', move_orphan,
1418
'Move orphans into the bzr-orphans directory.')
1419
orphaning_registry._set_default_key('conflict')
1278
1422
class TreeTransform(DiskTreeTransform):
1279
1423
"""Represent a tree transformation.
1397
1541
def tree_kind(self, trans_id):
1398
1542
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1544
:returns: The file kind or None if the file does not exist
1402
1546
path = self._tree_id_paths.get(trans_id)
1403
1547
if path is None:
1404
raise NoSuchFile(None)
1406
1550
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1551
except errors.NoSuchFile:
1413
1554
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1555
"""Set the mode of new file contents.
2298
2443
precomputed_delta = []
2300
2445
precomputed_delta = None
2446
# Check if tree inventory has content. If so, we populate
2447
# existing_files with the directory content. If there are no
2448
# entries we skip populating existing_files as its not used.
2449
# This improves performance and unncessary work on large
2450
# directory trees. (#501307)
2452
existing_files = set()
2453
for dir, files in wt.walkdirs():
2454
existing_files.update(f[0] for f in files)
2301
2455
for num, (tree_path, entry) in \
2302
2456
enumerate(tree.inventory.iter_entries_by_dir()):
2303
2457
pb.update("Building tree", num - len(deferred_contents), total)
2423
2577
for child in tt.iter_tree_children(old_parent):
2424
2578
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2581
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2582
by_parent = tt.by_parent()
2428
2583
for child in by_parent[old_parent]:
2429
2584
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2585
return by_parent[old_parent]
2432
2588
def _content_match(tree, entry, file_id, kind, target_path):
2433
2589
if entry.kind != kind:
2435
2591
if entry.kind == "directory":
2437
2593
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2594
f = file(target_path, 'rb')
2596
if tree.get_file_text(file_id) == f.read():
2440
2600
elif entry.kind == "symlink":
2441
2601
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2654
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)
2513
2657
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2658
filter_tree_path=None):
2515
2659
"""Create new file contents according to tree contents.
2546
2690
tt.set_executability(entry.executable, trans_id)
2693
@deprecated_function(deprecated_in((2, 3, 0)))
2549
2694
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
2695
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2698
@deprecated_function(deprecated_in((2, 3, 0)))
2553
2699
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
2700
"""Produce a backup-style name that appears to be available"""
2555
2701
def name_gen():
2676
2822
tt.delete_contents(trans_id)
2677
2823
elif kind[1] is not None:
2678
2824
parent_trans_id = tt.trans_id_file_id(parent[0])
2679
by_parent = tt.by_parent()
2680
backup_name = _get_backup_name(name[0], by_parent,
2681
parent_trans_id, tt)
2825
backup_name = tt._available_backup_name(name[0],
2682
2827
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2683
2828
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
2829
if versioned == (True, True):
2808
2953
elif c_type == 'missing parent':
2809
2954
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
2955
if trans_id in tt._removed_contents:
2956
cancel_deletion = True
2957
orphans = tt._get_potential_orphans(trans_id)
2959
cancel_deletion = False
2960
# All children are orphans
2963
tt.new_orphan(o, trans_id)
2964
except OrphaningError:
2965
# Something bad happened so we cancel the directory
2966
# deletion which will leave it in place with a
2967
# conflict. The user can deal with it from there.
2968
# Note that this also catch the case where we don't
2969
# want to create orphans and leave the directory in
2971
cancel_deletion = True
2974
# Cancel the directory deletion
2975
tt.cancel_deletion(trans_id)
2976
new_conflicts.add(('deleting parent', 'Not deleting',
2817
2981
tt.final_name(trans_id)
2900
3064
def rename(self, from_, to):
2901
3065
"""Rename a file from one path to another."""
2903
osutils.rename(from_, to)
3067
os.rename(from_, to)
2904
3068
except OSError, e:
2905
3069
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3070
raise errors.FileExists(to, str(e))
3071
# normal OSError doesn't include filenames so it's hard to see where
3072
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3073
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
3074
self.past_renames.append((from_, to))
2910
3076
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
