19
19
from stat import S_ISREG, S_IEXEC
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
29
lazy_import.lazy_import(globals(), """
23
30
from bzrlib import (
32
40
revision as _mod_revision,
35
45
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
36
ReusingTransform, NotVersionedError, CantMoveRoot,
46
ReusingTransform, CantMoveRoot,
37
47
ExistingLimbo, ImmortalLimbo, NoFinalPath,
38
48
UnableCreateSymlink)
39
49
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
40
from bzrlib.inventory import InventoryEntry
41
50
from bzrlib.osutils import (
49
57
supports_executable,
51
from bzrlib.progress import DummyProgress, ProgressPhase
59
from bzrlib.progress import ProgressPhase
52
60
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, warning
57
from bzrlib import tree
59
import bzrlib.urlutils as urlutils
62
67
ROOT_PARENT = "root-parent"
65
69
def unique_add(map, key, value):
67
71
raise DuplicateKey(key=key)
71
76
class _TransformResults(object):
72
77
def __init__(self, modified_paths, rename_count):
73
78
object.__init__(self)
78
83
class TreeTransformBase(object):
79
84
"""The base class for TreeTransform and its kin."""
81
def __init__(self, tree, pb=DummyProgress(),
86
def __init__(self, tree, pb=None,
82
87
case_sensitive=True):
85
90
:param tree: The tree that will be transformed, but not necessarily
87
:param pb: A ProgressTask indicating how much progress is being made
88
93
:param case_sensitive: If True, the target of the transform is
89
94
case sensitive, not just case preserving.
162
169
def adjust_path(self, name, parent, trans_id):
163
170
"""Change the path that is assigned to a transaction id."""
172
raise ValueError("Parent trans-id may not be None")
164
173
if trans_id == self._new_root:
165
174
raise CantMoveRoot
166
175
self._new_name[trans_id] = name
167
176
self._new_parent[trans_id] = parent
168
if parent == ROOT_PARENT:
169
if self._new_root is not None:
170
raise ValueError("Cannot have multiple roots.")
171
self._new_root = trans_id
173
178
def adjust_root_path(self, name, parent):
174
179
"""Emulate moving the root by moving all children, instead.
202
207
self.version_file(old_root_file_id, old_root)
203
208
self.unversion_file(self._new_root)
210
def fixup_new_roots(self):
211
"""Reinterpret requests to change the root directory
213
Instead of creating a root directory, or moving an existing directory,
214
all the attributes and children of the new root are applied to the
215
existing root directory.
217
This means that the old root trans-id becomes obsolete, so it is
218
recommended only to invoke this after the root trans-id has become
221
new_roots = [k for k, v in self._new_parent.iteritems() if v is
223
if len(new_roots) < 1:
225
if len(new_roots) != 1:
226
raise ValueError('A tree cannot have two roots!')
227
if self._new_root is None:
228
self._new_root = new_roots[0]
230
old_new_root = new_roots[0]
231
# TODO: What to do if a old_new_root is present, but self._new_root is
232
# not listed as being removed? This code explicitly unversions
233
# the old root and versions it with the new file_id. Though that
234
# seems like an incomplete delta
236
# unversion the new root's directory.
237
file_id = self.final_file_id(old_new_root)
238
if old_new_root in self._new_id:
239
self.cancel_versioning(old_new_root)
241
self.unversion_file(old_new_root)
242
# if, at this stage, root still has an old file_id, zap it so we can
243
# stick a new one in.
244
if (self.tree_file_id(self._new_root) is not None and
245
self._new_root not in self._removed_id):
246
self.unversion_file(self._new_root)
247
self.version_file(file_id, self._new_root)
249
# Now move children of new root into old root directory.
250
# Ensure all children are registered with the transaction, but don't
251
# use directly-- some tree children have new parents
252
list(self.iter_tree_children(old_new_root))
253
# Move all children of new root into old root directory.
254
for child in self.by_parent().get(old_new_root, []):
255
self.adjust_path(self.final_name(child), self._new_root, child)
257
# Ensure old_new_root has no directory.
258
if old_new_root in self._new_contents:
259
self.cancel_creation(old_new_root)
261
self.delete_contents(old_new_root)
263
# prevent deletion of root directory.
264
if self._new_root in self._removed_contents:
265
self.cancel_deletion(self._new_root)
267
# destroy path info for old_new_root.
268
del self._new_parent[old_new_root]
269
del self._new_name[old_new_root]
205
271
def trans_id_tree_file_id(self, inventory_id):
206
272
"""Determine the transaction id of a working tree file.
325
392
changed_kind = set(self._removed_contents)
326
393
changed_kind.intersection_update(self._new_contents)
327
394
changed_kind.difference_update(new_ids)
328
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
395
changed_kind = (t for t in changed_kind
396
if self.tree_kind(t) != self.final_kind(t))
330
397
new_ids.update(changed_kind)
331
398
return sorted(FinalPaths(self).get_paths(new_ids))
333
400
def final_kind(self, trans_id):
334
401
"""Determine the final file kind, after any changes applied.
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)
403
:return: None if the file does not exist/has no contents. (It is
404
conceivable that a path would be created without the corresponding
405
contents insertion command)
340
407
if trans_id in self._new_contents:
341
408
return self._new_contents[trans_id]
342
409
elif trans_id in self._removed_contents:
343
raise NoSuchFile(None)
345
412
return self.tree_kind(trans_id)
468
537
# ensure that all children are registered with the transaction
469
538
list(self.iter_tree_children(parent_id))
540
@deprecated_method(deprecated_in((2, 3, 0)))
471
541
def has_named_child(self, by_parent, parent_id, name):
473
children = by_parent[parent_id]
476
for child in children:
542
return self._has_named_child(
543
name, parent_id, known_children=by_parent.get(parent_id, []))
545
def _has_named_child(self, name, parent_id, known_children):
546
"""Does a parent already have a name child.
548
:param name: The searched for name.
550
:param parent_id: The parent for which the check is made.
552
:param known_children: The already known children. This should have
553
been recently obtained from `self.by_parent.get(parent_id)`
554
(or will be if None is passed).
556
if known_children is None:
557
known_children = self.by_parent().get(parent_id, [])
558
for child in known_children:
477
559
if self.final_name(child) == name:
480
path = self._tree_id_paths[parent_id]
561
parent_path = self._tree_id_paths.get(parent_id, None)
562
if parent_path is None:
563
# No parent... no children
483
childpath = joinpath(path, name)
484
child_id = self._tree_path_ids.get(childpath)
565
child_path = joinpath(parent_path, name)
566
child_id = self._tree_path_ids.get(child_path, None)
485
567
if child_id is None:
486
return lexists(self._tree.abspath(childpath))
568
# Not known by the tree transform yet, check the filesystem
569
return osutils.lexists(self._tree.abspath(child_path))
488
if self.final_parent(child_id) != parent_id:
490
if child_id in self._removed_contents:
491
# XXX What about dangling file-ids?
571
raise AssertionError('child_id is missing: %s, %s, %s'
572
% (name, parent_id, child_id))
574
def _available_backup_name(self, name, target_id):
575
"""Find an available backup name.
577
:param name: The basename of the file.
579
:param target_id: The directory trans_id where the backup should
582
known_children = self.by_parent().get(target_id, [])
583
return osutils.available_backup_name(
585
lambda base: self._has_named_child(
586
base, target_id, known_children))
496
588
def _parent_loops(self):
497
589
"""No entry should be its own ancestor"""
581
666
if (self._new_name, self._new_parent) == ({}, {}):
583
668
for children in by_parent.itervalues():
584
name_ids = [(self.final_name(t), t) for t in children]
585
if not self._case_sensitive_target:
586
name_ids = [(n.lower(), t) for n, t in name_ids]
670
for child_tid in children:
671
name = self.final_name(child_tid)
673
# Keep children only if they still exist in the end
674
if not self._case_sensitive_target:
676
name_ids.append((name, child_tid))
589
679
last_trans_id = None
590
680
for name, trans_id in name_ids:
592
kind = self.final_kind(trans_id)
681
kind = self.final_kind(trans_id)
595
682
file_id = self.final_file_id(trans_id)
596
683
if kind is None and file_id is None:
618
705
def _parent_type_conflicts(self, by_parent):
619
"""parents must have directory 'contents'."""
706
"""Children must have a directory parent"""
621
708
for parent_id, children in by_parent.iteritems():
622
709
if parent_id is ROOT_PARENT:
624
if not self._any_contents(children):
712
for child_id in children:
713
if self.final_kind(child_id) is not None:
626
for child in children:
628
self.final_kind(child)
632
kind = self.final_kind(parent_id)
718
# There is at least a child, so we need an existing directory to
720
kind = self.final_kind(parent_id)
722
# The directory will be deleted
636
723
conflicts.append(('missing parent', parent_id))
637
724
elif kind != "directory":
725
# Meh, we need a *directory* to put something in it
638
726
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)
651
729
def _set_executability(self, path, trans_id):
652
730
"""Set the executability of versioned files """
653
731
if supports_executable():
717
795
self.create_symlink(target, trans_id)
798
def new_orphan(self, trans_id, parent_id):
799
"""Schedule an item to be orphaned.
801
When a directory is about to be removed, its children, if they are not
802
versioned are moved out of the way: they don't have a parent anymore.
804
:param trans_id: The trans_id of the existing item.
805
:param parent_id: The parent trans_id of the item.
807
raise NotImplementedError(self.new_orphan)
809
def _get_potential_orphans(self, dir_id):
810
"""Find the potential orphans in a directory.
812
A directory can't be safely deleted if there are versioned files in it.
813
If all the contained files are unversioned then they can be orphaned.
815
The 'None' return value means that the directory contains at least one
816
versioned file and should not be deleted.
818
:param dir_id: The directory trans id.
820
:return: A list of the orphan trans ids or None if at least one
821
versioned file is present.
824
# Find the potential orphans, stop if one item should be kept
825
for child_tid in self.by_parent()[dir_id]:
826
if child_tid in self._removed_contents:
827
# The child is removed as part of the transform. Since it was
828
# versioned before, it's not an orphan
830
elif self.final_file_id(child_tid) is None:
831
# The child is not versioned
832
orphans.append(child_tid)
834
# We have a versioned file here, searching for orphans is
720
840
def _affected_ids(self):
721
841
"""Return the set of transform ids affected by the transform"""
722
842
trans_ids = set(self._removed_id)
859
976
def get_preview_tree(self):
860
977
"""Return a tree representing the result of the transform.
862
This tree only supports the subset of Tree functionality required
863
by show_diff_trees. It must only be compared to tt._tree.
979
The tree is a snapshot, and altering the TreeTransform will invalidate
865
982
return _PreviewTree(self)
867
def commit(self, branch, message, merge_parents=None, strict=False):
984
def commit(self, branch, message, merge_parents=None, strict=False,
985
timestamp=None, timezone=None, committer=None, authors=None,
986
revprops=None, revision_id=None):
868
987
"""Commit the result of this TreeTransform to a branch.
870
989
:param branch: The branch to commit to.
871
990
:param message: The message to attach to the commit.
872
:param merge_parents: Additional parents specified by pending merges.
991
:param merge_parents: Additional parent revision-ids specified by
993
:param strict: If True, abort the commit if there are unversioned
995
:param timestamp: if not None, seconds-since-epoch for the time and
996
date. (May be a float.)
997
:param timezone: Optional timezone for timestamp, as an offset in
999
:param committer: Optional committer in email-id format.
1000
(e.g. "J Random Hacker <jrandom@example.com>")
1001
:param authors: Optional list of authors in email-id format.
1002
:param revprops: Optional dictionary of revision properties.
1003
:param revision_id: Optional revision id. (Specifying a revision-id
1004
may reduce performance for some non-native formats.)
873
1005
:return: The revision_id of the revision committed.
875
1007
self._check_malformed()
1000
1138
class DiskTreeTransform(TreeTransformBase):
1001
1139
"""Tree transform storing its contents on disk."""
1003
def __init__(self, tree, limbodir, pb=DummyProgress(),
1141
def __init__(self, tree, limbodir, pb=None,
1004
1142
case_sensitive=True):
1005
1143
"""Constructor.
1006
1144
:param tree: The tree that will be transformed, but not necessarily
1007
1145
the output tree.
1008
1146
:param limbodir: A directory where new files can be stored until
1009
1147
they are installed in their proper places
1010
:param pb: A ProgressBar indicating how much progress is being made
1011
1149
:param case_sensitive: If True, the target of the transform is
1012
1150
case sensitive, not just case preserving.
1054
1193
def _limbo_name(self, trans_id):
1055
1194
"""Generate the limbo name of a file"""
1056
1195
limbo_name = self._limbo_files.get(trans_id)
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
1196
if limbo_name is None:
1197
limbo_name = self._generate_limbo_path(trans_id)
1198
self._limbo_files[trans_id] = limbo_name
1096
1199
return limbo_name
1201
def _generate_limbo_path(self, trans_id):
1202
"""Generate a limbo path using the trans_id as the relative path.
1204
This is suitable as a fallback, and when the transform should not be
1205
sensitive to the path encoding of the limbo directory.
1207
self._needs_rename.add(trans_id)
1208
return pathjoin(self._limbodir, trans_id)
1098
1210
def adjust_path(self, name, parent, trans_id):
1099
1211
previous_parent = self._new_parent.get(trans_id)
1100
1212
previous_name = self._new_name.get(trans_id)
1102
1214
if (trans_id in self._limbo_files and
1103
1215
trans_id not in self._needs_rename):
1104
1216
self._rename_in_limbo([trans_id])
1105
self._limbo_children[previous_parent].remove(trans_id)
1106
del self._limbo_children_names[previous_parent][previous_name]
1217
if previous_parent != parent:
1218
self._limbo_children[previous_parent].remove(trans_id)
1219
if previous_parent != parent or previous_name != name:
1220
del self._limbo_children_names[previous_parent][previous_name]
1108
1222
def _rename_in_limbo(self, trans_ids):
1109
1223
"""Fix limbo names so that the right final path is produced.
1123
1237
new_path = self._limbo_name(trans_id)
1124
1238
os.rename(old_path, new_path)
1126
def create_file(self, contents, trans_id, mode_id=None):
1239
for descendant in self._limbo_descendants(trans_id):
1240
desc_path = self._limbo_files[descendant]
1241
desc_path = new_path + desc_path[len(old_path):]
1242
self._limbo_files[descendant] = desc_path
1244
def _limbo_descendants(self, trans_id):
1245
"""Return the set of trans_ids whose limbo paths descend from this."""
1246
descendants = set(self._limbo_children.get(trans_id, []))
1247
for descendant in list(descendants):
1248
descendants.update(self._limbo_descendants(descendant))
1251
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1127
1252
"""Schedule creation of a new file.
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.
1256
:param contents: an iterator of strings, all of which will be written
1257
to the target destination.
1258
:param trans_id: TreeTransform handle
1259
:param mode_id: If not None, force the mode of the target file to match
1260
the mode of the object referenced by mode_id.
1261
Otherwise, we will try to preserve mode bits of an existing file.
1262
:param sha1: If the sha1 of this content is already known, pass it in.
1263
We can use it to prevent future sha1 computations.
1137
1265
name = self._limbo_name(trans_id)
1138
1266
f = open(name, 'wb')
1161
1294
def _read_symlink_target(self, trans_id):
1162
1295
return os.readlink(self._limbo_name(trans_id))
1297
def _set_mtime(self, path):
1298
"""All files that are created get the same mtime.
1300
This time is set by the first object to be created.
1302
if self._creation_mtime is None:
1303
self._creation_mtime = time.time()
1304
os.utime(path, (self._creation_mtime, self._creation_mtime))
1164
1306
def create_hardlink(self, path, trans_id):
1165
1307
"""Schedule creation of a hard link"""
1166
1308
name = self._limbo_name(trans_id)
1214
1358
del self._limbo_children_names[trans_id]
1215
1359
delete_any(self._limbo_name(trans_id))
1361
def new_orphan(self, trans_id, parent_id):
1362
# FIXME: There is no tree config, so we use the branch one (it's weird
1363
# to define it this way as orphaning can only occur in a working tree,
1364
# but that's all we have (for now). It will find the option in
1365
# locations.conf or bazaar.conf though) -- vila 20100916
1366
conf = self._tree.branch.get_config()
1367
conf_var_name = 'bzr.transform.orphan_policy'
1368
orphan_policy = conf.get_user_option(conf_var_name)
1369
default_policy = orphaning_registry.default_key
1370
if orphan_policy is None:
1371
orphan_policy = default_policy
1372
if orphan_policy not in orphaning_registry:
1373
trace.warning('%s (from %s) is not a known policy, defaulting '
1374
'to %s' % (orphan_policy, conf_var_name, default_policy))
1375
orphan_policy = default_policy
1376
handle_orphan = orphaning_registry.get(orphan_policy)
1377
handle_orphan(self, trans_id, parent_id)
1380
class OrphaningError(errors.BzrError):
1382
# Only bugs could lead to such exception being seen by the user
1383
internal_error = True
1384
_fmt = "Error while orphaning %s in %s directory"
1386
def __init__(self, orphan, parent):
1387
errors.BzrError.__init__(self)
1388
self.orphan = orphan
1389
self.parent = parent
1392
class OrphaningForbidden(OrphaningError):
1394
_fmt = "Policy: %s doesn't allow creating orphans."
1396
def __init__(self, policy):
1397
errors.BzrError.__init__(self)
1398
self.policy = policy
1401
def move_orphan(tt, orphan_id, parent_id):
1402
"""See TreeTransformBase.new_orphan.
1404
This creates a new orphan in the `bzr-orphans` dir at the root of the
1407
:param tt: The TreeTransform orphaning `trans_id`.
1409
:param orphan_id: The trans id that should be orphaned.
1411
:param parent_id: The orphan parent trans id.
1413
# Add the orphan dir if it doesn't exist
1414
orphan_dir_basename = 'bzr-orphans'
1415
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1416
if tt.final_kind(od_id) is None:
1417
tt.create_directory(od_id)
1418
parent_path = tt._tree_id_paths[parent_id]
1419
# Find a name that doesn't exist yet in the orphan dir
1420
actual_name = tt.final_name(orphan_id)
1421
new_name = tt._available_backup_name(actual_name, od_id)
1422
tt.adjust_path(new_name, od_id, orphan_id)
1423
trace.warning('%s has been orphaned in %s'
1424
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1427
def refuse_orphan(tt, orphan_id, parent_id):
1428
"""See TreeTransformBase.new_orphan.
1430
This refuses to create orphan, letting the caller handle the conflict.
1432
raise OrphaningForbidden('never')
1435
orphaning_registry = registry.Registry()
1436
orphaning_registry.register(
1437
'conflict', refuse_orphan,
1438
'Leave orphans in place and create a conflict on the directory.')
1439
orphaning_registry.register(
1440
'move', move_orphan,
1441
'Move orphans into the bzr-orphans directory.')
1442
orphaning_registry._set_default_key('conflict')
1218
1445
class TreeTransform(DiskTreeTransform):
1219
1446
"""Represent a tree transformation.
1337
1564
def tree_kind(self, trans_id):
1338
1565
"""Determine the file kind in the working tree.
1340
Raises NoSuchFile if the file does not exist
1567
:returns: The file kind or None if the file does not exist
1342
1569
path = self._tree_id_paths.get(trans_id)
1343
1570
if path is None:
1344
raise NoSuchFile(None)
1346
1573
return file_kind(self._tree.abspath(path))
1348
if e.errno != errno.ENOENT:
1351
raise NoSuchFile(path)
1574
except errors.NoSuchFile:
1353
1577
def _set_mode(self, trans_id, mode_id, typefunc):
1354
1578
"""Set the mode of new file contents.
1397
1621
yield self.trans_id_tree_path(childpath)
1623
def _generate_limbo_path(self, trans_id):
1624
"""Generate a limbo path using the final path if possible.
1626
This optimizes the performance of applying the tree transform by
1627
avoiding renames. These renames can be avoided only when the parent
1628
directory is already scheduled for creation.
1630
If the final path cannot be used, falls back to using the trans_id as
1633
parent = self._new_parent.get(trans_id)
1634
# if the parent directory is already in limbo (e.g. when building a
1635
# tree), choose a limbo name inside the parent, to reduce further
1637
use_direct_path = False
1638
if self._new_contents.get(parent) == 'directory':
1639
filename = self._new_name.get(trans_id)
1640
if filename is not None:
1641
if parent not in self._limbo_children:
1642
self._limbo_children[parent] = set()
1643
self._limbo_children_names[parent] = {}
1644
use_direct_path = True
1645
# the direct path can only be used if no other file has
1646
# already taken this pathname, i.e. if the name is unused, or
1647
# if it is already associated with this trans_id.
1648
elif self._case_sensitive_target:
1649
if (self._limbo_children_names[parent].get(filename)
1650
in (trans_id, None)):
1651
use_direct_path = True
1653
for l_filename, l_trans_id in\
1654
self._limbo_children_names[parent].iteritems():
1655
if l_trans_id == trans_id:
1657
if l_filename.lower() == filename.lower():
1660
use_direct_path = True
1662
if not use_direct_path:
1663
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1665
limbo_name = pathjoin(self._limbo_files[parent], filename)
1666
self._limbo_children[parent].add(trans_id)
1667
self._limbo_children_names[parent][filename] = trans_id
1399
1671
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1400
1672
"""Apply all changes to the inventory and filesystem.
1515
1787
tree_paths = list(self._tree_path_ids.iteritems())
1516
1788
tree_paths.sort(reverse=True)
1517
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1789
child_pb = ui.ui_factory.nested_progress_bar()
1519
1791
for num, data in enumerate(tree_paths):
1520
1792
path, trans_id = data
1521
1793
child_pb.update('removing file', num, len(tree_paths))
1522
1794
full_path = self._tree.abspath(path)
1523
1795
if trans_id in self._removed_contents:
1524
mover.pre_delete(full_path, os.path.join(self._deletiondir,
1526
elif trans_id in self._new_name or trans_id in \
1796
delete_path = os.path.join(self._deletiondir, trans_id)
1797
mover.pre_delete(full_path, delete_path)
1798
elif (trans_id in self._new_name
1799
or trans_id in self._new_parent):
1529
1801
mover.rename(full_path, self._limbo_name(trans_id))
1802
except errors.TransformRenameFailed, e:
1531
1803
if e.errno != errno.ENOENT:
1558
1830
if trans_id in self._needs_rename:
1560
1832
mover.rename(self._limbo_name(trans_id), full_path)
1833
except errors.TransformRenameFailed, e:
1562
1834
# We may be renaming a dangling inventory id
1563
1835
if e.errno != errno.ENOENT:
1566
1838
self.rename_count += 1
1839
# TODO: if trans_id in self._observed_sha1s, we should
1840
# re-stat the final target, since ctime will be
1841
# updated by the change.
1567
1842
if (trans_id in self._new_contents or
1568
1843
self.path_changed(trans_id)):
1569
1844
if trans_id in self._new_contents:
1570
1845
modified_paths.append(full_path)
1571
1846
if trans_id in self._new_executability:
1572
1847
self._set_executability(path, trans_id)
1848
if trans_id in self._observed_sha1s:
1849
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1850
st = osutils.lstat(full_path)
1851
self._observed_sha1s[trans_id] = (o_sha1, st)
1574
1853
child_pb.finished()
1575
1854
self._new_contents.clear()
1576
1855
return modified_paths
1857
def _apply_observed_sha1s(self):
1858
"""After we have finished renaming everything, update observed sha1s
1860
This has to be done after self._tree.apply_inventory_delta, otherwise
1861
it doesn't know anything about the files we are updating. Also, we want
1862
to do this as late as possible, so that most entries end up cached.
1864
# TODO: this doesn't update the stat information for directories. So
1865
# the first 'bzr status' will still need to rewrite
1866
# .bzr/checkout/dirstate. However, we at least don't need to
1867
# re-read all of the files.
1868
# TODO: If the operation took a while, we could do a time.sleep(3) here
1869
# to allow the clock to tick over and ensure we won't have any
1870
# problems. (we could observe start time, and finish time, and if
1871
# it is less than eg 10% overhead, add a sleep call.)
1872
paths = FinalPaths(self)
1873
for trans_id, observed in self._observed_sha1s.iteritems():
1874
path = paths.get_path(trans_id)
1875
# We could get the file_id, but dirstate prefers to use the path
1876
# anyway, and it is 'cheaper' to determine.
1877
# file_id = self._new_id[trans_id]
1878
self._tree._observed_sha1(None, path, observed)
1579
1881
class TransformPreview(DiskTreeTransform):
1580
1882
"""A TreeTransform for generating preview trees.
1635
1942
self._all_children_cache = {}
1636
1943
self._path2trans_id_cache = {}
1637
1944
self._final_name_cache = {}
1639
def _changes(self, file_id):
1640
for changes in self._transform.iter_changes():
1641
if changes[0] == file_id:
1945
self._iter_changes_cache = dict((c[0], c) for c in
1946
self._transform.iter_changes())
1644
1948
def _content_change(self, file_id):
1645
1949
"""Return True if the content of this file changed"""
1646
changes = self._changes(file_id)
1950
changes = self._iter_changes_cache.get(file_id)
1647
1951
# changes[2] is true if the file content changed. See
1648
1952
# InterTree.iter_changes.
1649
1953
return (changes is not None and changes[2])
1662
1966
yield self._get_repository().revision_tree(revision_id)
1664
1968
def _get_file_revision(self, file_id, vf, tree_revision):
1665
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1969
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1666
1970
self._iter_parent_trees()]
1667
1971
vf.add_lines((file_id, tree_revision), parent_keys,
1668
self.get_file(file_id).readlines())
1972
self.get_file_lines(file_id))
1669
1973
repo = self._get_repository()
1670
1974
base_vf = repo.texts
1671
1975
if base_vf not in vf.fallback_versionedfiles:
1672
1976
vf.fallback_versionedfiles.append(base_vf)
1673
1977
return tree_revision
1675
def _stat_limbo_file(self, file_id):
1676
trans_id = self._transform.trans_id_file_id(file_id)
1979
def _stat_limbo_file(self, file_id=None, trans_id=None):
1980
if trans_id is None:
1981
trans_id = self._transform.trans_id_file_id(file_id)
1677
1982
name = self._transform._limbo_name(trans_id)
1678
1983
return os.lstat(name)
2161
2483
for num, _unused in enumerate(wt.all_file_ids()):
2162
2484
if num > 0: # more than just a root
2163
2485
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2164
existing_files = set()
2165
for dir, files in wt.walkdirs():
2166
existing_files.update(f[0] for f in files)
2167
2486
file_trans_id = {}
2168
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2487
top_pb = ui.ui_factory.nested_progress_bar()
2169
2488
pp = ProgressPhase("Build phase", 2, top_pb)
2170
2489
if tree.inventory.root is not None:
2171
2490
# This is kind of a hack: we should be altering the root
2193
2512
precomputed_delta = []
2195
2514
precomputed_delta = None
2515
# Check if tree inventory has content. If so, we populate
2516
# existing_files with the directory content. If there are no
2517
# entries we skip populating existing_files as its not used.
2518
# This improves performance and unncessary work on large
2519
# directory trees. (#501307)
2521
existing_files = set()
2522
for dir, files in wt.walkdirs():
2523
existing_files.update(f[0] for f in files)
2196
2524
for num, (tree_path, entry) in \
2197
2525
enumerate(tree.inventory.iter_entries_by_dir()):
2198
2526
pb.update("Building tree", num - len(deferred_contents), total)
2271
2599
new_desired_files = desired_files
2273
2601
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2274
unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2275
in iter if not (c or e[0] != e[1]))
2602
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2603
in iter if not (c or e[0] != e[1])]
2604
if accelerator_tree.supports_content_filtering():
2605
unchanged = [(f, p) for (f, p) in unchanged
2606
if not accelerator_tree.iter_search_rules([p]).next()]
2607
unchanged = dict(unchanged)
2276
2608
new_desired_files = []
2278
for file_id, (trans_id, tree_path) in desired_files:
2610
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2279
2611
accelerator_path = unchanged.get(file_id)
2280
2612
if accelerator_path is None:
2281
new_desired_files.append((file_id, (trans_id, tree_path)))
2613
new_desired_files.append((file_id,
2614
(trans_id, tree_path, text_sha1)))
2283
2616
pb.update('Adding file contents', count + offset, total)
2302
2635
offset += count
2303
for count, ((trans_id, tree_path), contents) in enumerate(
2636
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2304
2637
tree.iter_files_bytes(new_desired_files)):
2305
2638
if wt.supports_content_filtering():
2306
2639
filters = wt._content_filter_stack(tree_path)
2307
2640
contents = filtered_output_bytes(contents, filters,
2308
2641
ContentFilterContext(tree_path, tree))
2309
tt.create_file(contents, trans_id)
2642
tt.create_file(contents, trans_id, sha1=text_sha1)
2310
2643
pb.update('Adding file contents', count + offset, total)
2314
2647
for child in tt.iter_tree_children(old_parent):
2315
2648
tt.adjust_path(tt.final_name(child), new_parent, child)
2317
2651
def _reparent_transform_children(tt, old_parent, new_parent):
2318
2652
by_parent = tt.by_parent()
2319
2653
for child in by_parent[old_parent]:
2320
2654
tt.adjust_path(tt.final_name(child), new_parent, child)
2321
2655
return by_parent[old_parent]
2323
2658
def _content_match(tree, entry, file_id, kind, target_path):
2324
2659
if entry.kind != kind:
2326
2661
if entry.kind == "directory":
2328
2663
if entry.kind == "file":
2329
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2664
f = file(target_path, 'rb')
2666
if tree.get_file_text(file_id) == f.read():
2331
2670
elif entry.kind == "symlink":
2332
2671
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2385
2724
raise errors.BadFileKindError(name, kind)
2388
@deprecated_function(deprecated_in((1, 9, 0)))
2389
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2390
"""Create new file contents according to an inventory entry.
2392
DEPRECATED. Use create_from_tree instead.
2727
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2728
filter_tree_path=None):
2729
"""Create new file contents according to tree contents.
2731
:param filter_tree_path: the tree path to use to lookup
2732
content filters to apply to the bytes output in the working tree.
2733
This only applies if the working tree supports content filtering.
2394
if entry.kind == "file":
2396
lines = tree.get_file(entry.file_id).readlines()
2397
tt.create_file(lines, trans_id, mode_id=mode_id)
2398
elif entry.kind == "symlink":
2399
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2400
elif entry.kind == "directory":
2401
tt.create_directory(trans_id)
2404
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
2405
"""Create new file contents according to tree contents."""
2406
2735
kind = tree.kind(file_id)
2407
2736
if kind == 'directory':
2408
2737
tt.create_directory(trans_id)
2426
2760
tt.set_executability(entry.executable, trans_id)
2763
@deprecated_function(deprecated_in((2, 3, 0)))
2429
2764
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2430
2765
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2768
@deprecated_function(deprecated_in((2, 3, 0)))
2433
2769
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2434
2770
"""Produce a backup-style name that appears to be available"""
2435
2771
def name_gen():
2522
2857
backups, merge_modified, basis_tree=None):
2523
2858
if basis_tree is not None:
2524
2859
basis_tree.lock_read()
2525
change_list = target_tree.iter_changes(working_tree,
2860
# We ask the working_tree for its changes relative to the target, rather
2861
# than the target changes relative to the working tree. Because WT4 has an
2862
# optimizer to compare itself to a target, but no optimizer for the
2864
change_list = working_tree.iter_changes(target_tree,
2526
2865
specific_files=specific_files, pb=pb)
2527
2866
if target_tree.get_root_id() is None:
2528
2867
skip_root = True
2532
2871
deferred_files = []
2533
2872
for id_num, (file_id, path, changed_content, versioned, parent, name,
2534
2873
kind, executable) in enumerate(change_list):
2535
if skip_root and file_id[0] is not None and parent[0] is None:
2874
target_path, wt_path = path
2875
target_versioned, wt_versioned = versioned
2876
target_parent, wt_parent = parent
2877
target_name, wt_name = name
2878
target_kind, wt_kind = kind
2879
target_executable, wt_executable = executable
2880
if skip_root and wt_parent is None:
2537
2882
trans_id = tt.trans_id_file_id(file_id)
2539
2884
if changed_content:
2540
2885
keep_content = False
2541
if kind[0] == 'file' and (backups or kind[1] is None):
2886
if wt_kind == 'file' and (backups or target_kind is None):
2542
2887
wt_sha1 = working_tree.get_file_sha1(file_id)
2543
2888
if merge_modified.get(file_id) != wt_sha1:
2544
2889
# acquire the basis tree lazily to prevent the
2550
2895
if file_id in basis_tree:
2551
2896
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2552
2897
keep_content = True
2553
elif kind[1] is None and not versioned[1]:
2898
elif target_kind is None and not target_versioned:
2554
2899
keep_content = True
2555
if kind[0] is not None:
2900
if wt_kind is not None:
2556
2901
if not keep_content:
2557
2902
tt.delete_contents(trans_id)
2558
elif kind[1] is not None:
2559
parent_trans_id = tt.trans_id_file_id(parent[0])
2560
by_parent = tt.by_parent()
2561
backup_name = _get_backup_name(name[0], by_parent,
2562
parent_trans_id, tt)
2903
elif target_kind is not None:
2904
parent_trans_id = tt.trans_id_file_id(wt_parent)
2905
backup_name = tt._available_backup_name(
2906
wt_name, parent_trans_id)
2563
2907
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2564
new_trans_id = tt.create_path(name[0], parent_trans_id)
2565
if versioned == (True, True):
2908
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2909
if wt_versioned and target_versioned:
2566
2910
tt.unversion_file(trans_id)
2567
2911
tt.version_file(file_id, new_trans_id)
2568
2912
# New contents should have the same unix perms as old
2570
2914
mode_id = trans_id
2571
2915
trans_id = new_trans_id
2572
if kind[1] in ('directory', 'tree-reference'):
2916
if target_kind in ('directory', 'tree-reference'):
2573
2917
tt.create_directory(trans_id)
2574
if kind[1] == 'tree-reference':
2918
if target_kind == 'tree-reference':
2575
2919
revision = target_tree.get_reference_revision(file_id,
2577
2921
tt.set_tree_reference(revision, trans_id)
2578
elif kind[1] == 'symlink':
2922
elif target_kind == 'symlink':
2579
2923
tt.create_symlink(target_tree.get_symlink_target(file_id),
2581
elif kind[1] == 'file':
2925
elif target_kind == 'file':
2582
2926
deferred_files.append((file_id, (trans_id, mode_id)))
2583
2927
if basis_tree is None:
2584
2928
basis_tree = working_tree.basis_tree()
2592
2936
merge_modified[file_id] = new_sha1
2594
2938
# preserve the execute bit when backing up
2595
if keep_content and executable[0] == executable[1]:
2596
tt.set_executability(executable[1], trans_id)
2597
elif kind[1] is not None:
2598
raise AssertionError(kind[1])
2599
if versioned == (False, True):
2939
if keep_content and wt_executable == target_executable:
2940
tt.set_executability(target_executable, trans_id)
2941
elif target_kind is not None:
2942
raise AssertionError(target_kind)
2943
if not wt_versioned and target_versioned:
2600
2944
tt.version_file(file_id, trans_id)
2601
if versioned == (True, False):
2945
if wt_versioned and not target_versioned:
2602
2946
tt.unversion_file(trans_id)
2603
if (name[1] is not None and
2604
(name[0] != name[1] or parent[0] != parent[1])):
2605
if name[1] == '' and parent[1] is None:
2947
if (target_name is not None and
2948
(wt_name != target_name or wt_parent != target_parent)):
2949
if target_name == '' and target_parent is None:
2606
2950
parent_trans = ROOT_PARENT
2608
parent_trans = tt.trans_id_file_id(parent[1])
2609
tt.adjust_path(name[1], parent_trans, trans_id)
2610
if executable[0] != executable[1] and kind[1] == "file":
2611
tt.set_executability(executable[1], trans_id)
2612
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2614
tt.create_file(bytes, trans_id, mode_id)
2952
parent_trans = tt.trans_id_file_id(target_parent)
2953
if wt_parent is None and wt_versioned:
2954
tt.adjust_root_path(target_name, parent_trans)
2956
tt.adjust_path(target_name, parent_trans, trans_id)
2957
if wt_executable != target_executable and target_kind == "file":
2958
tt.set_executability(target_executable, trans_id)
2959
if working_tree.supports_content_filtering():
2960
for index, ((trans_id, mode_id), bytes) in enumerate(
2961
target_tree.iter_files_bytes(deferred_files)):
2962
file_id = deferred_files[index][0]
2963
# We're reverting a tree to the target tree so using the
2964
# target tree to find the file path seems the best choice
2965
# here IMO - Ian C 27/Oct/2009
2966
filter_tree_path = target_tree.id2path(file_id)
2967
filters = working_tree._content_filter_stack(filter_tree_path)
2968
bytes = filtered_output_bytes(bytes, filters,
2969
ContentFilterContext(filter_tree_path, working_tree))
2970
tt.create_file(bytes, trans_id, mode_id)
2972
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2974
tt.create_file(bytes, trans_id, mode_id)
2975
tt.fixup_new_roots()
2616
2977
if basis_tree is not None:
2617
2978
basis_tree.unlock()
2618
2979
return merge_modified
2621
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2982
def resolve_conflicts(tt, pb=None, pass_func=None):
2622
2983
"""Make many conflict-resolution attempts, but die if they fail"""
2623
2984
if pass_func is None:
2624
2985
pass_func = conflict_pass
2625
2986
new_conflicts = set()
2987
pb = ui.ui_factory.nested_progress_bar()
2627
2989
for n in range(10):
2628
2990
pb.update('Resolution pass', n+1, 10)
2671
3033
elif c_type == 'missing parent':
2672
3034
trans_id = conflict[1]
2674
tt.cancel_deletion(trans_id)
2675
new_conflicts.add(('deleting parent', 'Not deleting',
3035
if trans_id in tt._removed_contents:
3036
cancel_deletion = True
3037
orphans = tt._get_potential_orphans(trans_id)
3039
cancel_deletion = False
3040
# All children are orphans
3043
tt.new_orphan(o, trans_id)
3044
except OrphaningError:
3045
# Something bad happened so we cancel the directory
3046
# deletion which will leave it in place with a
3047
# conflict. The user can deal with it from there.
3048
# Note that this also catch the case where we don't
3049
# want to create orphans and leave the directory in
3051
cancel_deletion = True
3054
# Cancel the directory deletion
3055
tt.cancel_deletion(trans_id)
3056
new_conflicts.add(('deleting parent', 'Not deleting',
2680
3061
tt.final_name(trans_id)
2761
3144
self.pending_deletions = []
2763
3146
def rename(self, from_, to):
2764
"""Rename a file from one path to another. Functions like os.rename"""
3147
"""Rename a file from one path to another."""
2766
3149
os.rename(from_, to)
2767
3150
except OSError, e:
2768
3151
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2769
3152
raise errors.FileExists(to, str(e))
3153
# normal OSError doesn't include filenames so it's hard to see where
3154
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3155
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2771
3156
self.past_renames.append((from_, to))
2773
3158
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
