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
393
return sorted(FinalPaths(self).get_paths(new_ids))
382
395
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,
396
"""Determine which trans_ids need new Inventory entries.
398
An new entry is needed when anything that would be reflected by an
399
inventory entry changes, including file name, file_id, parent file_id,
400
file kind, and the execute bit.
402
Some care is taken to return entries with real changes, not cases
403
where the value is deleted and then restored to its original value,
404
but some actually unchanged values may be returned.
406
:returns: A list of (path, trans_id) for all items requiring an
407
inventory change. Ordered by path.
410
# Find entries whose file_ids are new (or changed).
411
new_file_id = set(t for t in self._new_id
412
if self._new_id[t] != self.tree_file_id(t))
413
for id_set in [self._new_name, self._new_parent, new_file_id,
386
414
self._new_executability]:
387
new_ids.update(id_set)
415
changed_ids.update(id_set)
416
# removing implies a kind change
388
417
changed_kind = set(self._removed_contents)
389
419
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))
420
# Ignore entries that are already known to have changed.
421
changed_kind.difference_update(changed_ids)
422
# to keep only the truly changed ones
423
changed_kind = (t for t in changed_kind
424
if self.tree_kind(t) != self.final_kind(t))
425
# all kind changes will alter the inventory
426
changed_ids.update(changed_kind)
427
# To find entries with changed parent_ids, find parents which existed,
428
# but changed file_id.
429
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
430
# Now add all their children to the set.
431
for parent_trans_id in new_file_id:
432
changed_ids.update(self.iter_tree_children(parent_trans_id))
433
return sorted(FinalPaths(self).get_paths(changed_ids))
396
435
def final_kind(self, trans_id):
397
436
"""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)
438
:return: None if the file does not exist/has no contents. (It is
439
conceivable that a path would be created without the corresponding
440
contents insertion command)
403
442
if trans_id in self._new_contents:
404
443
return self._new_contents[trans_id]
405
444
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
447
return self.tree_kind(trans_id)
531
572
# ensure that all children are registered with the transaction
532
573
list(self.iter_tree_children(parent_id))
575
@deprecated_method(deprecated_in((2, 3, 0)))
534
576
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
577
return self._has_named_child(
578
name, parent_id, known_children=by_parent.get(parent_id, []))
580
def _has_named_child(self, name, parent_id, known_children):
581
"""Does a parent already have a name child.
583
:param name: The searched for name.
585
:param parent_id: The parent for which the check is made.
587
:param known_children: The already known children. This should have
588
been recently obtained from `self.by_parent.get(parent_id)`
589
(or will be if None is passed).
591
if known_children is None:
592
known_children = self.by_parent().get(parent_id, [])
593
for child in known_children:
540
594
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
596
parent_path = self._tree_id_paths.get(parent_id, None)
597
if parent_path is None:
598
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
600
child_path = joinpath(parent_path, name)
601
child_id = self._tree_path_ids.get(child_path, None)
548
602
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
603
# Not known by the tree transform yet, check the filesystem
604
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?
606
raise AssertionError('child_id is missing: %s, %s, %s'
607
% (name, parent_id, child_id))
609
def _available_backup_name(self, name, target_id):
610
"""Find an available backup name.
612
:param name: The basename of the file.
614
:param target_id: The directory trans_id where the backup should
617
known_children = self.by_parent().get(target_id, [])
618
return osutils.available_backup_name(
620
lambda base: self._has_named_child(
621
base, target_id, known_children))
559
623
def _parent_loops(self):
560
624
"""No entry should be its own ancestor"""
644
701
if (self._new_name, self._new_parent) == ({}, {}):
646
703
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]
705
for child_tid in children:
706
name = self.final_name(child_tid)
708
# Keep children only if they still exist in the end
709
if not self._case_sensitive_target:
711
name_ids.append((name, child_tid))
652
714
last_trans_id = None
653
715
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
716
kind = self.final_kind(trans_id)
658
717
file_id = self.final_file_id(trans_id)
659
718
if kind is None and file_id is None:
681
740
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
741
"""Children must have a directory parent"""
684
743
for parent_id, children in by_parent.iteritems():
685
744
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
747
for child_id in children:
748
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)
753
# There is at least a child, so we need an existing directory to
755
kind = self.final_kind(parent_id)
757
# The directory will be deleted
699
758
conflicts.append(('missing parent', parent_id))
700
759
elif kind != "directory":
760
# Meh, we need a *directory* to put something in it
701
761
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
764
def _set_executability(self, path, trans_id):
715
765
"""Set the executability of versioned files """
716
766
if supports_executable():
780
830
self.create_symlink(target, trans_id)
833
def new_orphan(self, trans_id, parent_id):
834
"""Schedule an item to be orphaned.
836
When a directory is about to be removed, its children, if they are not
837
versioned are moved out of the way: they don't have a parent anymore.
839
:param trans_id: The trans_id of the existing item.
840
:param parent_id: The parent trans_id of the item.
842
raise NotImplementedError(self.new_orphan)
844
def _get_potential_orphans(self, dir_id):
845
"""Find the potential orphans in a directory.
847
A directory can't be safely deleted if there are versioned files in it.
848
If all the contained files are unversioned then they can be orphaned.
850
The 'None' return value means that the directory contains at least one
851
versioned file and should not be deleted.
853
:param dir_id: The directory trans id.
855
:return: A list of the orphan trans ids or None if at least one
856
versioned file is present.
859
# Find the potential orphans, stop if one item should be kept
860
for child_tid in self.by_parent()[dir_id]:
861
if child_tid in self._removed_contents:
862
# The child is removed as part of the transform. Since it was
863
# versioned before, it's not an orphan
865
elif self.final_file_id(child_tid) is None:
866
# The child is not versioned
867
orphans.append(child_tid)
869
# We have a versioned file here, searching for orphans is
783
875
def _affected_ids(self):
784
876
"""Return the set of transform ids affected by the transform"""
785
877
trans_ids = set(self._removed_id)
928
1017
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1019
def commit(self, branch, message, merge_parents=None, strict=False,
1020
timestamp=None, timezone=None, committer=None, authors=None,
1021
revprops=None, revision_id=None):
931
1022
"""Commit the result of this TreeTransform to a branch.
933
1024
:param branch: The branch to commit to.
934
1025
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1026
:param merge_parents: Additional parent revision-ids specified by
1028
:param strict: If True, abort the commit if there are unversioned
1030
:param timestamp: if not None, seconds-since-epoch for the time and
1031
date. (May be a float.)
1032
:param timezone: Optional timezone for timestamp, as an offset in
1034
:param committer: Optional committer in email-id format.
1035
(e.g. "J Random Hacker <jrandom@example.com>")
1036
:param authors: Optional list of authors in email-id format.
1037
:param revprops: Optional dictionary of revision properties.
1038
:param revision_id: Optional revision id. (Specifying a revision-id
1039
may reduce performance for some non-native formats.)
936
1040
:return: The revision_id of the revision committed.
938
1042
self._check_malformed()
1097
1208
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:
1211
limbo_paths = self._limbo_files.values() + list(
1212
self._possibly_stale_limbo_files)
1213
limbo_paths = sorted(limbo_paths, reverse=True)
1214
for path in limbo_paths:
1218
if e.errno != errno.ENOENT:
1220
# XXX: warn? perhaps we just got interrupted at an
1221
# inconvenient moment, but perhaps files are disappearing
1106
1224
delete_any(self._limbodir)
1107
1225
except OSError:
1156
1274
entries from _limbo_files, because they are now stale.
1158
1276
for trans_id in trans_ids:
1159
old_path = self._limbo_files.pop(trans_id)
1277
old_path = self._limbo_files[trans_id]
1278
self._possibly_stale_limbo_files.add(old_path)
1279
del self._limbo_files[trans_id]
1160
1280
if trans_id not in self._new_contents:
1162
1282
new_path = self._limbo_name(trans_id)
1163
osutils.rename(old_path, new_path)
1283
os.rename(old_path, new_path)
1284
self._possibly_stale_limbo_files.remove(old_path)
1164
1285
for descendant in self._limbo_descendants(trans_id):
1165
1286
desc_path = self._limbo_files[descendant]
1166
1287
desc_path = new_path + desc_path[len(old_path):]
1173
1294
descendants.update(self._limbo_descendants(descendant))
1174
1295
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1297
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1298
"""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.
1302
:param contents: an iterator of strings, all of which will be written
1303
to the target destination.
1304
:param trans_id: TreeTransform handle
1305
:param mode_id: If not None, force the mode of the target file to match
1306
the mode of the object referenced by mode_id.
1307
Otherwise, we will try to preserve mode bits of an existing file.
1308
:param sha1: If the sha1 of this content is already known, pass it in.
1309
We can use it to prevent future sha1 computations.
1187
1311
name = self._limbo_name(trans_id)
1188
1312
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.
1314
unique_add(self._new_contents, trans_id, 'file')
1199
1315
f.writelines(contents)
1202
1318
self._set_mtime(name)
1203
1319
self._set_mode(trans_id, mode_id, S_ISREG)
1320
# It is unfortunate we have to use lstat instead of fstat, but we just
1321
# used utime and chmod on the file, so we need the accurate final
1323
if sha1 is not None:
1324
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1326
def _read_file_chunks(self, trans_id):
1206
1327
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1397
del self._limbo_children_names[trans_id]
1275
1398
delete_any(self._limbo_name(trans_id))
1400
def new_orphan(self, trans_id, parent_id):
1401
# FIXME: There is no tree config, so we use the branch one (it's weird
1402
# to define it this way as orphaning can only occur in a working tree,
1403
# but that's all we have (for now). It will find the option in
1404
# locations.conf or bazaar.conf though) -- vila 20100916
1405
conf = self._tree.branch.get_config()
1406
conf_var_name = 'bzr.transform.orphan_policy'
1407
orphan_policy = conf.get_user_option(conf_var_name)
1408
default_policy = orphaning_registry.default_key
1409
if orphan_policy is None:
1410
orphan_policy = default_policy
1411
if orphan_policy not in orphaning_registry:
1412
trace.warning('%s (from %s) is not a known policy, defaulting '
1413
'to %s' % (orphan_policy, conf_var_name, default_policy))
1414
orphan_policy = default_policy
1415
handle_orphan = orphaning_registry.get(orphan_policy)
1416
handle_orphan(self, trans_id, parent_id)
1419
class OrphaningError(errors.BzrError):
1421
# Only bugs could lead to such exception being seen by the user
1422
internal_error = True
1423
_fmt = "Error while orphaning %s in %s directory"
1425
def __init__(self, orphan, parent):
1426
errors.BzrError.__init__(self)
1427
self.orphan = orphan
1428
self.parent = parent
1431
class OrphaningForbidden(OrphaningError):
1433
_fmt = "Policy: %s doesn't allow creating orphans."
1435
def __init__(self, policy):
1436
errors.BzrError.__init__(self)
1437
self.policy = policy
1440
def move_orphan(tt, orphan_id, parent_id):
1441
"""See TreeTransformBase.new_orphan.
1443
This creates a new orphan in the `bzr-orphans` dir at the root of the
1446
:param tt: The TreeTransform orphaning `trans_id`.
1448
:param orphan_id: The trans id that should be orphaned.
1450
:param parent_id: The orphan parent trans id.
1452
# Add the orphan dir if it doesn't exist
1453
orphan_dir_basename = 'bzr-orphans'
1454
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1455
if tt.final_kind(od_id) is None:
1456
tt.create_directory(od_id)
1457
parent_path = tt._tree_id_paths[parent_id]
1458
# Find a name that doesn't exist yet in the orphan dir
1459
actual_name = tt.final_name(orphan_id)
1460
new_name = tt._available_backup_name(actual_name, od_id)
1461
tt.adjust_path(new_name, od_id, orphan_id)
1462
trace.warning('%s has been orphaned in %s'
1463
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1466
def refuse_orphan(tt, orphan_id, parent_id):
1467
"""See TreeTransformBase.new_orphan.
1469
This refuses to create orphan, letting the caller handle the conflict.
1471
raise OrphaningForbidden('never')
1474
orphaning_registry = registry.Registry()
1475
orphaning_registry.register(
1476
'conflict', refuse_orphan,
1477
'Leave orphans in place and create a conflict on the directory.')
1478
orphaning_registry.register(
1479
'move', move_orphan,
1480
'Move orphans into the bzr-orphans directory.')
1481
orphaning_registry._set_default_key('conflict')
1278
1484
class TreeTransform(DiskTreeTransform):
1279
1485
"""Represent a tree transformation.
1397
1603
def tree_kind(self, trans_id):
1398
1604
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1606
:returns: The file kind or None if the file does not exist
1402
1608
path = self._tree_id_paths.get(trans_id)
1403
1609
if path is None:
1404
raise NoSuchFile(None)
1406
1612
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1613
except errors.NoSuchFile:
1413
1616
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1617
"""Set the mode of new file contents.
1623
1826
tree_paths = list(self._tree_path_ids.iteritems())
1624
1827
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1828
child_pb = ui.ui_factory.nested_progress_bar()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1830
for num, (path, trans_id) in enumerate(tree_paths):
1831
# do not attempt to move root into a subdirectory of itself.
1629
1834
child_pb.update('removing file', num, len(tree_paths))
1630
1835
full_path = self._tree.abspath(path)
1631
1836
if trans_id in self._removed_contents:
1666
1871
if trans_id in self._needs_rename:
1668
1873
mover.rename(self._limbo_name(trans_id), full_path)
1874
except errors.TransformRenameFailed, e:
1670
1875
# We may be renaming a dangling inventory id
1671
1876
if e.errno != errno.ENOENT:
1674
1879
self.rename_count += 1
1880
# TODO: if trans_id in self._observed_sha1s, we should
1881
# re-stat the final target, since ctime will be
1882
# updated by the change.
1675
1883
if (trans_id in self._new_contents or
1676
1884
self.path_changed(trans_id)):
1677
1885
if trans_id in self._new_contents:
1678
1886
modified_paths.append(full_path)
1679
1887
if trans_id in self._new_executability:
1680
1888
self._set_executability(path, trans_id)
1889
if trans_id in self._observed_sha1s:
1890
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1891
st = osutils.lstat(full_path)
1892
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1894
child_pb.finished()
1895
for path, trans_id in new_paths:
1896
# new_paths includes stuff like workingtree conflicts. Only the
1897
# stuff in new_contents actually comes from limbo.
1898
if trans_id in self._limbo_files:
1899
del self._limbo_files[trans_id]
1683
1900
self._new_contents.clear()
1684
1901
return modified_paths
1903
def _apply_observed_sha1s(self):
1904
"""After we have finished renaming everything, update observed sha1s
1906
This has to be done after self._tree.apply_inventory_delta, otherwise
1907
it doesn't know anything about the files we are updating. Also, we want
1908
to do this as late as possible, so that most entries end up cached.
1910
# TODO: this doesn't update the stat information for directories. So
1911
# the first 'bzr status' will still need to rewrite
1912
# .bzr/checkout/dirstate. However, we at least don't need to
1913
# re-read all of the files.
1914
# TODO: If the operation took a while, we could do a time.sleep(3) here
1915
# to allow the clock to tick over and ensure we won't have any
1916
# problems. (we could observe start time, and finish time, and if
1917
# it is less than eg 10% overhead, add a sleep call.)
1918
paths = FinalPaths(self)
1919
for trans_id, observed in self._observed_sha1s.iteritems():
1920
path = paths.get_path(trans_id)
1921
# We could get the file_id, but dirstate prefers to use the path
1922
# anyway, and it is 'cheaper' to determine.
1923
# file_id = self._new_id[trans_id]
1924
self._tree._observed_sha1(None, path, observed)
1687
1927
class TransformPreview(DiskTreeTransform):
1688
1928
"""A TreeTransform for generating preview trees.
1767
2012
yield self._get_repository().revision_tree(revision_id)
1769
2014
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2015
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2016
self._iter_parent_trees()]
1772
2017
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2018
self.get_file_lines(file_id))
1774
2019
repo = self._get_repository()
1775
2020
base_vf = repo.texts
1776
2021
if base_vf not in vf.fallback_versionedfiles:
1777
2022
vf.fallback_versionedfiles.append(base_vf)
1778
2023
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2025
def _stat_limbo_file(self, file_id=None, trans_id=None):
2026
if trans_id is None:
2027
trans_id = self._transform.trans_id_file_id(file_id)
1782
2028
name = self._transform._limbo_name(trans_id)
1783
2029
return os.lstat(name)
2269
2529
for num, _unused in enumerate(wt.all_file_ids()):
2270
2530
if num > 0: # more than just a root
2271
2531
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2272
existing_files = set()
2273
for dir, files in wt.walkdirs():
2274
existing_files.update(f[0] for f in files)
2275
2532
file_trans_id = {}
2276
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2533
top_pb = ui.ui_factory.nested_progress_bar()
2277
2534
pp = ProgressPhase("Build phase", 2, top_pb)
2278
2535
if tree.inventory.root is not None:
2279
2536
# This is kind of a hack: we should be altering the root
2301
2558
precomputed_delta = []
2303
2560
precomputed_delta = None
2561
# Check if tree inventory has content. If so, we populate
2562
# existing_files with the directory content. If there are no
2563
# entries we skip populating existing_files as its not used.
2564
# This improves performance and unncessary work on large
2565
# directory trees. (#501307)
2567
existing_files = set()
2568
for dir, files in wt.walkdirs():
2569
existing_files.update(f[0] for f in files)
2304
2570
for num, (tree_path, entry) in \
2305
2571
enumerate(tree.inventory.iter_entries_by_dir()):
2306
2572
pb.update("Building tree", num - len(deferred_contents), total)
2387
2653
unchanged = dict(unchanged)
2388
2654
new_desired_files = []
2390
for file_id, (trans_id, tree_path) in desired_files:
2656
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2391
2657
accelerator_path = unchanged.get(file_id)
2392
2658
if accelerator_path is None:
2393
new_desired_files.append((file_id, (trans_id, tree_path)))
2659
new_desired_files.append((file_id,
2660
(trans_id, tree_path, text_sha1)))
2395
2662
pb.update('Adding file contents', count + offset, total)
2414
2681
offset += count
2415
for count, ((trans_id, tree_path), contents) in enumerate(
2682
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2416
2683
tree.iter_files_bytes(new_desired_files)):
2417
2684
if wt.supports_content_filtering():
2418
2685
filters = wt._content_filter_stack(tree_path)
2419
2686
contents = filtered_output_bytes(contents, filters,
2420
2687
ContentFilterContext(tree_path, tree))
2421
tt.create_file(contents, trans_id)
2688
tt.create_file(contents, trans_id, sha1=text_sha1)
2422
2689
pb.update('Adding file contents', count + offset, total)
2426
2693
for child in tt.iter_tree_children(old_parent):
2427
2694
tt.adjust_path(tt.final_name(child), new_parent, child)
2429
2697
def _reparent_transform_children(tt, old_parent, new_parent):
2430
2698
by_parent = tt.by_parent()
2431
2699
for child in by_parent[old_parent]:
2432
2700
tt.adjust_path(tt.final_name(child), new_parent, child)
2433
2701
return by_parent[old_parent]
2435
2704
def _content_match(tree, entry, file_id, kind, target_path):
2436
2705
if entry.kind != kind:
2438
2707
if entry.kind == "directory":
2440
2709
if entry.kind == "file":
2441
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2710
f = file(target_path, 'rb')
2712
if tree.get_file_text(file_id) == f.read():
2443
2716
elif entry.kind == "symlink":
2444
2717
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2497
2770
raise errors.BadFileKindError(name, kind)
2500
@deprecated_function(deprecated_in((1, 9, 0)))
2501
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2502
"""Create new file contents according to an inventory entry.
2504
DEPRECATED. Use create_from_tree instead.
2506
if entry.kind == "file":
2508
lines = tree.get_file(entry.file_id).readlines()
2509
tt.create_file(lines, trans_id, mode_id=mode_id)
2510
elif entry.kind == "symlink":
2511
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2512
elif entry.kind == "directory":
2513
tt.create_directory(trans_id)
2516
2773
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2517
2774
filter_tree_path=None):
2518
2775
"""Create new file contents according to tree contents.
2549
2806
tt.set_executability(entry.executable, trans_id)
2809
@deprecated_function(deprecated_in((2, 3, 0)))
2552
2810
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2553
2811
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2814
@deprecated_function(deprecated_in((2, 3, 0)))
2556
2815
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2557
2816
"""Produce a backup-style name that appears to be available"""
2558
2817
def name_gen():
2644
2903
backups, merge_modified, basis_tree=None):
2645
2904
if basis_tree is not None:
2646
2905
basis_tree.lock_read()
2647
change_list = target_tree.iter_changes(working_tree,
2906
# We ask the working_tree for its changes relative to the target, rather
2907
# than the target changes relative to the working tree. Because WT4 has an
2908
# optimizer to compare itself to a target, but no optimizer for the
2910
change_list = working_tree.iter_changes(target_tree,
2648
2911
specific_files=specific_files, pb=pb)
2649
2912
if target_tree.get_root_id() is None:
2650
2913
skip_root = True
2654
2917
deferred_files = []
2655
2918
for id_num, (file_id, path, changed_content, versioned, parent, name,
2656
2919
kind, executable) in enumerate(change_list):
2657
if skip_root and file_id[0] is not None and parent[0] is None:
2920
target_path, wt_path = path
2921
target_versioned, wt_versioned = versioned
2922
target_parent, wt_parent = parent
2923
target_name, wt_name = name
2924
target_kind, wt_kind = kind
2925
target_executable, wt_executable = executable
2926
if skip_root and wt_parent is None:
2659
2928
trans_id = tt.trans_id_file_id(file_id)
2661
2930
if changed_content:
2662
2931
keep_content = False
2663
if kind[0] == 'file' and (backups or kind[1] is None):
2932
if wt_kind == 'file' and (backups or target_kind is None):
2664
2933
wt_sha1 = working_tree.get_file_sha1(file_id)
2665
2934
if merge_modified.get(file_id) != wt_sha1:
2666
2935
# acquire the basis tree lazily to prevent the
2672
2941
if file_id in basis_tree:
2673
2942
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2674
2943
keep_content = True
2675
elif kind[1] is None and not versioned[1]:
2944
elif target_kind is None and not target_versioned:
2676
2945
keep_content = True
2677
if kind[0] is not None:
2946
if wt_kind is not None:
2678
2947
if not keep_content:
2679
2948
tt.delete_contents(trans_id)
2680
elif kind[1] is not None:
2681
parent_trans_id = tt.trans_id_file_id(parent[0])
2682
by_parent = tt.by_parent()
2683
backup_name = _get_backup_name(name[0], by_parent,
2684
parent_trans_id, tt)
2949
elif target_kind is not None:
2950
parent_trans_id = tt.trans_id_file_id(wt_parent)
2951
backup_name = tt._available_backup_name(
2952
wt_name, parent_trans_id)
2685
2953
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2686
new_trans_id = tt.create_path(name[0], parent_trans_id)
2687
if versioned == (True, True):
2954
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2955
if wt_versioned and target_versioned:
2688
2956
tt.unversion_file(trans_id)
2689
2957
tt.version_file(file_id, new_trans_id)
2690
2958
# New contents should have the same unix perms as old
2692
2960
mode_id = trans_id
2693
2961
trans_id = new_trans_id
2694
if kind[1] in ('directory', 'tree-reference'):
2962
if target_kind in ('directory', 'tree-reference'):
2695
2963
tt.create_directory(trans_id)
2696
if kind[1] == 'tree-reference':
2964
if target_kind == 'tree-reference':
2697
2965
revision = target_tree.get_reference_revision(file_id,
2699
2967
tt.set_tree_reference(revision, trans_id)
2700
elif kind[1] == 'symlink':
2968
elif target_kind == 'symlink':
2701
2969
tt.create_symlink(target_tree.get_symlink_target(file_id),
2703
elif kind[1] == 'file':
2971
elif target_kind == 'file':
2704
2972
deferred_files.append((file_id, (trans_id, mode_id)))
2705
2973
if basis_tree is None:
2706
2974
basis_tree = working_tree.basis_tree()
2714
2982
merge_modified[file_id] = new_sha1
2716
2984
# preserve the execute bit when backing up
2717
if keep_content and executable[0] == executable[1]:
2718
tt.set_executability(executable[1], trans_id)
2719
elif kind[1] is not None:
2720
raise AssertionError(kind[1])
2721
if versioned == (False, True):
2985
if keep_content and wt_executable == target_executable:
2986
tt.set_executability(target_executable, trans_id)
2987
elif target_kind is not None:
2988
raise AssertionError(target_kind)
2989
if not wt_versioned and target_versioned:
2722
2990
tt.version_file(file_id, trans_id)
2723
if versioned == (True, False):
2991
if wt_versioned and not target_versioned:
2724
2992
tt.unversion_file(trans_id)
2725
if (name[1] is not None and
2726
(name[0] != name[1] or parent[0] != parent[1])):
2727
if name[1] == '' and parent[1] is None:
2993
if (target_name is not None and
2994
(wt_name != target_name or wt_parent != target_parent)):
2995
if target_name == '' and target_parent is None:
2728
2996
parent_trans = ROOT_PARENT
2730
parent_trans = tt.trans_id_file_id(parent[1])
2731
if parent[0] is None and versioned[0]:
2732
tt.adjust_root_path(name[1], parent_trans)
2998
parent_trans = tt.trans_id_file_id(target_parent)
2999
if wt_parent is None and wt_versioned:
3000
tt.adjust_root_path(target_name, parent_trans)
2734
tt.adjust_path(name[1], parent_trans, trans_id)
2735
if executable[0] != executable[1] and kind[1] == "file":
2736
tt.set_executability(executable[1], trans_id)
3002
tt.adjust_path(target_name, parent_trans, trans_id)
3003
if wt_executable != target_executable and target_kind == "file":
3004
tt.set_executability(target_executable, trans_id)
2737
3005
if working_tree.supports_content_filtering():
2738
3006
for index, ((trans_id, mode_id), bytes) in enumerate(
2739
3007
target_tree.iter_files_bytes(deferred_files)):
2811
3079
elif c_type == 'missing parent':
2812
3080
trans_id = conflict[1]
2814
tt.cancel_deletion(trans_id)
2815
new_conflicts.add(('deleting parent', 'Not deleting',
3081
if trans_id in tt._removed_contents:
3082
cancel_deletion = True
3083
orphans = tt._get_potential_orphans(trans_id)
3085
cancel_deletion = False
3086
# All children are orphans
3089
tt.new_orphan(o, trans_id)
3090
except OrphaningError:
3091
# Something bad happened so we cancel the directory
3092
# deletion which will leave it in place with a
3093
# conflict. The user can deal with it from there.
3094
# Note that this also catch the case where we don't
3095
# want to create orphans and leave the directory in
3097
cancel_deletion = True
3100
# Cancel the directory deletion
3101
tt.cancel_deletion(trans_id)
3102
new_conflicts.add(('deleting parent', 'Not deleting',
2820
3107
tt.final_name(trans_id)
2903
3192
def rename(self, from_, to):
2904
3193
"""Rename a file from one path to another."""
2906
osutils.rename(from_, to)
3195
os.rename(from_, to)
2907
3196
except OSError, e:
2908
3197
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2909
3198
raise errors.FileExists(to, str(e))
3199
# normal OSError doesn't include filenames so it's hard to see where
3200
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3201
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2911
3202
self.past_renames.append((from_, to))
2913
3204
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
