51
58
supports_executable,
53
60
from bzrlib.progress import ProgressPhase
54
61
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
66
from bzrlib.trace import warning
61
68
import bzrlib.urlutils as urlutils
64
71
ROOT_PARENT = "root-parent"
67
73
def unique_add(map, key, value):
69
75
raise DuplicateKey(key=key)
73
80
class _TransformResults(object):
74
81
def __init__(self, modified_paths, rename_count):
75
82
object.__init__(self)
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
539
# ensure that all children are registered with the transaction
532
540
list(self.iter_tree_children(parent_id))
542
@deprecated_method(deprecated_in((2, 3, 0)))
534
543
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
544
return self._has_named_child(
545
name, parent_id, known_children=by_parent.get(parent_id, []))
547
def _has_named_child(self, name, parent_id, known_children):
548
"""Does a parent already have a name child.
550
:param name: The searched for name.
552
:param parent_id: The parent for which the check is made.
554
:param known_children: The already known children. This should have
555
been recently obtained from `self.by_parent.get(parent_id)`
556
(or will be if None is passed).
558
if known_children is None:
559
known_children = self.by_parent().get(parent_id, [])
560
for child in known_children:
540
561
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
563
parent_path = self._tree_id_paths.get(parent_id, None)
564
if parent_path is None:
565
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
567
child_path = joinpath(parent_path, name)
568
child_id = self._tree_path_ids.get(child_path, None)
548
569
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
570
# Not known by the tree transform yet, check the filesystem
571
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?
573
raise AssertionError('child_id is missing: %s, %s, %s'
574
% (name, parent_id, child_id))
576
def _available_backup_name(self, name, target_id):
577
"""Find an available backup name.
579
:param name: The basename of the file.
581
:param target_id: The directory trans_id where the backup should
584
known_children = self.by_parent().get(target_id, [])
585
return osutils.available_backup_name(
587
lambda base: self._has_named_child(
588
base, target_id, known_children))
559
590
def _parent_loops(self):
560
591
"""No entry should be its own ancestor"""
644
668
if (self._new_name, self._new_parent) == ({}, {}):
646
670
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]
672
for child_tid in children:
673
name = self.final_name(child_tid)
675
# Keep children only if they still exist in the end
676
if not self._case_sensitive_target:
678
name_ids.append((name, child_tid))
652
681
last_trans_id = None
653
682
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
683
kind = self.final_kind(trans_id)
658
684
file_id = self.final_file_id(trans_id)
659
685
if kind is None and file_id is None:
681
707
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
708
"""Children must have a directory parent"""
684
710
for parent_id, children in by_parent.iteritems():
685
711
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
714
for child_id in children:
715
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)
720
# There is at least a child, so we need an existing directory to
722
kind = self.final_kind(parent_id)
724
# The directory will be deleted
699
725
conflicts.append(('missing parent', parent_id))
700
726
elif kind != "directory":
727
# Meh, we need a *directory* to put something in it
701
728
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
731
def _set_executability(self, path, trans_id):
715
732
"""Set the executability of versioned files """
716
733
if supports_executable():
780
797
self.create_symlink(target, trans_id)
800
def new_orphan(self, trans_id, parent_id):
801
"""Schedule an item to be orphaned.
803
When a directory is about to be removed, its children, if they are not
804
versioned are moved out of the way: they don't have a parent anymore.
806
:param trans_id: The trans_id of the existing item.
807
:param parent_id: The parent trans_id of the item.
809
raise NotImplementedError(self.new_orphan)
811
def _get_potential_orphans(self, dir_id):
812
"""Find the potential orphans in a directory.
814
A directory can't be safely deleted if there are versioned files in it.
815
If all the contained files are unversioned then they can be orphaned.
817
The 'None' return value means that the directory contains at least one
818
versioned file and should not be deleted.
820
:param dir_id: The directory trans id.
822
:return: A list of the orphan trans ids or None if at least one
823
versioned file is present.
826
# Find the potential orphans, stop if one item should be kept
827
for child_tid in self.by_parent()[dir_id]:
828
if child_tid in self._removed_contents:
829
# The child is removed as part of the transform. Since it was
830
# versioned before, it's not an orphan
832
elif self.final_file_id(child_tid) is None:
833
# The child is not versioned
834
orphans.append(child_tid)
836
# We have a versioned file here, searching for orphans is
783
842
def _affected_ids(self):
784
843
"""Return the set of transform ids affected by the transform"""
785
844
trans_ids = set(self._removed_id)
928
984
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
986
def commit(self, branch, message, merge_parents=None, strict=False,
987
timestamp=None, timezone=None, committer=None, authors=None,
988
revprops=None, revision_id=None):
931
989
"""Commit the result of this TreeTransform to a branch.
933
991
:param branch: The branch to commit to.
934
992
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
993
:param merge_parents: Additional parent revision-ids specified by
995
:param strict: If True, abort the commit if there are unversioned
997
:param timestamp: if not None, seconds-since-epoch for the time and
998
date. (May be a float.)
999
:param timezone: Optional timezone for timestamp, as an offset in
1001
:param committer: Optional committer in email-id format.
1002
(e.g. "J Random Hacker <jrandom@example.com>")
1003
:param authors: Optional list of authors in email-id format.
1004
:param revprops: Optional dictionary of revision properties.
1005
:param revision_id: Optional revision id. (Specifying a revision-id
1006
may reduce performance for some non-native formats.)
936
1007
:return: The revision_id of the revision committed.
938
1009
self._check_malformed()
1274
1351
del self._limbo_children_names[trans_id]
1275
1352
delete_any(self._limbo_name(trans_id))
1354
def new_orphan(self, trans_id, parent_id):
1355
# FIXME: There is no tree config, so we use the branch one (it's weird
1356
# to define it this way as orphaning can only occur in a working tree,
1357
# but that's all we have (for now). It will find the option in
1358
# locations.conf or bazaar.conf though) -- vila 20100916
1359
conf = self._tree.branch.get_config()
1360
conf_var_name = 'bzr.transform.orphan_policy'
1361
orphan_policy = conf.get_user_option(conf_var_name)
1362
default_policy = orphaning_registry.default_key
1363
if orphan_policy is None:
1364
orphan_policy = default_policy
1365
if orphan_policy not in orphaning_registry:
1366
trace.warning('%s (from %s) is not a known policy, defaulting to %s'
1367
% (orphan_policy, conf_var_name, default_policy))
1368
orphan_policy = default_policy
1369
handle_orphan = orphaning_registry.get(orphan_policy)
1370
handle_orphan(self, trans_id, parent_id)
1373
class OrphaningError(errors.BzrError):
1375
# Only bugs could lead to such exception being seen by the user
1376
internal_error = True
1377
_fmt = "Error while orphaning %s in %s directory"
1379
def __init__(self, orphan, parent):
1380
errors.BzrError.__init__(self)
1381
self.orphan = orphan
1382
self.parent = parent
1385
class OrphaningForbidden(OrphaningError):
1387
_fmt = "Policy: %s doesn't allow creating orphans."
1389
def __init__(self, policy):
1390
errors.BzrError.__init__(self)
1391
self.policy = policy
1394
def move_orphan(tt, orphan_id, parent_id):
1395
"""See TreeTransformBase.new_orphan.
1397
This creates a new orphan in the `bzr-orphans` dir at the root of the
1400
:param tt: The TreeTransform orphaning `trans_id`.
1402
:param orphan_id: The trans id that should be orphaned.
1404
:param parent_id: The orphan parent trans id.
1406
# Add the orphan dir if it doesn't exist
1407
orphan_dir_basename = 'bzr-orphans'
1408
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1409
if tt.final_kind(od_id) is None:
1410
tt.create_directory(od_id)
1411
parent_path = tt._tree_id_paths[parent_id]
1412
# Find a name that doesn't exist yet in the orphan dir
1413
actual_name = tt.final_name(orphan_id)
1414
new_name = tt._available_backup_name(actual_name, od_id)
1415
tt.adjust_path(new_name, od_id, orphan_id)
1416
trace.warning('%s has been orphaned in %s'
1417
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1420
def refuse_orphan(tt, orphan_id, parent_id):
1421
"""See TreeTransformBase.new_orphan.
1423
This refuses to create orphan, letting the caller handle the conflict.
1425
raise OrphaningForbidden('never')
1428
orphaning_registry = registry.Registry()
1429
orphaning_registry.register(
1430
'conflict', refuse_orphan,
1431
'Leave orphans in place and create a conflict on the directory.')
1432
orphaning_registry.register(
1433
'move', move_orphan,
1434
'Move orphans into the bzr-orphans directory.')
1435
orphaning_registry._set_default_key('conflict')
1278
1438
class TreeTransform(DiskTreeTransform):
1279
1439
"""Represent a tree transformation.
1397
1557
def tree_kind(self, trans_id):
1398
1558
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1560
:returns: The file kind or None if the file does not exist
1402
1562
path = self._tree_id_paths.get(trans_id)
1403
1563
if path is None:
1404
raise NoSuchFile(None)
1406
1566
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1567
except errors.NoSuchFile:
1413
1570
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1571
"""Set the mode of new file contents.
2301
2459
precomputed_delta = []
2303
2461
precomputed_delta = None
2462
# Check if tree inventory has content. If so, we populate
2463
# existing_files with the directory content. If there are no
2464
# entries we skip populating existing_files as its not used.
2465
# This improves performance and unncessary work on large
2466
# directory trees. (#501307)
2468
existing_files = set()
2469
for dir, files in wt.walkdirs():
2470
existing_files.update(f[0] for f in files)
2304
2471
for num, (tree_path, entry) in \
2305
2472
enumerate(tree.inventory.iter_entries_by_dir()):
2306
2473
pb.update("Building tree", num - len(deferred_contents), total)
2426
2593
for child in tt.iter_tree_children(old_parent):
2427
2594
tt.adjust_path(tt.final_name(child), new_parent, child)
2429
2597
def _reparent_transform_children(tt, old_parent, new_parent):
2430
2598
by_parent = tt.by_parent()
2431
2599
for child in by_parent[old_parent]:
2432
2600
tt.adjust_path(tt.final_name(child), new_parent, child)
2433
2601
return by_parent[old_parent]
2435
2604
def _content_match(tree, entry, file_id, kind, target_path):
2436
2605
if entry.kind != kind:
2438
2607
if entry.kind == "directory":
2440
2609
if entry.kind == "file":
2441
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2610
f = file(target_path, 'rb')
2612
if tree.get_file_text(file_id) == f.read():
2443
2616
elif entry.kind == "symlink":
2444
2617
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2497
2670
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
2673
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2517
2674
filter_tree_path=None):
2518
2675
"""Create new file contents according to tree contents.
2549
2706
tt.set_executability(entry.executable, trans_id)
2709
@deprecated_function(deprecated_in((2, 3, 0)))
2552
2710
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2553
2711
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2714
@deprecated_function(deprecated_in((2, 3, 0)))
2556
2715
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2557
2716
"""Produce a backup-style name that appears to be available"""
2558
2717
def name_gen():
2679
2838
tt.delete_contents(trans_id)
2680
2839
elif kind[1] is not None:
2681
2840
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)
2841
backup_name = tt._available_backup_name(
2842
name[0], parent_trans_id)
2685
2843
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2686
2844
new_trans_id = tt.create_path(name[0], parent_trans_id)
2687
2845
if versioned == (True, True):
2811
2969
elif c_type == 'missing parent':
2812
2970
trans_id = conflict[1]
2814
tt.cancel_deletion(trans_id)
2815
new_conflicts.add(('deleting parent', 'Not deleting',
2971
if trans_id in tt._removed_contents:
2972
cancel_deletion = True
2973
orphans = tt._get_potential_orphans(trans_id)
2975
cancel_deletion = False
2976
# All children are orphans
2979
tt.new_orphan(o, trans_id)
2980
except OrphaningError:
2981
# Something bad happened so we cancel the directory
2982
# deletion which will leave it in place with a
2983
# conflict. The user can deal with it from there.
2984
# Note that this also catch the case where we don't
2985
# want to create orphans and leave the directory in
2987
cancel_deletion = True
2990
# Cancel the directory deletion
2991
tt.cancel_deletion(trans_id)
2992
new_conflicts.add(('deleting parent', 'Not deleting',
2820
2997
tt.final_name(trans_id)
2903
3081
def rename(self, from_, to):
2904
3082
"""Rename a file from one path to another."""
2906
osutils.rename(from_, to)
3084
os.rename(from_, to)
2907
3085
except OSError, e:
2908
3086
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2909
3087
raise errors.FileExists(to, str(e))
3088
# normal OSError doesn't include filenames so it's hard to see where
3089
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3090
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2911
3091
self.past_renames.append((from_, to))
2913
3093
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
