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
21
19
from stat import S_ISREG, S_IEXEC
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
33
23
from bzrlib import (
43
32
revision as _mod_revision,
47
from bzrlib.i18n import gettext
49
from bzrlib.errors import (DuplicateKey, MalformedTransform,
50
ReusingTransform, CantMoveRoot,
51
ImmortalLimbo, NoFinalPath,
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
36
ReusingTransform, NotVersionedError, CantMoveRoot,
37
ExistingLimbo, ImmortalLimbo, NoFinalPath,
52
38
UnableCreateSymlink)
53
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
54
from bzrlib.mutabletree import MutableTree
40
from bzrlib.inventory import InventoryEntry
55
41
from bzrlib.osutils import (
63
from bzrlib.progress import ProgressPhase
51
from bzrlib.progress import DummyProgress, ProgressPhase
64
52
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, warning
57
from bzrlib import tree
59
import bzrlib.urlutils as urlutils
71
62
ROOT_PARENT = "root-parent"
73
65
def unique_add(map, key, value):
75
67
raise DuplicateKey(key=key)
80
71
class _TransformResults(object):
81
72
def __init__(self, modified_paths, rename_count):
82
73
object.__init__(self)
221
202
self.version_file(old_root_file_id, old_root)
222
203
self.unversion_file(self._new_root)
224
def fixup_new_roots(self):
225
"""Reinterpret requests to change the root directory
227
Instead of creating a root directory, or moving an existing directory,
228
all the attributes and children of the new root are applied to the
229
existing root directory.
231
This means that the old root trans-id becomes obsolete, so it is
232
recommended only to invoke this after the root trans-id has become
236
new_roots = [k for k, v in self._new_parent.iteritems() if v ==
238
if len(new_roots) < 1:
240
if len(new_roots) != 1:
241
raise ValueError('A tree cannot have two roots!')
242
if self._new_root is None:
243
self._new_root = new_roots[0]
245
old_new_root = new_roots[0]
246
# unversion the new root's directory.
247
if self.final_kind(self._new_root) is None:
248
file_id = self.final_file_id(old_new_root)
250
file_id = self.final_file_id(self._new_root)
251
if old_new_root in self._new_id:
252
self.cancel_versioning(old_new_root)
254
self.unversion_file(old_new_root)
255
# if, at this stage, root still has an old file_id, zap it so we can
256
# stick a new one in.
257
if (self.tree_file_id(self._new_root) is not None and
258
self._new_root not in self._removed_id):
259
self.unversion_file(self._new_root)
260
if file_id is not None:
261
self.version_file(file_id, self._new_root)
263
# Now move children of new root into old root directory.
264
# Ensure all children are registered with the transaction, but don't
265
# use directly-- some tree children have new parents
266
list(self.iter_tree_children(old_new_root))
267
# Move all children of new root into old root directory.
268
for child in self.by_parent().get(old_new_root, []):
269
self.adjust_path(self.final_name(child), self._new_root, child)
271
# Ensure old_new_root has no directory.
272
if old_new_root in self._new_contents:
273
self.cancel_creation(old_new_root)
275
self.delete_contents(old_new_root)
277
# prevent deletion of root directory.
278
if self._new_root in self._removed_contents:
279
self.cancel_deletion(self._new_root)
281
# destroy path info for old_new_root.
282
del self._new_parent[old_new_root]
283
del self._new_name[old_new_root]
285
205
def trans_id_tree_file_id(self, inventory_id):
286
206
"""Determine the transaction id of a working tree file.
398
317
return sorted(FinalPaths(self).get_paths(new_ids))
400
319
def _inventory_altered(self):
401
"""Determine which trans_ids need new Inventory entries.
403
An new entry is needed when anything that would be reflected by an
404
inventory entry changes, including file name, file_id, parent file_id,
405
file kind, and the execute bit.
407
Some care is taken to return entries with real changes, not cases
408
where the value is deleted and then restored to its original value,
409
but some actually unchanged values may be returned.
411
:returns: A list of (path, trans_id) for all items requiring an
412
inventory change. Ordered by path.
415
# Find entries whose file_ids are new (or changed).
416
new_file_id = set(t for t in self._new_id
417
if self._new_id[t] != self.tree_file_id(t))
418
for id_set in [self._new_name, self._new_parent, new_file_id,
320
"""Get the trans_ids and paths of files needing new inv entries."""
322
for id_set in [self._new_name, self._new_parent, self._new_id,
419
323
self._new_executability]:
420
changed_ids.update(id_set)
421
# removing implies a kind change
324
new_ids.update(id_set)
422
325
changed_kind = set(self._removed_contents)
424
326
changed_kind.intersection_update(self._new_contents)
425
# Ignore entries that are already known to have changed.
426
changed_kind.difference_update(changed_ids)
427
# to keep only the truly changed ones
428
changed_kind = (t for t in changed_kind
429
if self.tree_kind(t) != self.final_kind(t))
430
# all kind changes will alter the inventory
431
changed_ids.update(changed_kind)
432
# To find entries with changed parent_ids, find parents which existed,
433
# but changed file_id.
434
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
435
# Now add all their children to the set.
436
for parent_trans_id in new_file_id:
437
changed_ids.update(self.iter_tree_children(parent_trans_id))
438
return sorted(FinalPaths(self).get_paths(changed_ids))
327
changed_kind.difference_update(new_ids)
328
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
330
new_ids.update(changed_kind)
331
return sorted(FinalPaths(self).get_paths(new_ids))
440
333
def final_kind(self, trans_id):
441
334
"""Determine the final file kind, after any changes applied.
443
:return: None if the file does not exist/has no contents. (It is
444
conceivable that a path would be created without the corresponding
445
contents insertion command)
336
Raises NoSuchFile if the file does not exist/has no contents.
337
(It is conceivable that a path would be created without the
338
corresponding contents insertion command)
447
340
if trans_id in self._new_contents:
448
341
return self._new_contents[trans_id]
449
342
elif trans_id in self._removed_contents:
343
raise NoSuchFile(None)
452
345
return self.tree_kind(trans_id)
575
468
# ensure that all children are registered with the transaction
576
469
list(self.iter_tree_children(parent_id))
578
def _has_named_child(self, name, parent_id, known_children):
579
"""Does a parent already have a name child.
581
:param name: The searched for name.
583
:param parent_id: The parent for which the check is made.
585
:param known_children: The already known children. This should have
586
been recently obtained from `self.by_parent.get(parent_id)`
587
(or will be if None is passed).
589
if known_children is None:
590
known_children = self.by_parent().get(parent_id, [])
591
for child in known_children:
471
def has_named_child(self, by_parent, parent_id, name):
473
children = by_parent[parent_id]
476
for child in children:
592
477
if self.final_name(child) == name:
594
parent_path = self._tree_id_paths.get(parent_id, None)
595
if parent_path is None:
596
# No parent... no children
480
path = self._tree_id_paths[parent_id]
598
child_path = joinpath(parent_path, name)
599
child_id = self._tree_path_ids.get(child_path, None)
483
childpath = joinpath(path, name)
484
child_id = self._tree_path_ids.get(childpath)
600
485
if child_id is None:
601
# Not known by the tree transform yet, check the filesystem
602
return osutils.lexists(self._tree.abspath(child_path))
486
return lexists(self._tree.abspath(childpath))
604
raise AssertionError('child_id is missing: %s, %s, %s'
605
% (name, parent_id, child_id))
607
def _available_backup_name(self, name, target_id):
608
"""Find an available backup name.
610
:param name: The basename of the file.
612
:param target_id: The directory trans_id where the backup should
615
known_children = self.by_parent().get(target_id, [])
616
return osutils.available_backup_name(
618
lambda base: self._has_named_child(
619
base, target_id, known_children))
488
if self.final_parent(child_id) != parent_id:
490
if child_id in self._removed_contents:
491
# XXX What about dangling file-ids?
621
496
def _parent_loops(self):
622
497
"""No entry should be its own ancestor"""
738
618
def _parent_type_conflicts(self, by_parent):
739
"""Children must have a directory parent"""
619
"""parents must have directory 'contents'."""
741
621
for parent_id, children in by_parent.iteritems():
742
if parent_id == ROOT_PARENT:
745
for child_id in children:
746
if self.final_kind(child_id) is not None:
751
# There is at least a child, so we need an existing directory to
753
kind = self.final_kind(parent_id)
622
if parent_id is ROOT_PARENT:
624
if not self._any_contents(children):
626
for child in children:
628
self.final_kind(child)
632
kind = self.final_kind(parent_id)
755
# The directory will be deleted
756
636
conflicts.append(('missing parent', parent_id))
757
637
elif kind != "directory":
758
# Meh, we need a *directory* to put something in it
759
638
conflicts.append(('non-directory parent', parent_id))
641
def _any_contents(self, trans_ids):
642
"""Return true if any of the trans_ids, will have contents."""
643
for trans_id in trans_ids:
645
kind = self.final_kind(trans_id)
762
651
def _set_executability(self, path, trans_id):
763
652
"""Set the executability of versioned files """
764
if self._tree._supports_executable():
653
if supports_executable():
765
654
new_executability = self._new_executability[trans_id]
766
655
abspath = self._tree.abspath(path)
767
656
current_mode = os.stat(abspath).st_mode
828
717
self.create_symlink(target, trans_id)
831
def new_orphan(self, trans_id, parent_id):
832
"""Schedule an item to be orphaned.
834
When a directory is about to be removed, its children, if they are not
835
versioned are moved out of the way: they don't have a parent anymore.
837
:param trans_id: The trans_id of the existing item.
838
:param parent_id: The parent trans_id of the item.
840
raise NotImplementedError(self.new_orphan)
842
def _get_potential_orphans(self, dir_id):
843
"""Find the potential orphans in a directory.
845
A directory can't be safely deleted if there are versioned files in it.
846
If all the contained files are unversioned then they can be orphaned.
848
The 'None' return value means that the directory contains at least one
849
versioned file and should not be deleted.
851
:param dir_id: The directory trans id.
853
:return: A list of the orphan trans ids or None if at least one
854
versioned file is present.
857
# Find the potential orphans, stop if one item should be kept
858
for child_tid in self.by_parent()[dir_id]:
859
if child_tid in self._removed_contents:
860
# The child is removed as part of the transform. Since it was
861
# versioned before, it's not an orphan
863
elif self.final_file_id(child_tid) is None:
864
# The child is not versioned
865
orphans.append(child_tid)
867
# We have a versioned file here, searching for orphans is
873
720
def _affected_ids(self):
874
721
"""Return the set of transform ids affected by the transform"""
875
722
trans_ids = set(self._removed_id)
1009
859
def get_preview_tree(self):
1010
860
"""Return a tree representing the result of the transform.
1012
The tree is a snapshot, and altering the TreeTransform will invalidate
862
This tree only supports the subset of Tree functionality required
863
by show_diff_trees. It must only be compared to tt._tree.
1015
865
return _PreviewTree(self)
1017
def commit(self, branch, message, merge_parents=None, strict=False,
1018
timestamp=None, timezone=None, committer=None, authors=None,
1019
revprops=None, revision_id=None):
867
def commit(self, branch, message, merge_parents=None, strict=False):
1020
868
"""Commit the result of this TreeTransform to a branch.
1022
870
:param branch: The branch to commit to.
1023
871
:param message: The message to attach to the commit.
1024
:param merge_parents: Additional parent revision-ids specified by
1026
:param strict: If True, abort the commit if there are unversioned
1028
:param timestamp: if not None, seconds-since-epoch for the time and
1029
date. (May be a float.)
1030
:param timezone: Optional timezone for timestamp, as an offset in
1032
:param committer: Optional committer in email-id format.
1033
(e.g. "J Random Hacker <jrandom@example.com>")
1034
:param authors: Optional list of authors in email-id format.
1035
:param revprops: Optional dictionary of revision properties.
1036
:param revision_id: Optional revision id. (Specifying a revision-id
1037
may reduce performance for some non-native formats.)
872
:param merge_parents: Additional parents specified by pending merges.
1038
873
:return: The revision_id of the revision committed.
1040
875
self._check_malformed()
1232
1052
TreeTransformBase.finalize(self)
1234
def _limbo_supports_executable(self):
1235
"""Check if the limbo path supports the executable bit."""
1236
# FIXME: Check actual file system capabilities of limbodir
1237
return osutils.supports_executable()
1239
1054
def _limbo_name(self, trans_id):
1240
1055
"""Generate the limbo name of a file"""
1241
1056
limbo_name = self._limbo_files.get(trans_id)
1242
if limbo_name is None:
1243
limbo_name = self._generate_limbo_path(trans_id)
1244
self._limbo_files[trans_id] = limbo_name
1057
if limbo_name is not None:
1059
parent = self._new_parent.get(trans_id)
1060
# if the parent directory is already in limbo (e.g. when building a
1061
# tree), choose a limbo name inside the parent, to reduce further
1063
use_direct_path = False
1064
if self._new_contents.get(parent) == 'directory':
1065
filename = self._new_name.get(trans_id)
1066
if filename is not None:
1067
if parent not in self._limbo_children:
1068
self._limbo_children[parent] = set()
1069
self._limbo_children_names[parent] = {}
1070
use_direct_path = True
1071
# the direct path can only be used if no other file has
1072
# already taken this pathname, i.e. if the name is unused, or
1073
# if it is already associated with this trans_id.
1074
elif self._case_sensitive_target:
1075
if (self._limbo_children_names[parent].get(filename)
1076
in (trans_id, None)):
1077
use_direct_path = True
1079
for l_filename, l_trans_id in\
1080
self._limbo_children_names[parent].iteritems():
1081
if l_trans_id == trans_id:
1083
if l_filename.lower() == filename.lower():
1086
use_direct_path = True
1089
limbo_name = pathjoin(self._limbo_files[parent], filename)
1090
self._limbo_children[parent].add(trans_id)
1091
self._limbo_children_names[parent][filename] = trans_id
1093
limbo_name = pathjoin(self._limbodir, trans_id)
1094
self._needs_rename.add(trans_id)
1095
self._limbo_files[trans_id] = limbo_name
1245
1096
return limbo_name
1247
def _generate_limbo_path(self, trans_id):
1248
"""Generate a limbo path using the trans_id as the relative path.
1250
This is suitable as a fallback, and when the transform should not be
1251
sensitive to the path encoding of the limbo directory.
1253
self._needs_rename.add(trans_id)
1254
return pathjoin(self._limbodir, trans_id)
1256
1098
def adjust_path(self, name, parent, trans_id):
1257
1099
previous_parent = self._new_parent.get(trans_id)
1258
1100
previous_name = self._new_name.get(trans_id)
1277
1117
entries from _limbo_files, because they are now stale.
1279
1119
for trans_id in trans_ids:
1280
old_path = self._limbo_files[trans_id]
1281
self._possibly_stale_limbo_files.add(old_path)
1282
del self._limbo_files[trans_id]
1120
old_path = self._limbo_files.pop(trans_id)
1283
1121
if trans_id not in self._new_contents:
1285
1123
new_path = self._limbo_name(trans_id)
1286
1124
os.rename(old_path, new_path)
1287
self._possibly_stale_limbo_files.remove(old_path)
1288
for descendant in self._limbo_descendants(trans_id):
1289
desc_path = self._limbo_files[descendant]
1290
desc_path = new_path + desc_path[len(old_path):]
1291
self._limbo_files[descendant] = desc_path
1293
def _limbo_descendants(self, trans_id):
1294
"""Return the set of trans_ids whose limbo paths descend from this."""
1295
descendants = set(self._limbo_children.get(trans_id, []))
1296
for descendant in list(descendants):
1297
descendants.update(self._limbo_descendants(descendant))
1300
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1126
def create_file(self, contents, trans_id, mode_id=None):
1301
1127
"""Schedule creation of a new file.
1305
:param contents: an iterator of strings, all of which will be written
1306
to the target destination.
1307
:param trans_id: TreeTransform handle
1308
:param mode_id: If not None, force the mode of the target file to match
1309
the mode of the object referenced by mode_id.
1310
Otherwise, we will try to preserve mode bits of an existing file.
1311
:param sha1: If the sha1 of this content is already known, pass it in.
1312
We can use it to prevent future sha1 computations.
1131
Contents is an iterator of strings, all of which will be written
1132
to the target destination.
1134
New file takes the permissions of any existing file with that id,
1135
unless mode_id is specified.
1314
1137
name = self._limbo_name(trans_id)
1315
1138
f = open(name, 'wb')
1317
unique_add(self._new_contents, trans_id, 'file')
1141
unique_add(self._new_contents, trans_id, 'file')
1143
# Clean up the file, it never got registered so
1144
# TreeTransform.finalize() won't clean it up.
1318
1149
f.writelines(contents)
1321
self._set_mtime(name)
1322
1152
self._set_mode(trans_id, mode_id, S_ISREG)
1323
# It is unfortunate we have to use lstat instead of fstat, but we just
1324
# used utime and chmod on the file, so we need the accurate final
1326
if sha1 is not None:
1327
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1329
1154
def _read_file_chunks(self, trans_id):
1330
1155
cur_file = open(self._limbo_name(trans_id), 'rb')
1400
1214
del self._limbo_children_names[trans_id]
1401
1215
delete_any(self._limbo_name(trans_id))
1403
def new_orphan(self, trans_id, parent_id):
1404
conf = self._tree.get_config_stack()
1405
handle_orphan = conf.get('bzr.transform.orphan_policy')
1406
handle_orphan(self, trans_id, parent_id)
1409
class OrphaningError(errors.BzrError):
1411
# Only bugs could lead to such exception being seen by the user
1412
internal_error = True
1413
_fmt = "Error while orphaning %s in %s directory"
1415
def __init__(self, orphan, parent):
1416
errors.BzrError.__init__(self)
1417
self.orphan = orphan
1418
self.parent = parent
1421
class OrphaningForbidden(OrphaningError):
1423
_fmt = "Policy: %s doesn't allow creating orphans."
1425
def __init__(self, policy):
1426
errors.BzrError.__init__(self)
1427
self.policy = policy
1430
def move_orphan(tt, orphan_id, parent_id):
1431
"""See TreeTransformBase.new_orphan.
1433
This creates a new orphan in the `bzr-orphans` dir at the root of the
1436
:param tt: The TreeTransform orphaning `trans_id`.
1438
:param orphan_id: The trans id that should be orphaned.
1440
:param parent_id: The orphan parent trans id.
1442
# Add the orphan dir if it doesn't exist
1443
orphan_dir_basename = 'bzr-orphans'
1444
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1445
if tt.final_kind(od_id) is None:
1446
tt.create_directory(od_id)
1447
parent_path = tt._tree_id_paths[parent_id]
1448
# Find a name that doesn't exist yet in the orphan dir
1449
actual_name = tt.final_name(orphan_id)
1450
new_name = tt._available_backup_name(actual_name, od_id)
1451
tt.adjust_path(new_name, od_id, orphan_id)
1452
trace.warning('%s has been orphaned in %s'
1453
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1456
def refuse_orphan(tt, orphan_id, parent_id):
1457
"""See TreeTransformBase.new_orphan.
1459
This refuses to create orphan, letting the caller handle the conflict.
1461
raise OrphaningForbidden('never')
1464
orphaning_registry = registry.Registry()
1465
orphaning_registry.register(
1466
'conflict', refuse_orphan,
1467
'Leave orphans in place and create a conflict on the directory.')
1468
orphaning_registry.register(
1469
'move', move_orphan,
1470
'Move orphans into the bzr-orphans directory.')
1471
orphaning_registry._set_default_key('conflict')
1474
opt_transform_orphan = _mod_config.RegistryOption(
1475
'bzr.transform.orphan_policy', orphaning_registry,
1476
help='Policy for orphaned files during transform operations.',
1480
1218
class TreeTransform(DiskTreeTransform):
1481
1219
"""Represent a tree transformation.
1652
1397
yield self.trans_id_tree_path(childpath)
1654
def _generate_limbo_path(self, trans_id):
1655
"""Generate a limbo path using the final path if possible.
1657
This optimizes the performance of applying the tree transform by
1658
avoiding renames. These renames can be avoided only when the parent
1659
directory is already scheduled for creation.
1661
If the final path cannot be used, falls back to using the trans_id as
1664
parent = self._new_parent.get(trans_id)
1665
# if the parent directory is already in limbo (e.g. when building a
1666
# tree), choose a limbo name inside the parent, to reduce further
1668
use_direct_path = False
1669
if self._new_contents.get(parent) == 'directory':
1670
filename = self._new_name.get(trans_id)
1671
if filename is not None:
1672
if parent not in self._limbo_children:
1673
self._limbo_children[parent] = set()
1674
self._limbo_children_names[parent] = {}
1675
use_direct_path = True
1676
# the direct path can only be used if no other file has
1677
# already taken this pathname, i.e. if the name is unused, or
1678
# if it is already associated with this trans_id.
1679
elif self._case_sensitive_target:
1680
if (self._limbo_children_names[parent].get(filename)
1681
in (trans_id, None)):
1682
use_direct_path = True
1684
for l_filename, l_trans_id in\
1685
self._limbo_children_names[parent].iteritems():
1686
if l_trans_id == trans_id:
1688
if l_filename.lower() == filename.lower():
1691
use_direct_path = True
1693
if not use_direct_path:
1694
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1696
limbo_name = pathjoin(self._limbo_files[parent], filename)
1697
self._limbo_children[parent].add(trans_id)
1698
self._limbo_children_names[parent][filename] = trans_id
1702
1399
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1703
1400
"""Apply all changes to the inventory and filesystem.
1822
1515
tree_paths = list(self._tree_path_ids.iteritems())
1823
1516
tree_paths.sort(reverse=True)
1824
child_pb = ui.ui_factory.nested_progress_bar()
1517
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1826
for num, (path, trans_id) in enumerate(tree_paths):
1827
# do not attempt to move root into a subdirectory of itself.
1830
child_pb.update(gettext('removing file'), num, len(tree_paths))
1519
for num, data in enumerate(tree_paths):
1520
path, trans_id = data
1521
child_pb.update('removing file', num, len(tree_paths))
1831
1522
full_path = self._tree.abspath(path)
1832
1523
if trans_id in self._removed_contents:
1833
delete_path = os.path.join(self._deletiondir, trans_id)
1834
mover.pre_delete(full_path, delete_path)
1835
elif (trans_id in self._new_name
1836
or trans_id in self._new_parent):
1524
mover.pre_delete(full_path, os.path.join(self._deletiondir,
1526
elif trans_id in self._new_name or trans_id in \
1838
1529
mover.rename(full_path, self._limbo_name(trans_id))
1839
except errors.TransformRenameFailed, e:
1840
1531
if e.errno != errno.ENOENT:
1858
1549
modified_paths = []
1859
1550
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1861
child_pb = ui.ui_factory.nested_progress_bar()
1552
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1863
1554
for num, (path, trans_id) in enumerate(new_paths):
1864
1555
if (num % 10) == 0:
1865
child_pb.update(gettext('adding file'), num, len(new_paths))
1556
child_pb.update('adding file', num, len(new_paths))
1866
1557
full_path = self._tree.abspath(path)
1867
1558
if trans_id in self._needs_rename:
1869
1560
mover.rename(self._limbo_name(trans_id), full_path)
1870
except errors.TransformRenameFailed, e:
1871
1562
# We may be renaming a dangling inventory id
1872
1563
if e.errno != errno.ENOENT:
1875
1566
self.rename_count += 1
1876
# TODO: if trans_id in self._observed_sha1s, we should
1877
# re-stat the final target, since ctime will be
1878
# updated by the change.
1879
1567
if (trans_id in self._new_contents or
1880
1568
self.path_changed(trans_id)):
1881
1569
if trans_id in self._new_contents:
1882
1570
modified_paths.append(full_path)
1883
1571
if trans_id in self._new_executability:
1884
1572
self._set_executability(path, trans_id)
1885
if trans_id in self._observed_sha1s:
1886
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1887
st = osutils.lstat(full_path)
1888
self._observed_sha1s[trans_id] = (o_sha1, st)
1890
1574
child_pb.finished()
1891
for path, trans_id in new_paths:
1892
# new_paths includes stuff like workingtree conflicts. Only the
1893
# stuff in new_contents actually comes from limbo.
1894
if trans_id in self._limbo_files:
1895
del self._limbo_files[trans_id]
1896
1575
self._new_contents.clear()
1897
1576
return modified_paths
1899
def _apply_observed_sha1s(self):
1900
"""After we have finished renaming everything, update observed sha1s
1902
This has to be done after self._tree.apply_inventory_delta, otherwise
1903
it doesn't know anything about the files we are updating. Also, we want
1904
to do this as late as possible, so that most entries end up cached.
1906
# TODO: this doesn't update the stat information for directories. So
1907
# the first 'bzr status' will still need to rewrite
1908
# .bzr/checkout/dirstate. However, we at least don't need to
1909
# re-read all of the files.
1910
# TODO: If the operation took a while, we could do a time.sleep(3) here
1911
# to allow the clock to tick over and ensure we won't have any
1912
# problems. (we could observe start time, and finish time, and if
1913
# it is less than eg 10% overhead, add a sleep call.)
1914
paths = FinalPaths(self)
1915
for trans_id, observed in self._observed_sha1s.iteritems():
1916
path = paths.get_path(trans_id)
1917
# We could get the file_id, but dirstate prefers to use the path
1918
# anyway, and it is 'cheaper' to determine.
1919
# file_id = self._new_id[trans_id]
1920
self._tree._observed_sha1(None, path, observed)
1923
1579
class TransformPreview(DiskTreeTransform):
1924
1580
"""A TreeTransform for generating preview trees.
2575
2185
pp.next_phase()
2576
2186
file_trans_id[wt.get_root_id()] = \
2577
2187
tt.trans_id_tree_file_id(wt.get_root_id())
2578
pb = ui.ui_factory.nested_progress_bar()
2188
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2580
2190
deferred_contents = []
2582
total = len(tree.all_file_ids())
2192
total = len(tree.inventory)
2583
2193
if delta_from_tree:
2584
2194
precomputed_delta = []
2586
2196
precomputed_delta = None
2587
# Check if tree inventory has content. If so, we populate
2588
# existing_files with the directory content. If there are no
2589
# entries we skip populating existing_files as its not used.
2590
# This improves performance and unncessary work on large
2591
# directory trees. (#501307)
2593
existing_files = set()
2594
for dir, files in wt.walkdirs():
2595
existing_files.update(f[0] for f in files)
2596
2197
for num, (tree_path, entry) in \
2597
enumerate(tree.iter_entries_by_dir()):
2598
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2198
enumerate(tree.inventory.iter_entries_by_dir()):
2199
pb.update("Building tree", num - len(deferred_contents), total)
2599
2200
if entry.parent_id is None:
2601
2202
reparent = False
2671
2272
new_desired_files = desired_files
2673
2274
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2674
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2675
in iter if not (c or e[0] != e[1])]
2676
if accelerator_tree.supports_content_filtering():
2677
unchanged = [(f, p) for (f, p) in unchanged
2678
if not accelerator_tree.iter_search_rules([p]).next()]
2679
unchanged = dict(unchanged)
2275
unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2276
in iter if not (c or e[0] != e[1]))
2680
2277
new_desired_files = []
2682
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2279
for file_id, (trans_id, tree_path) in desired_files:
2683
2280
accelerator_path = unchanged.get(file_id)
2684
2281
if accelerator_path is None:
2685
new_desired_files.append((file_id,
2686
(trans_id, tree_path, text_sha1)))
2282
new_desired_files.append((file_id, (trans_id, tree_path)))
2688
pb.update(gettext('Adding file contents'), count + offset, total)
2284
pb.update('Adding file contents', count + offset, total)
2690
2286
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2707
2303
offset += count
2708
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2304
for count, ((trans_id, tree_path), contents) in enumerate(
2709
2305
tree.iter_files_bytes(new_desired_files)):
2710
2306
if wt.supports_content_filtering():
2711
2307
filters = wt._content_filter_stack(tree_path)
2712
2308
contents = filtered_output_bytes(contents, filters,
2713
2309
ContentFilterContext(tree_path, tree))
2714
tt.create_file(contents, trans_id, sha1=text_sha1)
2715
pb.update(gettext('Adding file contents'), count + offset, total)
2310
tt.create_file(contents, trans_id)
2311
pb.update('Adding file contents', count + offset, total)
2718
2314
def _reparent_children(tt, old_parent, new_parent):
2719
2315
for child in tt.iter_tree_children(old_parent):
2720
2316
tt.adjust_path(tt.final_name(child), new_parent, child)
2723
2318
def _reparent_transform_children(tt, old_parent, new_parent):
2724
2319
by_parent = tt.by_parent()
2725
2320
for child in by_parent[old_parent]:
2726
2321
tt.adjust_path(tt.final_name(child), new_parent, child)
2727
2322
return by_parent[old_parent]
2730
2324
def _content_match(tree, entry, file_id, kind, target_path):
2731
2325
if entry.kind != kind:
2733
2327
if entry.kind == "directory":
2735
2329
if entry.kind == "file":
2736
f = file(target_path, 'rb')
2738
if tree.get_file_text(file_id) == f.read():
2330
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2742
2332
elif entry.kind == "symlink":
2743
2333
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2796
2386
raise errors.BadFileKindError(name, kind)
2799
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2800
filter_tree_path=None):
2801
"""Create new file contents according to tree contents.
2803
:param filter_tree_path: the tree path to use to lookup
2804
content filters to apply to the bytes output in the working tree.
2805
This only applies if the working tree supports content filtering.
2389
@deprecated_function(deprecated_in((1, 9, 0)))
2390
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2391
"""Create new file contents according to an inventory entry.
2393
DEPRECATED. Use create_from_tree instead.
2395
if entry.kind == "file":
2397
lines = tree.get_file(entry.file_id).readlines()
2398
tt.create_file(lines, trans_id, mode_id=mode_id)
2399
elif entry.kind == "symlink":
2400
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2401
elif entry.kind == "directory":
2402
tt.create_directory(trans_id)
2405
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
2406
"""Create new file contents according to tree contents."""
2807
2407
kind = tree.kind(file_id)
2808
2408
if kind == 'directory':
2809
2409
tt.create_directory(trans_id)
2832
2427
tt.set_executability(entry.executable, trans_id)
2430
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2431
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2434
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2435
"""Produce a backup-style name that appears to be available"""
2439
yield "%s.~%d~" % (name, counter)
2441
for new_name in name_gen():
2442
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2446
def _entry_changes(file_id, entry, working_tree):
2447
"""Determine in which ways the inventory entry has changed.
2449
Returns booleans: has_contents, content_mod, meta_mod
2450
has_contents means there are currently contents, but they differ
2451
contents_mod means contents need to be modified
2452
meta_mod means the metadata needs to be modified
2454
cur_entry = working_tree.inventory[file_id]
2456
working_kind = working_tree.kind(file_id)
2459
has_contents = False
2462
if has_contents is True:
2463
if entry.kind != working_kind:
2464
contents_mod, meta_mod = True, False
2466
cur_entry._read_tree_state(working_tree.id2path(file_id),
2468
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2469
cur_entry._forget_tree_state()
2470
return has_contents, contents_mod, meta_mod
2835
2473
def revert(working_tree, target_tree, filenames, backups=False,
2836
pb=None, change_reporter=None):
2474
pb=DummyProgress(), change_reporter=None):
2837
2475
"""Revert a working tree's contents to those of a target tree."""
2838
2476
target_tree.lock_read()
2839
pb = ui.ui_factory.nested_progress_bar()
2840
2477
tt = TreeTransform(working_tree, pb)
2842
2479
pp = ProgressPhase("Revert phase", 3, pb)
2919
2548
if basis_tree is None:
2920
2549
basis_tree = working_tree.basis_tree()
2921
2550
basis_tree.lock_read()
2922
if basis_tree.has_id(file_id):
2551
if file_id in basis_tree:
2923
2552
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2924
2553
keep_content = True
2925
elif target_kind is None and not target_versioned:
2554
elif kind[1] is None and not versioned[1]:
2926
2555
keep_content = True
2927
if wt_kind is not None:
2556
if kind[0] is not None:
2928
2557
if not keep_content:
2929
2558
tt.delete_contents(trans_id)
2930
elif target_kind is not None:
2931
parent_trans_id = tt.trans_id_file_id(wt_parent)
2932
backup_name = tt._available_backup_name(
2933
wt_name, parent_trans_id)
2559
elif kind[1] is not None:
2560
parent_trans_id = tt.trans_id_file_id(parent[0])
2561
by_parent = tt.by_parent()
2562
backup_name = _get_backup_name(name[0], by_parent,
2563
parent_trans_id, tt)
2934
2564
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2935
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2936
if wt_versioned and target_versioned:
2565
new_trans_id = tt.create_path(name[0], parent_trans_id)
2566
if versioned == (True, True):
2937
2567
tt.unversion_file(trans_id)
2938
2568
tt.version_file(file_id, new_trans_id)
2939
2569
# New contents should have the same unix perms as old
2941
2571
mode_id = trans_id
2942
2572
trans_id = new_trans_id
2943
if target_kind in ('directory', 'tree-reference'):
2573
if kind[1] in ('directory', 'tree-reference'):
2944
2574
tt.create_directory(trans_id)
2945
if target_kind == 'tree-reference':
2575
if kind[1] == 'tree-reference':
2946
2576
revision = target_tree.get_reference_revision(file_id,
2948
2578
tt.set_tree_reference(revision, trans_id)
2949
elif target_kind == 'symlink':
2579
elif kind[1] == 'symlink':
2950
2580
tt.create_symlink(target_tree.get_symlink_target(file_id),
2952
elif target_kind == 'file':
2582
elif kind[1] == 'file':
2953
2583
deferred_files.append((file_id, (trans_id, mode_id)))
2954
2584
if basis_tree is None:
2955
2585
basis_tree = working_tree.basis_tree()
2956
2586
basis_tree.lock_read()
2957
2587
new_sha1 = target_tree.get_file_sha1(file_id)
2958
if (basis_tree.has_id(file_id) and
2959
new_sha1 == basis_tree.get_file_sha1(file_id)):
2588
if (file_id in basis_tree and new_sha1 ==
2589
basis_tree.get_file_sha1(file_id)):
2960
2590
if file_id in merge_modified:
2961
2591
del merge_modified[file_id]
2963
2593
merge_modified[file_id] = new_sha1
2965
2595
# preserve the execute bit when backing up
2966
if keep_content and wt_executable == target_executable:
2967
tt.set_executability(target_executable, trans_id)
2968
elif target_kind is not None:
2969
raise AssertionError(target_kind)
2970
if not wt_versioned and target_versioned:
2596
if keep_content and executable[0] == executable[1]:
2597
tt.set_executability(executable[1], trans_id)
2598
elif kind[1] is not None:
2599
raise AssertionError(kind[1])
2600
if versioned == (False, True):
2971
2601
tt.version_file(file_id, trans_id)
2972
if wt_versioned and not target_versioned:
2602
if versioned == (True, False):
2973
2603
tt.unversion_file(trans_id)
2974
if (target_name is not None and
2975
(wt_name != target_name or wt_parent != target_parent)):
2976
if target_name == '' and target_parent is None:
2604
if (name[1] is not None and
2605
(name[0] != name[1] or parent[0] != parent[1])):
2606
if name[1] == '' and parent[1] is None:
2977
2607
parent_trans = ROOT_PARENT
2979
parent_trans = tt.trans_id_file_id(target_parent)
2980
if wt_parent is None and wt_versioned:
2981
tt.adjust_root_path(target_name, parent_trans)
2983
tt.adjust_path(target_name, parent_trans, trans_id)
2984
if wt_executable != target_executable and target_kind == "file":
2985
tt.set_executability(target_executable, trans_id)
2986
if working_tree.supports_content_filtering():
2987
for index, ((trans_id, mode_id), bytes) in enumerate(
2988
target_tree.iter_files_bytes(deferred_files)):
2989
file_id = deferred_files[index][0]
2990
# We're reverting a tree to the target tree so using the
2991
# target tree to find the file path seems the best choice
2992
# here IMO - Ian C 27/Oct/2009
2993
filter_tree_path = target_tree.id2path(file_id)
2994
filters = working_tree._content_filter_stack(filter_tree_path)
2995
bytes = filtered_output_bytes(bytes, filters,
2996
ContentFilterContext(filter_tree_path, working_tree))
2997
tt.create_file(bytes, trans_id, mode_id)
2999
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3001
tt.create_file(bytes, trans_id, mode_id)
3002
tt.fixup_new_roots()
2609
parent_trans = tt.trans_id_file_id(parent[1])
2610
tt.adjust_path(name[1], parent_trans, trans_id)
2611
if executable[0] != executable[1] and kind[1] == "file":
2612
tt.set_executability(executable[1], trans_id)
2613
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2615
tt.create_file(bytes, trans_id, mode_id)
3004
2617
if basis_tree is not None:
3005
2618
basis_tree.unlock()
3006
2619
return merge_modified
3009
def resolve_conflicts(tt, pb=None, pass_func=None):
2622
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
3010
2623
"""Make many conflict-resolution attempts, but die if they fail"""
3011
2624
if pass_func is None:
3012
2625
pass_func = conflict_pass
3013
2626
new_conflicts = set()
3014
pb = ui.ui_factory.nested_progress_bar()
3016
2628
for n in range(10):
3017
pb.update(gettext('Resolution pass'), n+1, 10)
2629
pb.update('Resolution pass', n+1, 10)
3018
2630
conflicts = tt.find_conflicts()
3019
2631
if len(conflicts) == 0:
3020
2632
return new_conflicts
3021
2633
new_conflicts.update(pass_func(tt, conflicts))
3022
2634
raise MalformedTransform(conflicts=conflicts)
3027
2639
def conflict_pass(tt, conflicts, path_tree=None):
added
removed
bzrlib/transform.py
