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