14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
24
33
from bzrlib import (
34
43
revision as _mod_revision,
47
from bzrlib.i18n import gettext
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
49
from bzrlib.errors import (DuplicateKey, MalformedTransform,
39
50
ReusingTransform, CantMoveRoot,
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
51
ImmortalLimbo, NoFinalPath,
41
52
UnableCreateSymlink)
42
53
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
54
from bzrlib.mutabletree import MutableTree
44
55
from bzrlib.osutils import (
54
63
from bzrlib.progress import ProgressPhase
55
64
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
65
71
ROOT_PARENT = "root-parent"
68
73
def unique_add(map, key, value):
70
75
raise DuplicateKey(key=key)
74
80
class _TransformResults(object):
75
81
def __init__(self, modified_paths, rename_count):
76
82
object.__init__(self)
381
398
return sorted(FinalPaths(self).get_paths(new_ids))
383
400
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,
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,
387
419
self._new_executability]:
388
new_ids.update(id_set)
420
changed_ids.update(id_set)
421
# removing implies a kind change
389
422
changed_kind = set(self._removed_contents)
390
424
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))
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))
397
440
def final_kind(self, trans_id):
398
441
"""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)
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)
404
447
if trans_id in self._new_contents:
405
448
return self._new_contents[trans_id]
406
449
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
452
return self.tree_kind(trans_id)
532
575
# ensure that all children are registered with the transaction
533
576
list(self.iter_tree_children(parent_id))
578
@deprecated_method(deprecated_in((2, 3, 0)))
535
579
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
580
return self._has_named_child(
581
name, parent_id, known_children=by_parent.get(parent_id, []))
583
def _has_named_child(self, name, parent_id, known_children):
584
"""Does a parent already have a name child.
586
:param name: The searched for name.
588
:param parent_id: The parent for which the check is made.
590
:param known_children: The already known children. This should have
591
been recently obtained from `self.by_parent.get(parent_id)`
592
(or will be if None is passed).
594
if known_children is None:
595
known_children = self.by_parent().get(parent_id, [])
596
for child in known_children:
541
597
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
599
parent_path = self._tree_id_paths.get(parent_id, None)
600
if parent_path is None:
601
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
603
child_path = joinpath(parent_path, name)
604
child_id = self._tree_path_ids.get(child_path, None)
549
605
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
606
# Not known by the tree transform yet, check the filesystem
607
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?
609
raise AssertionError('child_id is missing: %s, %s, %s'
610
% (name, parent_id, child_id))
612
def _available_backup_name(self, name, target_id):
613
"""Find an available backup name.
615
:param name: The basename of the file.
617
:param target_id: The directory trans_id where the backup should
620
known_children = self.by_parent().get(target_id, [])
621
return osutils.available_backup_name(
623
lambda base: self._has_named_child(
624
base, target_id, known_children))
560
626
def _parent_loops(self):
561
627
"""No entry should be its own ancestor"""
645
704
if (self._new_name, self._new_parent) == ({}, {}):
647
706
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]
708
for child_tid in children:
709
name = self.final_name(child_tid)
711
# Keep children only if they still exist in the end
712
if not self._case_sensitive_target:
714
name_ids.append((name, child_tid))
653
717
last_trans_id = None
654
718
for name, trans_id in name_ids:
656
kind = self.final_kind(trans_id)
719
kind = self.final_kind(trans_id)
659
720
file_id = self.final_file_id(trans_id)
660
721
if kind is None and file_id is None:
682
743
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
744
"""Children must have a directory parent"""
685
746
for parent_id, children in by_parent.iteritems():
686
if parent_id is ROOT_PARENT:
688
if not self._any_contents(children):
690
for child in children:
692
self.final_kind(child)
696
kind = self.final_kind(parent_id)
747
if parent_id == ROOT_PARENT:
750
for child_id in children:
751
if self.final_kind(child_id) is not None:
756
# There is at least a child, so we need an existing directory to
758
kind = self.final_kind(parent_id)
760
# The directory will be deleted
700
761
conflicts.append(('missing parent', parent_id))
701
762
elif kind != "directory":
763
# Meh, we need a *directory* to put something in it
702
764
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
767
def _set_executability(self, path, trans_id):
716
768
"""Set the executability of versioned files """
717
if supports_executable():
769
if self._tree._supports_executable():
718
770
new_executability = self._new_executability[trans_id]
719
771
abspath = self._tree.abspath(path)
720
772
current_mode = os.stat(abspath).st_mode
781
833
self.create_symlink(target, trans_id)
836
def new_orphan(self, trans_id, parent_id):
837
"""Schedule an item to be orphaned.
839
When a directory is about to be removed, its children, if they are not
840
versioned are moved out of the way: they don't have a parent anymore.
842
:param trans_id: The trans_id of the existing item.
843
:param parent_id: The parent trans_id of the item.
845
raise NotImplementedError(self.new_orphan)
847
def _get_potential_orphans(self, dir_id):
848
"""Find the potential orphans in a directory.
850
A directory can't be safely deleted if there are versioned files in it.
851
If all the contained files are unversioned then they can be orphaned.
853
The 'None' return value means that the directory contains at least one
854
versioned file and should not be deleted.
856
:param dir_id: The directory trans id.
858
:return: A list of the orphan trans ids or None if at least one
859
versioned file is present.
862
# Find the potential orphans, stop if one item should be kept
863
for child_tid in self.by_parent()[dir_id]:
864
if child_tid in self._removed_contents:
865
# The child is removed as part of the transform. Since it was
866
# versioned before, it's not an orphan
868
elif self.final_file_id(child_tid) is None:
869
# The child is not versioned
870
orphans.append(child_tid)
872
# We have a versioned file here, searching for orphans is
784
878
def _affected_ids(self):
785
879
"""Return the set of transform ids affected by the transform"""
786
880
trans_ids = set(self._removed_id)
1195
1302
descendants.update(self._limbo_descendants(descendant))
1196
1303
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1305
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1306
"""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.
1310
:param contents: an iterator of strings, all of which will be written
1311
to the target destination.
1312
:param trans_id: TreeTransform handle
1313
:param mode_id: If not None, force the mode of the target file to match
1314
the mode of the object referenced by mode_id.
1315
Otherwise, we will try to preserve mode bits of an existing file.
1316
:param sha1: If the sha1 of this content is already known, pass it in.
1317
We can use it to prevent future sha1 computations.
1209
1319
name = self._limbo_name(trans_id)
1210
1320
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.
1322
unique_add(self._new_contents, trans_id, 'file')
1221
1323
f.writelines(contents)
1224
1326
self._set_mtime(name)
1225
1327
self._set_mode(trans_id, mode_id, S_ISREG)
1328
# It is unfortunate we have to use lstat instead of fstat, but we just
1329
# used utime and chmod on the file, so we need the accurate final
1331
if sha1 is not None:
1332
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
1334
def _read_file_chunks(self, trans_id):
1228
1335
cur_file = open(self._limbo_name(trans_id), 'rb')
1296
1405
del self._limbo_children_names[trans_id]
1297
1406
delete_any(self._limbo_name(trans_id))
1408
def new_orphan(self, trans_id, parent_id):
1409
conf = self._tree.get_config_stack()
1410
handle_orphan = conf.get('bzr.transform.orphan_policy')
1411
handle_orphan(self, trans_id, parent_id)
1414
class OrphaningError(errors.BzrError):
1416
# Only bugs could lead to such exception being seen by the user
1417
internal_error = True
1418
_fmt = "Error while orphaning %s in %s directory"
1420
def __init__(self, orphan, parent):
1421
errors.BzrError.__init__(self)
1422
self.orphan = orphan
1423
self.parent = parent
1426
class OrphaningForbidden(OrphaningError):
1428
_fmt = "Policy: %s doesn't allow creating orphans."
1430
def __init__(self, policy):
1431
errors.BzrError.__init__(self)
1432
self.policy = policy
1435
def move_orphan(tt, orphan_id, parent_id):
1436
"""See TreeTransformBase.new_orphan.
1438
This creates a new orphan in the `bzr-orphans` dir at the root of the
1441
:param tt: The TreeTransform orphaning `trans_id`.
1443
:param orphan_id: The trans id that should be orphaned.
1445
:param parent_id: The orphan parent trans id.
1447
# Add the orphan dir if it doesn't exist
1448
orphan_dir_basename = 'bzr-orphans'
1449
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1450
if tt.final_kind(od_id) is None:
1451
tt.create_directory(od_id)
1452
parent_path = tt._tree_id_paths[parent_id]
1453
# Find a name that doesn't exist yet in the orphan dir
1454
actual_name = tt.final_name(orphan_id)
1455
new_name = tt._available_backup_name(actual_name, od_id)
1456
tt.adjust_path(new_name, od_id, orphan_id)
1457
trace.warning('%s has been orphaned in %s'
1458
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1461
def refuse_orphan(tt, orphan_id, parent_id):
1462
"""See TreeTransformBase.new_orphan.
1464
This refuses to create orphan, letting the caller handle the conflict.
1466
raise OrphaningForbidden('never')
1469
orphaning_registry = registry.Registry()
1470
orphaning_registry.register(
1471
'conflict', refuse_orphan,
1472
'Leave orphans in place and create a conflict on the directory.')
1473
orphaning_registry.register(
1474
'move', move_orphan,
1475
'Move orphans into the bzr-orphans directory.')
1476
orphaning_registry._set_default_key('conflict')
1479
opt_transform_orphan = _mod_config.RegistryOption(
1480
'bzr.transform.orphan_policy', orphaning_registry,
1481
help='Policy for orphaned files during transform operations.',
1300
1485
class TreeTransform(DiskTreeTransform):
1301
1486
"""Represent a tree transformation.
1645
1827
tree_paths = list(self._tree_path_ids.iteritems())
1646
1828
tree_paths.sort(reverse=True)
1647
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1829
child_pb = ui.ui_factory.nested_progress_bar()
1649
for num, data in enumerate(tree_paths):
1650
path, trans_id = data
1651
child_pb.update('removing file', num, len(tree_paths))
1831
for num, (path, trans_id) in enumerate(tree_paths):
1832
# do not attempt to move root into a subdirectory of itself.
1835
child_pb.update(gettext('removing file'), num, len(tree_paths))
1652
1836
full_path = self._tree.abspath(path)
1653
1837
if trans_id in self._removed_contents:
1654
1838
delete_path = os.path.join(self._deletiondir, trans_id)
1696
1880
self.rename_count += 1
1881
# TODO: if trans_id in self._observed_sha1s, we should
1882
# re-stat the final target, since ctime will be
1883
# updated by the change.
1697
1884
if (trans_id in self._new_contents or
1698
1885
self.path_changed(trans_id)):
1699
1886
if trans_id in self._new_contents:
1700
1887
modified_paths.append(full_path)
1701
1888
if trans_id in self._new_executability:
1702
1889
self._set_executability(path, trans_id)
1890
if trans_id in self._observed_sha1s:
1891
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1892
st = osutils.lstat(full_path)
1893
self._observed_sha1s[trans_id] = (o_sha1, st)
1704
1895
child_pb.finished()
1896
for path, trans_id in new_paths:
1897
# new_paths includes stuff like workingtree conflicts. Only the
1898
# stuff in new_contents actually comes from limbo.
1899
if trans_id in self._limbo_files:
1900
del self._limbo_files[trans_id]
1705
1901
self._new_contents.clear()
1706
1902
return modified_paths
1904
def _apply_observed_sha1s(self):
1905
"""After we have finished renaming everything, update observed sha1s
1907
This has to be done after self._tree.apply_inventory_delta, otherwise
1908
it doesn't know anything about the files we are updating. Also, we want
1909
to do this as late as possible, so that most entries end up cached.
1911
# TODO: this doesn't update the stat information for directories. So
1912
# the first 'bzr status' will still need to rewrite
1913
# .bzr/checkout/dirstate. However, we at least don't need to
1914
# re-read all of the files.
1915
# TODO: If the operation took a while, we could do a time.sleep(3) here
1916
# to allow the clock to tick over and ensure we won't have any
1917
# problems. (we could observe start time, and finish time, and if
1918
# it is less than eg 10% overhead, add a sleep call.)
1919
paths = FinalPaths(self)
1920
for trans_id, observed in self._observed_sha1s.iteritems():
1921
path = paths.get_path(trans_id)
1922
# We could get the file_id, but dirstate prefers to use the path
1923
# anyway, and it is 'cheaper' to determine.
1924
# file_id = self._new_id[trans_id]
1925
self._tree._observed_sha1(None, path, observed)
1709
1928
class TransformPreview(DiskTreeTransform):
1710
1929
"""A TreeTransform for generating preview trees.
2023
2257
def get_file_size(self, file_id):
2024
2258
"""See Tree.get_file_size"""
2259
trans_id = self._transform.trans_id_file_id(file_id)
2260
kind = self._transform.final_kind(trans_id)
2263
if trans_id in self._transform._new_contents:
2264
return self._stat_limbo_file(trans_id=trans_id).st_size
2025
2265
if self.kind(file_id) == 'file':
2026
2266
return self._transform._tree.get_file_size(file_id)
2270
def get_file_verifier(self, file_id, path=None, stat_value=None):
2271
trans_id = self._transform.trans_id_file_id(file_id)
2272
kind = self._transform._new_contents.get(trans_id)
2274
return self._transform._tree.get_file_verifier(file_id)
2276
fileobj = self.get_file(file_id)
2278
return ("SHA1", sha_file(fileobj))
2030
2282
def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
2283
trans_id = self._transform.trans_id_file_id(file_id)
2032
2284
kind = self._transform._new_contents.get(trans_id)
2415
2676
unchanged = dict(unchanged)
2416
2677
new_desired_files = []
2418
for file_id, (trans_id, tree_path) in desired_files:
2679
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2419
2680
accelerator_path = unchanged.get(file_id)
2420
2681
if accelerator_path is None:
2421
new_desired_files.append((file_id, (trans_id, tree_path)))
2682
new_desired_files.append((file_id,
2683
(trans_id, tree_path, text_sha1)))
2423
pb.update('Adding file contents', count + offset, total)
2685
pb.update(gettext('Adding file contents'), count + offset, total)
2425
2687
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2442
2704
offset += count
2443
for count, ((trans_id, tree_path), contents) in enumerate(
2705
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2444
2706
tree.iter_files_bytes(new_desired_files)):
2445
2707
if wt.supports_content_filtering():
2446
2708
filters = wt._content_filter_stack(tree_path)
2447
2709
contents = filtered_output_bytes(contents, filters,
2448
2710
ContentFilterContext(tree_path, tree))
2449
tt.create_file(contents, trans_id)
2450
pb.update('Adding file contents', count + offset, total)
2711
tt.create_file(contents, trans_id, sha1=text_sha1)
2712
pb.update(gettext('Adding file contents'), count + offset, total)
2453
2715
def _reparent_children(tt, old_parent, new_parent):
2454
2716
for child in tt.iter_tree_children(old_parent):
2455
2717
tt.adjust_path(tt.final_name(child), new_parent, child)
2457
2720
def _reparent_transform_children(tt, old_parent, new_parent):
2458
2721
by_parent = tt.by_parent()
2459
2722
for child in by_parent[old_parent]:
2460
2723
tt.adjust_path(tt.final_name(child), new_parent, child)
2461
2724
return by_parent[old_parent]
2463
2727
def _content_match(tree, entry, file_id, kind, target_path):
2464
2728
if entry.kind != kind:
2581
2847
return new_name
2584
def _entry_changes(file_id, entry, working_tree):
2585
"""Determine in which ways the inventory entry has changed.
2587
Returns booleans: has_contents, content_mod, meta_mod
2588
has_contents means there are currently contents, but they differ
2589
contents_mod means contents need to be modified
2590
meta_mod means the metadata needs to be modified
2592
cur_entry = working_tree.inventory[file_id]
2594
working_kind = working_tree.kind(file_id)
2597
has_contents = False
2600
if has_contents is True:
2601
if entry.kind != working_kind:
2602
contents_mod, meta_mod = True, False
2604
cur_entry._read_tree_state(working_tree.id2path(file_id),
2606
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2607
cur_entry._forget_tree_state()
2608
return has_contents, contents_mod, meta_mod
2611
2850
def revert(working_tree, target_tree, filenames, backups=False,
2612
2851
pb=None, change_reporter=None):
2613
2852
"""Revert a working tree's contents to those of a target tree."""
2670
2913
deferred_files = []
2671
2914
for id_num, (file_id, path, changed_content, versioned, parent, name,
2672
2915
kind, executable) in enumerate(change_list):
2673
if skip_root and file_id[0] is not None and parent[0] is None:
2916
target_path, wt_path = path
2917
target_versioned, wt_versioned = versioned
2918
target_parent, wt_parent = parent
2919
target_name, wt_name = name
2920
target_kind, wt_kind = kind
2921
target_executable, wt_executable = executable
2922
if skip_root and wt_parent is None:
2675
2924
trans_id = tt.trans_id_file_id(file_id)
2677
2926
if changed_content:
2678
2927
keep_content = False
2679
if kind[0] == 'file' and (backups or kind[1] is None):
2928
if wt_kind == 'file' and (backups or target_kind is None):
2680
2929
wt_sha1 = working_tree.get_file_sha1(file_id)
2681
2930
if merge_modified.get(file_id) != wt_sha1:
2682
2931
# acquire the basis tree lazily to prevent the
2685
2934
if basis_tree is None:
2686
2935
basis_tree = working_tree.basis_tree()
2687
2936
basis_tree.lock_read()
2688
if file_id in basis_tree:
2937
if basis_tree.has_id(file_id):
2689
2938
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2690
2939
keep_content = True
2691
elif kind[1] is None and not versioned[1]:
2940
elif target_kind is None and not target_versioned:
2692
2941
keep_content = True
2693
if kind[0] is not None:
2942
if wt_kind is not None:
2694
2943
if not keep_content:
2695
2944
tt.delete_contents(trans_id)
2696
elif kind[1] is not None:
2697
parent_trans_id = tt.trans_id_file_id(parent[0])
2698
by_parent = tt.by_parent()
2699
backup_name = _get_backup_name(name[0], by_parent,
2700
parent_trans_id, tt)
2945
elif target_kind is not None:
2946
parent_trans_id = tt.trans_id_file_id(wt_parent)
2947
backup_name = tt._available_backup_name(
2948
wt_name, parent_trans_id)
2701
2949
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2702
new_trans_id = tt.create_path(name[0], parent_trans_id)
2703
if versioned == (True, True):
2950
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2951
if wt_versioned and target_versioned:
2704
2952
tt.unversion_file(trans_id)
2705
2953
tt.version_file(file_id, new_trans_id)
2706
2954
# New contents should have the same unix perms as old
2708
2956
mode_id = trans_id
2709
2957
trans_id = new_trans_id
2710
if kind[1] in ('directory', 'tree-reference'):
2958
if target_kind in ('directory', 'tree-reference'):
2711
2959
tt.create_directory(trans_id)
2712
if kind[1] == 'tree-reference':
2960
if target_kind == 'tree-reference':
2713
2961
revision = target_tree.get_reference_revision(file_id,
2715
2963
tt.set_tree_reference(revision, trans_id)
2716
elif kind[1] == 'symlink':
2964
elif target_kind == 'symlink':
2717
2965
tt.create_symlink(target_tree.get_symlink_target(file_id),
2719
elif kind[1] == 'file':
2967
elif target_kind == 'file':
2720
2968
deferred_files.append((file_id, (trans_id, mode_id)))
2721
2969
if basis_tree is None:
2722
2970
basis_tree = working_tree.basis_tree()
2723
2971
basis_tree.lock_read()
2724
2972
new_sha1 = target_tree.get_file_sha1(file_id)
2725
if (file_id in basis_tree and new_sha1 ==
2726
basis_tree.get_file_sha1(file_id)):
2973
if (basis_tree.has_id(file_id) and
2974
new_sha1 == basis_tree.get_file_sha1(file_id)):
2727
2975
if file_id in merge_modified:
2728
2976
del merge_modified[file_id]
2730
2978
merge_modified[file_id] = new_sha1
2732
2980
# preserve the execute bit when backing up
2733
if keep_content and executable[0] == executable[1]:
2734
tt.set_executability(executable[1], trans_id)
2735
elif kind[1] is not None:
2736
raise AssertionError(kind[1])
2737
if versioned == (False, True):
2981
if keep_content and wt_executable == target_executable:
2982
tt.set_executability(target_executable, trans_id)
2983
elif target_kind is not None:
2984
raise AssertionError(target_kind)
2985
if not wt_versioned and target_versioned:
2738
2986
tt.version_file(file_id, trans_id)
2739
if versioned == (True, False):
2987
if wt_versioned and not target_versioned:
2740
2988
tt.unversion_file(trans_id)
2741
if (name[1] is not None and
2742
(name[0] != name[1] or parent[0] != parent[1])):
2743
if name[1] == '' and parent[1] is None:
2989
if (target_name is not None and
2990
(wt_name != target_name or wt_parent != target_parent)):
2991
if target_name == '' and target_parent is None:
2744
2992
parent_trans = ROOT_PARENT
2746
parent_trans = tt.trans_id_file_id(parent[1])
2747
if parent[0] is None and versioned[0]:
2748
tt.adjust_root_path(name[1], parent_trans)
2994
parent_trans = tt.trans_id_file_id(target_parent)
2995
if wt_parent is None and wt_versioned:
2996
tt.adjust_root_path(target_name, parent_trans)
2750
tt.adjust_path(name[1], parent_trans, trans_id)
2751
if executable[0] != executable[1] and kind[1] == "file":
2752
tt.set_executability(executable[1], trans_id)
2998
tt.adjust_path(target_name, parent_trans, trans_id)
2999
if wt_executable != target_executable and target_kind == "file":
3000
tt.set_executability(target_executable, trans_id)
2753
3001
if working_tree.supports_content_filtering():
2754
3002
for index, ((trans_id, mode_id), bytes) in enumerate(
2755
3003
target_tree.iter_files_bytes(deferred_files)):
2827
3075
elif c_type == 'missing parent':
2828
3076
trans_id = conflict[1]
2830
tt.cancel_deletion(trans_id)
2831
new_conflicts.add(('deleting parent', 'Not deleting',
3077
if trans_id in tt._removed_contents:
3078
cancel_deletion = True
3079
orphans = tt._get_potential_orphans(trans_id)
3081
cancel_deletion = False
3082
# All children are orphans
3085
tt.new_orphan(o, trans_id)
3086
except OrphaningError:
3087
# Something bad happened so we cancel the directory
3088
# deletion which will leave it in place with a
3089
# conflict. The user can deal with it from there.
3090
# Note that this also catch the case where we don't
3091
# want to create orphans and leave the directory in
3093
cancel_deletion = True
3096
# Cancel the directory deletion
3097
tt.cancel_deletion(trans_id)
3098
new_conflicts.add(('deleting parent', 'Not deleting',
2836
3103
tt.final_name(trans_id)
2897
3164
modified_path = fp.get_path(conflict[2])
2898
3165
modified_id = tt.final_file_id(conflict[2])
2899
3166
if len(conflict) == 3:
2900
yield Conflict.factory(c_type, action=action, path=modified_path,
2901
file_id=modified_id)
3167
yield conflicts.Conflict.factory(
3168
c_type, action=action, path=modified_path, file_id=modified_id)
2904
3171
conflicting_path = fp.get_path(conflict[3])
2905
3172
conflicting_id = tt.final_file_id(conflict[3])
2906
yield Conflict.factory(c_type, action=action, path=modified_path,
2907
file_id=modified_id,
2908
conflict_path=conflicting_path,
2909
conflict_file_id=conflicting_id)
3173
yield conflicts.Conflict.factory(
3174
c_type, action=action, path=modified_path,
3175
file_id=modified_id,
3176
conflict_path=conflicting_path,
3177
conflict_file_id=conflicting_id)
2912
3180
class _FileMover(object):
added
removed
bzrlib/transform.py
