40
48
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
49
UnableCreateSymlink)
42
50
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
44
51
from bzrlib.osutils import (
52
58
supports_executable,
54
60
from bzrlib.progress import ProgressPhase
55
61
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
65
68
ROOT_PARENT = "root-parent"
68
70
def unique_add(map, key, value):
70
72
raise DuplicateKey(key=key)
74
77
class _TransformResults(object):
75
78
def __init__(self, modified_paths, rename_count):
76
79
object.__init__(self)
381
393
return sorted(FinalPaths(self).get_paths(new_ids))
383
395
def _inventory_altered(self):
384
"""Get the trans_ids and paths of files needing new inv entries."""
386
for id_set in [self._new_name, self._new_parent, self._new_id,
396
"""Determine which trans_ids need new Inventory entries.
398
An new entry is needed when anything that would be reflected by an
399
inventory entry changes, including file name, file_id, parent file_id,
400
file kind, and the execute bit.
402
Some care is taken to return entries with real changes, not cases
403
where the value is deleted and then restored to its original value,
404
but some actually unchanged values may be returned.
406
:returns: A list of (path, trans_id) for all items requiring an
407
inventory change. Ordered by path.
410
# Find entries whose file_ids are new (or changed).
411
new_file_id = set(t for t in self._new_id
412
if self._new_id[t] != self.tree_file_id(t))
413
for id_set in [self._new_name, self._new_parent, new_file_id,
387
414
self._new_executability]:
388
new_ids.update(id_set)
415
changed_ids.update(id_set)
416
# removing implies a kind change
389
417
changed_kind = set(self._removed_contents)
390
419
changed_kind.intersection_update(self._new_contents)
391
changed_kind.difference_update(new_ids)
392
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
394
new_ids.update(changed_kind)
395
return sorted(FinalPaths(self).get_paths(new_ids))
420
# Ignore entries that are already known to have changed.
421
changed_kind.difference_update(changed_ids)
422
# to keep only the truly changed ones
423
changed_kind = (t for t in changed_kind
424
if self.tree_kind(t) != self.final_kind(t))
425
# all kind changes will alter the inventory
426
changed_ids.update(changed_kind)
427
# To find entries with changed parent_ids, find parents which existed,
428
# but changed file_id.
429
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
430
# Now add all their children to the set.
431
for parent_trans_id in new_file_id:
432
changed_ids.update(self.iter_tree_children(parent_trans_id))
433
return sorted(FinalPaths(self).get_paths(changed_ids))
397
435
def final_kind(self, trans_id):
398
436
"""Determine the final file kind, after any changes applied.
400
Raises NoSuchFile if the file does not exist/has no contents.
401
(It is conceivable that a path would be created without the
402
corresponding contents insertion command)
438
:return: None if the file does not exist/has no contents. (It is
439
conceivable that a path would be created without the corresponding
440
contents insertion command)
404
442
if trans_id in self._new_contents:
405
443
return self._new_contents[trans_id]
406
444
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
447
return self.tree_kind(trans_id)
532
572
# ensure that all children are registered with the transaction
533
573
list(self.iter_tree_children(parent_id))
575
@deprecated_method(deprecated_in((2, 3, 0)))
535
576
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
577
return self._has_named_child(
578
name, parent_id, known_children=by_parent.get(parent_id, []))
580
def _has_named_child(self, name, parent_id, known_children):
581
"""Does a parent already have a name child.
583
:param name: The searched for name.
585
:param parent_id: The parent for which the check is made.
587
:param known_children: The already known children. This should have
588
been recently obtained from `self.by_parent.get(parent_id)`
589
(or will be if None is passed).
591
if known_children is None:
592
known_children = self.by_parent().get(parent_id, [])
593
for child in known_children:
541
594
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
596
parent_path = self._tree_id_paths.get(parent_id, None)
597
if parent_path is None:
598
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
600
child_path = joinpath(parent_path, name)
601
child_id = self._tree_path_ids.get(child_path, None)
549
602
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
603
# Not known by the tree transform yet, check the filesystem
604
return osutils.lexists(self._tree.abspath(child_path))
552
if self.final_parent(child_id) != parent_id:
554
if child_id in self._removed_contents:
555
# XXX What about dangling file-ids?
606
raise AssertionError('child_id is missing: %s, %s, %s'
607
% (name, parent_id, child_id))
609
def _available_backup_name(self, name, target_id):
610
"""Find an available backup name.
612
:param name: The basename of the file.
614
:param target_id: The directory trans_id where the backup should
617
known_children = self.by_parent().get(target_id, [])
618
return osutils.available_backup_name(
620
lambda base: self._has_named_child(
621
base, target_id, known_children))
560
623
def _parent_loops(self):
561
624
"""No entry should be its own ancestor"""
645
701
if (self._new_name, self._new_parent) == ({}, {}):
647
703
for children in by_parent.itervalues():
648
name_ids = [(self.final_name(t), t) for t in children]
649
if not self._case_sensitive_target:
650
name_ids = [(n.lower(), t) for n, t in name_ids]
705
for child_tid in children:
706
name = self.final_name(child_tid)
708
# Keep children only if they still exist in the end
709
if not self._case_sensitive_target:
711
name_ids.append((name, child_tid))
653
714
last_trans_id = None
654
715
for name, trans_id in name_ids:
656
kind = self.final_kind(trans_id)
716
kind = self.final_kind(trans_id)
659
717
file_id = self.final_file_id(trans_id)
660
718
if kind is None and file_id is None:
682
740
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
741
"""Children must have a directory parent"""
685
743
for parent_id, children in by_parent.iteritems():
686
744
if parent_id is ROOT_PARENT:
688
if not self._any_contents(children):
747
for child_id in children:
748
if self.final_kind(child_id) is not None:
690
for child in children:
692
self.final_kind(child)
696
kind = self.final_kind(parent_id)
753
# There is at least a child, so we need an existing directory to
755
kind = self.final_kind(parent_id)
757
# The directory will be deleted
700
758
conflicts.append(('missing parent', parent_id))
701
759
elif kind != "directory":
760
# Meh, we need a *directory* to put something in it
702
761
conflicts.append(('non-directory parent', parent_id))
705
def _any_contents(self, trans_ids):
706
"""Return true if any of the trans_ids, will have contents."""
707
for trans_id in trans_ids:
709
kind = self.final_kind(trans_id)
715
764
def _set_executability(self, path, trans_id):
716
765
"""Set the executability of versioned files """
717
766
if supports_executable():
781
830
self.create_symlink(target, trans_id)
833
def new_orphan(self, trans_id, parent_id):
834
"""Schedule an item to be orphaned.
836
When a directory is about to be removed, its children, if they are not
837
versioned are moved out of the way: they don't have a parent anymore.
839
:param trans_id: The trans_id of the existing item.
840
:param parent_id: The parent trans_id of the item.
842
raise NotImplementedError(self.new_orphan)
844
def _get_potential_orphans(self, dir_id):
845
"""Find the potential orphans in a directory.
847
A directory can't be safely deleted if there are versioned files in it.
848
If all the contained files are unversioned then they can be orphaned.
850
The 'None' return value means that the directory contains at least one
851
versioned file and should not be deleted.
853
:param dir_id: The directory trans id.
855
:return: A list of the orphan trans ids or None if at least one
856
versioned file is present.
859
# Find the potential orphans, stop if one item should be kept
860
for child_tid in self.by_parent()[dir_id]:
861
if child_tid in self._removed_contents:
862
# The child is removed as part of the transform. Since it was
863
# versioned before, it's not an orphan
865
elif self.final_file_id(child_tid) is None:
866
# The child is not versioned
867
orphans.append(child_tid)
869
# We have a versioned file here, searching for orphans is
784
875
def _affected_ids(self):
785
876
"""Return the set of transform ids affected by the transform"""
786
877
trans_ids = set(self._removed_id)
1195
1294
descendants.update(self._limbo_descendants(descendant))
1196
1295
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1297
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1298
"""Schedule creation of a new file.
1203
Contents is an iterator of strings, all of which will be written
1204
to the target destination.
1206
New file takes the permissions of any existing file with that id,
1207
unless mode_id is specified.
1302
:param contents: an iterator of strings, all of which will be written
1303
to the target destination.
1304
:param trans_id: TreeTransform handle
1305
:param mode_id: If not None, force the mode of the target file to match
1306
the mode of the object referenced by mode_id.
1307
Otherwise, we will try to preserve mode bits of an existing file.
1308
:param sha1: If the sha1 of this content is already known, pass it in.
1309
We can use it to prevent future sha1 computations.
1209
1311
name = self._limbo_name(trans_id)
1210
1312
f = open(name, 'wb')
1213
unique_add(self._new_contents, trans_id, 'file')
1215
# Clean up the file, it never got registered so
1216
# TreeTransform.finalize() won't clean it up.
1314
unique_add(self._new_contents, trans_id, 'file')
1221
1315
f.writelines(contents)
1224
1318
self._set_mtime(name)
1225
1319
self._set_mode(trans_id, mode_id, S_ISREG)
1320
# It is unfortunate we have to use lstat instead of fstat, but we just
1321
# used utime and chmod on the file, so we need the accurate final
1323
if sha1 is not None:
1324
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
1326
def _read_file_chunks(self, trans_id):
1228
1327
cur_file = open(self._limbo_name(trans_id), 'rb')
1296
1397
del self._limbo_children_names[trans_id]
1297
1398
delete_any(self._limbo_name(trans_id))
1400
def new_orphan(self, trans_id, parent_id):
1401
# FIXME: There is no tree config, so we use the branch one (it's weird
1402
# to define it this way as orphaning can only occur in a working tree,
1403
# but that's all we have (for now). It will find the option in
1404
# locations.conf or bazaar.conf though) -- vila 20100916
1405
conf = self._tree.branch.get_config()
1406
conf_var_name = 'bzr.transform.orphan_policy'
1407
orphan_policy = conf.get_user_option(conf_var_name)
1408
default_policy = orphaning_registry.default_key
1409
if orphan_policy is None:
1410
orphan_policy = default_policy
1411
if orphan_policy not in orphaning_registry:
1412
trace.warning('%s (from %s) is not a known policy, defaulting '
1413
'to %s' % (orphan_policy, conf_var_name, default_policy))
1414
orphan_policy = default_policy
1415
handle_orphan = orphaning_registry.get(orphan_policy)
1416
handle_orphan(self, trans_id, parent_id)
1419
class OrphaningError(errors.BzrError):
1421
# Only bugs could lead to such exception being seen by the user
1422
internal_error = True
1423
_fmt = "Error while orphaning %s in %s directory"
1425
def __init__(self, orphan, parent):
1426
errors.BzrError.__init__(self)
1427
self.orphan = orphan
1428
self.parent = parent
1431
class OrphaningForbidden(OrphaningError):
1433
_fmt = "Policy: %s doesn't allow creating orphans."
1435
def __init__(self, policy):
1436
errors.BzrError.__init__(self)
1437
self.policy = policy
1440
def move_orphan(tt, orphan_id, parent_id):
1441
"""See TreeTransformBase.new_orphan.
1443
This creates a new orphan in the `bzr-orphans` dir at the root of the
1446
:param tt: The TreeTransform orphaning `trans_id`.
1448
:param orphan_id: The trans id that should be orphaned.
1450
:param parent_id: The orphan parent trans id.
1452
# Add the orphan dir if it doesn't exist
1453
orphan_dir_basename = 'bzr-orphans'
1454
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1455
if tt.final_kind(od_id) is None:
1456
tt.create_directory(od_id)
1457
parent_path = tt._tree_id_paths[parent_id]
1458
# Find a name that doesn't exist yet in the orphan dir
1459
actual_name = tt.final_name(orphan_id)
1460
new_name = tt._available_backup_name(actual_name, od_id)
1461
tt.adjust_path(new_name, od_id, orphan_id)
1462
trace.warning('%s has been orphaned in %s'
1463
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1466
def refuse_orphan(tt, orphan_id, parent_id):
1467
"""See TreeTransformBase.new_orphan.
1469
This refuses to create orphan, letting the caller handle the conflict.
1471
raise OrphaningForbidden('never')
1474
orphaning_registry = registry.Registry()
1475
orphaning_registry.register(
1476
'conflict', refuse_orphan,
1477
'Leave orphans in place and create a conflict on the directory.')
1478
orphaning_registry.register(
1479
'move', move_orphan,
1480
'Move orphans into the bzr-orphans directory.')
1481
orphaning_registry._set_default_key('conflict')
1300
1484
class TreeTransform(DiskTreeTransform):
1301
1485
"""Represent a tree transformation.
1688
1873
if trans_id in self._needs_rename:
1690
1875
mover.rename(self._limbo_name(trans_id), full_path)
1876
except errors.TransformRenameFailed, e:
1692
1877
# We may be renaming a dangling inventory id
1693
1878
if e.errno != errno.ENOENT:
1696
1881
self.rename_count += 1
1882
# TODO: if trans_id in self._observed_sha1s, we should
1883
# re-stat the final target, since ctime will be
1884
# updated by the change.
1697
1885
if (trans_id in self._new_contents or
1698
1886
self.path_changed(trans_id)):
1699
1887
if trans_id in self._new_contents:
1700
1888
modified_paths.append(full_path)
1701
1889
if trans_id in self._new_executability:
1702
1890
self._set_executability(path, trans_id)
1891
if trans_id in self._observed_sha1s:
1892
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1893
st = osutils.lstat(full_path)
1894
self._observed_sha1s[trans_id] = (o_sha1, st)
1704
1896
child_pb.finished()
1897
for path, trans_id in new_paths:
1898
# new_paths includes stuff like workingtree conflicts. Only the
1899
# stuff in new_contents actually comes from limbo.
1900
if trans_id in self._limbo_files:
1901
del self._limbo_files[trans_id]
1705
1902
self._new_contents.clear()
1706
1903
return modified_paths
1905
def _apply_observed_sha1s(self):
1906
"""After we have finished renaming everything, update observed sha1s
1908
This has to be done after self._tree.apply_inventory_delta, otherwise
1909
it doesn't know anything about the files we are updating. Also, we want
1910
to do this as late as possible, so that most entries end up cached.
1912
# TODO: this doesn't update the stat information for directories. So
1913
# the first 'bzr status' will still need to rewrite
1914
# .bzr/checkout/dirstate. However, we at least don't need to
1915
# re-read all of the files.
1916
# TODO: If the operation took a while, we could do a time.sleep(3) here
1917
# to allow the clock to tick over and ensure we won't have any
1918
# problems. (we could observe start time, and finish time, and if
1919
# it is less than eg 10% overhead, add a sleep call.)
1920
paths = FinalPaths(self)
1921
for trans_id, observed in self._observed_sha1s.iteritems():
1922
path = paths.get_path(trans_id)
1923
# We could get the file_id, but dirstate prefers to use the path
1924
# anyway, and it is 'cheaper' to determine.
1925
# file_id = self._new_id[trans_id]
1926
self._tree._observed_sha1(None, path, observed)
1709
1929
class TransformPreview(DiskTreeTransform):
1710
1930
"""A TreeTransform for generating preview trees.
1789
2014
yield self._get_repository().revision_tree(revision_id)
1791
2016
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2017
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1793
2018
self._iter_parent_trees()]
1794
2019
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2020
self.get_file_lines(file_id))
1796
2021
repo = self._get_repository()
1797
2022
base_vf = repo.texts
1798
2023
if base_vf not in vf.fallback_versionedfiles:
1799
2024
vf.fallback_versionedfiles.append(base_vf)
1800
2025
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2027
def _stat_limbo_file(self, file_id=None, trans_id=None):
2028
if trans_id is None:
2029
trans_id = self._transform.trans_id_file_id(file_id)
1804
2030
name = self._transform._limbo_name(trans_id)
1805
2031
return os.lstat(name)
2436
2683
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2684
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2438
2685
tree.iter_files_bytes(new_desired_files)):
2439
2686
if wt.supports_content_filtering():
2440
2687
filters = wt._content_filter_stack(tree_path)
2441
2688
contents = filtered_output_bytes(contents, filters,
2442
2689
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2690
tt.create_file(contents, trans_id, sha1=text_sha1)
2444
2691
pb.update('Adding file contents', count + offset, total)
2448
2695
for child in tt.iter_tree_children(old_parent):
2449
2696
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2699
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2700
by_parent = tt.by_parent()
2453
2701
for child in by_parent[old_parent]:
2454
2702
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2703
return by_parent[old_parent]
2457
2706
def _content_match(tree, entry, file_id, kind, target_path):
2458
2707
if entry.kind != kind:
2460
2709
if entry.kind == "directory":
2462
2711
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2712
f = file(target_path, 'rb')
2714
if tree.get_file_text(file_id) == f.read():
2465
2718
elif entry.kind == "symlink":
2466
2719
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2519
2772
raise errors.BadFileKindError(name, kind)
2522
@deprecated_function(deprecated_in((1, 9, 0)))
2523
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2524
"""Create new file contents according to an inventory entry.
2526
DEPRECATED. Use create_from_tree instead.
2528
if entry.kind == "file":
2530
lines = tree.get_file(entry.file_id).readlines()
2531
tt.create_file(lines, trans_id, mode_id=mode_id)
2532
elif entry.kind == "symlink":
2533
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2534
elif entry.kind == "directory":
2535
tt.create_directory(trans_id)
2538
2775
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2539
2776
filter_tree_path=None):
2540
2777
"""Create new file contents according to tree contents.
2676
2919
deferred_files = []
2677
2920
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
2921
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2922
target_path, wt_path = path
2923
target_versioned, wt_versioned = versioned
2924
target_parent, wt_parent = parent
2925
target_name, wt_name = name
2926
target_kind, wt_kind = kind
2927
target_executable, wt_executable = executable
2928
if skip_root and wt_parent is None:
2681
2930
trans_id = tt.trans_id_file_id(file_id)
2683
2932
if changed_content:
2684
2933
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2934
if wt_kind == 'file' and (backups or target_kind is None):
2686
2935
wt_sha1 = working_tree.get_file_sha1(file_id)
2687
2936
if merge_modified.get(file_id) != wt_sha1:
2688
2937
# acquire the basis tree lazily to prevent the
2691
2940
if basis_tree is None:
2692
2941
basis_tree = working_tree.basis_tree()
2693
2942
basis_tree.lock_read()
2694
if file_id in basis_tree:
2943
if basis_tree.has_id(file_id):
2695
2944
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2696
2945
keep_content = True
2697
elif kind[1] is None and not versioned[1]:
2946
elif target_kind is None and not target_versioned:
2698
2947
keep_content = True
2699
if kind[0] is not None:
2948
if wt_kind is not None:
2700
2949
if not keep_content:
2701
2950
tt.delete_contents(trans_id)
2702
elif kind[1] is not None:
2703
parent_trans_id = tt.trans_id_file_id(parent[0])
2704
by_parent = tt.by_parent()
2705
backup_name = _get_backup_name(name[0], by_parent,
2706
parent_trans_id, tt)
2951
elif target_kind is not None:
2952
parent_trans_id = tt.trans_id_file_id(wt_parent)
2953
backup_name = tt._available_backup_name(
2954
wt_name, parent_trans_id)
2707
2955
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2708
new_trans_id = tt.create_path(name[0], parent_trans_id)
2709
if versioned == (True, True):
2956
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2957
if wt_versioned and target_versioned:
2710
2958
tt.unversion_file(trans_id)
2711
2959
tt.version_file(file_id, new_trans_id)
2712
2960
# New contents should have the same unix perms as old
2714
2962
mode_id = trans_id
2715
2963
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2964
if target_kind in ('directory', 'tree-reference'):
2717
2965
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2966
if target_kind == 'tree-reference':
2719
2967
revision = target_tree.get_reference_revision(file_id,
2721
2969
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2970
elif target_kind == 'symlink':
2723
2971
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2973
elif target_kind == 'file':
2726
2974
deferred_files.append((file_id, (trans_id, mode_id)))
2727
2975
if basis_tree is None:
2728
2976
basis_tree = working_tree.basis_tree()
2729
2977
basis_tree.lock_read()
2730
2978
new_sha1 = target_tree.get_file_sha1(file_id)
2731
if (file_id in basis_tree and new_sha1 ==
2732
basis_tree.get_file_sha1(file_id)):
2979
if (basis_tree.has_id(file_id) and
2980
new_sha1 == basis_tree.get_file_sha1(file_id)):
2733
2981
if file_id in merge_modified:
2734
2982
del merge_modified[file_id]
2736
2984
merge_modified[file_id] = new_sha1
2738
2986
# preserve the execute bit when backing up
2739
if keep_content and executable[0] == executable[1]:
2740
tt.set_executability(executable[1], trans_id)
2741
elif kind[1] is not None:
2742
raise AssertionError(kind[1])
2743
if versioned == (False, True):
2987
if keep_content and wt_executable == target_executable:
2988
tt.set_executability(target_executable, trans_id)
2989
elif target_kind is not None:
2990
raise AssertionError(target_kind)
2991
if not wt_versioned and target_versioned:
2744
2992
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2993
if wt_versioned and not target_versioned:
2746
2994
tt.unversion_file(trans_id)
2747
if (name[1] is not None and
2748
(name[0] != name[1] or parent[0] != parent[1])):
2749
if name[1] == '' and parent[1] is None:
2995
if (target_name is not None and
2996
(wt_name != target_name or wt_parent != target_parent)):
2997
if target_name == '' and target_parent is None:
2750
2998
parent_trans = ROOT_PARENT
2752
parent_trans = tt.trans_id_file_id(parent[1])
2753
if parent[0] is None and versioned[0]:
2754
tt.adjust_root_path(name[1], parent_trans)
3000
parent_trans = tt.trans_id_file_id(target_parent)
3001
if wt_parent is None and wt_versioned:
3002
tt.adjust_root_path(target_name, parent_trans)
2756
tt.adjust_path(name[1], parent_trans, trans_id)
2757
if executable[0] != executable[1] and kind[1] == "file":
2758
tt.set_executability(executable[1], trans_id)
3004
tt.adjust_path(target_name, parent_trans, trans_id)
3005
if wt_executable != target_executable and target_kind == "file":
3006
tt.set_executability(target_executable, trans_id)
2759
3007
if working_tree.supports_content_filtering():
2760
3008
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
3009
target_tree.iter_files_bytes(deferred_files)):
2833
3081
elif c_type == 'missing parent':
2834
3082
trans_id = conflict[1]
2836
tt.cancel_deletion(trans_id)
2837
new_conflicts.add(('deleting parent', 'Not deleting',
3083
if trans_id in tt._removed_contents:
3084
cancel_deletion = True
3085
orphans = tt._get_potential_orphans(trans_id)
3087
cancel_deletion = False
3088
# All children are orphans
3091
tt.new_orphan(o, trans_id)
3092
except OrphaningError:
3093
# Something bad happened so we cancel the directory
3094
# deletion which will leave it in place with a
3095
# conflict. The user can deal with it from there.
3096
# Note that this also catch the case where we don't
3097
# want to create orphans and leave the directory in
3099
cancel_deletion = True
3102
# Cancel the directory deletion
3103
tt.cancel_deletion(trans_id)
3104
new_conflicts.add(('deleting parent', 'Not deleting',
2842
3109
tt.final_name(trans_id)
2903
3170
modified_path = fp.get_path(conflict[2])
2904
3171
modified_id = tt.final_file_id(conflict[2])
2905
3172
if len(conflict) == 3:
2906
yield Conflict.factory(c_type, action=action, path=modified_path,
2907
file_id=modified_id)
3173
yield conflicts.Conflict.factory(
3174
c_type, action=action, path=modified_path, file_id=modified_id)
2910
3177
conflicting_path = fp.get_path(conflict[3])
2911
3178
conflicting_id = tt.final_file_id(conflict[3])
2912
yield Conflict.factory(c_type, action=action, path=modified_path,
2913
file_id=modified_id,
2914
conflict_path=conflicting_path,
2915
conflict_file_id=conflicting_id)
3179
yield conflicts.Conflict.factory(
3180
c_type, action=action, path=modified_path,
3181
file_id=modified_id,
3182
conflict_path=conflicting_path,
3183
conflict_file_id=conflicting_id)
2918
3186
class _FileMover(object):
added
removed
bzrlib/transform.py
