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
392
return sorted(FinalPaths(self).get_paths(new_ids))
382
394
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,
395
"""Determine which trans_ids need new Inventory entries.
397
An new entry is needed when anything that would be reflected by an
398
inventory entry changes, including file name, file_id, parent file_id,
399
file kind, and the execute bit.
401
Some care is taken to return entries with real changes, not cases
402
where the value is deleted and then restored to its original value,
403
but some actually unchanged values may be returned.
405
:returns: A list of (path, trans_id) for all items requiring an
406
inventory change. Ordered by path.
409
# Find entries whose file_ids are new (or changed).
410
new_file_id = set(t for t in self._new_id
411
if self._new_id[t] != self.tree_file_id(t))
412
for id_set in [self._new_name, self._new_parent, new_file_id,
386
413
self._new_executability]:
387
new_ids.update(id_set)
414
changed_ids.update(id_set)
415
# removing implies a kind change
388
416
changed_kind = set(self._removed_contents)
389
418
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))
419
# Ignore entries that are already known to have changed.
420
changed_kind.difference_update(changed_ids)
421
# to keep only the truly changed ones
422
changed_kind = (t for t in changed_kind
423
if self.tree_kind(t) != self.final_kind(t))
424
# all kind changes will alter the inventory
425
changed_ids.update(changed_kind)
426
# To find entries with changed parent_ids, find parents which existed,
427
# but changed file_id.
428
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
429
# Now add all their children to the set.
430
for parent_trans_id in new_file_id:
431
changed_ids.update(self.iter_tree_children(parent_trans_id))
432
return sorted(FinalPaths(self).get_paths(changed_ids))
396
434
def final_kind(self, trans_id):
397
435
"""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)
437
:return: None if the file does not exist/has no contents. (It is
438
conceivable that a path would be created without the corresponding
439
contents insertion command)
403
441
if trans_id in self._new_contents:
404
442
return self._new_contents[trans_id]
405
443
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
446
return self.tree_kind(trans_id)
531
571
# ensure that all children are registered with the transaction
532
572
list(self.iter_tree_children(parent_id))
574
@deprecated_method(deprecated_in((2, 3, 0)))
534
575
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
576
return self._has_named_child(
577
name, parent_id, known_children=by_parent.get(parent_id, []))
579
def _has_named_child(self, name, parent_id, known_children):
580
"""Does a parent already have a name child.
582
:param name: The searched for name.
584
:param parent_id: The parent for which the check is made.
586
:param known_children: The already known children. This should have
587
been recently obtained from `self.by_parent.get(parent_id)`
588
(or will be if None is passed).
590
if known_children is None:
591
known_children = self.by_parent().get(parent_id, [])
592
for child in known_children:
540
593
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
595
parent_path = self._tree_id_paths.get(parent_id, None)
596
if parent_path is None:
597
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
599
child_path = joinpath(parent_path, name)
600
child_id = self._tree_path_ids.get(child_path, None)
548
601
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
602
# Not known by the tree transform yet, check the filesystem
603
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?
605
raise AssertionError('child_id is missing: %s, %s, %s'
606
% (name, parent_id, child_id))
608
def _available_backup_name(self, name, target_id):
609
"""Find an available backup name.
611
:param name: The basename of the file.
613
:param target_id: The directory trans_id where the backup should
616
known_children = self.by_parent().get(target_id, [])
617
return osutils.available_backup_name(
619
lambda base: self._has_named_child(
620
base, target_id, known_children))
559
622
def _parent_loops(self):
560
623
"""No entry should be its own ancestor"""
644
700
if (self._new_name, self._new_parent) == ({}, {}):
646
702
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]
704
for child_tid in children:
705
name = self.final_name(child_tid)
707
# Keep children only if they still exist in the end
708
if not self._case_sensitive_target:
710
name_ids.append((name, child_tid))
652
713
last_trans_id = None
653
714
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
715
kind = self.final_kind(trans_id)
658
716
file_id = self.final_file_id(trans_id)
659
717
if kind is None and file_id is None:
681
739
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
740
"""Children must have a directory parent"""
684
742
for parent_id, children in by_parent.iteritems():
685
743
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
746
for child_id in children:
747
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)
752
# There is at least a child, so we need an existing directory to
754
kind = self.final_kind(parent_id)
756
# The directory will be deleted
699
757
conflicts.append(('missing parent', parent_id))
700
758
elif kind != "directory":
759
# Meh, we need a *directory* to put something in it
701
760
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
763
def _set_executability(self, path, trans_id):
715
764
"""Set the executability of versioned files """
716
765
if supports_executable():
780
829
self.create_symlink(target, trans_id)
832
def new_orphan(self, trans_id, parent_id):
833
"""Schedule an item to be orphaned.
835
When a directory is about to be removed, its children, if they are not
836
versioned are moved out of the way: they don't have a parent anymore.
838
:param trans_id: The trans_id of the existing item.
839
:param parent_id: The parent trans_id of the item.
841
raise NotImplementedError(self.new_orphan)
843
def _get_potential_orphans(self, dir_id):
844
"""Find the potential orphans in a directory.
846
A directory can't be safely deleted if there are versioned files in it.
847
If all the contained files are unversioned then they can be orphaned.
849
The 'None' return value means that the directory contains at least one
850
versioned file and should not be deleted.
852
:param dir_id: The directory trans id.
854
:return: A list of the orphan trans ids or None if at least one
855
versioned file is present.
858
# Find the potential orphans, stop if one item should be kept
859
for child_tid in self.by_parent()[dir_id]:
860
if child_tid in self._removed_contents:
861
# The child is removed as part of the transform. Since it was
862
# versioned before, it's not an orphan
864
elif self.final_file_id(child_tid) is None:
865
# The child is not versioned
866
orphans.append(child_tid)
868
# We have a versioned file here, searching for orphans is
783
874
def _affected_ids(self):
784
875
"""Return the set of transform ids affected by the transform"""
785
876
trans_ids = set(self._removed_id)
928
1016
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1018
def commit(self, branch, message, merge_parents=None, strict=False,
1019
timestamp=None, timezone=None, committer=None, authors=None,
1020
revprops=None, revision_id=None):
931
1021
"""Commit the result of this TreeTransform to a branch.
933
1023
:param branch: The branch to commit to.
934
1024
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1025
:param merge_parents: Additional parent revision-ids specified by
1027
:param strict: If True, abort the commit if there are unversioned
1029
:param timestamp: if not None, seconds-since-epoch for the time and
1030
date. (May be a float.)
1031
:param timezone: Optional timezone for timestamp, as an offset in
1033
:param committer: Optional committer in email-id format.
1034
(e.g. "J Random Hacker <jrandom@example.com>")
1035
:param authors: Optional list of authors in email-id format.
1036
:param revprops: Optional dictionary of revision properties.
1037
:param revision_id: Optional revision id. (Specifying a revision-id
1038
may reduce performance for some non-native formats.)
936
1039
:return: The revision_id of the revision committed.
938
1041
self._check_malformed()
1097
1207
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:
1210
limbo_paths = self._limbo_files.values() + list(
1211
self._possibly_stale_limbo_files)
1212
limbo_paths = sorted(limbo_paths, reverse=True)
1213
for path in limbo_paths:
1217
if e.errno != errno.ENOENT:
1219
# XXX: warn? perhaps we just got interrupted at an
1220
# inconvenient moment, but perhaps files are disappearing
1106
1223
delete_any(self._limbodir)
1107
1224
except OSError:
1156
1273
entries from _limbo_files, because they are now stale.
1158
1275
for trans_id in trans_ids:
1159
old_path = self._limbo_files.pop(trans_id)
1276
old_path = self._limbo_files[trans_id]
1277
self._possibly_stale_limbo_files.add(old_path)
1278
del self._limbo_files[trans_id]
1160
1279
if trans_id not in self._new_contents:
1162
1281
new_path = self._limbo_name(trans_id)
1163
osutils.rename(old_path, new_path)
1282
os.rename(old_path, new_path)
1283
self._possibly_stale_limbo_files.remove(old_path)
1164
1284
for descendant in self._limbo_descendants(trans_id):
1165
1285
desc_path = self._limbo_files[descendant]
1166
1286
desc_path = new_path + desc_path[len(old_path):]
1173
1293
descendants.update(self._limbo_descendants(descendant))
1174
1294
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1296
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1297
"""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.
1301
:param contents: an iterator of strings, all of which will be written
1302
to the target destination.
1303
:param trans_id: TreeTransform handle
1304
:param mode_id: If not None, force the mode of the target file to match
1305
the mode of the object referenced by mode_id.
1306
Otherwise, we will try to preserve mode bits of an existing file.
1307
:param sha1: If the sha1 of this content is already known, pass it in.
1308
We can use it to prevent future sha1 computations.
1187
1310
name = self._limbo_name(trans_id)
1188
1311
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.
1313
unique_add(self._new_contents, trans_id, 'file')
1199
1314
f.writelines(contents)
1202
1317
self._set_mtime(name)
1203
1318
self._set_mode(trans_id, mode_id, S_ISREG)
1319
# It is unfortunate we have to use lstat instead of fstat, but we just
1320
# used utime and chmod on the file, so we need the accurate final
1322
if sha1 is not None:
1323
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1325
def _read_file_chunks(self, trans_id):
1206
1326
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1396
del self._limbo_children_names[trans_id]
1275
1397
delete_any(self._limbo_name(trans_id))
1399
def new_orphan(self, trans_id, parent_id):
1400
# FIXME: There is no tree config, so we use the branch one (it's weird
1401
# to define it this way as orphaning can only occur in a working tree,
1402
# but that's all we have (for now). It will find the option in
1403
# locations.conf or bazaar.conf though) -- vila 20100916
1404
conf = self._tree.branch.get_config()
1405
conf_var_name = 'bzr.transform.orphan_policy'
1406
orphan_policy = conf.get_user_option(conf_var_name)
1407
default_policy = orphaning_registry.default_key
1408
if orphan_policy is None:
1409
orphan_policy = default_policy
1410
if orphan_policy not in orphaning_registry:
1411
trace.warning('%s (from %s) is not a known policy, defaulting '
1412
'to %s' % (orphan_policy, conf_var_name, default_policy))
1413
orphan_policy = default_policy
1414
handle_orphan = orphaning_registry.get(orphan_policy)
1415
handle_orphan(self, trans_id, parent_id)
1418
class OrphaningError(errors.BzrError):
1420
# Only bugs could lead to such exception being seen by the user
1421
internal_error = True
1422
_fmt = "Error while orphaning %s in %s directory"
1424
def __init__(self, orphan, parent):
1425
errors.BzrError.__init__(self)
1426
self.orphan = orphan
1427
self.parent = parent
1430
class OrphaningForbidden(OrphaningError):
1432
_fmt = "Policy: %s doesn't allow creating orphans."
1434
def __init__(self, policy):
1435
errors.BzrError.__init__(self)
1436
self.policy = policy
1439
def move_orphan(tt, orphan_id, parent_id):
1440
"""See TreeTransformBase.new_orphan.
1442
This creates a new orphan in the `bzr-orphans` dir at the root of the
1445
:param tt: The TreeTransform orphaning `trans_id`.
1447
:param orphan_id: The trans id that should be orphaned.
1449
:param parent_id: The orphan parent trans id.
1451
# Add the orphan dir if it doesn't exist
1452
orphan_dir_basename = 'bzr-orphans'
1453
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1454
if tt.final_kind(od_id) is None:
1455
tt.create_directory(od_id)
1456
parent_path = tt._tree_id_paths[parent_id]
1457
# Find a name that doesn't exist yet in the orphan dir
1458
actual_name = tt.final_name(orphan_id)
1459
new_name = tt._available_backup_name(actual_name, od_id)
1460
tt.adjust_path(new_name, od_id, orphan_id)
1461
trace.warning('%s has been orphaned in %s'
1462
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1465
def refuse_orphan(tt, orphan_id, parent_id):
1466
"""See TreeTransformBase.new_orphan.
1468
This refuses to create orphan, letting the caller handle the conflict.
1470
raise OrphaningForbidden('never')
1473
orphaning_registry = registry.Registry()
1474
orphaning_registry.register(
1475
'conflict', refuse_orphan,
1476
'Leave orphans in place and create a conflict on the directory.')
1477
orphaning_registry.register(
1478
'move', move_orphan,
1479
'Move orphans into the bzr-orphans directory.')
1480
orphaning_registry._set_default_key('conflict')
1278
1483
class TreeTransform(DiskTreeTransform):
1279
1484
"""Represent a tree transformation.
1397
1602
def tree_kind(self, trans_id):
1398
1603
"""Determine the file kind in the working tree.
1400
Raises NoSuchFile if the file does not exist
1605
:returns: The file kind or None if the file does not exist
1402
1607
path = self._tree_id_paths.get(trans_id)
1403
1608
if path is None:
1404
raise NoSuchFile(None)
1406
1611
return file_kind(self._tree.abspath(path))
1408
if e.errno != errno.ENOENT:
1411
raise NoSuchFile(path)
1612
except errors.NoSuchFile:
1413
1615
def _set_mode(self, trans_id, mode_id, typefunc):
1414
1616
"""Set the mode of new file contents.
1666
1868
if trans_id in self._needs_rename:
1668
1870
mover.rename(self._limbo_name(trans_id), full_path)
1871
except errors.TransformRenameFailed, e:
1670
1872
# We may be renaming a dangling inventory id
1671
1873
if e.errno != errno.ENOENT:
1674
1876
self.rename_count += 1
1877
# TODO: if trans_id in self._observed_sha1s, we should
1878
# re-stat the final target, since ctime will be
1879
# updated by the change.
1675
1880
if (trans_id in self._new_contents or
1676
1881
self.path_changed(trans_id)):
1677
1882
if trans_id in self._new_contents:
1678
1883
modified_paths.append(full_path)
1679
1884
if trans_id in self._new_executability:
1680
1885
self._set_executability(path, trans_id)
1886
if trans_id in self._observed_sha1s:
1887
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1888
st = osutils.lstat(full_path)
1889
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1891
child_pb.finished()
1892
for path, trans_id in new_paths:
1893
# new_paths includes stuff like workingtree conflicts. Only the
1894
# stuff in new_contents actually comes from limbo.
1895
if trans_id in self._limbo_files:
1896
del self._limbo_files[trans_id]
1683
1897
self._new_contents.clear()
1684
1898
return modified_paths
1900
def _apply_observed_sha1s(self):
1901
"""After we have finished renaming everything, update observed sha1s
1903
This has to be done after self._tree.apply_inventory_delta, otherwise
1904
it doesn't know anything about the files we are updating. Also, we want
1905
to do this as late as possible, so that most entries end up cached.
1907
# TODO: this doesn't update the stat information for directories. So
1908
# the first 'bzr status' will still need to rewrite
1909
# .bzr/checkout/dirstate. However, we at least don't need to
1910
# re-read all of the files.
1911
# TODO: If the operation took a while, we could do a time.sleep(3) here
1912
# to allow the clock to tick over and ensure we won't have any
1913
# problems. (we could observe start time, and finish time, and if
1914
# it is less than eg 10% overhead, add a sleep call.)
1915
paths = FinalPaths(self)
1916
for trans_id, observed in self._observed_sha1s.iteritems():
1917
path = paths.get_path(trans_id)
1918
# We could get the file_id, but dirstate prefers to use the path
1919
# anyway, and it is 'cheaper' to determine.
1920
# file_id = self._new_id[trans_id]
1921
self._tree._observed_sha1(None, path, observed)
1687
1924
class TransformPreview(DiskTreeTransform):
1688
1925
"""A TreeTransform for generating preview trees.
1767
2009
yield self._get_repository().revision_tree(revision_id)
1769
2011
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2012
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2013
self._iter_parent_trees()]
1772
2014
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2015
self.get_file_lines(file_id))
1774
2016
repo = self._get_repository()
1775
2017
base_vf = repo.texts
1776
2018
if base_vf not in vf.fallback_versionedfiles:
1777
2019
vf.fallback_versionedfiles.append(base_vf)
1778
2020
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2022
def _stat_limbo_file(self, file_id=None, trans_id=None):
2023
if trans_id is None:
2024
trans_id = self._transform.trans_id_file_id(file_id)
1782
2025
name = self._transform._limbo_name(trans_id)
1783
2026
return os.lstat(name)
2266
2526
for num, _unused in enumerate(wt.all_file_ids()):
2267
2527
if num > 0: # more than just a root
2268
2528
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
2529
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2530
top_pb = ui.ui_factory.nested_progress_bar()
2274
2531
pp = ProgressPhase("Build phase", 2, top_pb)
2275
2532
if tree.inventory.root is not None:
2276
2533
# This is kind of a hack: we should be altering the root
2298
2555
precomputed_delta = []
2300
2557
precomputed_delta = None
2558
# Check if tree inventory has content. If so, we populate
2559
# existing_files with the directory content. If there are no
2560
# entries we skip populating existing_files as its not used.
2561
# This improves performance and unncessary work on large
2562
# directory trees. (#501307)
2564
existing_files = set()
2565
for dir, files in wt.walkdirs():
2566
existing_files.update(f[0] for f in files)
2301
2567
for num, (tree_path, entry) in \
2302
2568
enumerate(tree.inventory.iter_entries_by_dir()):
2303
2569
pb.update("Building tree", num - len(deferred_contents), total)
2384
2650
unchanged = dict(unchanged)
2385
2651
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2653
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2654
accelerator_path = unchanged.get(file_id)
2389
2655
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2656
new_desired_files.append((file_id,
2657
(trans_id, tree_path, text_sha1)))
2392
2659
pb.update('Adding file contents', count + offset, total)
2411
2678
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2679
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2680
tree.iter_files_bytes(new_desired_files)):
2414
2681
if wt.supports_content_filtering():
2415
2682
filters = wt._content_filter_stack(tree_path)
2416
2683
contents = filtered_output_bytes(contents, filters,
2417
2684
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2685
tt.create_file(contents, trans_id, sha1=text_sha1)
2419
2686
pb.update('Adding file contents', count + offset, total)
2423
2690
for child in tt.iter_tree_children(old_parent):
2424
2691
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2694
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2695
by_parent = tt.by_parent()
2428
2696
for child in by_parent[old_parent]:
2429
2697
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2698
return by_parent[old_parent]
2432
2701
def _content_match(tree, entry, file_id, kind, target_path):
2433
2702
if entry.kind != kind:
2435
2704
if entry.kind == "directory":
2437
2706
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2707
f = file(target_path, 'rb')
2709
if tree.get_file_text(file_id) == f.read():
2440
2713
elif entry.kind == "symlink":
2441
2714
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2767
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
2770
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2771
filter_tree_path=None):
2515
2772
"""Create new file contents according to tree contents.
2546
2803
tt.set_executability(entry.executable, trans_id)
2806
@deprecated_function(deprecated_in((2, 3, 0)))
2549
2807
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
2808
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2811
@deprecated_function(deprecated_in((2, 3, 0)))
2553
2812
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
2813
"""Produce a backup-style name that appears to be available"""
2555
2814
def name_gen():
2641
2900
backups, merge_modified, basis_tree=None):
2642
2901
if basis_tree is not None:
2643
2902
basis_tree.lock_read()
2644
change_list = target_tree.iter_changes(working_tree,
2903
# We ask the working_tree for its changes relative to the target, rather
2904
# than the target changes relative to the working tree. Because WT4 has an
2905
# optimizer to compare itself to a target, but no optimizer for the
2907
change_list = working_tree.iter_changes(target_tree,
2645
2908
specific_files=specific_files, pb=pb)
2646
2909
if target_tree.get_root_id() is None:
2647
2910
skip_root = True
2651
2914
deferred_files = []
2652
2915
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2916
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2917
target_path, wt_path = path
2918
target_versioned, wt_versioned = versioned
2919
target_parent, wt_parent = parent
2920
target_name, wt_name = name
2921
target_kind, wt_kind = kind
2922
target_executable, wt_executable = executable
2923
if skip_root and wt_parent is None:
2656
2925
trans_id = tt.trans_id_file_id(file_id)
2658
2927
if changed_content:
2659
2928
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2929
if wt_kind == 'file' and (backups or target_kind is None):
2661
2930
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2931
if merge_modified.get(file_id) != wt_sha1:
2663
2932
# acquire the basis tree lazily to prevent the
2669
2938
if file_id in basis_tree:
2670
2939
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2940
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2941
elif target_kind is None and not target_versioned:
2673
2942
keep_content = True
2674
if kind[0] is not None:
2943
if wt_kind is not None:
2675
2944
if not keep_content:
2676
2945
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)
2946
elif target_kind is not None:
2947
parent_trans_id = tt.trans_id_file_id(wt_parent)
2948
backup_name = tt._available_backup_name(
2949
wt_name, parent_trans_id)
2682
2950
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):
2951
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2952
if wt_versioned and target_versioned:
2685
2953
tt.unversion_file(trans_id)
2686
2954
tt.version_file(file_id, new_trans_id)
2687
2955
# New contents should have the same unix perms as old
2689
2957
mode_id = trans_id
2690
2958
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2959
if target_kind in ('directory', 'tree-reference'):
2692
2960
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2961
if target_kind == 'tree-reference':
2694
2962
revision = target_tree.get_reference_revision(file_id,
2696
2964
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2965
elif target_kind == 'symlink':
2698
2966
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2968
elif target_kind == 'file':
2701
2969
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2970
if basis_tree is None:
2703
2971
basis_tree = working_tree.basis_tree()
2711
2979
merge_modified[file_id] = new_sha1
2713
2981
# 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):
2982
if keep_content and wt_executable == target_executable:
2983
tt.set_executability(target_executable, trans_id)
2984
elif target_kind is not None:
2985
raise AssertionError(target_kind)
2986
if not wt_versioned and target_versioned:
2719
2987
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2988
if wt_versioned and not target_versioned:
2721
2989
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:
2990
if (target_name is not None and
2991
(wt_name != target_name or wt_parent != target_parent)):
2992
if target_name == '' and target_parent is None:
2725
2993
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)
2995
parent_trans = tt.trans_id_file_id(target_parent)
2996
if wt_parent is None and wt_versioned:
2997
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)
2999
tt.adjust_path(target_name, parent_trans, trans_id)
3000
if wt_executable != target_executable and target_kind == "file":
3001
tt.set_executability(target_executable, trans_id)
2734
3002
if working_tree.supports_content_filtering():
2735
3003
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
3004
target_tree.iter_files_bytes(deferred_files)):
2808
3076
elif c_type == 'missing parent':
2809
3077
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3078
if trans_id in tt._removed_contents:
3079
cancel_deletion = True
3080
orphans = tt._get_potential_orphans(trans_id)
3082
cancel_deletion = False
3083
# All children are orphans
3086
tt.new_orphan(o, trans_id)
3087
except OrphaningError:
3088
# Something bad happened so we cancel the directory
3089
# deletion which will leave it in place with a
3090
# conflict. The user can deal with it from there.
3091
# Note that this also catch the case where we don't
3092
# want to create orphans and leave the directory in
3094
cancel_deletion = True
3097
# Cancel the directory deletion
3098
tt.cancel_deletion(trans_id)
3099
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3104
tt.final_name(trans_id)
2900
3189
def rename(self, from_, to):
2901
3190
"""Rename a file from one path to another."""
2903
osutils.rename(from_, to)
3192
os.rename(from_, to)
2904
3193
except OSError, e:
2905
3194
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3195
raise errors.FileExists(to, str(e))
3196
# normal OSError doesn't include filenames so it's hard to see where
3197
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3198
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
3199
self.past_renames.append((from_, to))
2910
3201
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
