19
19
from stat import S_ISREG, S_IEXEC
29
lazy_import.lazy_import(globals(), """
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
30
23
from bzrlib import (
41
32
revision as _mod_revision,
46
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
47
ReusingTransform, CantMoveRoot,
36
ReusingTransform, NotVersionedError, CantMoveRoot,
48
37
ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
38
UnableCreateSymlink)
50
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
40
from bzrlib.inventory import InventoryEntry
51
41
from bzrlib.osutils import (
58
49
supports_executable,
60
from bzrlib.progress import ProgressPhase
51
from bzrlib.progress import DummyProgress, ProgressPhase
61
52
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, warning
57
from bzrlib import tree
59
import bzrlib.urlutils as urlutils
68
62
ROOT_PARENT = "root-parent"
70
65
def unique_add(map, key, value):
72
67
raise DuplicateKey(key=key)
77
71
class _TransformResults(object):
78
72
def __init__(self, modified_paths, rename_count):
79
73
object.__init__(self)
216
202
self.version_file(old_root_file_id, old_root)
217
203
self.unversion_file(self._new_root)
219
def fixup_new_roots(self):
220
"""Reinterpret requests to change the root directory
222
Instead of creating a root directory, or moving an existing directory,
223
all the attributes and children of the new root are applied to the
224
existing root directory.
226
This means that the old root trans-id becomes obsolete, so it is
227
recommended only to invoke this after the root trans-id has become
231
new_roots = [k for k, v in self._new_parent.iteritems() if v is
233
if len(new_roots) < 1:
234
if self.final_kind(self.root) is None:
235
self.cancel_deletion(self.root)
236
if self.final_file_id(self.root) is None:
237
self.version_file(self.tree_file_id(self.root),
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
# TODO: What to do if a old_new_root is present, but self._new_root is
247
# not listed as being removed? This code explicitly unversions
248
# the old root and versions it with the new file_id. Though that
249
# seems like an incomplete delta
251
# unversion the new root's directory.
252
file_id = self.final_file_id(old_new_root)
253
if old_new_root in self._new_id:
254
self.cancel_versioning(old_new_root)
256
self.unversion_file(old_new_root)
257
# if, at this stage, root still has an old file_id, zap it so we can
258
# stick a new one in.
259
if (self.tree_file_id(self._new_root) is not None and
260
self._new_root not in self._removed_id):
261
self.unversion_file(self._new_root)
262
if file_id is not None:
263
self.version_file(file_id, self._new_root)
265
# Now move children of new root into old root directory.
266
# Ensure all children are registered with the transaction, but don't
267
# use directly-- some tree children have new parents
268
list(self.iter_tree_children(old_new_root))
269
# Move all children of new root into old root directory.
270
for child in self.by_parent().get(old_new_root, []):
271
self.adjust_path(self.final_name(child), self._new_root, child)
273
# Ensure old_new_root has no directory.
274
if old_new_root in self._new_contents:
275
self.cancel_creation(old_new_root)
277
self.delete_contents(old_new_root)
279
# prevent deletion of root directory.
280
if self._new_root in self._removed_contents:
281
self.cancel_deletion(self._new_root)
283
# destroy path info for old_new_root.
284
del self._new_parent[old_new_root]
285
del self._new_name[old_new_root]
287
205
def trans_id_tree_file_id(self, inventory_id):
288
206
"""Determine the transaction id of a working tree file.
400
317
return sorted(FinalPaths(self).get_paths(new_ids))
402
319
def _inventory_altered(self):
403
"""Determine which trans_ids need new Inventory entries.
405
An new entry is needed when anything that would be reflected by an
406
inventory entry changes, including file name, file_id, parent file_id,
407
file kind, and the execute bit.
409
Some care is taken to return entries with real changes, not cases
410
where the value is deleted and then restored to its original value,
411
but some actually unchanged values may be returned.
413
:returns: A list of (path, trans_id) for all items requiring an
414
inventory change. Ordered by path.
417
# Find entries whose file_ids are new (or changed).
418
new_file_id = set(t for t in self._new_id
419
if self._new_id[t] != self.tree_file_id(t))
420
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,
421
323
self._new_executability]:
422
changed_ids.update(id_set)
423
# removing implies a kind change
324
new_ids.update(id_set)
424
325
changed_kind = set(self._removed_contents)
426
326
changed_kind.intersection_update(self._new_contents)
427
# Ignore entries that are already known to have changed.
428
changed_kind.difference_update(changed_ids)
429
# to keep only the truly changed ones
430
changed_kind = (t for t in changed_kind
431
if self.tree_kind(t) != self.final_kind(t))
432
# all kind changes will alter the inventory
433
changed_ids.update(changed_kind)
434
# To find entries with changed parent_ids, find parents which existed,
435
# but changed file_id.
436
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
437
# Now add all their children to the set.
438
for parent_trans_id in new_file_id:
439
changed_ids.update(self.iter_tree_children(parent_trans_id))
440
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))
442
333
def final_kind(self, trans_id):
443
334
"""Determine the final file kind, after any changes applied.
445
:return: None if the file does not exist/has no contents. (It is
446
conceivable that a path would be created without the corresponding
447
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)
449
340
if trans_id in self._new_contents:
450
341
return self._new_contents[trans_id]
451
342
elif trans_id in self._removed_contents:
343
raise NoSuchFile(None)
454
345
return self.tree_kind(trans_id)
579
468
# ensure that all children are registered with the transaction
580
469
list(self.iter_tree_children(parent_id))
582
@deprecated_method(deprecated_in((2, 3, 0)))
583
471
def has_named_child(self, by_parent, parent_id, name):
584
return self._has_named_child(
585
name, parent_id, known_children=by_parent.get(parent_id, []))
587
def _has_named_child(self, name, parent_id, known_children):
588
"""Does a parent already have a name child.
590
:param name: The searched for name.
592
:param parent_id: The parent for which the check is made.
594
:param known_children: The already known children. This should have
595
been recently obtained from `self.by_parent.get(parent_id)`
596
(or will be if None is passed).
598
if known_children is None:
599
known_children = self.by_parent().get(parent_id, [])
600
for child in known_children:
473
children = by_parent[parent_id]
476
for child in children:
601
477
if self.final_name(child) == name:
603
parent_path = self._tree_id_paths.get(parent_id, None)
604
if parent_path is None:
605
# No parent... no children
480
path = self._tree_id_paths[parent_id]
607
child_path = joinpath(parent_path, name)
608
child_id = self._tree_path_ids.get(child_path, None)
483
childpath = joinpath(path, name)
484
child_id = self._tree_path_ids.get(childpath)
609
485
if child_id is None:
610
# Not known by the tree transform yet, check the filesystem
611
return osutils.lexists(self._tree.abspath(child_path))
486
return lexists(self._tree.abspath(childpath))
613
raise AssertionError('child_id is missing: %s, %s, %s'
614
% (name, parent_id, child_id))
616
def _available_backup_name(self, name, target_id):
617
"""Find an available backup name.
619
:param name: The basename of the file.
621
:param target_id: The directory trans_id where the backup should
624
known_children = self.by_parent().get(target_id, [])
625
return osutils.available_backup_name(
627
lambda base: self._has_named_child(
628
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?
630
496
def _parent_loops(self):
631
497
"""No entry should be its own ancestor"""
747
618
def _parent_type_conflicts(self, by_parent):
748
"""Children must have a directory parent"""
619
"""parents must have directory 'contents'."""
750
621
for parent_id, children in by_parent.iteritems():
751
622
if parent_id is ROOT_PARENT:
754
for child_id in children:
755
if self.final_kind(child_id) is not None:
624
if not self._any_contents(children):
760
# There is at least a child, so we need an existing directory to
762
kind = self.final_kind(parent_id)
626
for child in children:
628
self.final_kind(child)
632
kind = self.final_kind(parent_id)
764
# The directory will be deleted
765
636
conflicts.append(('missing parent', parent_id))
766
637
elif kind != "directory":
767
# Meh, we need a *directory* to put something in it
768
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)
771
651
def _set_executability(self, path, trans_id):
772
652
"""Set the executability of versioned files """
773
653
if supports_executable():
837
717
self.create_symlink(target, trans_id)
840
def new_orphan(self, trans_id, parent_id):
841
"""Schedule an item to be orphaned.
843
When a directory is about to be removed, its children, if they are not
844
versioned are moved out of the way: they don't have a parent anymore.
846
:param trans_id: The trans_id of the existing item.
847
:param parent_id: The parent trans_id of the item.
849
raise NotImplementedError(self.new_orphan)
851
def _get_potential_orphans(self, dir_id):
852
"""Find the potential orphans in a directory.
854
A directory can't be safely deleted if there are versioned files in it.
855
If all the contained files are unversioned then they can be orphaned.
857
The 'None' return value means that the directory contains at least one
858
versioned file and should not be deleted.
860
:param dir_id: The directory trans id.
862
:return: A list of the orphan trans ids or None if at least one
863
versioned file is present.
866
# Find the potential orphans, stop if one item should be kept
867
for child_tid in self.by_parent()[dir_id]:
868
if child_tid in self._removed_contents:
869
# The child is removed as part of the transform. Since it was
870
# versioned before, it's not an orphan
872
elif self.final_file_id(child_tid) is None:
873
# The child is not versioned
874
orphans.append(child_tid)
876
# We have a versioned file here, searching for orphans is
882
720
def _affected_ids(self):
883
721
"""Return the set of transform ids affected by the transform"""
884
722
trans_ids = set(self._removed_id)
1018
859
def get_preview_tree(self):
1019
860
"""Return a tree representing the result of the transform.
1021
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.
1024
865
return _PreviewTree(self)
1026
def commit(self, branch, message, merge_parents=None, strict=False,
1027
timestamp=None, timezone=None, committer=None, authors=None,
1028
revprops=None, revision_id=None):
867
def commit(self, branch, message, merge_parents=None, strict=False):
1029
868
"""Commit the result of this TreeTransform to a branch.
1031
870
:param branch: The branch to commit to.
1032
871
:param message: The message to attach to the commit.
1033
:param merge_parents: Additional parent revision-ids specified by
1035
:param strict: If True, abort the commit if there are unversioned
1037
:param timestamp: if not None, seconds-since-epoch for the time and
1038
date. (May be a float.)
1039
:param timezone: Optional timezone for timestamp, as an offset in
1041
:param committer: Optional committer in email-id format.
1042
(e.g. "J Random Hacker <jrandom@example.com>")
1043
:param authors: Optional list of authors in email-id format.
1044
:param revprops: Optional dictionary of revision properties.
1045
:param revision_id: Optional revision id. (Specifying a revision-id
1046
may reduce performance for some non-native formats.)
872
:param merge_parents: Additional parents specified by pending merges.
1047
873
:return: The revision_id of the revision committed.
1049
875
self._check_malformed()
1243
1054
def _limbo_name(self, trans_id):
1244
1055
"""Generate the limbo name of a file"""
1245
1056
limbo_name = self._limbo_files.get(trans_id)
1246
if limbo_name is None:
1247
limbo_name = self._generate_limbo_path(trans_id)
1248
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
1249
1096
return limbo_name
1251
def _generate_limbo_path(self, trans_id):
1252
"""Generate a limbo path using the trans_id as the relative path.
1254
This is suitable as a fallback, and when the transform should not be
1255
sensitive to the path encoding of the limbo directory.
1257
self._needs_rename.add(trans_id)
1258
return pathjoin(self._limbodir, trans_id)
1260
1098
def adjust_path(self, name, parent, trans_id):
1261
1099
previous_parent = self._new_parent.get(trans_id)
1262
1100
previous_name = self._new_name.get(trans_id)
1281
1117
entries from _limbo_files, because they are now stale.
1283
1119
for trans_id in trans_ids:
1284
old_path = self._limbo_files[trans_id]
1285
self._possibly_stale_limbo_files.add(old_path)
1286
del self._limbo_files[trans_id]
1120
old_path = self._limbo_files.pop(trans_id)
1287
1121
if trans_id not in self._new_contents:
1289
1123
new_path = self._limbo_name(trans_id)
1290
1124
os.rename(old_path, new_path)
1291
self._possibly_stale_limbo_files.remove(old_path)
1292
for descendant in self._limbo_descendants(trans_id):
1293
desc_path = self._limbo_files[descendant]
1294
desc_path = new_path + desc_path[len(old_path):]
1295
self._limbo_files[descendant] = desc_path
1297
def _limbo_descendants(self, trans_id):
1298
"""Return the set of trans_ids whose limbo paths descend from this."""
1299
descendants = set(self._limbo_children.get(trans_id, []))
1300
for descendant in list(descendants):
1301
descendants.update(self._limbo_descendants(descendant))
1304
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1126
def create_file(self, contents, trans_id, mode_id=None):
1305
1127
"""Schedule creation of a new file.
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.
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.
1318
1137
name = self._limbo_name(trans_id)
1319
1138
f = open(name, 'wb')
1321
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.
1322
1149
f.writelines(contents)
1325
self._set_mtime(name)
1326
1152
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))
1333
1154
def _read_file_chunks(self, trans_id):
1334
1155
cur_file = open(self._limbo_name(trans_id), 'rb')
1404
1214
del self._limbo_children_names[trans_id]
1405
1215
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')
1491
1218
class TreeTransform(DiskTreeTransform):
1492
1219
"""Represent a tree transformation.
1667
1397
yield self.trans_id_tree_path(childpath)
1669
def _generate_limbo_path(self, trans_id):
1670
"""Generate a limbo path using the final path if possible.
1672
This optimizes the performance of applying the tree transform by
1673
avoiding renames. These renames can be avoided only when the parent
1674
directory is already scheduled for creation.
1676
If the final path cannot be used, falls back to using the trans_id as
1679
parent = self._new_parent.get(trans_id)
1680
# if the parent directory is already in limbo (e.g. when building a
1681
# tree), choose a limbo name inside the parent, to reduce further
1683
use_direct_path = False
1684
if self._new_contents.get(parent) == 'directory':
1685
filename = self._new_name.get(trans_id)
1686
if filename is not None:
1687
if parent not in self._limbo_children:
1688
self._limbo_children[parent] = set()
1689
self._limbo_children_names[parent] = {}
1690
use_direct_path = True
1691
# the direct path can only be used if no other file has
1692
# already taken this pathname, i.e. if the name is unused, or
1693
# if it is already associated with this trans_id.
1694
elif self._case_sensitive_target:
1695
if (self._limbo_children_names[parent].get(filename)
1696
in (trans_id, None)):
1697
use_direct_path = True
1699
for l_filename, l_trans_id in\
1700
self._limbo_children_names[parent].iteritems():
1701
if l_trans_id == trans_id:
1703
if l_filename.lower() == filename.lower():
1706
use_direct_path = True
1708
if not use_direct_path:
1709
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1711
limbo_name = pathjoin(self._limbo_files[parent], filename)
1712
self._limbo_children[parent].add(trans_id)
1713
self._limbo_children_names[parent][filename] = trans_id
1717
1399
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1718
1400
"""Apply all changes to the inventory and filesystem.
1833
1515
tree_paths = list(self._tree_path_ids.iteritems())
1834
1516
tree_paths.sort(reverse=True)
1835
child_pb = ui.ui_factory.nested_progress_bar()
1517
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1837
for num, (path, trans_id) in enumerate(tree_paths):
1838
# do not attempt to move root into a subdirectory of itself.
1519
for num, data in enumerate(tree_paths):
1520
path, trans_id = data
1841
1521
child_pb.update('removing file', num, len(tree_paths))
1842
1522
full_path = self._tree.abspath(path)
1843
1523
if trans_id in self._removed_contents:
1844
delete_path = os.path.join(self._deletiondir, trans_id)
1845
mover.pre_delete(full_path, delete_path)
1846
elif (trans_id in self._new_name
1847
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 \
1849
1529
mover.rename(full_path, self._limbo_name(trans_id))
1850
except errors.TransformRenameFailed, e:
1851
1531
if e.errno != errno.ENOENT:
1878
1558
if trans_id in self._needs_rename:
1880
1560
mover.rename(self._limbo_name(trans_id), full_path)
1881
except errors.TransformRenameFailed, e:
1882
1562
# We may be renaming a dangling inventory id
1883
1563
if e.errno != errno.ENOENT:
1886
1566
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.
1890
1567
if (trans_id in self._new_contents or
1891
1568
self.path_changed(trans_id)):
1892
1569
if trans_id in self._new_contents:
1893
1570
modified_paths.append(full_path)
1894
1571
if trans_id in self._new_executability:
1895
1572
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)
1901
1574
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]
1907
1575
self._new_contents.clear()
1908
1576
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)
1934
1579
class TransformPreview(DiskTreeTransform):
1935
1580
"""A TreeTransform for generating preview trees.
2019
1662
yield self._get_repository().revision_tree(revision_id)
2021
1664
def _get_file_revision(self, file_id, vf, tree_revision):
2022
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1665
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2023
1666
self._iter_parent_trees()]
2024
1667
vf.add_lines((file_id, tree_revision), parent_keys,
2025
self.get_file_lines(file_id))
1668
self.get_file(file_id).readlines())
2026
1669
repo = self._get_repository()
2027
1670
base_vf = repo.texts
2028
1671
if base_vf not in vf.fallback_versionedfiles:
2029
1672
vf.fallback_versionedfiles.append(base_vf)
2030
1673
return tree_revision
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)
1675
def _stat_limbo_file(self, file_id):
1676
trans_id = self._transform.trans_id_file_id(file_id)
2035
1677
name = self._transform._limbo_name(trans_id)
2036
1678
return os.lstat(name)
2652
2271
new_desired_files = desired_files
2654
2273
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2655
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2656
in iter if not (c or e[0] != e[1])]
2657
if accelerator_tree.supports_content_filtering():
2658
unchanged = [(f, p) for (f, p) in unchanged
2659
if not accelerator_tree.iter_search_rules([p]).next()]
2660
unchanged = dict(unchanged)
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]))
2661
2276
new_desired_files = []
2663
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2278
for file_id, (trans_id, tree_path) in desired_files:
2664
2279
accelerator_path = unchanged.get(file_id)
2665
2280
if accelerator_path is None:
2666
new_desired_files.append((file_id,
2667
(trans_id, tree_path, text_sha1)))
2281
new_desired_files.append((file_id, (trans_id, tree_path)))
2669
2283
pb.update('Adding file contents', count + offset, total)
2777
2385
raise errors.BadFileKindError(name, kind)
2780
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2781
filter_tree_path=None):
2782
"""Create new file contents according to tree contents.
2784
:param filter_tree_path: the tree path to use to lookup
2785
content filters to apply to the bytes output in the working tree.
2786
This only applies if the working tree supports content filtering.
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.
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."""
2788
2406
kind = tree.kind(file_id)
2789
2407
if kind == 'directory':
2790
2408
tt.create_directory(trans_id)
2924
2532
deferred_files = []
2925
2533
for id_num, (file_id, path, changed_content, versioned, parent, name,
2926
2534
kind, executable) in enumerate(change_list):
2927
target_path, wt_path = path
2928
target_versioned, wt_versioned = versioned
2929
target_parent, wt_parent = parent
2930
target_name, wt_name = name
2931
target_kind, wt_kind = kind
2932
target_executable, wt_executable = executable
2933
if skip_root and wt_parent is None:
2535
if skip_root and file_id[0] is not None and parent[0] is None:
2935
2537
trans_id = tt.trans_id_file_id(file_id)
2937
2539
if changed_content:
2938
2540
keep_content = False
2939
if wt_kind == 'file' and (backups or target_kind is None):
2541
if kind[0] == 'file' and (backups or kind[1] is None):
2940
2542
wt_sha1 = working_tree.get_file_sha1(file_id)
2941
2543
if merge_modified.get(file_id) != wt_sha1:
2942
2544
# acquire the basis tree lazily to prevent the
2945
2547
if basis_tree is None:
2946
2548
basis_tree = working_tree.basis_tree()
2947
2549
basis_tree.lock_read()
2948
if basis_tree.has_id(file_id):
2550
if file_id in basis_tree:
2949
2551
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2950
2552
keep_content = True
2951
elif target_kind is None and not target_versioned:
2553
elif kind[1] is None and not versioned[1]:
2952
2554
keep_content = True
2953
if wt_kind is not None:
2555
if kind[0] is not None:
2954
2556
if not keep_content:
2955
2557
tt.delete_contents(trans_id)
2956
elif target_kind is not None:
2957
parent_trans_id = tt.trans_id_file_id(wt_parent)
2958
backup_name = tt._available_backup_name(
2959
wt_name, parent_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)
2960
2563
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2961
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2962
if wt_versioned and target_versioned:
2564
new_trans_id = tt.create_path(name[0], parent_trans_id)
2565
if versioned == (True, True):
2963
2566
tt.unversion_file(trans_id)
2964
2567
tt.version_file(file_id, new_trans_id)
2965
2568
# New contents should have the same unix perms as old
2967
2570
mode_id = trans_id
2968
2571
trans_id = new_trans_id
2969
if target_kind in ('directory', 'tree-reference'):
2572
if kind[1] in ('directory', 'tree-reference'):
2970
2573
tt.create_directory(trans_id)
2971
if target_kind == 'tree-reference':
2574
if kind[1] == 'tree-reference':
2972
2575
revision = target_tree.get_reference_revision(file_id,
2974
2577
tt.set_tree_reference(revision, trans_id)
2975
elif target_kind == 'symlink':
2578
elif kind[1] == 'symlink':
2976
2579
tt.create_symlink(target_tree.get_symlink_target(file_id),
2978
elif target_kind == 'file':
2581
elif kind[1] == 'file':
2979
2582
deferred_files.append((file_id, (trans_id, mode_id)))
2980
2583
if basis_tree is None:
2981
2584
basis_tree = working_tree.basis_tree()
2982
2585
basis_tree.lock_read()
2983
2586
new_sha1 = target_tree.get_file_sha1(file_id)
2984
if (basis_tree.has_id(file_id) and
2985
new_sha1 == basis_tree.get_file_sha1(file_id)):
2587
if (file_id in basis_tree and new_sha1 ==
2588
basis_tree.get_file_sha1(file_id)):
2986
2589
if file_id in merge_modified:
2987
2590
del merge_modified[file_id]
2989
2592
merge_modified[file_id] = new_sha1
2991
2594
# preserve the execute bit when backing up
2992
if keep_content and wt_executable == target_executable:
2993
tt.set_executability(target_executable, trans_id)
2994
elif target_kind is not None:
2995
raise AssertionError(target_kind)
2996
if not wt_versioned and target_versioned:
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):
2997
2600
tt.version_file(file_id, trans_id)
2998
if wt_versioned and not target_versioned:
2601
if versioned == (True, False):
2999
2602
tt.unversion_file(trans_id)
3000
if (target_name is not None and
3001
(wt_name != target_name or wt_parent != target_parent)):
3002
if target_name == '' and target_parent is None:
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:
3003
2606
parent_trans = ROOT_PARENT
3005
parent_trans = tt.trans_id_file_id(target_parent)
3006
if wt_parent is None and wt_versioned:
3007
tt.adjust_root_path(target_name, parent_trans)
3009
tt.adjust_path(target_name, parent_trans, trans_id)
3010
if wt_executable != target_executable and target_kind == "file":
3011
tt.set_executability(target_executable, trans_id)
3012
if working_tree.supports_content_filtering():
3013
for index, ((trans_id, mode_id), bytes) in enumerate(
3014
target_tree.iter_files_bytes(deferred_files)):
3015
file_id = deferred_files[index][0]
3016
# We're reverting a tree to the target tree so using the
3017
# target tree to find the file path seems the best choice
3018
# here IMO - Ian C 27/Oct/2009
3019
filter_tree_path = target_tree.id2path(file_id)
3020
filters = working_tree._content_filter_stack(filter_tree_path)
3021
bytes = filtered_output_bytes(bytes, filters,
3022
ContentFilterContext(filter_tree_path, working_tree))
3023
tt.create_file(bytes, trans_id, mode_id)
3025
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3027
tt.create_file(bytes, trans_id, mode_id)
3028
tt.fixup_new_roots()
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)
3030
2616
if basis_tree is not None:
3031
2617
basis_tree.unlock()
3032
2618
return merge_modified
3035
def resolve_conflicts(tt, pb=None, pass_func=None):
2621
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
3036
2622
"""Make many conflict-resolution attempts, but die if they fail"""
3037
2623
if pass_func is None:
3038
2624
pass_func = conflict_pass
3039
2625
new_conflicts = set()
3040
pb = ui.ui_factory.nested_progress_bar()
3042
2627
for n in range(10):
3043
2628
pb.update('Resolution pass', n+1, 10)
3175
2741
modified_path = fp.get_path(conflict[2])
3176
2742
modified_id = tt.final_file_id(conflict[2])
3177
2743
if len(conflict) == 3:
3178
yield conflicts.Conflict.factory(
3179
c_type, action=action, path=modified_path, file_id=modified_id)
2744
yield Conflict.factory(c_type, action=action, path=modified_path,
2745
file_id=modified_id)
3182
2748
conflicting_path = fp.get_path(conflict[3])
3183
2749
conflicting_id = tt.final_file_id(conflict[3])
3184
yield conflicts.Conflict.factory(
3185
c_type, action=action, path=modified_path,
3186
file_id=modified_id,
3187
conflict_path=conflicting_path,
3188
conflict_file_id=conflicting_id)
2750
yield Conflict.factory(c_type, action=action, path=modified_path,
2751
file_id=modified_id,
2752
conflict_path=conflicting_path,
2753
conflict_file_id=conflicting_id)
3191
2756
class _FileMover(object):
added
removed
bzrlib/transform.py
