40
47
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
48
UnableCreateSymlink)
42
49
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
44
50
from bzrlib.osutils import (
52
57
supports_executable,
54
59
from bzrlib.progress import ProgressPhase
55
60
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
65
67
ROOT_PARENT = "root-parent"
68
69
def unique_add(map, key, value):
70
71
raise DuplicateKey(key=key)
74
76
class _TransformResults(object):
75
77
def __init__(self, modified_paths, rename_count):
76
78
object.__init__(self)
389
392
changed_kind = set(self._removed_contents)
390
393
changed_kind.intersection_update(self._new_contents)
391
394
changed_kind.difference_update(new_ids)
392
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
395
changed_kind = (t for t in changed_kind
396
if self.tree_kind(t) != self.final_kind(t))
394
397
new_ids.update(changed_kind)
395
398
return sorted(FinalPaths(self).get_paths(new_ids))
397
400
def final_kind(self, trans_id):
398
401
"""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)
403
:return: None if the file does not exist/has no contents. (It is
404
conceivable that a path would be created without the corresponding
405
contents insertion command)
404
407
if trans_id in self._new_contents:
405
408
return self._new_contents[trans_id]
406
409
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
412
return self.tree_kind(trans_id)
532
537
# ensure that all children are registered with the transaction
533
538
list(self.iter_tree_children(parent_id))
540
@deprecated_method(deprecated_in((2, 3, 0)))
535
541
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
542
return self._has_named_child(
543
name, parent_id, known_children=by_parent.get(parent_id, []))
545
def _has_named_child(self, name, parent_id, known_children):
546
"""Does a parent already have a name child.
548
:param name: The searched for name.
550
:param parent_id: The parent for which the check is made.
552
:param known_children: The already known children. This should have
553
been recently obtained from `self.by_parent.get(parent_id)`
554
(or will be if None is passed).
556
if known_children is None:
557
known_children = self.by_parent().get(parent_id, [])
558
for child in known_children:
541
559
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
561
parent_path = self._tree_id_paths.get(parent_id, None)
562
if parent_path is None:
563
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
565
child_path = joinpath(parent_path, name)
566
child_id = self._tree_path_ids.get(child_path, None)
549
567
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
568
# Not known by the tree transform yet, check the filesystem
569
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?
571
raise AssertionError('child_id is missing: %s, %s, %s'
572
% (name, parent_id, child_id))
574
def _available_backup_name(self, name, target_id):
575
"""Find an available backup name.
577
:param name: The basename of the file.
579
:param target_id: The directory trans_id where the backup should
582
known_children = self.by_parent().get(target_id, [])
583
return osutils.available_backup_name(
585
lambda base: self._has_named_child(
586
base, target_id, known_children))
560
588
def _parent_loops(self):
561
589
"""No entry should be its own ancestor"""
645
666
if (self._new_name, self._new_parent) == ({}, {}):
647
668
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]
670
for child_tid in children:
671
name = self.final_name(child_tid)
673
# Keep children only if they still exist in the end
674
if not self._case_sensitive_target:
676
name_ids.append((name, child_tid))
653
679
last_trans_id = None
654
680
for name, trans_id in name_ids:
656
kind = self.final_kind(trans_id)
681
kind = self.final_kind(trans_id)
659
682
file_id = self.final_file_id(trans_id)
660
683
if kind is None and file_id is None:
682
705
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
706
"""Children must have a directory parent"""
685
708
for parent_id, children in by_parent.iteritems():
686
709
if parent_id is ROOT_PARENT:
688
if not self._any_contents(children):
712
for child_id in children:
713
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)
718
# There is at least a child, so we need an existing directory to
720
kind = self.final_kind(parent_id)
722
# The directory will be deleted
700
723
conflicts.append(('missing parent', parent_id))
701
724
elif kind != "directory":
725
# Meh, we need a *directory* to put something in it
702
726
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
729
def _set_executability(self, path, trans_id):
716
730
"""Set the executability of versioned files """
717
731
if supports_executable():
781
795
self.create_symlink(target, trans_id)
798
def new_orphan(self, trans_id, parent_id):
799
"""Schedule an item to be orphaned.
801
When a directory is about to be removed, its children, if they are not
802
versioned are moved out of the way: they don't have a parent anymore.
804
:param trans_id: The trans_id of the existing item.
805
:param parent_id: The parent trans_id of the item.
807
raise NotImplementedError(self.new_orphan)
809
def _get_potential_orphans(self, dir_id):
810
"""Find the potential orphans in a directory.
812
A directory can't be safely deleted if there are versioned files in it.
813
If all the contained files are unversioned then they can be orphaned.
815
The 'None' return value means that the directory contains at least one
816
versioned file and should not be deleted.
818
:param dir_id: The directory trans id.
820
:return: A list of the orphan trans ids or None if at least one
821
versioned file is present.
824
# Find the potential orphans, stop if one item should be kept
825
for child_tid in self.by_parent()[dir_id]:
826
if child_tid in self._removed_contents:
827
# The child is removed as part of the transform. Since it was
828
# versioned before, it's not an orphan
830
elif self.final_file_id(child_tid) is None:
831
# The child is not versioned
832
orphans.append(child_tid)
834
# We have a versioned file here, searching for orphans is
784
840
def _affected_ids(self):
785
841
"""Return the set of transform ids affected by the transform"""
786
842
trans_ids = set(self._removed_id)
1119
1173
if self._tree is None:
1122
entries = [(self._limbo_name(t), t, k) for t, k in
1123
self._new_contents.iteritems()]
1124
entries.sort(reverse=True)
1125
for path, trans_id, kind in entries:
1176
limbo_paths = self._limbo_files.values() + list(
1177
self._possibly_stale_limbo_files)
1178
limbo_paths = sorted(limbo_paths, reverse=True)
1179
for path in limbo_paths:
1183
if e.errno != errno.ENOENT:
1185
# XXX: warn? perhaps we just got interrupted at an
1186
# inconvenient moment, but perhaps files are disappearing
1128
1189
delete_any(self._limbodir)
1129
1190
except OSError:
1178
1239
entries from _limbo_files, because they are now stale.
1180
1241
for trans_id in trans_ids:
1181
old_path = self._limbo_files.pop(trans_id)
1242
old_path = self._limbo_files[trans_id]
1243
self._possibly_stale_limbo_files.add(old_path)
1244
del self._limbo_files[trans_id]
1182
1245
if trans_id not in self._new_contents:
1184
1247
new_path = self._limbo_name(trans_id)
1185
osutils.rename(old_path, new_path)
1248
os.rename(old_path, new_path)
1249
self._possibly_stale_limbo_files.remove(old_path)
1186
1250
for descendant in self._limbo_descendants(trans_id):
1187
1251
desc_path = self._limbo_files[descendant]
1188
1252
desc_path = new_path + desc_path[len(old_path):]
1195
1259
descendants.update(self._limbo_descendants(descendant))
1196
1260
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1262
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1263
"""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.
1267
:param contents: an iterator of strings, all of which will be written
1268
to the target destination.
1269
:param trans_id: TreeTransform handle
1270
:param mode_id: If not None, force the mode of the target file to match
1271
the mode of the object referenced by mode_id.
1272
Otherwise, we will try to preserve mode bits of an existing file.
1273
:param sha1: If the sha1 of this content is already known, pass it in.
1274
We can use it to prevent future sha1 computations.
1209
1276
name = self._limbo_name(trans_id)
1210
1277
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.
1279
unique_add(self._new_contents, trans_id, 'file')
1221
1280
f.writelines(contents)
1224
1283
self._set_mtime(name)
1225
1284
self._set_mode(trans_id, mode_id, S_ISREG)
1285
# It is unfortunate we have to use lstat instead of fstat, but we just
1286
# used utime and chmod on the file, so we need the accurate final
1288
if sha1 is not None:
1289
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
1291
def _read_file_chunks(self, trans_id):
1228
1292
cur_file = open(self._limbo_name(trans_id), 'rb')
1296
1362
del self._limbo_children_names[trans_id]
1297
1363
delete_any(self._limbo_name(trans_id))
1365
def new_orphan(self, trans_id, parent_id):
1366
# FIXME: There is no tree config, so we use the branch one (it's weird
1367
# to define it this way as orphaning can only occur in a working tree,
1368
# but that's all we have (for now). It will find the option in
1369
# locations.conf or bazaar.conf though) -- vila 20100916
1370
conf = self._tree.branch.get_config()
1371
conf_var_name = 'bzr.transform.orphan_policy'
1372
orphan_policy = conf.get_user_option(conf_var_name)
1373
default_policy = orphaning_registry.default_key
1374
if orphan_policy is None:
1375
orphan_policy = default_policy
1376
if orphan_policy not in orphaning_registry:
1377
trace.warning('%s (from %s) is not a known policy, defaulting '
1378
'to %s' % (orphan_policy, conf_var_name, default_policy))
1379
orphan_policy = default_policy
1380
handle_orphan = orphaning_registry.get(orphan_policy)
1381
handle_orphan(self, trans_id, parent_id)
1384
class OrphaningError(errors.BzrError):
1386
# Only bugs could lead to such exception being seen by the user
1387
internal_error = True
1388
_fmt = "Error while orphaning %s in %s directory"
1390
def __init__(self, orphan, parent):
1391
errors.BzrError.__init__(self)
1392
self.orphan = orphan
1393
self.parent = parent
1396
class OrphaningForbidden(OrphaningError):
1398
_fmt = "Policy: %s doesn't allow creating orphans."
1400
def __init__(self, policy):
1401
errors.BzrError.__init__(self)
1402
self.policy = policy
1405
def move_orphan(tt, orphan_id, parent_id):
1406
"""See TreeTransformBase.new_orphan.
1408
This creates a new orphan in the `bzr-orphans` dir at the root of the
1411
:param tt: The TreeTransform orphaning `trans_id`.
1413
:param orphan_id: The trans id that should be orphaned.
1415
:param parent_id: The orphan parent trans id.
1417
# Add the orphan dir if it doesn't exist
1418
orphan_dir_basename = 'bzr-orphans'
1419
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1420
if tt.final_kind(od_id) is None:
1421
tt.create_directory(od_id)
1422
parent_path = tt._tree_id_paths[parent_id]
1423
# Find a name that doesn't exist yet in the orphan dir
1424
actual_name = tt.final_name(orphan_id)
1425
new_name = tt._available_backup_name(actual_name, od_id)
1426
tt.adjust_path(new_name, od_id, orphan_id)
1427
trace.warning('%s has been orphaned in %s'
1428
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1431
def refuse_orphan(tt, orphan_id, parent_id):
1432
"""See TreeTransformBase.new_orphan.
1434
This refuses to create orphan, letting the caller handle the conflict.
1436
raise OrphaningForbidden('never')
1439
orphaning_registry = registry.Registry()
1440
orphaning_registry.register(
1441
'conflict', refuse_orphan,
1442
'Leave orphans in place and create a conflict on the directory.')
1443
orphaning_registry.register(
1444
'move', move_orphan,
1445
'Move orphans into the bzr-orphans directory.')
1446
orphaning_registry._set_default_key('conflict')
1300
1449
class TreeTransform(DiskTreeTransform):
1301
1450
"""Represent a tree transformation.
1419
1568
def tree_kind(self, trans_id):
1420
1569
"""Determine the file kind in the working tree.
1422
Raises NoSuchFile if the file does not exist
1571
:returns: The file kind or None if the file does not exist
1424
1573
path = self._tree_id_paths.get(trans_id)
1425
1574
if path is None:
1426
raise NoSuchFile(None)
1428
1577
return file_kind(self._tree.abspath(path))
1430
if e.errno != errno.ENOENT:
1433
raise NoSuchFile(path)
1578
except errors.NoSuchFile:
1435
1581
def _set_mode(self, trans_id, mode_id, typefunc):
1436
1582
"""Set the mode of new file contents.
1688
1834
if trans_id in self._needs_rename:
1690
1836
mover.rename(self._limbo_name(trans_id), full_path)
1837
except errors.TransformRenameFailed, e:
1692
1838
# We may be renaming a dangling inventory id
1693
1839
if e.errno != errno.ENOENT:
1696
1842
self.rename_count += 1
1843
# TODO: if trans_id in self._observed_sha1s, we should
1844
# re-stat the final target, since ctime will be
1845
# updated by the change.
1697
1846
if (trans_id in self._new_contents or
1698
1847
self.path_changed(trans_id)):
1699
1848
if trans_id in self._new_contents:
1700
1849
modified_paths.append(full_path)
1701
1850
if trans_id in self._new_executability:
1702
1851
self._set_executability(path, trans_id)
1852
if trans_id in self._observed_sha1s:
1853
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1854
st = osutils.lstat(full_path)
1855
self._observed_sha1s[trans_id] = (o_sha1, st)
1704
1857
child_pb.finished()
1858
for path, trans_id in new_paths:
1859
# new_paths includes stuff like workingtree conflicts. Only the
1860
# stuff in new_contents actually comes from limbo.
1861
if trans_id in self._limbo_files:
1862
del self._limbo_files[trans_id]
1705
1863
self._new_contents.clear()
1706
1864
return modified_paths
1866
def _apply_observed_sha1s(self):
1867
"""After we have finished renaming everything, update observed sha1s
1869
This has to be done after self._tree.apply_inventory_delta, otherwise
1870
it doesn't know anything about the files we are updating. Also, we want
1871
to do this as late as possible, so that most entries end up cached.
1873
# TODO: this doesn't update the stat information for directories. So
1874
# the first 'bzr status' will still need to rewrite
1875
# .bzr/checkout/dirstate. However, we at least don't need to
1876
# re-read all of the files.
1877
# TODO: If the operation took a while, we could do a time.sleep(3) here
1878
# to allow the clock to tick over and ensure we won't have any
1879
# problems. (we could observe start time, and finish time, and if
1880
# it is less than eg 10% overhead, add a sleep call.)
1881
paths = FinalPaths(self)
1882
for trans_id, observed in self._observed_sha1s.iteritems():
1883
path = paths.get_path(trans_id)
1884
# We could get the file_id, but dirstate prefers to use the path
1885
# anyway, and it is 'cheaper' to determine.
1886
# file_id = self._new_id[trans_id]
1887
self._tree._observed_sha1(None, path, observed)
1709
1890
class TransformPreview(DiskTreeTransform):
1710
1891
"""A TreeTransform for generating preview trees.
1789
1975
yield self._get_repository().revision_tree(revision_id)
1791
1977
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1978
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1793
1979
self._iter_parent_trees()]
1794
1980
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
1981
self.get_file_lines(file_id))
1796
1982
repo = self._get_repository()
1797
1983
base_vf = repo.texts
1798
1984
if base_vf not in vf.fallback_versionedfiles:
1799
1985
vf.fallback_versionedfiles.append(base_vf)
1800
1986
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
1988
def _stat_limbo_file(self, file_id=None, trans_id=None):
1989
if trans_id is None:
1990
trans_id = self._transform.trans_id_file_id(file_id)
1804
1991
name = self._transform._limbo_name(trans_id)
1805
1992
return os.lstat(name)
2291
2492
for num, _unused in enumerate(wt.all_file_ids()):
2292
2493
if num > 0: # more than just a root
2293
2494
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2294
existing_files = set()
2295
for dir, files in wt.walkdirs():
2296
existing_files.update(f[0] for f in files)
2297
2495
file_trans_id = {}
2298
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2496
top_pb = ui.ui_factory.nested_progress_bar()
2299
2497
pp = ProgressPhase("Build phase", 2, top_pb)
2300
2498
if tree.inventory.root is not None:
2301
2499
# This is kind of a hack: we should be altering the root
2323
2521
precomputed_delta = []
2325
2523
precomputed_delta = None
2524
# Check if tree inventory has content. If so, we populate
2525
# existing_files with the directory content. If there are no
2526
# entries we skip populating existing_files as its not used.
2527
# This improves performance and unncessary work on large
2528
# directory trees. (#501307)
2530
existing_files = set()
2531
for dir, files in wt.walkdirs():
2532
existing_files.update(f[0] for f in files)
2326
2533
for num, (tree_path, entry) in \
2327
2534
enumerate(tree.inventory.iter_entries_by_dir()):
2328
2535
pb.update("Building tree", num - len(deferred_contents), total)
2409
2616
unchanged = dict(unchanged)
2410
2617
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2619
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2413
2620
accelerator_path = unchanged.get(file_id)
2414
2621
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2622
new_desired_files.append((file_id,
2623
(trans_id, tree_path, text_sha1)))
2417
2625
pb.update('Adding file contents', count + offset, total)
2436
2644
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2645
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2438
2646
tree.iter_files_bytes(new_desired_files)):
2439
2647
if wt.supports_content_filtering():
2440
2648
filters = wt._content_filter_stack(tree_path)
2441
2649
contents = filtered_output_bytes(contents, filters,
2442
2650
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2651
tt.create_file(contents, trans_id, sha1=text_sha1)
2444
2652
pb.update('Adding file contents', count + offset, total)
2448
2656
for child in tt.iter_tree_children(old_parent):
2449
2657
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2660
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2661
by_parent = tt.by_parent()
2453
2662
for child in by_parent[old_parent]:
2454
2663
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2664
return by_parent[old_parent]
2457
2667
def _content_match(tree, entry, file_id, kind, target_path):
2458
2668
if entry.kind != kind:
2460
2670
if entry.kind == "directory":
2462
2672
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2673
f = file(target_path, 'rb')
2675
if tree.get_file_text(file_id) == f.read():
2465
2679
elif entry.kind == "symlink":
2466
2680
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2519
2733
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
2736
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2539
2737
filter_tree_path=None):
2540
2738
"""Create new file contents according to tree contents.
2571
2769
tt.set_executability(entry.executable, trans_id)
2772
@deprecated_function(deprecated_in((2, 3, 0)))
2574
2773
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2575
2774
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2777
@deprecated_function(deprecated_in((2, 3, 0)))
2578
2778
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2579
2779
"""Produce a backup-style name that appears to be available"""
2580
2780
def name_gen():
2666
2866
backups, merge_modified, basis_tree=None):
2667
2867
if basis_tree is not None:
2668
2868
basis_tree.lock_read()
2669
change_list = target_tree.iter_changes(working_tree,
2869
# We ask the working_tree for its changes relative to the target, rather
2870
# than the target changes relative to the working tree. Because WT4 has an
2871
# optimizer to compare itself to a target, but no optimizer for the
2873
change_list = working_tree.iter_changes(target_tree,
2670
2874
specific_files=specific_files, pb=pb)
2671
2875
if target_tree.get_root_id() is None:
2672
2876
skip_root = True
2676
2880
deferred_files = []
2677
2881
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
2882
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2883
target_path, wt_path = path
2884
target_versioned, wt_versioned = versioned
2885
target_parent, wt_parent = parent
2886
target_name, wt_name = name
2887
target_kind, wt_kind = kind
2888
target_executable, wt_executable = executable
2889
if skip_root and wt_parent is None:
2681
2891
trans_id = tt.trans_id_file_id(file_id)
2683
2893
if changed_content:
2684
2894
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2895
if wt_kind == 'file' and (backups or target_kind is None):
2686
2896
wt_sha1 = working_tree.get_file_sha1(file_id)
2687
2897
if merge_modified.get(file_id) != wt_sha1:
2688
2898
# acquire the basis tree lazily to prevent the
2694
2904
if file_id in basis_tree:
2695
2905
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2696
2906
keep_content = True
2697
elif kind[1] is None and not versioned[1]:
2907
elif target_kind is None and not target_versioned:
2698
2908
keep_content = True
2699
if kind[0] is not None:
2909
if wt_kind is not None:
2700
2910
if not keep_content:
2701
2911
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)
2912
elif target_kind is not None:
2913
parent_trans_id = tt.trans_id_file_id(wt_parent)
2914
backup_name = tt._available_backup_name(
2915
wt_name, parent_trans_id)
2707
2916
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):
2917
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2918
if wt_versioned and target_versioned:
2710
2919
tt.unversion_file(trans_id)
2711
2920
tt.version_file(file_id, new_trans_id)
2712
2921
# New contents should have the same unix perms as old
2714
2923
mode_id = trans_id
2715
2924
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2925
if target_kind in ('directory', 'tree-reference'):
2717
2926
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2927
if target_kind == 'tree-reference':
2719
2928
revision = target_tree.get_reference_revision(file_id,
2721
2930
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2931
elif target_kind == 'symlink':
2723
2932
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2934
elif target_kind == 'file':
2726
2935
deferred_files.append((file_id, (trans_id, mode_id)))
2727
2936
if basis_tree is None:
2728
2937
basis_tree = working_tree.basis_tree()
2736
2945
merge_modified[file_id] = new_sha1
2738
2947
# 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):
2948
if keep_content and wt_executable == target_executable:
2949
tt.set_executability(target_executable, trans_id)
2950
elif target_kind is not None:
2951
raise AssertionError(target_kind)
2952
if not wt_versioned and target_versioned:
2744
2953
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2954
if wt_versioned and not target_versioned:
2746
2955
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:
2956
if (target_name is not None and
2957
(wt_name != target_name or wt_parent != target_parent)):
2958
if target_name == '' and target_parent is None:
2750
2959
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)
2961
parent_trans = tt.trans_id_file_id(target_parent)
2962
if wt_parent is None and wt_versioned:
2963
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)
2965
tt.adjust_path(target_name, parent_trans, trans_id)
2966
if wt_executable != target_executable and target_kind == "file":
2967
tt.set_executability(target_executable, trans_id)
2759
2968
if working_tree.supports_content_filtering():
2760
2969
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
2970
target_tree.iter_files_bytes(deferred_files)):
2833
3042
elif c_type == 'missing parent':
2834
3043
trans_id = conflict[1]
2836
tt.cancel_deletion(trans_id)
2837
new_conflicts.add(('deleting parent', 'Not deleting',
3044
if trans_id in tt._removed_contents:
3045
cancel_deletion = True
3046
orphans = tt._get_potential_orphans(trans_id)
3048
cancel_deletion = False
3049
# All children are orphans
3052
tt.new_orphan(o, trans_id)
3053
except OrphaningError:
3054
# Something bad happened so we cancel the directory
3055
# deletion which will leave it in place with a
3056
# conflict. The user can deal with it from there.
3057
# Note that this also catch the case where we don't
3058
# want to create orphans and leave the directory in
3060
cancel_deletion = True
3063
# Cancel the directory deletion
3064
tt.cancel_deletion(trans_id)
3065
new_conflicts.add(('deleting parent', 'Not deleting',
2842
3070
tt.final_name(trans_id)
2925
3155
def rename(self, from_, to):
2926
3156
"""Rename a file from one path to another."""
2928
osutils.rename(from_, to)
3158
os.rename(from_, to)
2929
3159
except OSError, e:
2930
3160
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2931
3161
raise errors.FileExists(to, str(e))
3162
# normal OSError doesn't include filenames so it's hard to see where
3163
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3164
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2933
3165
self.past_renames.append((from_, to))
2935
3167
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
