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
398
return sorted(FinalPaths(self).get_paths(new_ids))
382
400
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,
401
"""Determine which trans_ids need new Inventory entries.
403
An new entry is needed when anything that would be reflected by an
404
inventory entry changes, including file name, file_id, parent file_id,
405
file kind, and the execute bit.
407
Some care is taken to return entries with real changes, not cases
408
where the value is deleted and then restored to its original value,
409
but some actually unchanged values may be returned.
411
:returns: A list of (path, trans_id) for all items requiring an
412
inventory change. Ordered by path.
415
# Find entries whose file_ids are new (or changed).
416
new_file_id = set(t for t in self._new_id
417
if self._new_id[t] != self.tree_file_id(t))
418
for id_set in [self._new_name, self._new_parent, new_file_id,
386
419
self._new_executability]:
387
new_ids.update(id_set)
420
changed_ids.update(id_set)
421
# removing implies a kind change
388
422
changed_kind = set(self._removed_contents)
389
424
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))
425
# Ignore entries that are already known to have changed.
426
changed_kind.difference_update(changed_ids)
427
# to keep only the truly changed ones
428
changed_kind = (t for t in changed_kind
429
if self.tree_kind(t) != self.final_kind(t))
430
# all kind changes will alter the inventory
431
changed_ids.update(changed_kind)
432
# To find entries with changed parent_ids, find parents which existed,
433
# but changed file_id.
434
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
435
# Now add all their children to the set.
436
for parent_trans_id in new_file_id:
437
changed_ids.update(self.iter_tree_children(parent_trans_id))
438
return sorted(FinalPaths(self).get_paths(changed_ids))
396
440
def final_kind(self, trans_id):
397
441
"""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)
443
:return: None if the file does not exist/has no contents. (It is
444
conceivable that a path would be created without the corresponding
445
contents insertion command)
403
447
if trans_id in self._new_contents:
404
448
return self._new_contents[trans_id]
405
449
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
452
return self.tree_kind(trans_id)
531
577
# ensure that all children are registered with the transaction
532
578
list(self.iter_tree_children(parent_id))
580
@deprecated_method(deprecated_in((2, 3, 0)))
534
581
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
582
return self._has_named_child(
583
name, parent_id, known_children=by_parent.get(parent_id, []))
585
def _has_named_child(self, name, parent_id, known_children):
586
"""Does a parent already have a name child.
588
:param name: The searched for name.
590
:param parent_id: The parent for which the check is made.
592
:param known_children: The already known children. This should have
593
been recently obtained from `self.by_parent.get(parent_id)`
594
(or will be if None is passed).
596
if known_children is None:
597
known_children = self.by_parent().get(parent_id, [])
598
for child in known_children:
540
599
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
601
parent_path = self._tree_id_paths.get(parent_id, None)
602
if parent_path is None:
603
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
605
child_path = joinpath(parent_path, name)
606
child_id = self._tree_path_ids.get(child_path, None)
548
607
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
608
# Not known by the tree transform yet, check the filesystem
609
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?
611
raise AssertionError('child_id is missing: %s, %s, %s'
612
% (name, parent_id, child_id))
614
def _available_backup_name(self, name, target_id):
615
"""Find an available backup name.
617
:param name: The basename of the file.
619
:param target_id: The directory trans_id where the backup should
622
known_children = self.by_parent().get(target_id, [])
623
return osutils.available_backup_name(
625
lambda base: self._has_named_child(
626
base, target_id, known_children))
559
628
def _parent_loops(self):
560
629
"""No entry should be its own ancestor"""
644
706
if (self._new_name, self._new_parent) == ({}, {}):
646
708
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]
710
for child_tid in children:
711
name = self.final_name(child_tid)
713
# Keep children only if they still exist in the end
714
if not self._case_sensitive_target:
716
name_ids.append((name, child_tid))
652
719
last_trans_id = None
653
720
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
721
kind = self.final_kind(trans_id)
658
722
file_id = self.final_file_id(trans_id)
659
723
if kind is None and file_id is None:
681
745
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
746
"""Children must have a directory parent"""
684
748
for parent_id, children in by_parent.iteritems():
685
749
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
752
for child_id in children:
753
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)
758
# There is at least a child, so we need an existing directory to
760
kind = self.final_kind(parent_id)
762
# The directory will be deleted
699
763
conflicts.append(('missing parent', parent_id))
700
764
elif kind != "directory":
765
# Meh, we need a *directory* to put something in it
701
766
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
769
def _set_executability(self, path, trans_id):
715
770
"""Set the executability of versioned files """
716
771
if supports_executable():
780
835
self.create_symlink(target, trans_id)
838
def new_orphan(self, trans_id, parent_id):
839
"""Schedule an item to be orphaned.
841
When a directory is about to be removed, its children, if they are not
842
versioned are moved out of the way: they don't have a parent anymore.
844
:param trans_id: The trans_id of the existing item.
845
:param parent_id: The parent trans_id of the item.
847
raise NotImplementedError(self.new_orphan)
849
def _get_potential_orphans(self, dir_id):
850
"""Find the potential orphans in a directory.
852
A directory can't be safely deleted if there are versioned files in it.
853
If all the contained files are unversioned then they can be orphaned.
855
The 'None' return value means that the directory contains at least one
856
versioned file and should not be deleted.
858
:param dir_id: The directory trans id.
860
:return: A list of the orphan trans ids or None if at least one
861
versioned file is present.
864
# Find the potential orphans, stop if one item should be kept
865
for child_tid in self.by_parent()[dir_id]:
866
if child_tid in self._removed_contents:
867
# The child is removed as part of the transform. Since it was
868
# versioned before, it's not an orphan
870
elif self.final_file_id(child_tid) is None:
871
# The child is not versioned
872
orphans.append(child_tid)
874
# We have a versioned file here, searching for orphans is
783
880
def _affected_ids(self):
784
881
"""Return the set of transform ids affected by the transform"""
785
882
trans_ids = set(self._removed_id)
928
1022
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1024
def commit(self, branch, message, merge_parents=None, strict=False,
1025
timestamp=None, timezone=None, committer=None, authors=None,
1026
revprops=None, revision_id=None):
931
1027
"""Commit the result of this TreeTransform to a branch.
933
1029
:param branch: The branch to commit to.
934
1030
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1031
:param merge_parents: Additional parent revision-ids specified by
1033
:param strict: If True, abort the commit if there are unversioned
1035
:param timestamp: if not None, seconds-since-epoch for the time and
1036
date. (May be a float.)
1037
:param timezone: Optional timezone for timestamp, as an offset in
1039
:param committer: Optional committer in email-id format.
1040
(e.g. "J Random Hacker <jrandom@example.com>")
1041
:param authors: Optional list of authors in email-id format.
1042
:param revprops: Optional dictionary of revision properties.
1043
:param revision_id: Optional revision id. (Specifying a revision-id
1044
may reduce performance for some non-native formats.)
936
1045
:return: The revision_id of the revision committed.
938
1047
self._check_malformed()
1173
1299
descendants.update(self._limbo_descendants(descendant))
1174
1300
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1302
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1303
"""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.
1307
:param contents: an iterator of strings, all of which will be written
1308
to the target destination.
1309
:param trans_id: TreeTransform handle
1310
:param mode_id: If not None, force the mode of the target file to match
1311
the mode of the object referenced by mode_id.
1312
Otherwise, we will try to preserve mode bits of an existing file.
1313
:param sha1: If the sha1 of this content is already known, pass it in.
1314
We can use it to prevent future sha1 computations.
1187
1316
name = self._limbo_name(trans_id)
1188
1317
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.
1319
unique_add(self._new_contents, trans_id, 'file')
1199
1320
f.writelines(contents)
1202
1323
self._set_mtime(name)
1203
1324
self._set_mode(trans_id, mode_id, S_ISREG)
1325
# It is unfortunate we have to use lstat instead of fstat, but we just
1326
# used utime and chmod on the file, so we need the accurate final
1328
if sha1 is not None:
1329
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1331
def _read_file_chunks(self, trans_id):
1206
1332
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1402
del self._limbo_children_names[trans_id]
1275
1403
delete_any(self._limbo_name(trans_id))
1405
def new_orphan(self, trans_id, parent_id):
1406
# FIXME: There is no tree config, so we use the branch one (it's weird
1407
# to define it this way as orphaning can only occur in a working tree,
1408
# but that's all we have (for now). It will find the option in
1409
# locations.conf or bazaar.conf though) -- vila 20100916
1410
conf = self._tree.branch.get_config()
1411
conf_var_name = 'bzr.transform.orphan_policy'
1412
orphan_policy = conf.get_user_option(conf_var_name)
1413
default_policy = orphaning_registry.default_key
1414
if orphan_policy is None:
1415
orphan_policy = default_policy
1416
if orphan_policy not in orphaning_registry:
1417
trace.warning('%s (from %s) is not a known policy, defaulting '
1418
'to %s' % (orphan_policy, conf_var_name, default_policy))
1419
orphan_policy = default_policy
1420
handle_orphan = orphaning_registry.get(orphan_policy)
1421
handle_orphan(self, trans_id, parent_id)
1424
class OrphaningError(errors.BzrError):
1426
# Only bugs could lead to such exception being seen by the user
1427
internal_error = True
1428
_fmt = "Error while orphaning %s in %s directory"
1430
def __init__(self, orphan, parent):
1431
errors.BzrError.__init__(self)
1432
self.orphan = orphan
1433
self.parent = parent
1436
class OrphaningForbidden(OrphaningError):
1438
_fmt = "Policy: %s doesn't allow creating orphans."
1440
def __init__(self, policy):
1441
errors.BzrError.__init__(self)
1442
self.policy = policy
1445
def move_orphan(tt, orphan_id, parent_id):
1446
"""See TreeTransformBase.new_orphan.
1448
This creates a new orphan in the `bzr-orphans` dir at the root of the
1451
:param tt: The TreeTransform orphaning `trans_id`.
1453
:param orphan_id: The trans id that should be orphaned.
1455
:param parent_id: The orphan parent trans id.
1457
# Add the orphan dir if it doesn't exist
1458
orphan_dir_basename = 'bzr-orphans'
1459
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1460
if tt.final_kind(od_id) is None:
1461
tt.create_directory(od_id)
1462
parent_path = tt._tree_id_paths[parent_id]
1463
# Find a name that doesn't exist yet in the orphan dir
1464
actual_name = tt.final_name(orphan_id)
1465
new_name = tt._available_backup_name(actual_name, od_id)
1466
tt.adjust_path(new_name, od_id, orphan_id)
1467
trace.warning('%s has been orphaned in %s'
1468
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1471
def refuse_orphan(tt, orphan_id, parent_id):
1472
"""See TreeTransformBase.new_orphan.
1474
This refuses to create orphan, letting the caller handle the conflict.
1476
raise OrphaningForbidden('never')
1479
orphaning_registry = registry.Registry()
1480
orphaning_registry.register(
1481
'conflict', refuse_orphan,
1482
'Leave orphans in place and create a conflict on the directory.')
1483
orphaning_registry.register(
1484
'move', move_orphan,
1485
'Move orphans into the bzr-orphans directory.')
1486
orphaning_registry._set_default_key('conflict')
1278
1489
class TreeTransform(DiskTreeTransform):
1279
1490
"""Represent a tree transformation.
1666
1876
if trans_id in self._needs_rename:
1668
1878
mover.rename(self._limbo_name(trans_id), full_path)
1879
except errors.TransformRenameFailed, e:
1670
1880
# We may be renaming a dangling inventory id
1671
1881
if e.errno != errno.ENOENT:
1674
1884
self.rename_count += 1
1885
# TODO: if trans_id in self._observed_sha1s, we should
1886
# re-stat the final target, since ctime will be
1887
# updated by the change.
1675
1888
if (trans_id in self._new_contents or
1676
1889
self.path_changed(trans_id)):
1677
1890
if trans_id in self._new_contents:
1678
1891
modified_paths.append(full_path)
1679
1892
if trans_id in self._new_executability:
1680
1893
self._set_executability(path, trans_id)
1894
if trans_id in self._observed_sha1s:
1895
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1896
st = osutils.lstat(full_path)
1897
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1899
child_pb.finished()
1900
for path, trans_id in new_paths:
1901
# new_paths includes stuff like workingtree conflicts. Only the
1902
# stuff in new_contents actually comes from limbo.
1903
if trans_id in self._limbo_files:
1904
del self._limbo_files[trans_id]
1683
1905
self._new_contents.clear()
1684
1906
return modified_paths
1908
def _apply_observed_sha1s(self):
1909
"""After we have finished renaming everything, update observed sha1s
1911
This has to be done after self._tree.apply_inventory_delta, otherwise
1912
it doesn't know anything about the files we are updating. Also, we want
1913
to do this as late as possible, so that most entries end up cached.
1915
# TODO: this doesn't update the stat information for directories. So
1916
# the first 'bzr status' will still need to rewrite
1917
# .bzr/checkout/dirstate. However, we at least don't need to
1918
# re-read all of the files.
1919
# TODO: If the operation took a while, we could do a time.sleep(3) here
1920
# to allow the clock to tick over and ensure we won't have any
1921
# problems. (we could observe start time, and finish time, and if
1922
# it is less than eg 10% overhead, add a sleep call.)
1923
paths = FinalPaths(self)
1924
for trans_id, observed in self._observed_sha1s.iteritems():
1925
path = paths.get_path(trans_id)
1926
# We could get the file_id, but dirstate prefers to use the path
1927
# anyway, and it is 'cheaper' to determine.
1928
# file_id = self._new_id[trans_id]
1929
self._tree._observed_sha1(None, path, observed)
1687
1932
class TransformPreview(DiskTreeTransform):
1688
1933
"""A TreeTransform for generating preview trees.
1767
2017
yield self._get_repository().revision_tree(revision_id)
1769
2019
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2020
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2021
self._iter_parent_trees()]
1772
2022
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2023
self.get_file_lines(file_id))
1774
2024
repo = self._get_repository()
1775
2025
base_vf = repo.texts
1776
2026
if base_vf not in vf.fallback_versionedfiles:
1777
2027
vf.fallback_versionedfiles.append(base_vf)
1778
2028
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2030
def _stat_limbo_file(self, file_id=None, trans_id=None):
2031
if trans_id is None:
2032
trans_id = self._transform.trans_id_file_id(file_id)
1782
2033
name = self._transform._limbo_name(trans_id)
1783
2034
return os.lstat(name)
2411
2686
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2687
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2688
tree.iter_files_bytes(new_desired_files)):
2414
2689
if wt.supports_content_filtering():
2415
2690
filters = wt._content_filter_stack(tree_path)
2416
2691
contents = filtered_output_bytes(contents, filters,
2417
2692
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2693
tt.create_file(contents, trans_id, sha1=text_sha1)
2419
2694
pb.update('Adding file contents', count + offset, total)
2423
2698
for child in tt.iter_tree_children(old_parent):
2424
2699
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2702
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2703
by_parent = tt.by_parent()
2428
2704
for child in by_parent[old_parent]:
2429
2705
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2706
return by_parent[old_parent]
2432
2709
def _content_match(tree, entry, file_id, kind, target_path):
2433
2710
if entry.kind != kind:
2435
2712
if entry.kind == "directory":
2437
2714
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2715
f = file(target_path, 'rb')
2717
if tree.get_file_text(file_id) == f.read():
2440
2721
elif entry.kind == "symlink":
2441
2722
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2775
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
2778
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2779
filter_tree_path=None):
2515
2780
"""Create new file contents according to tree contents.
2651
2922
deferred_files = []
2652
2923
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2924
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2925
target_path, wt_path = path
2926
target_versioned, wt_versioned = versioned
2927
target_parent, wt_parent = parent
2928
target_name, wt_name = name
2929
target_kind, wt_kind = kind
2930
target_executable, wt_executable = executable
2931
if skip_root and wt_parent is None:
2656
2933
trans_id = tt.trans_id_file_id(file_id)
2658
2935
if changed_content:
2659
2936
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2937
if wt_kind == 'file' and (backups or target_kind is None):
2661
2938
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2939
if merge_modified.get(file_id) != wt_sha1:
2663
2940
# acquire the basis tree lazily to prevent the
2666
2943
if basis_tree is None:
2667
2944
basis_tree = working_tree.basis_tree()
2668
2945
basis_tree.lock_read()
2669
if file_id in basis_tree:
2946
if basis_tree.has_id(file_id):
2670
2947
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2948
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2949
elif target_kind is None and not target_versioned:
2673
2950
keep_content = True
2674
if kind[0] is not None:
2951
if wt_kind is not None:
2675
2952
if not keep_content:
2676
2953
tt.delete_contents(trans_id)
2677
elif kind[1] is not None:
2678
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)
2954
elif target_kind is not None:
2955
parent_trans_id = tt.trans_id_file_id(wt_parent)
2956
backup_name = tt._available_backup_name(
2957
wt_name, parent_trans_id)
2682
2958
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2959
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2960
if wt_versioned and target_versioned:
2685
2961
tt.unversion_file(trans_id)
2686
2962
tt.version_file(file_id, new_trans_id)
2687
2963
# New contents should have the same unix perms as old
2689
2965
mode_id = trans_id
2690
2966
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2967
if target_kind in ('directory', 'tree-reference'):
2692
2968
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2969
if target_kind == 'tree-reference':
2694
2970
revision = target_tree.get_reference_revision(file_id,
2696
2972
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2973
elif target_kind == 'symlink':
2698
2974
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2976
elif target_kind == 'file':
2701
2977
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2978
if basis_tree is None:
2703
2979
basis_tree = working_tree.basis_tree()
2704
2980
basis_tree.lock_read()
2705
2981
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2982
if (basis_tree.has_id(file_id) and
2983
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2984
if file_id in merge_modified:
2709
2985
del merge_modified[file_id]
2711
2987
merge_modified[file_id] = new_sha1
2713
2989
# preserve the execute bit when backing up
2714
if keep_content and executable[0] == executable[1]:
2715
tt.set_executability(executable[1], trans_id)
2716
elif kind[1] is not None:
2717
raise AssertionError(kind[1])
2718
if versioned == (False, True):
2990
if keep_content and wt_executable == target_executable:
2991
tt.set_executability(target_executable, trans_id)
2992
elif target_kind is not None:
2993
raise AssertionError(target_kind)
2994
if not wt_versioned and target_versioned:
2719
2995
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2996
if wt_versioned and not target_versioned:
2721
2997
tt.unversion_file(trans_id)
2722
if (name[1] is not None and
2723
(name[0] != name[1] or parent[0] != parent[1])):
2724
if name[1] == '' and parent[1] is None:
2998
if (target_name is not None and
2999
(wt_name != target_name or wt_parent != target_parent)):
3000
if target_name == '' and target_parent is None:
2725
3001
parent_trans = ROOT_PARENT
2727
parent_trans = tt.trans_id_file_id(parent[1])
2728
if parent[0] is None and versioned[0]:
2729
tt.adjust_root_path(name[1], parent_trans)
3003
parent_trans = tt.trans_id_file_id(target_parent)
3004
if wt_parent is None and wt_versioned:
3005
tt.adjust_root_path(target_name, parent_trans)
2731
tt.adjust_path(name[1], parent_trans, trans_id)
2732
if executable[0] != executable[1] and kind[1] == "file":
2733
tt.set_executability(executable[1], trans_id)
3007
tt.adjust_path(target_name, parent_trans, trans_id)
3008
if wt_executable != target_executable and target_kind == "file":
3009
tt.set_executability(target_executable, trans_id)
2734
3010
if working_tree.supports_content_filtering():
2735
3011
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
3012
target_tree.iter_files_bytes(deferred_files)):
2808
3084
elif c_type == 'missing parent':
2809
3085
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3086
if trans_id in tt._removed_contents:
3087
cancel_deletion = True
3088
orphans = tt._get_potential_orphans(trans_id)
3090
cancel_deletion = False
3091
# All children are orphans
3094
tt.new_orphan(o, trans_id)
3095
except OrphaningError:
3096
# Something bad happened so we cancel the directory
3097
# deletion which will leave it in place with a
3098
# conflict. The user can deal with it from there.
3099
# Note that this also catch the case where we don't
3100
# want to create orphans and leave the directory in
3102
cancel_deletion = True
3105
# Cancel the directory deletion
3106
tt.cancel_deletion(trans_id)
3107
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3112
tt.final_name(trans_id)
2878
3173
modified_path = fp.get_path(conflict[2])
2879
3174
modified_id = tt.final_file_id(conflict[2])
2880
3175
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3176
yield conflicts.Conflict.factory(
3177
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3180
conflicting_path = fp.get_path(conflict[3])
2886
3181
conflicting_id = tt.final_file_id(conflict[3])
2887
yield Conflict.factory(c_type, action=action, path=modified_path,
2888
file_id=modified_id,
2889
conflict_path=conflicting_path,
2890
conflict_file_id=conflicting_id)
3182
yield conflicts.Conflict.factory(
3183
c_type, action=action, path=modified_path,
3184
file_id=modified_id,
3185
conflict_path=conflicting_path,
3186
conflict_file_id=conflicting_id)
2893
3189
class _FileMover(object):
added
removed
bzrlib/transform.py
