39
47
ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
48
UnableCreateSymlink)
41
49
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
50
from bzrlib.osutils import (
51
57
supports_executable,
53
59
from bzrlib.progress import ProgressPhase
54
60
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
64
67
ROOT_PARENT = "root-parent"
67
69
def unique_add(map, key, value):
69
71
raise DuplicateKey(key=key)
73
76
class _TransformResults(object):
74
77
def __init__(self, modified_paths, rename_count):
75
78
object.__init__(self)
382
394
def _inventory_altered(self):
383
395
"""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,
397
changed_id = set(t for t in self._new_id
398
if self._new_id[t] != self.tree_file_id(t))
399
for id_set in [self._new_name, self._new_parent, changed_id,
386
400
self._new_executability]:
387
401
new_ids.update(id_set)
388
402
changed_kind = set(self._removed_contents)
389
403
changed_kind.intersection_update(self._new_contents)
390
404
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
405
changed_kind = (t for t in changed_kind
406
if self.tree_kind(t) != self.final_kind(t))
393
407
new_ids.update(changed_kind)
408
file_id_changed = set(t for t in changed_id if t in self._removed_id)
409
for parent_trans_id in file_id_changed:
410
new_ids.update(self.iter_tree_children(parent_trans_id))
394
411
return sorted(FinalPaths(self).get_paths(new_ids))
396
413
def final_kind(self, trans_id):
397
414
"""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)
416
:return: None if the file does not exist/has no contents. (It is
417
conceivable that a path would be created without the corresponding
418
contents insertion command)
403
420
if trans_id in self._new_contents:
404
421
return self._new_contents[trans_id]
405
422
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
425
return self.tree_kind(trans_id)
531
550
# ensure that all children are registered with the transaction
532
551
list(self.iter_tree_children(parent_id))
553
@deprecated_method(deprecated_in((2, 3, 0)))
534
554
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
555
return self._has_named_child(
556
name, parent_id, known_children=by_parent.get(parent_id, []))
558
def _has_named_child(self, name, parent_id, known_children):
559
"""Does a parent already have a name child.
561
:param name: The searched for name.
563
:param parent_id: The parent for which the check is made.
565
:param known_children: The already known children. This should have
566
been recently obtained from `self.by_parent.get(parent_id)`
567
(or will be if None is passed).
569
if known_children is None:
570
known_children = self.by_parent().get(parent_id, [])
571
for child in known_children:
540
572
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
574
parent_path = self._tree_id_paths.get(parent_id, None)
575
if parent_path is None:
576
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
578
child_path = joinpath(parent_path, name)
579
child_id = self._tree_path_ids.get(child_path, None)
548
580
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
581
# Not known by the tree transform yet, check the filesystem
582
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?
584
raise AssertionError('child_id is missing: %s, %s, %s'
585
% (name, parent_id, child_id))
587
def _available_backup_name(self, name, target_id):
588
"""Find an available backup name.
590
:param name: The basename of the file.
592
:param target_id: The directory trans_id where the backup should
595
known_children = self.by_parent().get(target_id, [])
596
return osutils.available_backup_name(
598
lambda base: self._has_named_child(
599
base, target_id, known_children))
559
601
def _parent_loops(self):
560
602
"""No entry should be its own ancestor"""
644
679
if (self._new_name, self._new_parent) == ({}, {}):
646
681
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]
683
for child_tid in children:
684
name = self.final_name(child_tid)
686
# Keep children only if they still exist in the end
687
if not self._case_sensitive_target:
689
name_ids.append((name, child_tid))
652
692
last_trans_id = None
653
693
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
694
kind = self.final_kind(trans_id)
658
695
file_id = self.final_file_id(trans_id)
659
696
if kind is None and file_id is None:
681
718
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
719
"""Children must have a directory parent"""
684
721
for parent_id, children in by_parent.iteritems():
685
722
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
725
for child_id in children:
726
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)
731
# There is at least a child, so we need an existing directory to
733
kind = self.final_kind(parent_id)
735
# The directory will be deleted
699
736
conflicts.append(('missing parent', parent_id))
700
737
elif kind != "directory":
738
# Meh, we need a *directory* to put something in it
701
739
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
742
def _set_executability(self, path, trans_id):
715
743
"""Set the executability of versioned files """
716
744
if supports_executable():
780
808
self.create_symlink(target, trans_id)
811
def new_orphan(self, trans_id, parent_id):
812
"""Schedule an item to be orphaned.
814
When a directory is about to be removed, its children, if they are not
815
versioned are moved out of the way: they don't have a parent anymore.
817
:param trans_id: The trans_id of the existing item.
818
:param parent_id: The parent trans_id of the item.
820
raise NotImplementedError(self.new_orphan)
822
def _get_potential_orphans(self, dir_id):
823
"""Find the potential orphans in a directory.
825
A directory can't be safely deleted if there are versioned files in it.
826
If all the contained files are unversioned then they can be orphaned.
828
The 'None' return value means that the directory contains at least one
829
versioned file and should not be deleted.
831
:param dir_id: The directory trans id.
833
:return: A list of the orphan trans ids or None if at least one
834
versioned file is present.
837
# Find the potential orphans, stop if one item should be kept
838
for child_tid in self.by_parent()[dir_id]:
839
if child_tid in self._removed_contents:
840
# The child is removed as part of the transform. Since it was
841
# versioned before, it's not an orphan
843
elif self.final_file_id(child_tid) is None:
844
# The child is not versioned
845
orphans.append(child_tid)
847
# We have a versioned file here, searching for orphans is
783
853
def _affected_ids(self):
784
854
"""Return the set of transform ids affected by the transform"""
785
855
trans_ids = set(self._removed_id)
928
995
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
997
def commit(self, branch, message, merge_parents=None, strict=False,
998
timestamp=None, timezone=None, committer=None, authors=None,
999
revprops=None, revision_id=None):
931
1000
"""Commit the result of this TreeTransform to a branch.
933
1002
:param branch: The branch to commit to.
934
1003
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1004
:param merge_parents: Additional parent revision-ids specified by
1006
:param strict: If True, abort the commit if there are unversioned
1008
:param timestamp: if not None, seconds-since-epoch for the time and
1009
date. (May be a float.)
1010
:param timezone: Optional timezone for timestamp, as an offset in
1012
:param committer: Optional committer in email-id format.
1013
(e.g. "J Random Hacker <jrandom@example.com>")
1014
:param authors: Optional list of authors in email-id format.
1015
:param revprops: Optional dictionary of revision properties.
1016
:param revision_id: Optional revision id. (Specifying a revision-id
1017
may reduce performance for some non-native formats.)
936
1018
:return: The revision_id of the revision committed.
938
1020
self._check_malformed()
1097
1185
if self._tree is None:
1100
entries = [(self._limbo_name(t), t, k) for t, k in
1101
self._new_contents.iteritems()]
1102
entries.sort(reverse=True)
1103
for path, trans_id, kind in entries:
1188
limbo_paths = sorted(self._limbo_files.values(), reverse=True)
1189
for path in limbo_paths:
1193
if e.errno != errno.ENOENT:
1195
# XXX: warn? perhaps we just got interrupted at an
1196
# inconvenient moment, but perhaps files are disappearing
1106
1199
delete_any(self._limbodir)
1107
1200
except OSError:
1173
1266
descendants.update(self._limbo_descendants(descendant))
1174
1267
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1269
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1270
"""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.
1274
:param contents: an iterator of strings, all of which will be written
1275
to the target destination.
1276
:param trans_id: TreeTransform handle
1277
:param mode_id: If not None, force the mode of the target file to match
1278
the mode of the object referenced by mode_id.
1279
Otherwise, we will try to preserve mode bits of an existing file.
1280
:param sha1: If the sha1 of this content is already known, pass it in.
1281
We can use it to prevent future sha1 computations.
1187
1283
name = self._limbo_name(trans_id)
1188
1284
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.
1286
unique_add(self._new_contents, trans_id, 'file')
1199
1287
f.writelines(contents)
1202
1290
self._set_mtime(name)
1203
1291
self._set_mode(trans_id, mode_id, S_ISREG)
1292
# It is unfortunate we have to use lstat instead of fstat, but we just
1293
# used utime and chmod on the file, so we need the accurate final
1295
if sha1 is not None:
1296
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1298
def _read_file_chunks(self, trans_id):
1206
1299
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1369
del self._limbo_children_names[trans_id]
1275
1370
delete_any(self._limbo_name(trans_id))
1372
def new_orphan(self, trans_id, parent_id):
1373
# FIXME: There is no tree config, so we use the branch one (it's weird
1374
# to define it this way as orphaning can only occur in a working tree,
1375
# but that's all we have (for now). It will find the option in
1376
# locations.conf or bazaar.conf though) -- vila 20100916
1377
conf = self._tree.branch.get_config()
1378
conf_var_name = 'bzr.transform.orphan_policy'
1379
orphan_policy = conf.get_user_option(conf_var_name)
1380
default_policy = orphaning_registry.default_key
1381
if orphan_policy is None:
1382
orphan_policy = default_policy
1383
if orphan_policy not in orphaning_registry:
1384
trace.warning('%s (from %s) is not a known policy, defaulting '
1385
'to %s' % (orphan_policy, conf_var_name, default_policy))
1386
orphan_policy = default_policy
1387
handle_orphan = orphaning_registry.get(orphan_policy)
1388
handle_orphan(self, trans_id, parent_id)
1391
class OrphaningError(errors.BzrError):
1393
# Only bugs could lead to such exception being seen by the user
1394
internal_error = True
1395
_fmt = "Error while orphaning %s in %s directory"
1397
def __init__(self, orphan, parent):
1398
errors.BzrError.__init__(self)
1399
self.orphan = orphan
1400
self.parent = parent
1403
class OrphaningForbidden(OrphaningError):
1405
_fmt = "Policy: %s doesn't allow creating orphans."
1407
def __init__(self, policy):
1408
errors.BzrError.__init__(self)
1409
self.policy = policy
1412
def move_orphan(tt, orphan_id, parent_id):
1413
"""See TreeTransformBase.new_orphan.
1415
This creates a new orphan in the `bzr-orphans` dir at the root of the
1418
:param tt: The TreeTransform orphaning `trans_id`.
1420
:param orphan_id: The trans id that should be orphaned.
1422
:param parent_id: The orphan parent trans id.
1424
# Add the orphan dir if it doesn't exist
1425
orphan_dir_basename = 'bzr-orphans'
1426
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1427
if tt.final_kind(od_id) is None:
1428
tt.create_directory(od_id)
1429
parent_path = tt._tree_id_paths[parent_id]
1430
# Find a name that doesn't exist yet in the orphan dir
1431
actual_name = tt.final_name(orphan_id)
1432
new_name = tt._available_backup_name(actual_name, od_id)
1433
tt.adjust_path(new_name, od_id, orphan_id)
1434
trace.warning('%s has been orphaned in %s'
1435
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1438
def refuse_orphan(tt, orphan_id, parent_id):
1439
"""See TreeTransformBase.new_orphan.
1441
This refuses to create orphan, letting the caller handle the conflict.
1443
raise OrphaningForbidden('never')
1446
orphaning_registry = registry.Registry()
1447
orphaning_registry.register(
1448
'conflict', refuse_orphan,
1449
'Leave orphans in place and create a conflict on the directory.')
1450
orphaning_registry.register(
1451
'move', move_orphan,
1452
'Move orphans into the bzr-orphans directory.')
1453
orphaning_registry._set_default_key('conflict')
1278
1456
class TreeTransform(DiskTreeTransform):
1279
1457
"""Represent a tree transformation.
1397
1575
def tree_kind(self, trans_id):
1398
1576
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1578
:returns: The file kind or None if the file does not exist
1402
1580
path = self._tree_id_paths.get(trans_id)
1403
1581
if path is None:
1404
raise NoSuchFile(None)
1406
1584
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1585
except errors.NoSuchFile:
1413
1588
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1589
"""Set the mode of new file contents.
1666
1841
if trans_id in self._needs_rename:
1668
1843
mover.rename(self._limbo_name(trans_id), full_path)
1844
except errors.TransformRenameFailed, e:
1670
1845
# We may be renaming a dangling inventory id
1671
1846
if e.errno != errno.ENOENT:
1674
1849
self.rename_count += 1
1850
# TODO: if trans_id in self._observed_sha1s, we should
1851
# re-stat the final target, since ctime will be
1852
# updated by the change.
1675
1853
if (trans_id in self._new_contents or
1676
1854
self.path_changed(trans_id)):
1677
1855
if trans_id in self._new_contents:
1678
1856
modified_paths.append(full_path)
1679
1857
if trans_id in self._new_executability:
1680
1858
self._set_executability(path, trans_id)
1859
if trans_id in self._observed_sha1s:
1860
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1861
st = osutils.lstat(full_path)
1862
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1864
child_pb.finished()
1865
for path, trans_id in new_paths:
1866
# new_paths includes stuff like workingtree conflicts. Only the
1867
# stuff in new_contents actually comes from limbo.
1868
if trans_id in self._limbo_files:
1869
del self._limbo_files[trans_id]
1683
1870
self._new_contents.clear()
1684
1871
return modified_paths
1873
def _apply_observed_sha1s(self):
1874
"""After we have finished renaming everything, update observed sha1s
1876
This has to be done after self._tree.apply_inventory_delta, otherwise
1877
it doesn't know anything about the files we are updating. Also, we want
1878
to do this as late as possible, so that most entries end up cached.
1880
# TODO: this doesn't update the stat information for directories. So
1881
# the first 'bzr status' will still need to rewrite
1882
# .bzr/checkout/dirstate. However, we at least don't need to
1883
# re-read all of the files.
1884
# TODO: If the operation took a while, we could do a time.sleep(3) here
1885
# to allow the clock to tick over and ensure we won't have any
1886
# problems. (we could observe start time, and finish time, and if
1887
# it is less than eg 10% overhead, add a sleep call.)
1888
paths = FinalPaths(self)
1889
for trans_id, observed in self._observed_sha1s.iteritems():
1890
path = paths.get_path(trans_id)
1891
# We could get the file_id, but dirstate prefers to use the path
1892
# anyway, and it is 'cheaper' to determine.
1893
# file_id = self._new_id[trans_id]
1894
self._tree._observed_sha1(None, path, observed)
1687
1897
class TransformPreview(DiskTreeTransform):
1688
1898
"""A TreeTransform for generating preview trees.
1767
1982
yield self._get_repository().revision_tree(revision_id)
1769
1984
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1985
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
1986
self._iter_parent_trees()]
1772
1987
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
1988
self.get_file_lines(file_id))
1774
1989
repo = self._get_repository()
1775
1990
base_vf = repo.texts
1776
1991
if base_vf not in vf.fallback_versionedfiles:
1777
1992
vf.fallback_versionedfiles.append(base_vf)
1778
1993
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
1995
def _stat_limbo_file(self, file_id=None, trans_id=None):
1996
if trans_id is None:
1997
trans_id = self._transform.trans_id_file_id(file_id)
1782
1998
name = self._transform._limbo_name(trans_id)
1783
1999
return os.lstat(name)
2266
2499
for num, _unused in enumerate(wt.all_file_ids()):
2267
2500
if num > 0: # more than just a root
2268
2501
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
existing_files = set()
2270
for dir, files in wt.walkdirs():
2271
existing_files.update(f[0] for f in files)
2272
2502
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2503
top_pb = ui.ui_factory.nested_progress_bar()
2274
2504
pp = ProgressPhase("Build phase", 2, top_pb)
2275
2505
if tree.inventory.root is not None:
2276
2506
# This is kind of a hack: we should be altering the root
2298
2528
precomputed_delta = []
2300
2530
precomputed_delta = None
2531
# Check if tree inventory has content. If so, we populate
2532
# existing_files with the directory content. If there are no
2533
# entries we skip populating existing_files as its not used.
2534
# This improves performance and unncessary work on large
2535
# directory trees. (#501307)
2537
existing_files = set()
2538
for dir, files in wt.walkdirs():
2539
existing_files.update(f[0] for f in files)
2301
2540
for num, (tree_path, entry) in \
2302
2541
enumerate(tree.inventory.iter_entries_by_dir()):
2303
2542
pb.update("Building tree", num - len(deferred_contents), total)
2384
2623
unchanged = dict(unchanged)
2385
2624
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2626
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2627
accelerator_path = unchanged.get(file_id)
2389
2628
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2629
new_desired_files.append((file_id,
2630
(trans_id, tree_path, text_sha1)))
2392
2632
pb.update('Adding file contents', count + offset, total)
2411
2651
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2652
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2653
tree.iter_files_bytes(new_desired_files)):
2414
2654
if wt.supports_content_filtering():
2415
2655
filters = wt._content_filter_stack(tree_path)
2416
2656
contents = filtered_output_bytes(contents, filters,
2417
2657
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2658
tt.create_file(contents, trans_id, sha1=text_sha1)
2419
2659
pb.update('Adding file contents', count + offset, total)
2423
2663
for child in tt.iter_tree_children(old_parent):
2424
2664
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2667
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2668
by_parent = tt.by_parent()
2428
2669
for child in by_parent[old_parent]:
2429
2670
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2671
return by_parent[old_parent]
2432
2674
def _content_match(tree, entry, file_id, kind, target_path):
2433
2675
if entry.kind != kind:
2435
2677
if entry.kind == "directory":
2437
2679
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2680
f = file(target_path, 'rb')
2682
if tree.get_file_text(file_id) == f.read():
2440
2686
elif entry.kind == "symlink":
2441
2687
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2740
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
2743
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2744
filter_tree_path=None):
2515
2745
"""Create new file contents according to tree contents.
2546
2776
tt.set_executability(entry.executable, trans_id)
2779
@deprecated_function(deprecated_in((2, 3, 0)))
2549
2780
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
2781
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2784
@deprecated_function(deprecated_in((2, 3, 0)))
2553
2785
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
2786
"""Produce a backup-style name that appears to be available"""
2555
2787
def name_gen():
2641
2873
backups, merge_modified, basis_tree=None):
2642
2874
if basis_tree is not None:
2643
2875
basis_tree.lock_read()
2644
change_list = target_tree.iter_changes(working_tree,
2876
# We ask the working_tree for its changes relative to the target, rather
2877
# than the target changes relative to the working tree. Because WT4 has an
2878
# optimizer to compare itself to a target, but no optimizer for the
2880
change_list = working_tree.iter_changes(target_tree,
2645
2881
specific_files=specific_files, pb=pb)
2646
2882
if target_tree.get_root_id() is None:
2647
2883
skip_root = True
2651
2887
deferred_files = []
2652
2888
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2889
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2890
target_path, wt_path = path
2891
target_versioned, wt_versioned = versioned
2892
target_parent, wt_parent = parent
2893
target_name, wt_name = name
2894
target_kind, wt_kind = kind
2895
target_executable, wt_executable = executable
2896
if skip_root and wt_parent is None:
2656
2898
trans_id = tt.trans_id_file_id(file_id)
2658
2900
if changed_content:
2659
2901
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2902
if wt_kind == 'file' and (backups or target_kind is None):
2661
2903
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2904
if merge_modified.get(file_id) != wt_sha1:
2663
2905
# acquire the basis tree lazily to prevent the
2669
2911
if file_id in basis_tree:
2670
2912
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2913
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2914
elif target_kind is None and not target_versioned:
2673
2915
keep_content = True
2674
if kind[0] is not None:
2916
if wt_kind is not None:
2675
2917
if not keep_content:
2676
2918
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)
2919
elif target_kind is not None:
2920
parent_trans_id = tt.trans_id_file_id(wt_parent)
2921
backup_name = tt._available_backup_name(
2922
wt_name, parent_trans_id)
2682
2923
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):
2924
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2925
if wt_versioned and target_versioned:
2685
2926
tt.unversion_file(trans_id)
2686
2927
tt.version_file(file_id, new_trans_id)
2687
2928
# New contents should have the same unix perms as old
2689
2930
mode_id = trans_id
2690
2931
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2932
if target_kind in ('directory', 'tree-reference'):
2692
2933
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2934
if target_kind == 'tree-reference':
2694
2935
revision = target_tree.get_reference_revision(file_id,
2696
2937
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2938
elif target_kind == 'symlink':
2698
2939
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2941
elif target_kind == 'file':
2701
2942
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2943
if basis_tree is None:
2703
2944
basis_tree = working_tree.basis_tree()
2711
2952
merge_modified[file_id] = new_sha1
2713
2954
# 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):
2955
if keep_content and wt_executable == target_executable:
2956
tt.set_executability(target_executable, trans_id)
2957
elif target_kind is not None:
2958
raise AssertionError(target_kind)
2959
if not wt_versioned and target_versioned:
2719
2960
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2961
if wt_versioned and not target_versioned:
2721
2962
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:
2963
if (target_name is not None and
2964
(wt_name != target_name or wt_parent != target_parent)):
2965
if target_name == '' and target_parent is None:
2725
2966
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)
2968
parent_trans = tt.trans_id_file_id(target_parent)
2969
if wt_parent is None and wt_versioned:
2970
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)
2972
tt.adjust_path(target_name, parent_trans, trans_id)
2973
if wt_executable != target_executable and target_kind == "file":
2974
tt.set_executability(target_executable, trans_id)
2734
2975
if working_tree.supports_content_filtering():
2735
2976
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
2977
target_tree.iter_files_bytes(deferred_files)):
2808
3049
elif c_type == 'missing parent':
2809
3050
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3051
if trans_id in tt._removed_contents:
3052
cancel_deletion = True
3053
orphans = tt._get_potential_orphans(trans_id)
3055
cancel_deletion = False
3056
# All children are orphans
3059
tt.new_orphan(o, trans_id)
3060
except OrphaningError:
3061
# Something bad happened so we cancel the directory
3062
# deletion which will leave it in place with a
3063
# conflict. The user can deal with it from there.
3064
# Note that this also catch the case where we don't
3065
# want to create orphans and leave the directory in
3067
cancel_deletion = True
3070
# Cancel the directory deletion
3071
tt.cancel_deletion(trans_id)
3072
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3077
tt.final_name(trans_id)
2900
3162
def rename(self, from_, to):
2901
3163
"""Rename a file from one path to another."""
2903
osutils.rename(from_, to)
3165
os.rename(from_, to)
2904
3166
except OSError, e:
2905
3167
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3168
raise errors.FileExists(to, str(e))
3169
# normal OSError doesn't include filenames so it's hard to see where
3170
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3171
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
3172
self.past_renames.append((from_, to))
2910
3174
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
