14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
31
lazy_import.lazy_import(globals(), """
24
32
from bzrlib import (
33
42
revision as _mod_revision,
46
from bzrlib.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
48
from bzrlib.errors import (DuplicateKey, MalformedTransform,
38
49
ReusingTransform, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
50
ImmortalLimbo, NoFinalPath,
40
51
UnableCreateSymlink)
41
52
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
53
from bzrlib.mutabletree import MutableTree
43
54
from bzrlib.osutils import (
53
62
from bzrlib.progress import ProgressPhase
54
63
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
64
70
ROOT_PARENT = "root-parent"
67
72
def unique_add(map, key, value):
69
74
raise DuplicateKey(key=key)
73
79
class _TransformResults(object):
74
80
def __init__(self, modified_paths, rename_count):
75
81
object.__init__(self)
380
397
return sorted(FinalPaths(self).get_paths(new_ids))
382
399
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,
400
"""Determine which trans_ids need new Inventory entries.
402
An new entry is needed when anything that would be reflected by an
403
inventory entry changes, including file name, file_id, parent file_id,
404
file kind, and the execute bit.
406
Some care is taken to return entries with real changes, not cases
407
where the value is deleted and then restored to its original value,
408
but some actually unchanged values may be returned.
410
:returns: A list of (path, trans_id) for all items requiring an
411
inventory change. Ordered by path.
414
# Find entries whose file_ids are new (or changed).
415
new_file_id = set(t for t in self._new_id
416
if self._new_id[t] != self.tree_file_id(t))
417
for id_set in [self._new_name, self._new_parent, new_file_id,
386
418
self._new_executability]:
387
new_ids.update(id_set)
419
changed_ids.update(id_set)
420
# removing implies a kind change
388
421
changed_kind = set(self._removed_contents)
389
423
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))
424
# Ignore entries that are already known to have changed.
425
changed_kind.difference_update(changed_ids)
426
# to keep only the truly changed ones
427
changed_kind = (t for t in changed_kind
428
if self.tree_kind(t) != self.final_kind(t))
429
# all kind changes will alter the inventory
430
changed_ids.update(changed_kind)
431
# To find entries with changed parent_ids, find parents which existed,
432
# but changed file_id.
433
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
434
# Now add all their children to the set.
435
for parent_trans_id in new_file_id:
436
changed_ids.update(self.iter_tree_children(parent_trans_id))
437
return sorted(FinalPaths(self).get_paths(changed_ids))
396
439
def final_kind(self, trans_id):
397
440
"""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)
442
:return: None if the file does not exist/has no contents. (It is
443
conceivable that a path would be created without the corresponding
444
contents insertion command)
403
446
if trans_id in self._new_contents:
404
447
return self._new_contents[trans_id]
405
448
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
451
return self.tree_kind(trans_id)
531
574
# ensure that all children are registered with the transaction
532
575
list(self.iter_tree_children(parent_id))
577
@deprecated_method(deprecated_in((2, 3, 0)))
534
578
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
579
return self._has_named_child(
580
name, parent_id, known_children=by_parent.get(parent_id, []))
582
def _has_named_child(self, name, parent_id, known_children):
583
"""Does a parent already have a name child.
585
:param name: The searched for name.
587
:param parent_id: The parent for which the check is made.
589
:param known_children: The already known children. This should have
590
been recently obtained from `self.by_parent.get(parent_id)`
591
(or will be if None is passed).
593
if known_children is None:
594
known_children = self.by_parent().get(parent_id, [])
595
for child in known_children:
540
596
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
598
parent_path = self._tree_id_paths.get(parent_id, None)
599
if parent_path is None:
600
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
602
child_path = joinpath(parent_path, name)
603
child_id = self._tree_path_ids.get(child_path, None)
548
604
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
605
# Not known by the tree transform yet, check the filesystem
606
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?
608
raise AssertionError('child_id is missing: %s, %s, %s'
609
% (name, parent_id, child_id))
611
def _available_backup_name(self, name, target_id):
612
"""Find an available backup name.
614
:param name: The basename of the file.
616
:param target_id: The directory trans_id where the backup should
619
known_children = self.by_parent().get(target_id, [])
620
return osutils.available_backup_name(
622
lambda base: self._has_named_child(
623
base, target_id, known_children))
559
625
def _parent_loops(self):
560
626
"""No entry should be its own ancestor"""
644
703
if (self._new_name, self._new_parent) == ({}, {}):
646
705
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]
707
for child_tid in children:
708
name = self.final_name(child_tid)
710
# Keep children only if they still exist in the end
711
if not self._case_sensitive_target:
713
name_ids.append((name, child_tid))
652
716
last_trans_id = None
653
717
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
718
kind = self.final_kind(trans_id)
658
719
file_id = self.final_file_id(trans_id)
659
720
if kind is None and file_id is None:
681
742
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
743
"""Children must have a directory parent"""
684
745
for parent_id, children in by_parent.iteritems():
685
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
746
if parent_id == ROOT_PARENT:
749
for child_id in children:
750
if self.final_kind(child_id) is not None:
755
# There is at least a child, so we need an existing directory to
757
kind = self.final_kind(parent_id)
759
# The directory will be deleted
699
760
conflicts.append(('missing parent', parent_id))
700
761
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
701
763
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
766
def _set_executability(self, path, trans_id):
715
767
"""Set the executability of versioned files """
716
if supports_executable():
768
if self._tree._supports_executable():
717
769
new_executability = self._new_executability[trans_id]
718
770
abspath = self._tree.abspath(path)
719
771
current_mode = os.stat(abspath).st_mode
780
832
self.create_symlink(target, trans_id)
835
def new_orphan(self, trans_id, parent_id):
836
"""Schedule an item to be orphaned.
838
When a directory is about to be removed, its children, if they are not
839
versioned are moved out of the way: they don't have a parent anymore.
841
:param trans_id: The trans_id of the existing item.
842
:param parent_id: The parent trans_id of the item.
844
raise NotImplementedError(self.new_orphan)
846
def _get_potential_orphans(self, dir_id):
847
"""Find the potential orphans in a directory.
849
A directory can't be safely deleted if there are versioned files in it.
850
If all the contained files are unversioned then they can be orphaned.
852
The 'None' return value means that the directory contains at least one
853
versioned file and should not be deleted.
855
:param dir_id: The directory trans id.
857
:return: A list of the orphan trans ids or None if at least one
858
versioned file is present.
861
# Find the potential orphans, stop if one item should be kept
862
for child_tid in self.by_parent()[dir_id]:
863
if child_tid in self._removed_contents:
864
# The child is removed as part of the transform. Since it was
865
# versioned before, it's not an orphan
867
elif self.final_file_id(child_tid) is None:
868
# The child is not versioned
869
orphans.append(child_tid)
871
# We have a versioned file here, searching for orphans is
783
877
def _affected_ids(self):
784
878
"""Return the set of transform ids affected by the transform"""
785
879
trans_ids = set(self._removed_id)
928
1019
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1021
def commit(self, branch, message, merge_parents=None, strict=False,
1022
timestamp=None, timezone=None, committer=None, authors=None,
1023
revprops=None, revision_id=None):
931
1024
"""Commit the result of this TreeTransform to a branch.
933
1026
:param branch: The branch to commit to.
934
1027
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1028
:param merge_parents: Additional parent revision-ids specified by
1030
:param strict: If True, abort the commit if there are unversioned
1032
:param timestamp: if not None, seconds-since-epoch for the time and
1033
date. (May be a float.)
1034
:param timezone: Optional timezone for timestamp, as an offset in
1036
:param committer: Optional committer in email-id format.
1037
(e.g. "J Random Hacker <jrandom@example.com>")
1038
:param authors: Optional list of authors in email-id format.
1039
:param revprops: Optional dictionary of revision properties.
1040
:param revision_id: Optional revision id. (Specifying a revision-id
1041
may reduce performance for some non-native formats.)
936
1042
:return: The revision_id of the revision committed.
938
1044
self._check_malformed()
1173
1301
descendants.update(self._limbo_descendants(descendant))
1174
1302
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1304
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1305
"""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.
1309
:param contents: an iterator of strings, all of which will be written
1310
to the target destination.
1311
:param trans_id: TreeTransform handle
1312
:param mode_id: If not None, force the mode of the target file to match
1313
the mode of the object referenced by mode_id.
1314
Otherwise, we will try to preserve mode bits of an existing file.
1315
:param sha1: If the sha1 of this content is already known, pass it in.
1316
We can use it to prevent future sha1 computations.
1187
1318
name = self._limbo_name(trans_id)
1188
1319
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.
1321
unique_add(self._new_contents, trans_id, 'file')
1199
1322
f.writelines(contents)
1202
1325
self._set_mtime(name)
1203
1326
self._set_mode(trans_id, mode_id, S_ISREG)
1327
# It is unfortunate we have to use lstat instead of fstat, but we just
1328
# used utime and chmod on the file, so we need the accurate final
1330
if sha1 is not None:
1331
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1333
def _read_file_chunks(self, trans_id):
1206
1334
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1404
del self._limbo_children_names[trans_id]
1275
1405
delete_any(self._limbo_name(trans_id))
1407
def new_orphan(self, trans_id, parent_id):
1408
# FIXME: There is no tree config, so we use the branch one (it's weird
1409
# to define it this way as orphaning can only occur in a working tree,
1410
# but that's all we have (for now). It will find the option in
1411
# locations.conf or bazaar.conf though) -- vila 20100916
1412
conf = self._tree.branch.get_config()
1413
conf_var_name = 'bzr.transform.orphan_policy'
1414
orphan_policy = conf.get_user_option(conf_var_name)
1415
default_policy = orphaning_registry.default_key
1416
if orphan_policy is None:
1417
orphan_policy = default_policy
1418
if orphan_policy not in orphaning_registry:
1419
trace.warning('%s (from %s) is not a known policy, defaulting '
1420
'to %s' % (orphan_policy, conf_var_name, default_policy))
1421
orphan_policy = default_policy
1422
handle_orphan = orphaning_registry.get(orphan_policy)
1423
handle_orphan(self, trans_id, parent_id)
1426
class OrphaningError(errors.BzrError):
1428
# Only bugs could lead to such exception being seen by the user
1429
internal_error = True
1430
_fmt = "Error while orphaning %s in %s directory"
1432
def __init__(self, orphan, parent):
1433
errors.BzrError.__init__(self)
1434
self.orphan = orphan
1435
self.parent = parent
1438
class OrphaningForbidden(OrphaningError):
1440
_fmt = "Policy: %s doesn't allow creating orphans."
1442
def __init__(self, policy):
1443
errors.BzrError.__init__(self)
1444
self.policy = policy
1447
def move_orphan(tt, orphan_id, parent_id):
1448
"""See TreeTransformBase.new_orphan.
1450
This creates a new orphan in the `bzr-orphans` dir at the root of the
1453
:param tt: The TreeTransform orphaning `trans_id`.
1455
:param orphan_id: The trans id that should be orphaned.
1457
:param parent_id: The orphan parent trans id.
1459
# Add the orphan dir if it doesn't exist
1460
orphan_dir_basename = 'bzr-orphans'
1461
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1462
if tt.final_kind(od_id) is None:
1463
tt.create_directory(od_id)
1464
parent_path = tt._tree_id_paths[parent_id]
1465
# Find a name that doesn't exist yet in the orphan dir
1466
actual_name = tt.final_name(orphan_id)
1467
new_name = tt._available_backup_name(actual_name, od_id)
1468
tt.adjust_path(new_name, od_id, orphan_id)
1469
trace.warning('%s has been orphaned in %s'
1470
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1473
def refuse_orphan(tt, orphan_id, parent_id):
1474
"""See TreeTransformBase.new_orphan.
1476
This refuses to create orphan, letting the caller handle the conflict.
1478
raise OrphaningForbidden('never')
1481
orphaning_registry = registry.Registry()
1482
orphaning_registry.register(
1483
'conflict', refuse_orphan,
1484
'Leave orphans in place and create a conflict on the directory.')
1485
orphaning_registry.register(
1486
'move', move_orphan,
1487
'Move orphans into the bzr-orphans directory.')
1488
orphaning_registry._set_default_key('conflict')
1278
1491
class TreeTransform(DiskTreeTransform):
1279
1492
"""Represent a tree transformation.
1623
1833
tree_paths = list(self._tree_path_ids.iteritems())
1624
1834
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1835
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))
1837
for num, (path, trans_id) in enumerate(tree_paths):
1838
# do not attempt to move root into a subdirectory of itself.
1841
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1842
full_path = self._tree.abspath(path)
1631
1843
if trans_id in self._removed_contents:
1632
1844
delete_path = os.path.join(self._deletiondir, trans_id)
1657
1869
modified_paths = []
1658
1870
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()
1872
child_pb = ui.ui_factory.nested_progress_bar()
1662
1874
for num, (path, trans_id) in enumerate(new_paths):
1663
1875
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1876
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1877
full_path = self._tree.abspath(path)
1666
1878
if trans_id in self._needs_rename:
1668
1880
mover.rename(self._limbo_name(trans_id), full_path)
1881
except errors.TransformRenameFailed, e:
1670
1882
# We may be renaming a dangling inventory id
1671
1883
if e.errno != errno.ENOENT:
1674
1886
self.rename_count += 1
1887
# TODO: if trans_id in self._observed_sha1s, we should
1888
# re-stat the final target, since ctime will be
1889
# updated by the change.
1675
1890
if (trans_id in self._new_contents or
1676
1891
self.path_changed(trans_id)):
1677
1892
if trans_id in self._new_contents:
1678
1893
modified_paths.append(full_path)
1679
1894
if trans_id in self._new_executability:
1680
1895
self._set_executability(path, trans_id)
1896
if trans_id in self._observed_sha1s:
1897
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1898
st = osutils.lstat(full_path)
1899
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1901
child_pb.finished()
1902
for path, trans_id in new_paths:
1903
# new_paths includes stuff like workingtree conflicts. Only the
1904
# stuff in new_contents actually comes from limbo.
1905
if trans_id in self._limbo_files:
1906
del self._limbo_files[trans_id]
1683
1907
self._new_contents.clear()
1684
1908
return modified_paths
1910
def _apply_observed_sha1s(self):
1911
"""After we have finished renaming everything, update observed sha1s
1913
This has to be done after self._tree.apply_inventory_delta, otherwise
1914
it doesn't know anything about the files we are updating. Also, we want
1915
to do this as late as possible, so that most entries end up cached.
1917
# TODO: this doesn't update the stat information for directories. So
1918
# the first 'bzr status' will still need to rewrite
1919
# .bzr/checkout/dirstate. However, we at least don't need to
1920
# re-read all of the files.
1921
# TODO: If the operation took a while, we could do a time.sleep(3) here
1922
# to allow the clock to tick over and ensure we won't have any
1923
# problems. (we could observe start time, and finish time, and if
1924
# it is less than eg 10% overhead, add a sleep call.)
1925
paths = FinalPaths(self)
1926
for trans_id, observed in self._observed_sha1s.iteritems():
1927
path = paths.get_path(trans_id)
1928
# We could get the file_id, but dirstate prefers to use the path
1929
# anyway, and it is 'cheaper' to determine.
1930
# file_id = self._new_id[trans_id]
1931
self._tree._observed_sha1(None, path, observed)
1687
1934
class TransformPreview(DiskTreeTransform):
1688
1935
"""A TreeTransform for generating preview trees.
1767
2019
yield self._get_repository().revision_tree(revision_id)
1769
2021
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2022
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2023
self._iter_parent_trees()]
1772
2024
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2025
self.get_file_lines(file_id))
1774
2026
repo = self._get_repository()
1775
2027
base_vf = repo.texts
1776
2028
if base_vf not in vf.fallback_versionedfiles:
1777
2029
vf.fallback_versionedfiles.append(base_vf)
1778
2030
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2032
def _stat_limbo_file(self, file_id=None, trans_id=None):
2033
if trans_id is None:
2034
trans_id = self._transform.trans_id_file_id(file_id)
1782
2035
name = self._transform._limbo_name(trans_id)
1783
2036
return os.lstat(name)
1998
2259
def get_file_size(self, file_id):
1999
2260
"""See Tree.get_file_size"""
2261
trans_id = self._transform.trans_id_file_id(file_id)
2262
kind = self._transform.final_kind(trans_id)
2265
if trans_id in self._transform._new_contents:
2266
return self._stat_limbo_file(trans_id=trans_id).st_size
2000
2267
if self.kind(file_id) == 'file':
2001
2268
return self._transform._tree.get_file_size(file_id)
2272
def get_file_verifier(self, file_id, path=None, stat_value=None):
2273
trans_id = self._transform.trans_id_file_id(file_id)
2274
kind = self._transform._new_contents.get(trans_id)
2276
return self._transform._tree.get_file_verifier(file_id)
2278
fileobj = self.get_file(file_id)
2280
return ("SHA1", sha_file(fileobj))
2005
2284
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
2285
trans_id = self._transform.trans_id_file_id(file_id)
2007
2286
kind = self._transform._new_contents.get(trans_id)
2289
2574
pp.next_phase()
2290
2575
file_trans_id[wt.get_root_id()] = \
2291
2576
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2577
pb = ui.ui_factory.nested_progress_bar()
2294
2579
deferred_contents = []
2296
total = len(tree.inventory)
2581
total = len(tree.all_file_ids())
2297
2582
if delta_from_tree:
2298
2583
precomputed_delta = []
2300
2585
precomputed_delta = None
2586
# Check if tree inventory has content. If so, we populate
2587
# existing_files with the directory content. If there are no
2588
# entries we skip populating existing_files as its not used.
2589
# This improves performance and unncessary work on large
2590
# directory trees. (#501307)
2592
existing_files = set()
2593
for dir, files in wt.walkdirs():
2594
existing_files.update(f[0] for f in files)
2301
2595
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2596
enumerate(tree.iter_entries_by_dir()):
2597
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2598
if entry.parent_id is None:
2306
2600
reparent = False
2384
2678
unchanged = dict(unchanged)
2385
2679
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2681
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2682
accelerator_path = unchanged.get(file_id)
2389
2683
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2684
new_desired_files.append((file_id,
2685
(trans_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2687
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2689
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2411
2706
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2707
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2708
tree.iter_files_bytes(new_desired_files)):
2414
2709
if wt.supports_content_filtering():
2415
2710
filters = wt._content_filter_stack(tree_path)
2416
2711
contents = filtered_output_bytes(contents, filters,
2417
2712
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2713
tt.create_file(contents, trans_id, sha1=text_sha1)
2714
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2717
def _reparent_children(tt, old_parent, new_parent):
2423
2718
for child in tt.iter_tree_children(old_parent):
2424
2719
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2722
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2723
by_parent = tt.by_parent()
2428
2724
for child in by_parent[old_parent]:
2429
2725
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2726
return by_parent[old_parent]
2432
2729
def _content_match(tree, entry, file_id, kind, target_path):
2433
2730
if entry.kind != kind:
2435
2732
if entry.kind == "directory":
2437
2734
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2735
f = file(target_path, 'rb')
2737
if tree.get_file_text(file_id) == f.read():
2440
2741
elif entry.kind == "symlink":
2441
2742
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2795
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
2798
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2799
filter_tree_path=None):
2515
2800
"""Create new file contents according to tree contents.
2562
2849
return new_name
2565
def _entry_changes(file_id, entry, working_tree):
2566
"""Determine in which ways the inventory entry has changed.
2568
Returns booleans: has_contents, content_mod, meta_mod
2569
has_contents means there are currently contents, but they differ
2570
contents_mod means contents need to be modified
2571
meta_mod means the metadata needs to be modified
2573
cur_entry = working_tree.inventory[file_id]
2575
working_kind = working_tree.kind(file_id)
2578
has_contents = False
2581
if has_contents is True:
2582
if entry.kind != working_kind:
2583
contents_mod, meta_mod = True, False
2585
cur_entry._read_tree_state(working_tree.id2path(file_id),
2587
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
cur_entry._forget_tree_state()
2589
return has_contents, contents_mod, meta_mod
2592
2852
def revert(working_tree, target_tree, filenames, backups=False,
2593
2853
pb=None, change_reporter=None):
2594
2854
"""Revert a working tree's contents to those of a target tree."""
2651
2915
deferred_files = []
2652
2916
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2917
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2918
target_path, wt_path = path
2919
target_versioned, wt_versioned = versioned
2920
target_parent, wt_parent = parent
2921
target_name, wt_name = name
2922
target_kind, wt_kind = kind
2923
target_executable, wt_executable = executable
2924
if skip_root and wt_parent is None:
2656
2926
trans_id = tt.trans_id_file_id(file_id)
2658
2928
if changed_content:
2659
2929
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2930
if wt_kind == 'file' and (backups or target_kind is None):
2661
2931
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2932
if merge_modified.get(file_id) != wt_sha1:
2663
2933
# acquire the basis tree lazily to prevent the
2666
2936
if basis_tree is None:
2667
2937
basis_tree = working_tree.basis_tree()
2668
2938
basis_tree.lock_read()
2669
if file_id in basis_tree:
2939
if basis_tree.has_id(file_id):
2670
2940
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2941
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2942
elif target_kind is None and not target_versioned:
2673
2943
keep_content = True
2674
if kind[0] is not None:
2944
if wt_kind is not None:
2675
2945
if not keep_content:
2676
2946
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)
2947
elif target_kind is not None:
2948
parent_trans_id = tt.trans_id_file_id(wt_parent)
2949
backup_name = tt._available_backup_name(
2950
wt_name, parent_trans_id)
2682
2951
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):
2952
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2953
if wt_versioned and target_versioned:
2685
2954
tt.unversion_file(trans_id)
2686
2955
tt.version_file(file_id, new_trans_id)
2687
2956
# New contents should have the same unix perms as old
2689
2958
mode_id = trans_id
2690
2959
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2960
if target_kind in ('directory', 'tree-reference'):
2692
2961
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2962
if target_kind == 'tree-reference':
2694
2963
revision = target_tree.get_reference_revision(file_id,
2696
2965
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2966
elif target_kind == 'symlink':
2698
2967
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2969
elif target_kind == 'file':
2701
2970
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2971
if basis_tree is None:
2703
2972
basis_tree = working_tree.basis_tree()
2704
2973
basis_tree.lock_read()
2705
2974
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)):
2975
if (basis_tree.has_id(file_id) and
2976
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2977
if file_id in merge_modified:
2709
2978
del merge_modified[file_id]
2711
2980
merge_modified[file_id] = new_sha1
2713
2982
# 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):
2983
if keep_content and wt_executable == target_executable:
2984
tt.set_executability(target_executable, trans_id)
2985
elif target_kind is not None:
2986
raise AssertionError(target_kind)
2987
if not wt_versioned and target_versioned:
2719
2988
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2989
if wt_versioned and not target_versioned:
2721
2990
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:
2991
if (target_name is not None and
2992
(wt_name != target_name or wt_parent != target_parent)):
2993
if target_name == '' and target_parent is None:
2725
2994
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)
2996
parent_trans = tt.trans_id_file_id(target_parent)
2997
if wt_parent is None and wt_versioned:
2998
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)
3000
tt.adjust_path(target_name, parent_trans, trans_id)
3001
if wt_executable != target_executable and target_kind == "file":
3002
tt.set_executability(target_executable, trans_id)
2734
3003
if working_tree.supports_content_filtering():
2735
3004
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
3005
target_tree.iter_files_bytes(deferred_files)):
2808
3077
elif c_type == 'missing parent':
2809
3078
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3079
if trans_id in tt._removed_contents:
3080
cancel_deletion = True
3081
orphans = tt._get_potential_orphans(trans_id)
3083
cancel_deletion = False
3084
# All children are orphans
3087
tt.new_orphan(o, trans_id)
3088
except OrphaningError:
3089
# Something bad happened so we cancel the directory
3090
# deletion which will leave it in place with a
3091
# conflict. The user can deal with it from there.
3092
# Note that this also catch the case where we don't
3093
# want to create orphans and leave the directory in
3095
cancel_deletion = True
3098
# Cancel the directory deletion
3099
tt.cancel_deletion(trans_id)
3100
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3105
tt.final_name(trans_id)
2878
3166
modified_path = fp.get_path(conflict[2])
2879
3167
modified_id = tt.final_file_id(conflict[2])
2880
3168
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3169
yield conflicts.Conflict.factory(
3170
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3173
conflicting_path = fp.get_path(conflict[3])
2886
3174
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)
3175
yield conflicts.Conflict.factory(
3176
c_type, action=action, path=modified_path,
3177
file_id=modified_id,
3178
conflict_path=conflicting_path,
3179
conflict_file_id=conflicting_id)
2893
3182
class _FileMover(object):
added
removed
bzrlib/transform.py
