33
41
revision as _mod_revision,
45
from bzrlib.i18n import gettext
37
47
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
48
ReusingTransform, CantMoveRoot,
39
49
ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
50
UnableCreateSymlink)
41
51
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
52
from bzrlib.osutils import (
51
59
supports_executable,
53
61
from bzrlib.progress import ProgressPhase
54
62
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
64
69
ROOT_PARENT = "root-parent"
67
71
def unique_add(map, key, value):
69
73
raise DuplicateKey(key=key)
73
78
class _TransformResults(object):
74
79
def __init__(self, modified_paths, rename_count):
75
80
object.__init__(self)
380
394
return sorted(FinalPaths(self).get_paths(new_ids))
382
396
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,
397
"""Determine which trans_ids need new Inventory entries.
399
An new entry is needed when anything that would be reflected by an
400
inventory entry changes, including file name, file_id, parent file_id,
401
file kind, and the execute bit.
403
Some care is taken to return entries with real changes, not cases
404
where the value is deleted and then restored to its original value,
405
but some actually unchanged values may be returned.
407
:returns: A list of (path, trans_id) for all items requiring an
408
inventory change. Ordered by path.
411
# Find entries whose file_ids are new (or changed).
412
new_file_id = set(t for t in self._new_id
413
if self._new_id[t] != self.tree_file_id(t))
414
for id_set in [self._new_name, self._new_parent, new_file_id,
386
415
self._new_executability]:
387
new_ids.update(id_set)
416
changed_ids.update(id_set)
417
# removing implies a kind change
388
418
changed_kind = set(self._removed_contents)
389
420
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))
421
# Ignore entries that are already known to have changed.
422
changed_kind.difference_update(changed_ids)
423
# to keep only the truly changed ones
424
changed_kind = (t for t in changed_kind
425
if self.tree_kind(t) != self.final_kind(t))
426
# all kind changes will alter the inventory
427
changed_ids.update(changed_kind)
428
# To find entries with changed parent_ids, find parents which existed,
429
# but changed file_id.
430
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
431
# Now add all their children to the set.
432
for parent_trans_id in new_file_id:
433
changed_ids.update(self.iter_tree_children(parent_trans_id))
434
return sorted(FinalPaths(self).get_paths(changed_ids))
396
436
def final_kind(self, trans_id):
397
437
"""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)
439
:return: None if the file does not exist/has no contents. (It is
440
conceivable that a path would be created without the corresponding
441
contents insertion command)
403
443
if trans_id in self._new_contents:
404
444
return self._new_contents[trans_id]
405
445
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
448
return self.tree_kind(trans_id)
531
573
# ensure that all children are registered with the transaction
532
574
list(self.iter_tree_children(parent_id))
576
@deprecated_method(deprecated_in((2, 3, 0)))
534
577
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
578
return self._has_named_child(
579
name, parent_id, known_children=by_parent.get(parent_id, []))
581
def _has_named_child(self, name, parent_id, known_children):
582
"""Does a parent already have a name child.
584
:param name: The searched for name.
586
:param parent_id: The parent for which the check is made.
588
:param known_children: The already known children. This should have
589
been recently obtained from `self.by_parent.get(parent_id)`
590
(or will be if None is passed).
592
if known_children is None:
593
known_children = self.by_parent().get(parent_id, [])
594
for child in known_children:
540
595
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
597
parent_path = self._tree_id_paths.get(parent_id, None)
598
if parent_path is None:
599
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
601
child_path = joinpath(parent_path, name)
602
child_id = self._tree_path_ids.get(child_path, None)
548
603
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
604
# Not known by the tree transform yet, check the filesystem
605
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?
607
raise AssertionError('child_id is missing: %s, %s, %s'
608
% (name, parent_id, child_id))
610
def _available_backup_name(self, name, target_id):
611
"""Find an available backup name.
613
:param name: The basename of the file.
615
:param target_id: The directory trans_id where the backup should
618
known_children = self.by_parent().get(target_id, [])
619
return osutils.available_backup_name(
621
lambda base: self._has_named_child(
622
base, target_id, known_children))
559
624
def _parent_loops(self):
560
625
"""No entry should be its own ancestor"""
644
702
if (self._new_name, self._new_parent) == ({}, {}):
646
704
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]
706
for child_tid in children:
707
name = self.final_name(child_tid)
709
# Keep children only if they still exist in the end
710
if not self._case_sensitive_target:
712
name_ids.append((name, child_tid))
652
715
last_trans_id = None
653
716
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
717
kind = self.final_kind(trans_id)
658
718
file_id = self.final_file_id(trans_id)
659
719
if kind is None and file_id is None:
681
741
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
742
"""Children must have a directory parent"""
684
744
for parent_id, children in by_parent.iteritems():
685
745
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
748
for child_id in children:
749
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)
754
# There is at least a child, so we need an existing directory to
756
kind = self.final_kind(parent_id)
758
# The directory will be deleted
699
759
conflicts.append(('missing parent', parent_id))
700
760
elif kind != "directory":
761
# Meh, we need a *directory* to put something in it
701
762
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
765
def _set_executability(self, path, trans_id):
715
766
"""Set the executability of versioned files """
716
767
if supports_executable():
780
831
self.create_symlink(target, trans_id)
834
def new_orphan(self, trans_id, parent_id):
835
"""Schedule an item to be orphaned.
837
When a directory is about to be removed, its children, if they are not
838
versioned are moved out of the way: they don't have a parent anymore.
840
:param trans_id: The trans_id of the existing item.
841
:param parent_id: The parent trans_id of the item.
843
raise NotImplementedError(self.new_orphan)
845
def _get_potential_orphans(self, dir_id):
846
"""Find the potential orphans in a directory.
848
A directory can't be safely deleted if there are versioned files in it.
849
If all the contained files are unversioned then they can be orphaned.
851
The 'None' return value means that the directory contains at least one
852
versioned file and should not be deleted.
854
:param dir_id: The directory trans id.
856
:return: A list of the orphan trans ids or None if at least one
857
versioned file is present.
860
# Find the potential orphans, stop if one item should be kept
861
for child_tid in self.by_parent()[dir_id]:
862
if child_tid in self._removed_contents:
863
# The child is removed as part of the transform. Since it was
864
# versioned before, it's not an orphan
866
elif self.final_file_id(child_tid) is None:
867
# The child is not versioned
868
orphans.append(child_tid)
870
# We have a versioned file here, searching for orphans is
783
876
def _affected_ids(self):
784
877
"""Return the set of transform ids affected by the transform"""
785
878
trans_ids = set(self._removed_id)
928
1018
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1020
def commit(self, branch, message, merge_parents=None, strict=False,
1021
timestamp=None, timezone=None, committer=None, authors=None,
1022
revprops=None, revision_id=None):
931
1023
"""Commit the result of this TreeTransform to a branch.
933
1025
:param branch: The branch to commit to.
934
1026
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1027
:param merge_parents: Additional parent revision-ids specified by
1029
:param strict: If True, abort the commit if there are unversioned
1031
:param timestamp: if not None, seconds-since-epoch for the time and
1032
date. (May be a float.)
1033
:param timezone: Optional timezone for timestamp, as an offset in
1035
:param committer: Optional committer in email-id format.
1036
(e.g. "J Random Hacker <jrandom@example.com>")
1037
:param authors: Optional list of authors in email-id format.
1038
:param revprops: Optional dictionary of revision properties.
1039
:param revision_id: Optional revision id. (Specifying a revision-id
1040
may reduce performance for some non-native formats.)
936
1041
:return: The revision_id of the revision committed.
938
1043
self._check_malformed()
1173
1295
descendants.update(self._limbo_descendants(descendant))
1174
1296
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1298
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1299
"""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.
1303
:param contents: an iterator of strings, all of which will be written
1304
to the target destination.
1305
:param trans_id: TreeTransform handle
1306
:param mode_id: If not None, force the mode of the target file to match
1307
the mode of the object referenced by mode_id.
1308
Otherwise, we will try to preserve mode bits of an existing file.
1309
:param sha1: If the sha1 of this content is already known, pass it in.
1310
We can use it to prevent future sha1 computations.
1187
1312
name = self._limbo_name(trans_id)
1188
1313
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.
1315
unique_add(self._new_contents, trans_id, 'file')
1199
1316
f.writelines(contents)
1202
1319
self._set_mtime(name)
1203
1320
self._set_mode(trans_id, mode_id, S_ISREG)
1321
# It is unfortunate we have to use lstat instead of fstat, but we just
1322
# used utime and chmod on the file, so we need the accurate final
1324
if sha1 is not None:
1325
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1327
def _read_file_chunks(self, trans_id):
1206
1328
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1398
del self._limbo_children_names[trans_id]
1275
1399
delete_any(self._limbo_name(trans_id))
1401
def new_orphan(self, trans_id, parent_id):
1402
# FIXME: There is no tree config, so we use the branch one (it's weird
1403
# to define it this way as orphaning can only occur in a working tree,
1404
# but that's all we have (for now). It will find the option in
1405
# locations.conf or bazaar.conf though) -- vila 20100916
1406
conf = self._tree.branch.get_config()
1407
conf_var_name = 'bzr.transform.orphan_policy'
1408
orphan_policy = conf.get_user_option(conf_var_name)
1409
default_policy = orphaning_registry.default_key
1410
if orphan_policy is None:
1411
orphan_policy = default_policy
1412
if orphan_policy not in orphaning_registry:
1413
trace.warning('%s (from %s) is not a known policy, defaulting '
1414
'to %s' % (orphan_policy, conf_var_name, default_policy))
1415
orphan_policy = default_policy
1416
handle_orphan = orphaning_registry.get(orphan_policy)
1417
handle_orphan(self, trans_id, parent_id)
1420
class OrphaningError(errors.BzrError):
1422
# Only bugs could lead to such exception being seen by the user
1423
internal_error = True
1424
_fmt = "Error while orphaning %s in %s directory"
1426
def __init__(self, orphan, parent):
1427
errors.BzrError.__init__(self)
1428
self.orphan = orphan
1429
self.parent = parent
1432
class OrphaningForbidden(OrphaningError):
1434
_fmt = "Policy: %s doesn't allow creating orphans."
1436
def __init__(self, policy):
1437
errors.BzrError.__init__(self)
1438
self.policy = policy
1441
def move_orphan(tt, orphan_id, parent_id):
1442
"""See TreeTransformBase.new_orphan.
1444
This creates a new orphan in the `bzr-orphans` dir at the root of the
1447
:param tt: The TreeTransform orphaning `trans_id`.
1449
:param orphan_id: The trans id that should be orphaned.
1451
:param parent_id: The orphan parent trans id.
1453
# Add the orphan dir if it doesn't exist
1454
orphan_dir_basename = 'bzr-orphans'
1455
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1456
if tt.final_kind(od_id) is None:
1457
tt.create_directory(od_id)
1458
parent_path = tt._tree_id_paths[parent_id]
1459
# Find a name that doesn't exist yet in the orphan dir
1460
actual_name = tt.final_name(orphan_id)
1461
new_name = tt._available_backup_name(actual_name, od_id)
1462
tt.adjust_path(new_name, od_id, orphan_id)
1463
trace.warning('%s has been orphaned in %s'
1464
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1467
def refuse_orphan(tt, orphan_id, parent_id):
1468
"""See TreeTransformBase.new_orphan.
1470
This refuses to create orphan, letting the caller handle the conflict.
1472
raise OrphaningForbidden('never')
1475
orphaning_registry = registry.Registry()
1476
orphaning_registry.register(
1477
'conflict', refuse_orphan,
1478
'Leave orphans in place and create a conflict on the directory.')
1479
orphaning_registry.register(
1480
'move', move_orphan,
1481
'Move orphans into the bzr-orphans directory.')
1482
orphaning_registry._set_default_key('conflict')
1278
1485
class TreeTransform(DiskTreeTransform):
1279
1486
"""Represent a tree transformation.
1623
1829
tree_paths = list(self._tree_path_ids.iteritems())
1624
1830
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1831
child_pb = ui.ui_factory.nested_progress_bar()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1629
child_pb.update('removing file', num, len(tree_paths))
1833
for num, (path, trans_id) in enumerate(tree_paths):
1834
# do not attempt to move root into a subdirectory of itself.
1837
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1838
full_path = self._tree.abspath(path)
1631
1839
if trans_id in self._removed_contents:
1632
1840
delete_path = os.path.join(self._deletiondir, trans_id)
1657
1865
modified_paths = []
1658
1866
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1660
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1868
child_pb = ui.ui_factory.nested_progress_bar()
1662
1870
for num, (path, trans_id) in enumerate(new_paths):
1663
1871
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1872
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1873
full_path = self._tree.abspath(path)
1666
1874
if trans_id in self._needs_rename:
1668
1876
mover.rename(self._limbo_name(trans_id), full_path)
1877
except errors.TransformRenameFailed, e:
1670
1878
# We may be renaming a dangling inventory id
1671
1879
if e.errno != errno.ENOENT:
1674
1882
self.rename_count += 1
1883
# TODO: if trans_id in self._observed_sha1s, we should
1884
# re-stat the final target, since ctime will be
1885
# updated by the change.
1675
1886
if (trans_id in self._new_contents or
1676
1887
self.path_changed(trans_id)):
1677
1888
if trans_id in self._new_contents:
1678
1889
modified_paths.append(full_path)
1679
1890
if trans_id in self._new_executability:
1680
1891
self._set_executability(path, trans_id)
1892
if trans_id in self._observed_sha1s:
1893
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1894
st = osutils.lstat(full_path)
1895
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1897
child_pb.finished()
1898
for path, trans_id in new_paths:
1899
# new_paths includes stuff like workingtree conflicts. Only the
1900
# stuff in new_contents actually comes from limbo.
1901
if trans_id in self._limbo_files:
1902
del self._limbo_files[trans_id]
1683
1903
self._new_contents.clear()
1684
1904
return modified_paths
1906
def _apply_observed_sha1s(self):
1907
"""After we have finished renaming everything, update observed sha1s
1909
This has to be done after self._tree.apply_inventory_delta, otherwise
1910
it doesn't know anything about the files we are updating. Also, we want
1911
to do this as late as possible, so that most entries end up cached.
1913
# TODO: this doesn't update the stat information for directories. So
1914
# the first 'bzr status' will still need to rewrite
1915
# .bzr/checkout/dirstate. However, we at least don't need to
1916
# re-read all of the files.
1917
# TODO: If the operation took a while, we could do a time.sleep(3) here
1918
# to allow the clock to tick over and ensure we won't have any
1919
# problems. (we could observe start time, and finish time, and if
1920
# it is less than eg 10% overhead, add a sleep call.)
1921
paths = FinalPaths(self)
1922
for trans_id, observed in self._observed_sha1s.iteritems():
1923
path = paths.get_path(trans_id)
1924
# We could get the file_id, but dirstate prefers to use the path
1925
# anyway, and it is 'cheaper' to determine.
1926
# file_id = self._new_id[trans_id]
1927
self._tree._observed_sha1(None, path, observed)
1687
1930
class TransformPreview(DiskTreeTransform):
1688
1931
"""A TreeTransform for generating preview trees.
1767
2015
yield self._get_repository().revision_tree(revision_id)
1769
2017
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2018
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2019
self._iter_parent_trees()]
1772
2020
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2021
self.get_file_lines(file_id))
1774
2022
repo = self._get_repository()
1775
2023
base_vf = repo.texts
1776
2024
if base_vf not in vf.fallback_versionedfiles:
1777
2025
vf.fallback_versionedfiles.append(base_vf)
1778
2026
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2028
def _stat_limbo_file(self, file_id=None, trans_id=None):
2029
if trans_id is None:
2030
trans_id = self._transform.trans_id_file_id(file_id)
1782
2031
name = self._transform._limbo_name(trans_id)
1783
2032
return os.lstat(name)
1998
2249
def get_file_size(self, file_id):
1999
2250
"""See Tree.get_file_size"""
2251
trans_id = self._transform.trans_id_file_id(file_id)
2252
kind = self._transform.final_kind(trans_id)
2255
if trans_id in self._transform._new_contents:
2256
return self._stat_limbo_file(trans_id=trans_id).st_size
2000
2257
if self.kind(file_id) == 'file':
2001
2258
return self._transform._tree.get_file_size(file_id)
2262
def get_file_verifier(self, file_id, path=None, stat_value=None):
2263
trans_id = self._transform.trans_id_file_id(file_id)
2264
kind = self._transform._new_contents.get(trans_id)
2266
return self._transform._tree.get_file_verifier(file_id)
2268
fileobj = self.get_file(file_id)
2270
return ("SHA1", sha_file(fileobj))
2005
2274
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
2275
trans_id = self._transform.trans_id_file_id(file_id)
2007
2276
kind = self._transform._new_contents.get(trans_id)
2298
2573
precomputed_delta = []
2300
2575
precomputed_delta = None
2576
# Check if tree inventory has content. If so, we populate
2577
# existing_files with the directory content. If there are no
2578
# entries we skip populating existing_files as its not used.
2579
# This improves performance and unncessary work on large
2580
# directory trees. (#501307)
2582
existing_files = set()
2583
for dir, files in wt.walkdirs():
2584
existing_files.update(f[0] for f in files)
2301
2585
for num, (tree_path, entry) in \
2302
2586
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2587
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2588
if entry.parent_id is None:
2306
2590
reparent = False
2384
2668
unchanged = dict(unchanged)
2385
2669
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2671
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2672
accelerator_path = unchanged.get(file_id)
2389
2673
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2674
new_desired_files.append((file_id,
2675
(trans_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2677
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2679
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2411
2696
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2697
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2698
tree.iter_files_bytes(new_desired_files)):
2414
2699
if wt.supports_content_filtering():
2415
2700
filters = wt._content_filter_stack(tree_path)
2416
2701
contents = filtered_output_bytes(contents, filters,
2417
2702
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2703
tt.create_file(contents, trans_id, sha1=text_sha1)
2704
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2707
def _reparent_children(tt, old_parent, new_parent):
2423
2708
for child in tt.iter_tree_children(old_parent):
2424
2709
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2712
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2713
by_parent = tt.by_parent()
2428
2714
for child in by_parent[old_parent]:
2429
2715
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2716
return by_parent[old_parent]
2432
2719
def _content_match(tree, entry, file_id, kind, target_path):
2433
2720
if entry.kind != kind:
2435
2722
if entry.kind == "directory":
2437
2724
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2725
f = file(target_path, 'rb')
2727
if tree.get_file_text(file_id) == f.read():
2440
2731
elif entry.kind == "symlink":
2441
2732
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2785
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
2788
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2789
filter_tree_path=None):
2515
2790
"""Create new file contents according to tree contents.
2651
2932
deferred_files = []
2652
2933
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2934
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2935
target_path, wt_path = path
2936
target_versioned, wt_versioned = versioned
2937
target_parent, wt_parent = parent
2938
target_name, wt_name = name
2939
target_kind, wt_kind = kind
2940
target_executable, wt_executable = executable
2941
if skip_root and wt_parent is None:
2656
2943
trans_id = tt.trans_id_file_id(file_id)
2658
2945
if changed_content:
2659
2946
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2947
if wt_kind == 'file' and (backups or target_kind is None):
2661
2948
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2949
if merge_modified.get(file_id) != wt_sha1:
2663
2950
# acquire the basis tree lazily to prevent the
2666
2953
if basis_tree is None:
2667
2954
basis_tree = working_tree.basis_tree()
2668
2955
basis_tree.lock_read()
2669
if file_id in basis_tree:
2956
if basis_tree.has_id(file_id):
2670
2957
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2958
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2959
elif target_kind is None and not target_versioned:
2673
2960
keep_content = True
2674
if kind[0] is not None:
2961
if wt_kind is not None:
2675
2962
if not keep_content:
2676
2963
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)
2964
elif target_kind is not None:
2965
parent_trans_id = tt.trans_id_file_id(wt_parent)
2966
backup_name = tt._available_backup_name(
2967
wt_name, parent_trans_id)
2682
2968
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):
2969
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2970
if wt_versioned and target_versioned:
2685
2971
tt.unversion_file(trans_id)
2686
2972
tt.version_file(file_id, new_trans_id)
2687
2973
# New contents should have the same unix perms as old
2689
2975
mode_id = trans_id
2690
2976
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2977
if target_kind in ('directory', 'tree-reference'):
2692
2978
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2979
if target_kind == 'tree-reference':
2694
2980
revision = target_tree.get_reference_revision(file_id,
2696
2982
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2983
elif target_kind == 'symlink':
2698
2984
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2986
elif target_kind == 'file':
2701
2987
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2988
if basis_tree is None:
2703
2989
basis_tree = working_tree.basis_tree()
2704
2990
basis_tree.lock_read()
2705
2991
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2992
if (basis_tree.has_id(file_id) and
2993
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2994
if file_id in merge_modified:
2709
2995
del merge_modified[file_id]
2711
2997
merge_modified[file_id] = new_sha1
2713
2999
# 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):
3000
if keep_content and wt_executable == target_executable:
3001
tt.set_executability(target_executable, trans_id)
3002
elif target_kind is not None:
3003
raise AssertionError(target_kind)
3004
if not wt_versioned and target_versioned:
2719
3005
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
3006
if wt_versioned and not target_versioned:
2721
3007
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:
3008
if (target_name is not None and
3009
(wt_name != target_name or wt_parent != target_parent)):
3010
if target_name == '' and target_parent is None:
2725
3011
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)
3013
parent_trans = tt.trans_id_file_id(target_parent)
3014
if wt_parent is None and wt_versioned:
3015
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)
3017
tt.adjust_path(target_name, parent_trans, trans_id)
3018
if wt_executable != target_executable and target_kind == "file":
3019
tt.set_executability(target_executable, trans_id)
2734
3020
if working_tree.supports_content_filtering():
2735
3021
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
3022
target_tree.iter_files_bytes(deferred_files)):
2808
3094
elif c_type == 'missing parent':
2809
3095
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3096
if trans_id in tt._removed_contents:
3097
cancel_deletion = True
3098
orphans = tt._get_potential_orphans(trans_id)
3100
cancel_deletion = False
3101
# All children are orphans
3104
tt.new_orphan(o, trans_id)
3105
except OrphaningError:
3106
# Something bad happened so we cancel the directory
3107
# deletion which will leave it in place with a
3108
# conflict. The user can deal with it from there.
3109
# Note that this also catch the case where we don't
3110
# want to create orphans and leave the directory in
3112
cancel_deletion = True
3115
# Cancel the directory deletion
3116
tt.cancel_deletion(trans_id)
3117
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3122
tt.final_name(trans_id)
2878
3183
modified_path = fp.get_path(conflict[2])
2879
3184
modified_id = tt.final_file_id(conflict[2])
2880
3185
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3186
yield conflicts.Conflict.factory(
3187
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3190
conflicting_path = fp.get_path(conflict[3])
2886
3191
conflicting_id = tt.final_file_id(conflict[3])
2887
yield Conflict.factory(c_type, action=action, path=modified_path,
2888
file_id=modified_id,
2889
conflict_path=conflicting_path,
2890
conflict_file_id=conflicting_id)
3192
yield conflicts.Conflict.factory(
3193
c_type, action=action, path=modified_path,
3194
file_id=modified_id,
3195
conflict_path=conflicting_path,
3196
conflict_file_id=conflicting_id)
2893
3199
class _FileMover(object):
added
removed
bzrlib/transform.py
