39
48
ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
49
UnableCreateSymlink)
41
50
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
51
from bzrlib.osutils import (
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
61
import bzrlib.urlutils as urlutils
64
68
ROOT_PARENT = "root-parent"
67
70
def unique_add(map, key, value):
69
72
raise DuplicateKey(key=key)
73
77
class _TransformResults(object):
74
78
def __init__(self, modified_paths, rename_count):
75
79
object.__init__(self)
380
400
return sorted(FinalPaths(self).get_paths(new_ids))
382
402
def _inventory_altered(self):
383
"""Get the trans_ids and paths of files needing new inv entries."""
385
for id_set in [self._new_name, self._new_parent, self._new_id,
403
"""Determine which trans_ids need new Inventory entries.
405
An new entry is needed when anything that would be reflected by an
406
inventory entry changes, including file name, file_id, parent file_id,
407
file kind, and the execute bit.
409
Some care is taken to return entries with real changes, not cases
410
where the value is deleted and then restored to its original value,
411
but some actually unchanged values may be returned.
413
:returns: A list of (path, trans_id) for all items requiring an
414
inventory change. Ordered by path.
417
# Find entries whose file_ids are new (or changed).
418
new_file_id = set(t for t in self._new_id
419
if self._new_id[t] != self.tree_file_id(t))
420
for id_set in [self._new_name, self._new_parent, new_file_id,
386
421
self._new_executability]:
387
new_ids.update(id_set)
422
changed_ids.update(id_set)
423
# removing implies a kind change
388
424
changed_kind = set(self._removed_contents)
389
426
changed_kind.intersection_update(self._new_contents)
390
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
393
new_ids.update(changed_kind)
394
return sorted(FinalPaths(self).get_paths(new_ids))
427
# Ignore entries that are already known to have changed.
428
changed_kind.difference_update(changed_ids)
429
# to keep only the truly changed ones
430
changed_kind = (t for t in changed_kind
431
if self.tree_kind(t) != self.final_kind(t))
432
# all kind changes will alter the inventory
433
changed_ids.update(changed_kind)
434
# To find entries with changed parent_ids, find parents which existed,
435
# but changed file_id.
436
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
437
# Now add all their children to the set.
438
for parent_trans_id in new_file_id:
439
changed_ids.update(self.iter_tree_children(parent_trans_id))
440
return sorted(FinalPaths(self).get_paths(changed_ids))
396
442
def final_kind(self, trans_id):
397
443
"""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)
445
:return: None if the file does not exist/has no contents. (It is
446
conceivable that a path would be created without the corresponding
447
contents insertion command)
403
449
if trans_id in self._new_contents:
404
450
return self._new_contents[trans_id]
405
451
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
454
return self.tree_kind(trans_id)
531
579
# ensure that all children are registered with the transaction
532
580
list(self.iter_tree_children(parent_id))
582
@deprecated_method(deprecated_in((2, 3, 0)))
534
583
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
584
return self._has_named_child(
585
name, parent_id, known_children=by_parent.get(parent_id, []))
587
def _has_named_child(self, name, parent_id, known_children):
588
"""Does a parent already have a name child.
590
:param name: The searched for name.
592
:param parent_id: The parent for which the check is made.
594
:param known_children: The already known children. This should have
595
been recently obtained from `self.by_parent.get(parent_id)`
596
(or will be if None is passed).
598
if known_children is None:
599
known_children = self.by_parent().get(parent_id, [])
600
for child in known_children:
540
601
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
603
parent_path = self._tree_id_paths.get(parent_id, None)
604
if parent_path is None:
605
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
607
child_path = joinpath(parent_path, name)
608
child_id = self._tree_path_ids.get(child_path, None)
548
609
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
610
# Not known by the tree transform yet, check the filesystem
611
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?
613
raise AssertionError('child_id is missing: %s, %s, %s'
614
% (name, parent_id, child_id))
616
def _available_backup_name(self, name, target_id):
617
"""Find an available backup name.
619
:param name: The basename of the file.
621
:param target_id: The directory trans_id where the backup should
624
known_children = self.by_parent().get(target_id, [])
625
return osutils.available_backup_name(
627
lambda base: self._has_named_child(
628
base, target_id, known_children))
559
630
def _parent_loops(self):
560
631
"""No entry should be its own ancestor"""
644
708
if (self._new_name, self._new_parent) == ({}, {}):
646
710
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]
712
for child_tid in children:
713
name = self.final_name(child_tid)
715
# Keep children only if they still exist in the end
716
if not self._case_sensitive_target:
718
name_ids.append((name, child_tid))
652
721
last_trans_id = None
653
722
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
723
kind = self.final_kind(trans_id)
658
724
file_id = self.final_file_id(trans_id)
659
725
if kind is None and file_id is None:
681
747
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
748
"""Children must have a directory parent"""
684
750
for parent_id, children in by_parent.iteritems():
685
751
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
754
for child_id in children:
755
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)
760
# There is at least a child, so we need an existing directory to
762
kind = self.final_kind(parent_id)
764
# The directory will be deleted
699
765
conflicts.append(('missing parent', parent_id))
700
766
elif kind != "directory":
767
# Meh, we need a *directory* to put something in it
701
768
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
771
def _set_executability(self, path, trans_id):
715
772
"""Set the executability of versioned files """
716
773
if supports_executable():
780
837
self.create_symlink(target, trans_id)
840
def new_orphan(self, trans_id, parent_id):
841
"""Schedule an item to be orphaned.
843
When a directory is about to be removed, its children, if they are not
844
versioned are moved out of the way: they don't have a parent anymore.
846
:param trans_id: The trans_id of the existing item.
847
:param parent_id: The parent trans_id of the item.
849
raise NotImplementedError(self.new_orphan)
851
def _get_potential_orphans(self, dir_id):
852
"""Find the potential orphans in a directory.
854
A directory can't be safely deleted if there are versioned files in it.
855
If all the contained files are unversioned then they can be orphaned.
857
The 'None' return value means that the directory contains at least one
858
versioned file and should not be deleted.
860
:param dir_id: The directory trans id.
862
:return: A list of the orphan trans ids or None if at least one
863
versioned file is present.
866
# Find the potential orphans, stop if one item should be kept
867
for child_tid in self.by_parent()[dir_id]:
868
if child_tid in self._removed_contents:
869
# The child is removed as part of the transform. Since it was
870
# versioned before, it's not an orphan
872
elif self.final_file_id(child_tid) is None:
873
# The child is not versioned
874
orphans.append(child_tid)
876
# We have a versioned file here, searching for orphans is
783
882
def _affected_ids(self):
784
883
"""Return the set of transform ids affected by the transform"""
785
884
trans_ids = set(self._removed_id)
928
1024
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1026
def commit(self, branch, message, merge_parents=None, strict=False,
1027
timestamp=None, timezone=None, committer=None, authors=None,
1028
revprops=None, revision_id=None):
931
1029
"""Commit the result of this TreeTransform to a branch.
933
1031
:param branch: The branch to commit to.
934
1032
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1033
:param merge_parents: Additional parent revision-ids specified by
1035
:param strict: If True, abort the commit if there are unversioned
1037
:param timestamp: if not None, seconds-since-epoch for the time and
1038
date. (May be a float.)
1039
:param timezone: Optional timezone for timestamp, as an offset in
1041
:param committer: Optional committer in email-id format.
1042
(e.g. "J Random Hacker <jrandom@example.com>")
1043
:param authors: Optional list of authors in email-id format.
1044
:param revprops: Optional dictionary of revision properties.
1045
:param revision_id: Optional revision id. (Specifying a revision-id
1046
may reduce performance for some non-native formats.)
936
1047
:return: The revision_id of the revision committed.
938
1049
self._check_malformed()
1173
1301
descendants.update(self._limbo_descendants(descendant))
1174
1302
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1304
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1305
"""Schedule creation of a new file.
1181
Contents is an iterator of strings, all of which will be written
1182
to the target destination.
1184
New file takes the permissions of any existing file with that id,
1185
unless mode_id is specified.
1309
:param contents: an iterator of strings, all of which will be written
1310
to the target destination.
1311
:param trans_id: TreeTransform handle
1312
:param mode_id: If not None, force the mode of the target file to match
1313
the mode of the object referenced by mode_id.
1314
Otherwise, we will try to preserve mode bits of an existing file.
1315
:param sha1: If the sha1 of this content is already known, pass it in.
1316
We can use it to prevent future sha1 computations.
1187
1318
name = self._limbo_name(trans_id)
1188
1319
f = open(name, 'wb')
1191
unique_add(self._new_contents, trans_id, 'file')
1193
# Clean up the file, it never got registered so
1194
# TreeTransform.finalize() won't clean it up.
1321
unique_add(self._new_contents, trans_id, 'file')
1199
1322
f.writelines(contents)
1202
1325
self._set_mtime(name)
1203
1326
self._set_mode(trans_id, mode_id, S_ISREG)
1327
# It is unfortunate we have to use lstat instead of fstat, but we just
1328
# used utime and chmod on the file, so we need the accurate final
1330
if sha1 is not None:
1331
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1333
def _read_file_chunks(self, trans_id):
1206
1334
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1404
del self._limbo_children_names[trans_id]
1275
1405
delete_any(self._limbo_name(trans_id))
1407
def new_orphan(self, trans_id, parent_id):
1408
# FIXME: There is no tree config, so we use the branch one (it's weird
1409
# to define it this way as orphaning can only occur in a working tree,
1410
# but that's all we have (for now). It will find the option in
1411
# locations.conf or bazaar.conf though) -- vila 20100916
1412
conf = self._tree.branch.get_config()
1413
conf_var_name = 'bzr.transform.orphan_policy'
1414
orphan_policy = conf.get_user_option(conf_var_name)
1415
default_policy = orphaning_registry.default_key
1416
if orphan_policy is None:
1417
orphan_policy = default_policy
1418
if orphan_policy not in orphaning_registry:
1419
trace.warning('%s (from %s) is not a known policy, defaulting '
1420
'to %s' % (orphan_policy, conf_var_name, default_policy))
1421
orphan_policy = default_policy
1422
handle_orphan = orphaning_registry.get(orphan_policy)
1423
handle_orphan(self, trans_id, parent_id)
1426
class OrphaningError(errors.BzrError):
1428
# Only bugs could lead to such exception being seen by the user
1429
internal_error = True
1430
_fmt = "Error while orphaning %s in %s directory"
1432
def __init__(self, orphan, parent):
1433
errors.BzrError.__init__(self)
1434
self.orphan = orphan
1435
self.parent = parent
1438
class OrphaningForbidden(OrphaningError):
1440
_fmt = "Policy: %s doesn't allow creating orphans."
1442
def __init__(self, policy):
1443
errors.BzrError.__init__(self)
1444
self.policy = policy
1447
def move_orphan(tt, orphan_id, parent_id):
1448
"""See TreeTransformBase.new_orphan.
1450
This creates a new orphan in the `bzr-orphans` dir at the root of the
1453
:param tt: The TreeTransform orphaning `trans_id`.
1455
:param orphan_id: The trans id that should be orphaned.
1457
:param parent_id: The orphan parent trans id.
1459
# Add the orphan dir if it doesn't exist
1460
orphan_dir_basename = 'bzr-orphans'
1461
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1462
if tt.final_kind(od_id) is None:
1463
tt.create_directory(od_id)
1464
parent_path = tt._tree_id_paths[parent_id]
1465
# Find a name that doesn't exist yet in the orphan dir
1466
actual_name = tt.final_name(orphan_id)
1467
new_name = tt._available_backup_name(actual_name, od_id)
1468
tt.adjust_path(new_name, od_id, orphan_id)
1469
trace.warning('%s has been orphaned in %s'
1470
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1473
def refuse_orphan(tt, orphan_id, parent_id):
1474
"""See TreeTransformBase.new_orphan.
1476
This refuses to create orphan, letting the caller handle the conflict.
1478
raise OrphaningForbidden('never')
1481
orphaning_registry = registry.Registry()
1482
orphaning_registry.register(
1483
'conflict', refuse_orphan,
1484
'Leave orphans in place and create a conflict on the directory.')
1485
orphaning_registry.register(
1486
'move', move_orphan,
1487
'Move orphans into the bzr-orphans directory.')
1488
orphaning_registry._set_default_key('conflict')
1278
1491
class TreeTransform(DiskTreeTransform):
1279
1492
"""Represent a tree transformation.
1666
1878
if trans_id in self._needs_rename:
1668
1880
mover.rename(self._limbo_name(trans_id), full_path)
1881
except errors.TransformRenameFailed, e:
1670
1882
# We may be renaming a dangling inventory id
1671
1883
if e.errno != errno.ENOENT:
1674
1886
self.rename_count += 1
1887
# TODO: if trans_id in self._observed_sha1s, we should
1888
# re-stat the final target, since ctime will be
1889
# updated by the change.
1675
1890
if (trans_id in self._new_contents or
1676
1891
self.path_changed(trans_id)):
1677
1892
if trans_id in self._new_contents:
1678
1893
modified_paths.append(full_path)
1679
1894
if trans_id in self._new_executability:
1680
1895
self._set_executability(path, trans_id)
1896
if trans_id in self._observed_sha1s:
1897
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1898
st = osutils.lstat(full_path)
1899
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1901
child_pb.finished()
1902
for path, trans_id in new_paths:
1903
# new_paths includes stuff like workingtree conflicts. Only the
1904
# stuff in new_contents actually comes from limbo.
1905
if trans_id in self._limbo_files:
1906
del self._limbo_files[trans_id]
1683
1907
self._new_contents.clear()
1684
1908
return modified_paths
1910
def _apply_observed_sha1s(self):
1911
"""After we have finished renaming everything, update observed sha1s
1913
This has to be done after self._tree.apply_inventory_delta, otherwise
1914
it doesn't know anything about the files we are updating. Also, we want
1915
to do this as late as possible, so that most entries end up cached.
1917
# TODO: this doesn't update the stat information for directories. So
1918
# the first 'bzr status' will still need to rewrite
1919
# .bzr/checkout/dirstate. However, we at least don't need to
1920
# re-read all of the files.
1921
# TODO: If the operation took a while, we could do a time.sleep(3) here
1922
# to allow the clock to tick over and ensure we won't have any
1923
# problems. (we could observe start time, and finish time, and if
1924
# it is less than eg 10% overhead, add a sleep call.)
1925
paths = FinalPaths(self)
1926
for trans_id, observed in self._observed_sha1s.iteritems():
1927
path = paths.get_path(trans_id)
1928
# We could get the file_id, but dirstate prefers to use the path
1929
# anyway, and it is 'cheaper' to determine.
1930
# file_id = self._new_id[trans_id]
1931
self._tree._observed_sha1(None, path, observed)
1687
1934
class TransformPreview(DiskTreeTransform):
1688
1935
"""A TreeTransform for generating preview trees.
1767
2019
yield self._get_repository().revision_tree(revision_id)
1769
2021
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2022
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2023
self._iter_parent_trees()]
1772
2024
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2025
self.get_file_lines(file_id))
1774
2026
repo = self._get_repository()
1775
2027
base_vf = repo.texts
1776
2028
if base_vf not in vf.fallback_versionedfiles:
1777
2029
vf.fallback_versionedfiles.append(base_vf)
1778
2030
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2032
def _stat_limbo_file(self, file_id=None, trans_id=None):
2033
if trans_id is None:
2034
trans_id = self._transform.trans_id_file_id(file_id)
1782
2035
name = self._transform._limbo_name(trans_id)
1783
2036
return os.lstat(name)
2414
2688
offset += count
2415
for count, ((trans_id, tree_path), contents) in enumerate(
2689
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2416
2690
tree.iter_files_bytes(new_desired_files)):
2417
2691
if wt.supports_content_filtering():
2418
2692
filters = wt._content_filter_stack(tree_path)
2419
2693
contents = filtered_output_bytes(contents, filters,
2420
2694
ContentFilterContext(tree_path, tree))
2421
tt.create_file(contents, trans_id)
2695
tt.create_file(contents, trans_id, sha1=text_sha1)
2422
2696
pb.update('Adding file contents', count + offset, total)
2426
2700
for child in tt.iter_tree_children(old_parent):
2427
2701
tt.adjust_path(tt.final_name(child), new_parent, child)
2429
2704
def _reparent_transform_children(tt, old_parent, new_parent):
2430
2705
by_parent = tt.by_parent()
2431
2706
for child in by_parent[old_parent]:
2432
2707
tt.adjust_path(tt.final_name(child), new_parent, child)
2433
2708
return by_parent[old_parent]
2435
2711
def _content_match(tree, entry, file_id, kind, target_path):
2436
2712
if entry.kind != kind:
2438
2714
if entry.kind == "directory":
2440
2716
if entry.kind == "file":
2441
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2717
f = file(target_path, 'rb')
2719
if tree.get_file_text(file_id) == f.read():
2443
2723
elif entry.kind == "symlink":
2444
2724
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2497
2777
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
2780
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2517
2781
filter_tree_path=None):
2518
2782
"""Create new file contents according to tree contents.
2654
2924
deferred_files = []
2655
2925
for id_num, (file_id, path, changed_content, versioned, parent, name,
2656
2926
kind, executable) in enumerate(change_list):
2657
if skip_root and file_id[0] is not None and parent[0] is None:
2927
target_path, wt_path = path
2928
target_versioned, wt_versioned = versioned
2929
target_parent, wt_parent = parent
2930
target_name, wt_name = name
2931
target_kind, wt_kind = kind
2932
target_executable, wt_executable = executable
2933
if skip_root and wt_parent is None:
2659
2935
trans_id = tt.trans_id_file_id(file_id)
2661
2937
if changed_content:
2662
2938
keep_content = False
2663
if kind[0] == 'file' and (backups or kind[1] is None):
2939
if wt_kind == 'file' and (backups or target_kind is None):
2664
2940
wt_sha1 = working_tree.get_file_sha1(file_id)
2665
2941
if merge_modified.get(file_id) != wt_sha1:
2666
2942
# acquire the basis tree lazily to prevent the
2669
2945
if basis_tree is None:
2670
2946
basis_tree = working_tree.basis_tree()
2671
2947
basis_tree.lock_read()
2672
if file_id in basis_tree:
2948
if basis_tree.has_id(file_id):
2673
2949
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2674
2950
keep_content = True
2675
elif kind[1] is None and not versioned[1]:
2951
elif target_kind is None and not target_versioned:
2676
2952
keep_content = True
2677
if kind[0] is not None:
2953
if wt_kind is not None:
2678
2954
if not keep_content:
2679
2955
tt.delete_contents(trans_id)
2680
elif kind[1] is not None:
2681
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)
2956
elif target_kind is not None:
2957
parent_trans_id = tt.trans_id_file_id(wt_parent)
2958
backup_name = tt._available_backup_name(
2959
wt_name, parent_trans_id)
2685
2960
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2686
new_trans_id = tt.create_path(name[0], parent_trans_id)
2687
if versioned == (True, True):
2961
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2962
if wt_versioned and target_versioned:
2688
2963
tt.unversion_file(trans_id)
2689
2964
tt.version_file(file_id, new_trans_id)
2690
2965
# New contents should have the same unix perms as old
2692
2967
mode_id = trans_id
2693
2968
trans_id = new_trans_id
2694
if kind[1] in ('directory', 'tree-reference'):
2969
if target_kind in ('directory', 'tree-reference'):
2695
2970
tt.create_directory(trans_id)
2696
if kind[1] == 'tree-reference':
2971
if target_kind == 'tree-reference':
2697
2972
revision = target_tree.get_reference_revision(file_id,
2699
2974
tt.set_tree_reference(revision, trans_id)
2700
elif kind[1] == 'symlink':
2975
elif target_kind == 'symlink':
2701
2976
tt.create_symlink(target_tree.get_symlink_target(file_id),
2703
elif kind[1] == 'file':
2978
elif target_kind == 'file':
2704
2979
deferred_files.append((file_id, (trans_id, mode_id)))
2705
2980
if basis_tree is None:
2706
2981
basis_tree = working_tree.basis_tree()
2707
2982
basis_tree.lock_read()
2708
2983
new_sha1 = target_tree.get_file_sha1(file_id)
2709
if (file_id in basis_tree and new_sha1 ==
2710
basis_tree.get_file_sha1(file_id)):
2984
if (basis_tree.has_id(file_id) and
2985
new_sha1 == basis_tree.get_file_sha1(file_id)):
2711
2986
if file_id in merge_modified:
2712
2987
del merge_modified[file_id]
2714
2989
merge_modified[file_id] = new_sha1
2716
2991
# preserve the execute bit when backing up
2717
if keep_content and executable[0] == executable[1]:
2718
tt.set_executability(executable[1], trans_id)
2719
elif kind[1] is not None:
2720
raise AssertionError(kind[1])
2721
if versioned == (False, True):
2992
if keep_content and wt_executable == target_executable:
2993
tt.set_executability(target_executable, trans_id)
2994
elif target_kind is not None:
2995
raise AssertionError(target_kind)
2996
if not wt_versioned and target_versioned:
2722
2997
tt.version_file(file_id, trans_id)
2723
if versioned == (True, False):
2998
if wt_versioned and not target_versioned:
2724
2999
tt.unversion_file(trans_id)
2725
if (name[1] is not None and
2726
(name[0] != name[1] or parent[0] != parent[1])):
2727
if name[1] == '' and parent[1] is None:
3000
if (target_name is not None and
3001
(wt_name != target_name or wt_parent != target_parent)):
3002
if target_name == '' and target_parent is None:
2728
3003
parent_trans = ROOT_PARENT
2730
parent_trans = tt.trans_id_file_id(parent[1])
2731
if parent[0] is None and versioned[0]:
2732
tt.adjust_root_path(name[1], parent_trans)
3005
parent_trans = tt.trans_id_file_id(target_parent)
3006
if wt_parent is None and wt_versioned:
3007
tt.adjust_root_path(target_name, parent_trans)
2734
tt.adjust_path(name[1], parent_trans, trans_id)
2735
if executable[0] != executable[1] and kind[1] == "file":
2736
tt.set_executability(executable[1], trans_id)
3009
tt.adjust_path(target_name, parent_trans, trans_id)
3010
if wt_executable != target_executable and target_kind == "file":
3011
tt.set_executability(target_executable, trans_id)
2737
3012
if working_tree.supports_content_filtering():
2738
3013
for index, ((trans_id, mode_id), bytes) in enumerate(
2739
3014
target_tree.iter_files_bytes(deferred_files)):
2811
3086
elif c_type == 'missing parent':
2812
3087
trans_id = conflict[1]
2814
tt.cancel_deletion(trans_id)
2815
new_conflicts.add(('deleting parent', 'Not deleting',
3088
if trans_id in tt._removed_contents:
3089
cancel_deletion = True
3090
orphans = tt._get_potential_orphans(trans_id)
3092
cancel_deletion = False
3093
# All children are orphans
3096
tt.new_orphan(o, trans_id)
3097
except OrphaningError:
3098
# Something bad happened so we cancel the directory
3099
# deletion which will leave it in place with a
3100
# conflict. The user can deal with it from there.
3101
# Note that this also catch the case where we don't
3102
# want to create orphans and leave the directory in
3104
cancel_deletion = True
3107
# Cancel the directory deletion
3108
tt.cancel_deletion(trans_id)
3109
new_conflicts.add(('deleting parent', 'Not deleting',
2820
3114
tt.final_name(trans_id)
2881
3175
modified_path = fp.get_path(conflict[2])
2882
3176
modified_id = tt.final_file_id(conflict[2])
2883
3177
if len(conflict) == 3:
2884
yield Conflict.factory(c_type, action=action, path=modified_path,
2885
file_id=modified_id)
3178
yield conflicts.Conflict.factory(
3179
c_type, action=action, path=modified_path, file_id=modified_id)
2888
3182
conflicting_path = fp.get_path(conflict[3])
2889
3183
conflicting_id = tt.final_file_id(conflict[3])
2890
yield Conflict.factory(c_type, action=action, path=modified_path,
2891
file_id=modified_id,
2892
conflict_path=conflicting_path,
2893
conflict_file_id=conflicting_id)
3184
yield conflicts.Conflict.factory(
3185
c_type, action=action, path=modified_path,
3186
file_id=modified_id,
3187
conflict_path=conflicting_path,
3188
conflict_file_id=conflicting_id)
2896
3191
class _FileMover(object):
added
removed
bzrlib/transform.py
