41
33
revision as _mod_revision,
46
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
47
ReusingTransform, CantMoveRoot,
38
ReusingTransform, NotVersionedError, CantMoveRoot,
48
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
40
UnableCreateSymlink)
50
41
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
51
43
from bzrlib.osutils import (
58
51
supports_executable,
60
53
from bzrlib.progress import ProgressPhase
61
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
68
64
ROOT_PARENT = "root-parent"
70
67
def unique_add(map, key, value):
72
69
raise DuplicateKey(key=key)
77
73
class _TransformResults(object):
78
74
def __init__(self, modified_paths, rename_count):
79
75
object.__init__(self)
400
380
return sorted(FinalPaths(self).get_paths(new_ids))
402
382
def _inventory_altered(self):
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,
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,
421
386
self._new_executability]:
422
changed_ids.update(id_set)
423
# removing implies a kind change
387
new_ids.update(id_set)
424
388
changed_kind = set(self._removed_contents)
426
389
changed_kind.intersection_update(self._new_contents)
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))
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))
442
396
def final_kind(self, trans_id):
443
397
"""Determine the final file kind, after any changes applied.
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)
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)
449
403
if trans_id in self._new_contents:
450
404
return self._new_contents[trans_id]
451
405
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
454
408
return self.tree_kind(trans_id)
579
531
# ensure that all children are registered with the transaction
580
532
list(self.iter_tree_children(parent_id))
582
@deprecated_method(deprecated_in((2, 3, 0)))
583
534
def has_named_child(self, by_parent, parent_id, name):
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:
536
children = by_parent[parent_id]
539
for child in children:
601
540
if self.final_name(child) == name:
603
parent_path = self._tree_id_paths.get(parent_id, None)
604
if parent_path is None:
605
# No parent... no children
543
path = self._tree_id_paths[parent_id]
607
child_path = joinpath(parent_path, name)
608
child_id = self._tree_path_ids.get(child_path, None)
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
609
548
if child_id is None:
610
# Not known by the tree transform yet, check the filesystem
611
return osutils.lexists(self._tree.abspath(child_path))
549
return lexists(self._tree.abspath(childpath))
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))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
630
559
def _parent_loops(self):
631
560
"""No entry should be its own ancestor"""
708
644
if (self._new_name, self._new_parent) == ({}, {}):
710
646
for children in by_parent.itervalues():
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))
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]
721
652
last_trans_id = None
722
653
for name, trans_id in name_ids:
723
kind = self.final_kind(trans_id)
655
kind = self.final_kind(trans_id)
724
658
file_id = self.final_file_id(trans_id)
725
659
if kind is None and file_id is None:
747
681
def _parent_type_conflicts(self, by_parent):
748
"""Children must have a directory parent"""
682
"""parents must have directory 'contents'."""
750
684
for parent_id, children in by_parent.iteritems():
751
685
if parent_id is ROOT_PARENT:
754
for child_id in children:
755
if self.final_kind(child_id) is not None:
687
if not self._any_contents(children):
760
# There is at least a child, so we need an existing directory to
762
kind = self.final_kind(parent_id)
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
764
# The directory will be deleted
765
699
conflicts.append(('missing parent', parent_id))
766
700
elif kind != "directory":
767
# Meh, we need a *directory* to put something in it
768
701
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)
771
714
def _set_executability(self, path, trans_id):
772
715
"""Set the executability of versioned files """
773
716
if supports_executable():
837
780
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
882
783
def _affected_ids(self):
883
784
"""Return the set of transform ids affected by the transform"""
884
785
trans_ids = set(self._removed_id)
1024
928
return _PreviewTree(self)
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):
930
def commit(self, branch, message, merge_parents=None, strict=False):
1029
931
"""Commit the result of this TreeTransform to a branch.
1031
933
:param branch: The branch to commit to.
1032
934
:param message: The message to attach to the commit.
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.)
935
:param merge_parents: Additional parents specified by pending merges.
1047
936
:return: The revision_id of the revision committed.
1049
938
self._check_malformed()
1301
1173
descendants.update(self._limbo_descendants(descendant))
1302
1174
return descendants
1304
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1176
def create_file(self, contents, trans_id, mode_id=None):
1305
1177
"""Schedule creation of a new file.
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.
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.
1318
1187
name = self._limbo_name(trans_id)
1319
1188
f = open(name, 'wb')
1321
unique_add(self._new_contents, trans_id, 'file')
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.
1322
1199
f.writelines(contents)
1325
1202
self._set_mtime(name)
1326
1203
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))
1333
1205
def _read_file_chunks(self, trans_id):
1334
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1404
1274
del self._limbo_children_names[trans_id]
1405
1275
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')
1491
1278
class TreeTransform(DiskTreeTransform):
1492
1279
"""Represent a tree transformation.
1878
1666
if trans_id in self._needs_rename:
1880
1668
mover.rename(self._limbo_name(trans_id), full_path)
1881
except errors.TransformRenameFailed, e:
1882
1670
# We may be renaming a dangling inventory id
1883
1671
if e.errno != errno.ENOENT:
1886
1674
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.
1890
1675
if (trans_id in self._new_contents or
1891
1676
self.path_changed(trans_id)):
1892
1677
if trans_id in self._new_contents:
1893
1678
modified_paths.append(full_path)
1894
1679
if trans_id in self._new_executability:
1895
1680
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)
1901
1682
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]
1907
1683
self._new_contents.clear()
1908
1684
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)
1934
1687
class TransformPreview(DiskTreeTransform):
1935
1688
"""A TreeTransform for generating preview trees.
2019
1767
yield self._get_repository().revision_tree(revision_id)
2021
1769
def _get_file_revision(self, file_id, vf, tree_revision):
2022
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2023
1771
self._iter_parent_trees()]
2024
1772
vf.add_lines((file_id, tree_revision), parent_keys,
2025
self.get_file_lines(file_id))
1773
self.get_file(file_id).readlines())
2026
1774
repo = self._get_repository()
2027
1775
base_vf = repo.texts
2028
1776
if base_vf not in vf.fallback_versionedfiles:
2029
1777
vf.fallback_versionedfiles.append(base_vf)
2030
1778
return tree_revision
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)
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2035
1782
name = self._transform._limbo_name(trans_id)
2036
1783
return os.lstat(name)
2688
2411
offset += count
2689
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2690
2413
tree.iter_files_bytes(new_desired_files)):
2691
2414
if wt.supports_content_filtering():
2692
2415
filters = wt._content_filter_stack(tree_path)
2693
2416
contents = filtered_output_bytes(contents, filters,
2694
2417
ContentFilterContext(tree_path, tree))
2695
tt.create_file(contents, trans_id, sha1=text_sha1)
2418
tt.create_file(contents, trans_id)
2696
2419
pb.update('Adding file contents', count + offset, total)
2700
2423
for child in tt.iter_tree_children(old_parent):
2701
2424
tt.adjust_path(tt.final_name(child), new_parent, child)
2704
2426
def _reparent_transform_children(tt, old_parent, new_parent):
2705
2427
by_parent = tt.by_parent()
2706
2428
for child in by_parent[old_parent]:
2707
2429
tt.adjust_path(tt.final_name(child), new_parent, child)
2708
2430
return by_parent[old_parent]
2711
2432
def _content_match(tree, entry, file_id, kind, target_path):
2712
2433
if entry.kind != kind:
2714
2435
if entry.kind == "directory":
2716
2437
if entry.kind == "file":
2717
f = file(target_path, 'rb')
2719
if tree.get_file_text(file_id) == f.read():
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2723
2440
elif entry.kind == "symlink":
2724
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2777
2494
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)
2780
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2781
2514
filter_tree_path=None):
2782
2515
"""Create new file contents according to tree contents.
2924
2651
deferred_files = []
2925
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2926
2653
kind, executable) in enumerate(change_list):
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:
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2935
2656
trans_id = tt.trans_id_file_id(file_id)
2937
2658
if changed_content:
2938
2659
keep_content = False
2939
if wt_kind == 'file' and (backups or target_kind is None):
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2940
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2941
2662
if merge_modified.get(file_id) != wt_sha1:
2942
2663
# acquire the basis tree lazily to prevent the
2945
2666
if basis_tree is None:
2946
2667
basis_tree = working_tree.basis_tree()
2947
2668
basis_tree.lock_read()
2948
if basis_tree.has_id(file_id):
2669
if file_id in basis_tree:
2949
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2950
2671
keep_content = True
2951
elif target_kind is None and not target_versioned:
2672
elif kind[1] is None and not versioned[1]:
2952
2673
keep_content = True
2953
if wt_kind is not None:
2674
if kind[0] is not None:
2954
2675
if not keep_content:
2955
2676
tt.delete_contents(trans_id)
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)
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)
2960
2682
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2961
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2962
if wt_versioned and target_versioned:
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2963
2685
tt.unversion_file(trans_id)
2964
2686
tt.version_file(file_id, new_trans_id)
2965
2687
# New contents should have the same unix perms as old
2967
2689
mode_id = trans_id
2968
2690
trans_id = new_trans_id
2969
if target_kind in ('directory', 'tree-reference'):
2691
if kind[1] in ('directory', 'tree-reference'):
2970
2692
tt.create_directory(trans_id)
2971
if target_kind == 'tree-reference':
2693
if kind[1] == 'tree-reference':
2972
2694
revision = target_tree.get_reference_revision(file_id,
2974
2696
tt.set_tree_reference(revision, trans_id)
2975
elif target_kind == 'symlink':
2697
elif kind[1] == 'symlink':
2976
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2978
elif target_kind == 'file':
2700
elif kind[1] == 'file':
2979
2701
deferred_files.append((file_id, (trans_id, mode_id)))
2980
2702
if basis_tree is None:
2981
2703
basis_tree = working_tree.basis_tree()
2982
2704
basis_tree.lock_read()
2983
2705
new_sha1 = target_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)):
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2986
2708
if file_id in merge_modified:
2987
2709
del merge_modified[file_id]
2989
2711
merge_modified[file_id] = new_sha1
2991
2713
# preserve the execute bit when backing up
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:
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):
2997
2719
tt.version_file(file_id, trans_id)
2998
if wt_versioned and not target_versioned:
2720
if versioned == (True, False):
2999
2721
tt.unversion_file(trans_id)
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:
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:
3003
2725
parent_trans = ROOT_PARENT
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)
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)
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)
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)
3012
2734
if working_tree.supports_content_filtering():
3013
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
3014
2736
target_tree.iter_files_bytes(deferred_files)):
3086
2808
elif c_type == 'missing parent':
3087
2809
trans_id = conflict[1]
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',
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3114
2817
tt.final_name(trans_id)
3175
2878
modified_path = fp.get_path(conflict[2])
3176
2879
modified_id = tt.final_file_id(conflict[2])
3177
2880
if len(conflict) == 3:
3178
yield conflicts.Conflict.factory(
3179
c_type, action=action, path=modified_path, file_id=modified_id)
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3182
2885
conflicting_path = fp.get_path(conflict[3])
3183
2886
conflicting_id = tt.final_file_id(conflict[3])
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)
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)
3191
2893
class _FileMover(object):
3196
2898
self.pending_deletions = []
3198
2900
def rename(self, from_, to):
3199
"""Rename a file from one path to another."""
2901
"""Rename a file from one path to another. Functions like os.rename"""
3201
2903
os.rename(from_, to)
3202
2904
except OSError, e:
3203
2905
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3204
2906
raise errors.FileExists(to, str(e))
3205
# normal OSError doesn't include filenames so it's hard to see where
3206
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3207
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
3208
2908
self.past_renames.append((from_, to))
3210
2910
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
