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)
380
399
return sorted(FinalPaths(self).get_paths(new_ids))
382
401
def _inventory_altered(self):
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,
402
"""Determine which trans_ids need new Inventory entries.
404
An new entry is needed when anything that would be reflected by an
405
inventory entry changes, including file name, file_id, parent file_id,
406
file kind, and the execute bit.
408
Some care is taken to return entries with real changes, not cases
409
where the value is deleted and then restored to its original value,
410
but some actually unchanged values may be returned.
412
:returns: A list of (path, trans_id) for all items requiring an
413
inventory change. Ordered by path.
416
# Find entries whose file_ids are new (or changed).
417
new_file_id = set(t for t in self._new_id
418
if self._new_id[t] != self.tree_file_id(t))
419
for id_set in [self._new_name, self._new_parent, new_file_id,
386
420
self._new_executability]:
387
new_ids.update(id_set)
421
changed_ids.update(id_set)
422
# removing implies a kind change
388
423
changed_kind = set(self._removed_contents)
389
425
changed_kind.intersection_update(self._new_contents)
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))
426
# Ignore entries that are already known to have changed.
427
changed_kind.difference_update(changed_ids)
428
# to keep only the truly changed ones
429
changed_kind = (t for t in changed_kind
430
if self.tree_kind(t) != self.final_kind(t))
431
# all kind changes will alter the inventory
432
changed_ids.update(changed_kind)
433
# To find entries with changed parent_ids, find parents which existed,
434
# but changed file_id.
435
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
436
# Now add all their children to the set.
437
for parent_trans_id in new_file_id:
438
changed_ids.update(self.iter_tree_children(parent_trans_id))
439
return sorted(FinalPaths(self).get_paths(changed_ids))
396
441
def final_kind(self, trans_id):
397
442
"""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)
444
:return: None if the file does not exist/has no contents. (It is
445
conceivable that a path would be created without the corresponding
446
contents insertion command)
403
448
if trans_id in self._new_contents:
404
449
return self._new_contents[trans_id]
405
450
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
453
return self.tree_kind(trans_id)
531
578
# ensure that all children are registered with the transaction
532
579
list(self.iter_tree_children(parent_id))
581
@deprecated_method(deprecated_in((2, 3, 0)))
534
582
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
583
return self._has_named_child(
584
name, parent_id, known_children=by_parent.get(parent_id, []))
586
def _has_named_child(self, name, parent_id, known_children):
587
"""Does a parent already have a name child.
589
:param name: The searched for name.
591
:param parent_id: The parent for which the check is made.
593
:param known_children: The already known children. This should have
594
been recently obtained from `self.by_parent.get(parent_id)`
595
(or will be if None is passed).
597
if known_children is None:
598
known_children = self.by_parent().get(parent_id, [])
599
for child in known_children:
540
600
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
602
parent_path = self._tree_id_paths.get(parent_id, None)
603
if parent_path is None:
604
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
606
child_path = joinpath(parent_path, name)
607
child_id = self._tree_path_ids.get(child_path, None)
548
608
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
609
# Not known by the tree transform yet, check the filesystem
610
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?
612
raise AssertionError('child_id is missing: %s, %s, %s'
613
% (name, parent_id, child_id))
615
def _available_backup_name(self, name, target_id):
616
"""Find an available backup name.
618
:param name: The basename of the file.
620
:param target_id: The directory trans_id where the backup should
623
known_children = self.by_parent().get(target_id, [])
624
return osutils.available_backup_name(
626
lambda base: self._has_named_child(
627
base, target_id, known_children))
559
629
def _parent_loops(self):
560
630
"""No entry should be its own ancestor"""
644
707
if (self._new_name, self._new_parent) == ({}, {}):
646
709
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]
711
for child_tid in children:
712
name = self.final_name(child_tid)
714
# Keep children only if they still exist in the end
715
if not self._case_sensitive_target:
717
name_ids.append((name, child_tid))
652
720
last_trans_id = None
653
721
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
722
kind = self.final_kind(trans_id)
658
723
file_id = self.final_file_id(trans_id)
659
724
if kind is None and file_id is None:
681
746
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
747
"""Children must have a directory parent"""
684
749
for parent_id, children in by_parent.iteritems():
685
750
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
753
for child_id in children:
754
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)
759
# There is at least a child, so we need an existing directory to
761
kind = self.final_kind(parent_id)
763
# The directory will be deleted
699
764
conflicts.append(('missing parent', parent_id))
700
765
elif kind != "directory":
766
# Meh, we need a *directory* to put something in it
701
767
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
770
def _set_executability(self, path, trans_id):
715
771
"""Set the executability of versioned files """
716
772
if supports_executable():
780
836
self.create_symlink(target, trans_id)
839
def new_orphan(self, trans_id, parent_id):
840
"""Schedule an item to be orphaned.
842
When a directory is about to be removed, its children, if they are not
843
versioned are moved out of the way: they don't have a parent anymore.
845
:param trans_id: The trans_id of the existing item.
846
:param parent_id: The parent trans_id of the item.
848
raise NotImplementedError(self.new_orphan)
850
def _get_potential_orphans(self, dir_id):
851
"""Find the potential orphans in a directory.
853
A directory can't be safely deleted if there are versioned files in it.
854
If all the contained files are unversioned then they can be orphaned.
856
The 'None' return value means that the directory contains at least one
857
versioned file and should not be deleted.
859
:param dir_id: The directory trans id.
861
:return: A list of the orphan trans ids or None if at least one
862
versioned file is present.
865
# Find the potential orphans, stop if one item should be kept
866
for child_tid in self.by_parent()[dir_id]:
867
if child_tid in self._removed_contents:
868
# The child is removed as part of the transform. Since it was
869
# versioned before, it's not an orphan
871
elif self.final_file_id(child_tid) is None:
872
# The child is not versioned
873
orphans.append(child_tid)
875
# We have a versioned file here, searching for orphans is
783
881
def _affected_ids(self):
784
882
"""Return the set of transform ids affected by the transform"""
785
883
trans_ids = set(self._removed_id)
928
1023
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1025
def commit(self, branch, message, merge_parents=None, strict=False,
1026
timestamp=None, timezone=None, committer=None, authors=None,
1027
revprops=None, revision_id=None):
931
1028
"""Commit the result of this TreeTransform to a branch.
933
1030
:param branch: The branch to commit to.
934
1031
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1032
:param merge_parents: Additional parent revision-ids specified by
1034
:param strict: If True, abort the commit if there are unversioned
1036
:param timestamp: if not None, seconds-since-epoch for the time and
1037
date. (May be a float.)
1038
:param timezone: Optional timezone for timestamp, as an offset in
1040
:param committer: Optional committer in email-id format.
1041
(e.g. "J Random Hacker <jrandom@example.com>")
1042
:param authors: Optional list of authors in email-id format.
1043
:param revprops: Optional dictionary of revision properties.
1044
:param revision_id: Optional revision id. (Specifying a revision-id
1045
may reduce performance for some non-native formats.)
936
1046
:return: The revision_id of the revision committed.
938
1048
self._check_malformed()
1097
1214
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:
1217
limbo_paths = self._limbo_files.values() + list(
1218
self._possibly_stale_limbo_files)
1219
limbo_paths = sorted(limbo_paths, reverse=True)
1220
for path in limbo_paths:
1224
if e.errno != errno.ENOENT:
1226
# XXX: warn? perhaps we just got interrupted at an
1227
# inconvenient moment, but perhaps files are disappearing
1106
1230
delete_any(self._limbodir)
1107
1231
except OSError:
1156
1280
entries from _limbo_files, because they are now stale.
1158
1282
for trans_id in trans_ids:
1159
old_path = self._limbo_files.pop(trans_id)
1283
old_path = self._limbo_files[trans_id]
1284
self._possibly_stale_limbo_files.add(old_path)
1285
del self._limbo_files[trans_id]
1160
1286
if trans_id not in self._new_contents:
1162
1288
new_path = self._limbo_name(trans_id)
1163
osutils.rename(old_path, new_path)
1289
os.rename(old_path, new_path)
1290
self._possibly_stale_limbo_files.remove(old_path)
1164
1291
for descendant in self._limbo_descendants(trans_id):
1165
1292
desc_path = self._limbo_files[descendant]
1166
1293
desc_path = new_path + desc_path[len(old_path):]
1173
1300
descendants.update(self._limbo_descendants(descendant))
1174
1301
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1303
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1304
"""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.
1308
:param contents: an iterator of strings, all of which will be written
1309
to the target destination.
1310
:param trans_id: TreeTransform handle
1311
:param mode_id: If not None, force the mode of the target file to match
1312
the mode of the object referenced by mode_id.
1313
Otherwise, we will try to preserve mode bits of an existing file.
1314
:param sha1: If the sha1 of this content is already known, pass it in.
1315
We can use it to prevent future sha1 computations.
1187
1317
name = self._limbo_name(trans_id)
1188
1318
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.
1320
unique_add(self._new_contents, trans_id, 'file')
1199
1321
f.writelines(contents)
1202
1324
self._set_mtime(name)
1203
1325
self._set_mode(trans_id, mode_id, S_ISREG)
1326
# It is unfortunate we have to use lstat instead of fstat, but we just
1327
# used utime and chmod on the file, so we need the accurate final
1329
if sha1 is not None:
1330
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1332
def _read_file_chunks(self, trans_id):
1206
1333
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1403
del self._limbo_children_names[trans_id]
1275
1404
delete_any(self._limbo_name(trans_id))
1406
def new_orphan(self, trans_id, parent_id):
1407
# FIXME: There is no tree config, so we use the branch one (it's weird
1408
# to define it this way as orphaning can only occur in a working tree,
1409
# but that's all we have (for now). It will find the option in
1410
# locations.conf or bazaar.conf though) -- vila 20100916
1411
conf = self._tree.branch.get_config()
1412
conf_var_name = 'bzr.transform.orphan_policy'
1413
orphan_policy = conf.get_user_option(conf_var_name)
1414
default_policy = orphaning_registry.default_key
1415
if orphan_policy is None:
1416
orphan_policy = default_policy
1417
if orphan_policy not in orphaning_registry:
1418
trace.warning('%s (from %s) is not a known policy, defaulting '
1419
'to %s' % (orphan_policy, conf_var_name, default_policy))
1420
orphan_policy = default_policy
1421
handle_orphan = orphaning_registry.get(orphan_policy)
1422
handle_orphan(self, trans_id, parent_id)
1425
class OrphaningError(errors.BzrError):
1427
# Only bugs could lead to such exception being seen by the user
1428
internal_error = True
1429
_fmt = "Error while orphaning %s in %s directory"
1431
def __init__(self, orphan, parent):
1432
errors.BzrError.__init__(self)
1433
self.orphan = orphan
1434
self.parent = parent
1437
class OrphaningForbidden(OrphaningError):
1439
_fmt = "Policy: %s doesn't allow creating orphans."
1441
def __init__(self, policy):
1442
errors.BzrError.__init__(self)
1443
self.policy = policy
1446
def move_orphan(tt, orphan_id, parent_id):
1447
"""See TreeTransformBase.new_orphan.
1449
This creates a new orphan in the `bzr-orphans` dir at the root of the
1452
:param tt: The TreeTransform orphaning `trans_id`.
1454
:param orphan_id: The trans id that should be orphaned.
1456
:param parent_id: The orphan parent trans id.
1458
# Add the orphan dir if it doesn't exist
1459
orphan_dir_basename = 'bzr-orphans'
1460
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1461
if tt.final_kind(od_id) is None:
1462
tt.create_directory(od_id)
1463
parent_path = tt._tree_id_paths[parent_id]
1464
# Find a name that doesn't exist yet in the orphan dir
1465
actual_name = tt.final_name(orphan_id)
1466
new_name = tt._available_backup_name(actual_name, od_id)
1467
tt.adjust_path(new_name, od_id, orphan_id)
1468
trace.warning('%s has been orphaned in %s'
1469
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1472
def refuse_orphan(tt, orphan_id, parent_id):
1473
"""See TreeTransformBase.new_orphan.
1475
This refuses to create orphan, letting the caller handle the conflict.
1477
raise OrphaningForbidden('never')
1480
orphaning_registry = registry.Registry()
1481
orphaning_registry.register(
1482
'conflict', refuse_orphan,
1483
'Leave orphans in place and create a conflict on the directory.')
1484
orphaning_registry.register(
1485
'move', move_orphan,
1486
'Move orphans into the bzr-orphans directory.')
1487
orphaning_registry._set_default_key('conflict')
1278
1490
class TreeTransform(DiskTreeTransform):
1279
1491
"""Represent a tree transformation.
1397
1609
def tree_kind(self, trans_id):
1398
1610
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1612
:returns: The file kind or None if the file does not exist
1402
1614
path = self._tree_id_paths.get(trans_id)
1403
1615
if path is None:
1404
raise NoSuchFile(None)
1406
1618
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1619
except errors.NoSuchFile:
1413
1622
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1623
"""Set the mode of new file contents.
1623
1832
tree_paths = list(self._tree_path_ids.iteritems())
1624
1833
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1834
child_pb = ui.ui_factory.nested_progress_bar()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1836
for num, (path, trans_id) in enumerate(tree_paths):
1837
# do not attempt to move root into a subdirectory of itself.
1629
1840
child_pb.update('removing file', num, len(tree_paths))
1630
1841
full_path = self._tree.abspath(path)
1631
1842
if trans_id in self._removed_contents:
1666
1877
if trans_id in self._needs_rename:
1668
1879
mover.rename(self._limbo_name(trans_id), full_path)
1880
except errors.TransformRenameFailed, e:
1670
1881
# We may be renaming a dangling inventory id
1671
1882
if e.errno != errno.ENOENT:
1674
1885
self.rename_count += 1
1886
# TODO: if trans_id in self._observed_sha1s, we should
1887
# re-stat the final target, since ctime will be
1888
# updated by the change.
1675
1889
if (trans_id in self._new_contents or
1676
1890
self.path_changed(trans_id)):
1677
1891
if trans_id in self._new_contents:
1678
1892
modified_paths.append(full_path)
1679
1893
if trans_id in self._new_executability:
1680
1894
self._set_executability(path, trans_id)
1895
if trans_id in self._observed_sha1s:
1896
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1897
st = osutils.lstat(full_path)
1898
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1900
child_pb.finished()
1901
for path, trans_id in new_paths:
1902
# new_paths includes stuff like workingtree conflicts. Only the
1903
# stuff in new_contents actually comes from limbo.
1904
if trans_id in self._limbo_files:
1905
del self._limbo_files[trans_id]
1683
1906
self._new_contents.clear()
1684
1907
return modified_paths
1909
def _apply_observed_sha1s(self):
1910
"""After we have finished renaming everything, update observed sha1s
1912
This has to be done after self._tree.apply_inventory_delta, otherwise
1913
it doesn't know anything about the files we are updating. Also, we want
1914
to do this as late as possible, so that most entries end up cached.
1916
# TODO: this doesn't update the stat information for directories. So
1917
# the first 'bzr status' will still need to rewrite
1918
# .bzr/checkout/dirstate. However, we at least don't need to
1919
# re-read all of the files.
1920
# TODO: If the operation took a while, we could do a time.sleep(3) here
1921
# to allow the clock to tick over and ensure we won't have any
1922
# problems. (we could observe start time, and finish time, and if
1923
# it is less than eg 10% overhead, add a sleep call.)
1924
paths = FinalPaths(self)
1925
for trans_id, observed in self._observed_sha1s.iteritems():
1926
path = paths.get_path(trans_id)
1927
# We could get the file_id, but dirstate prefers to use the path
1928
# anyway, and it is 'cheaper' to determine.
1929
# file_id = self._new_id[trans_id]
1930
self._tree._observed_sha1(None, path, observed)
1687
1933
class TransformPreview(DiskTreeTransform):
1688
1934
"""A TreeTransform for generating preview trees.
1767
2018
yield self._get_repository().revision_tree(revision_id)
1769
2020
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2021
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2022
self._iter_parent_trees()]
1772
2023
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2024
self.get_file_lines(file_id))
1774
2025
repo = self._get_repository()
1775
2026
base_vf = repo.texts
1776
2027
if base_vf not in vf.fallback_versionedfiles:
1777
2028
vf.fallback_versionedfiles.append(base_vf)
1778
2029
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2031
def _stat_limbo_file(self, file_id=None, trans_id=None):
2032
if trans_id is None:
2033
trans_id = self._transform.trans_id_file_id(file_id)
1782
2034
name = self._transform._limbo_name(trans_id)
1783
2035
return os.lstat(name)
2266
2535
for num, _unused in enumerate(wt.all_file_ids()):
2267
2536
if num > 0: # more than just a root
2268
2537
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
2538
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2539
top_pb = ui.ui_factory.nested_progress_bar()
2274
2540
pp = ProgressPhase("Build phase", 2, top_pb)
2275
2541
if tree.inventory.root is not None:
2276
2542
# This is kind of a hack: we should be altering the root
2298
2564
precomputed_delta = []
2300
2566
precomputed_delta = None
2567
# Check if tree inventory has content. If so, we populate
2568
# existing_files with the directory content. If there are no
2569
# entries we skip populating existing_files as its not used.
2570
# This improves performance and unncessary work on large
2571
# directory trees. (#501307)
2573
existing_files = set()
2574
for dir, files in wt.walkdirs():
2575
existing_files.update(f[0] for f in files)
2301
2576
for num, (tree_path, entry) in \
2302
2577
enumerate(tree.inventory.iter_entries_by_dir()):
2303
2578
pb.update("Building tree", num - len(deferred_contents), total)
2384
2659
unchanged = dict(unchanged)
2385
2660
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2662
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2663
accelerator_path = unchanged.get(file_id)
2389
2664
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2665
new_desired_files.append((file_id,
2666
(trans_id, tree_path, text_sha1)))
2392
2668
pb.update('Adding file contents', count + offset, total)
2411
2687
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2688
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2689
tree.iter_files_bytes(new_desired_files)):
2414
2690
if wt.supports_content_filtering():
2415
2691
filters = wt._content_filter_stack(tree_path)
2416
2692
contents = filtered_output_bytes(contents, filters,
2417
2693
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2694
tt.create_file(contents, trans_id, sha1=text_sha1)
2419
2695
pb.update('Adding file contents', count + offset, total)
2423
2699
for child in tt.iter_tree_children(old_parent):
2424
2700
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2703
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2704
by_parent = tt.by_parent()
2428
2705
for child in by_parent[old_parent]:
2429
2706
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2707
return by_parent[old_parent]
2432
2710
def _content_match(tree, entry, file_id, kind, target_path):
2433
2711
if entry.kind != kind:
2435
2713
if entry.kind == "directory":
2437
2715
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2716
f = file(target_path, 'rb')
2718
if tree.get_file_text(file_id) == f.read():
2440
2722
elif entry.kind == "symlink":
2441
2723
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2776
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
2779
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2780
filter_tree_path=None):
2515
2781
"""Create new file contents according to tree contents.
2546
2812
tt.set_executability(entry.executable, trans_id)
2815
@deprecated_function(deprecated_in((2, 3, 0)))
2549
2816
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
2817
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2820
@deprecated_function(deprecated_in((2, 3, 0)))
2553
2821
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
2822
"""Produce a backup-style name that appears to be available"""
2555
2823
def name_gen():
2641
2909
backups, merge_modified, basis_tree=None):
2642
2910
if basis_tree is not None:
2643
2911
basis_tree.lock_read()
2644
change_list = target_tree.iter_changes(working_tree,
2912
# We ask the working_tree for its changes relative to the target, rather
2913
# than the target changes relative to the working tree. Because WT4 has an
2914
# optimizer to compare itself to a target, but no optimizer for the
2916
change_list = working_tree.iter_changes(target_tree,
2645
2917
specific_files=specific_files, pb=pb)
2646
2918
if target_tree.get_root_id() is None:
2647
2919
skip_root = True
2651
2923
deferred_files = []
2652
2924
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2925
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2926
target_path, wt_path = path
2927
target_versioned, wt_versioned = versioned
2928
target_parent, wt_parent = parent
2929
target_name, wt_name = name
2930
target_kind, wt_kind = kind
2931
target_executable, wt_executable = executable
2932
if skip_root and wt_parent is None:
2656
2934
trans_id = tt.trans_id_file_id(file_id)
2658
2936
if changed_content:
2659
2937
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2938
if wt_kind == 'file' and (backups or target_kind is None):
2661
2939
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2940
if merge_modified.get(file_id) != wt_sha1:
2663
2941
# acquire the basis tree lazily to prevent the
2669
2947
if file_id in basis_tree:
2670
2948
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2949
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2950
elif target_kind is None and not target_versioned:
2673
2951
keep_content = True
2674
if kind[0] is not None:
2952
if wt_kind is not None:
2675
2953
if not keep_content:
2676
2954
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)
2955
elif target_kind is not None:
2956
parent_trans_id = tt.trans_id_file_id(wt_parent)
2957
backup_name = tt._available_backup_name(
2958
wt_name, parent_trans_id)
2682
2959
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):
2960
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2961
if wt_versioned and target_versioned:
2685
2962
tt.unversion_file(trans_id)
2686
2963
tt.version_file(file_id, new_trans_id)
2687
2964
# New contents should have the same unix perms as old
2689
2966
mode_id = trans_id
2690
2967
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2968
if target_kind in ('directory', 'tree-reference'):
2692
2969
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2970
if target_kind == 'tree-reference':
2694
2971
revision = target_tree.get_reference_revision(file_id,
2696
2973
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2974
elif target_kind == 'symlink':
2698
2975
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2977
elif target_kind == 'file':
2701
2978
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2979
if basis_tree is None:
2703
2980
basis_tree = working_tree.basis_tree()
2711
2988
merge_modified[file_id] = new_sha1
2713
2990
# 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):
2991
if keep_content and wt_executable == target_executable:
2992
tt.set_executability(target_executable, trans_id)
2993
elif target_kind is not None:
2994
raise AssertionError(target_kind)
2995
if not wt_versioned and target_versioned:
2719
2996
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2997
if wt_versioned and not target_versioned:
2721
2998
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:
2999
if (target_name is not None and
3000
(wt_name != target_name or wt_parent != target_parent)):
3001
if target_name == '' and target_parent is None:
2725
3002
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)
3004
parent_trans = tt.trans_id_file_id(target_parent)
3005
if wt_parent is None and wt_versioned:
3006
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)
3008
tt.adjust_path(target_name, parent_trans, trans_id)
3009
if wt_executable != target_executable and target_kind == "file":
3010
tt.set_executability(target_executable, trans_id)
2734
3011
if working_tree.supports_content_filtering():
2735
3012
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
3013
target_tree.iter_files_bytes(deferred_files)):
2808
3085
elif c_type == 'missing parent':
2809
3086
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3087
if trans_id in tt._removed_contents:
3088
cancel_deletion = True
3089
orphans = tt._get_potential_orphans(trans_id)
3091
cancel_deletion = False
3092
# All children are orphans
3095
tt.new_orphan(o, trans_id)
3096
except OrphaningError:
3097
# Something bad happened so we cancel the directory
3098
# deletion which will leave it in place with a
3099
# conflict. The user can deal with it from there.
3100
# Note that this also catch the case where we don't
3101
# want to create orphans and leave the directory in
3103
cancel_deletion = True
3106
# Cancel the directory deletion
3107
tt.cancel_deletion(trans_id)
3108
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3113
tt.final_name(trans_id)
2900
3198
def rename(self, from_, to):
2901
3199
"""Rename a file from one path to another."""
2903
osutils.rename(from_, to)
3201
os.rename(from_, to)
2904
3202
except OSError, e:
2905
3203
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3204
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)
2908
3208
self.past_renames.append((from_, to))
2910
3210
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
