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,
45
from bzrlib.i18n import gettext
47
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
48
ReusingTransform, CantMoveRoot,
36
ReusingTransform, NotVersionedError, CantMoveRoot,
49
37
ExistingLimbo, ImmortalLimbo, NoFinalPath,
50
38
UnableCreateSymlink)
51
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
40
from bzrlib.inventory import InventoryEntry
52
41
from bzrlib.osutils import (
59
49
supports_executable,
61
from bzrlib.progress import ProgressPhase
51
from bzrlib.progress import DummyProgress, ProgressPhase
62
52
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, warning
57
from bzrlib import tree
59
import bzrlib.urlutils as urlutils
69
62
ROOT_PARENT = "root-parent"
71
65
def unique_add(map, key, value):
73
67
raise DuplicateKey(key=key)
78
71
class _TransformResults(object):
79
72
def __init__(self, modified_paths, rename_count):
80
73
object.__init__(self)
217
202
self.version_file(old_root_file_id, old_root)
218
203
self.unversion_file(self._new_root)
220
def fixup_new_roots(self):
221
"""Reinterpret requests to change the root directory
223
Instead of creating a root directory, or moving an existing directory,
224
all the attributes and children of the new root are applied to the
225
existing root directory.
227
This means that the old root trans-id becomes obsolete, so it is
228
recommended only to invoke this after the root trans-id has become
232
new_roots = [k for k, v in self._new_parent.iteritems() if v is
234
if len(new_roots) < 1:
236
if len(new_roots) != 1:
237
raise ValueError('A tree cannot have two roots!')
238
if self._new_root is None:
239
self._new_root = new_roots[0]
241
old_new_root = new_roots[0]
242
# unversion the new root's directory.
243
if self.final_kind(self._new_root) is None:
244
file_id = self.final_file_id(old_new_root)
246
file_id = self.final_file_id(self._new_root)
247
if old_new_root in self._new_id:
248
self.cancel_versioning(old_new_root)
250
self.unversion_file(old_new_root)
251
# if, at this stage, root still has an old file_id, zap it so we can
252
# stick a new one in.
253
if (self.tree_file_id(self._new_root) is not None and
254
self._new_root not in self._removed_id):
255
self.unversion_file(self._new_root)
256
if file_id is not None:
257
self.version_file(file_id, self._new_root)
259
# Now move children of new root into old root directory.
260
# Ensure all children are registered with the transaction, but don't
261
# use directly-- some tree children have new parents
262
list(self.iter_tree_children(old_new_root))
263
# Move all children of new root into old root directory.
264
for child in self.by_parent().get(old_new_root, []):
265
self.adjust_path(self.final_name(child), self._new_root, child)
267
# Ensure old_new_root has no directory.
268
if old_new_root in self._new_contents:
269
self.cancel_creation(old_new_root)
271
self.delete_contents(old_new_root)
273
# prevent deletion of root directory.
274
if self._new_root in self._removed_contents:
275
self.cancel_deletion(self._new_root)
277
# destroy path info for old_new_root.
278
del self._new_parent[old_new_root]
279
del self._new_name[old_new_root]
281
205
def trans_id_tree_file_id(self, inventory_id):
282
206
"""Determine the transaction id of a working tree file.
394
317
return sorted(FinalPaths(self).get_paths(new_ids))
396
319
def _inventory_altered(self):
397
"""Determine which trans_ids need new Inventory entries.
399
An new entry is needed when anything that would be reflected by an
400
inventory entry changes, including file name, file_id, parent file_id,
401
file kind, and the execute bit.
403
Some care is taken to return entries with real changes, not cases
404
where the value is deleted and then restored to its original value,
405
but some actually unchanged values may be returned.
407
:returns: A list of (path, trans_id) for all items requiring an
408
inventory change. Ordered by path.
411
# Find entries whose file_ids are new (or changed).
412
new_file_id = set(t for t in self._new_id
413
if self._new_id[t] != self.tree_file_id(t))
414
for id_set in [self._new_name, self._new_parent, new_file_id,
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,
415
323
self._new_executability]:
416
changed_ids.update(id_set)
417
# removing implies a kind change
324
new_ids.update(id_set)
418
325
changed_kind = set(self._removed_contents)
420
326
changed_kind.intersection_update(self._new_contents)
421
# Ignore entries that are already known to have changed.
422
changed_kind.difference_update(changed_ids)
423
# to keep only the truly changed ones
424
changed_kind = (t for t in changed_kind
425
if self.tree_kind(t) != self.final_kind(t))
426
# all kind changes will alter the inventory
427
changed_ids.update(changed_kind)
428
# To find entries with changed parent_ids, find parents which existed,
429
# but changed file_id.
430
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
431
# Now add all their children to the set.
432
for parent_trans_id in new_file_id:
433
changed_ids.update(self.iter_tree_children(parent_trans_id))
434
return sorted(FinalPaths(self).get_paths(changed_ids))
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))
436
333
def final_kind(self, trans_id):
437
334
"""Determine the final file kind, after any changes applied.
439
:return: None if the file does not exist/has no contents. (It is
440
conceivable that a path would be created without the corresponding
441
contents insertion command)
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)
443
340
if trans_id in self._new_contents:
444
341
return self._new_contents[trans_id]
445
342
elif trans_id in self._removed_contents:
343
raise NoSuchFile(None)
448
345
return self.tree_kind(trans_id)
573
468
# ensure that all children are registered with the transaction
574
469
list(self.iter_tree_children(parent_id))
576
@deprecated_method(deprecated_in((2, 3, 0)))
577
471
def has_named_child(self, by_parent, parent_id, name):
578
return self._has_named_child(
579
name, parent_id, known_children=by_parent.get(parent_id, []))
581
def _has_named_child(self, name, parent_id, known_children):
582
"""Does a parent already have a name child.
584
:param name: The searched for name.
586
:param parent_id: The parent for which the check is made.
588
:param known_children: The already known children. This should have
589
been recently obtained from `self.by_parent.get(parent_id)`
590
(or will be if None is passed).
592
if known_children is None:
593
known_children = self.by_parent().get(parent_id, [])
594
for child in known_children:
473
children = by_parent[parent_id]
476
for child in children:
595
477
if self.final_name(child) == name:
597
parent_path = self._tree_id_paths.get(parent_id, None)
598
if parent_path is None:
599
# No parent... no children
480
path = self._tree_id_paths[parent_id]
601
child_path = joinpath(parent_path, name)
602
child_id = self._tree_path_ids.get(child_path, None)
483
childpath = joinpath(path, name)
484
child_id = self._tree_path_ids.get(childpath)
603
485
if child_id is None:
604
# Not known by the tree transform yet, check the filesystem
605
return osutils.lexists(self._tree.abspath(child_path))
486
return lexists(self._tree.abspath(childpath))
607
raise AssertionError('child_id is missing: %s, %s, %s'
608
% (name, parent_id, child_id))
610
def _available_backup_name(self, name, target_id):
611
"""Find an available backup name.
613
:param name: The basename of the file.
615
:param target_id: The directory trans_id where the backup should
618
known_children = self.by_parent().get(target_id, [])
619
return osutils.available_backup_name(
621
lambda base: self._has_named_child(
622
base, target_id, known_children))
488
if self.final_parent(child_id) != parent_id:
490
if child_id in self._removed_contents:
491
# XXX What about dangling file-ids?
624
496
def _parent_loops(self):
625
497
"""No entry should be its own ancestor"""
702
581
if (self._new_name, self._new_parent) == ({}, {}):
704
583
for children in by_parent.itervalues():
706
for child_tid in children:
707
name = self.final_name(child_tid)
709
# Keep children only if they still exist in the end
710
if not self._case_sensitive_target:
712
name_ids.append((name, child_tid))
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]
715
589
last_trans_id = None
716
590
for name, trans_id in name_ids:
717
kind = self.final_kind(trans_id)
592
kind = self.final_kind(trans_id)
718
595
file_id = self.final_file_id(trans_id)
719
596
if kind is None and file_id is None:
741
618
def _parent_type_conflicts(self, by_parent):
742
"""Children must have a directory parent"""
619
"""parents must have directory 'contents'."""
744
621
for parent_id, children in by_parent.iteritems():
745
622
if parent_id is ROOT_PARENT:
748
for child_id in children:
749
if self.final_kind(child_id) is not None:
624
if not self._any_contents(children):
754
# There is at least a child, so we need an existing directory to
756
kind = self.final_kind(parent_id)
626
for child in children:
628
self.final_kind(child)
632
kind = self.final_kind(parent_id)
758
# The directory will be deleted
759
636
conflicts.append(('missing parent', parent_id))
760
637
elif kind != "directory":
761
# Meh, we need a *directory* to put something in it
762
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)
765
651
def _set_executability(self, path, trans_id):
766
652
"""Set the executability of versioned files """
767
653
if supports_executable():
831
717
self.create_symlink(target, trans_id)
834
def new_orphan(self, trans_id, parent_id):
835
"""Schedule an item to be orphaned.
837
When a directory is about to be removed, its children, if they are not
838
versioned are moved out of the way: they don't have a parent anymore.
840
:param trans_id: The trans_id of the existing item.
841
:param parent_id: The parent trans_id of the item.
843
raise NotImplementedError(self.new_orphan)
845
def _get_potential_orphans(self, dir_id):
846
"""Find the potential orphans in a directory.
848
A directory can't be safely deleted if there are versioned files in it.
849
If all the contained files are unversioned then they can be orphaned.
851
The 'None' return value means that the directory contains at least one
852
versioned file and should not be deleted.
854
:param dir_id: The directory trans id.
856
:return: A list of the orphan trans ids or None if at least one
857
versioned file is present.
860
# Find the potential orphans, stop if one item should be kept
861
for child_tid in self.by_parent()[dir_id]:
862
if child_tid in self._removed_contents:
863
# The child is removed as part of the transform. Since it was
864
# versioned before, it's not an orphan
866
elif self.final_file_id(child_tid) is None:
867
# The child is not versioned
868
orphans.append(child_tid)
870
# We have a versioned file here, searching for orphans is
876
720
def _affected_ids(self):
877
721
"""Return the set of transform ids affected by the transform"""
878
722
trans_ids = set(self._removed_id)
1018
865
return _PreviewTree(self)
1020
def commit(self, branch, message, merge_parents=None, strict=False,
1021
timestamp=None, timezone=None, committer=None, authors=None,
1022
revprops=None, revision_id=None):
867
def commit(self, branch, message, merge_parents=None, strict=False):
1023
868
"""Commit the result of this TreeTransform to a branch.
1025
870
:param branch: The branch to commit to.
1026
871
:param message: The message to attach to the commit.
1027
:param merge_parents: Additional parent revision-ids specified by
1029
:param strict: If True, abort the commit if there are unversioned
1031
:param timestamp: if not None, seconds-since-epoch for the time and
1032
date. (May be a float.)
1033
:param timezone: Optional timezone for timestamp, as an offset in
1035
:param committer: Optional committer in email-id format.
1036
(e.g. "J Random Hacker <jrandom@example.com>")
1037
:param authors: Optional list of authors in email-id format.
1038
:param revprops: Optional dictionary of revision properties.
1039
:param revision_id: Optional revision id. (Specifying a revision-id
1040
may reduce performance for some non-native formats.)
872
:param merge_parents: Additional parents specified by pending merges.
1041
873
:return: The revision_id of the revision committed.
1043
875
self._check_malformed()
1174
1000
class DiskTreeTransform(TreeTransformBase):
1175
1001
"""Tree transform storing its contents on disk."""
1177
def __init__(self, tree, limbodir, pb=None,
1003
def __init__(self, tree, limbodir, pb=DummyProgress(),
1178
1004
case_sensitive=True):
1179
1005
"""Constructor.
1180
1006
:param tree: The tree that will be transformed, but not necessarily
1181
1007
the output tree.
1182
1008
:param limbodir: A directory where new files can be stored until
1183
1009
they are installed in their proper places
1010
:param pb: A ProgressBar indicating how much progress is being made
1185
1011
:param case_sensitive: If True, the target of the transform is
1186
1012
case sensitive, not just case preserving.
1295
1107
descendants.update(self._limbo_descendants(descendant))
1296
1108
return descendants
1298
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1110
def create_file(self, contents, trans_id, mode_id=None):
1299
1111
"""Schedule creation of a new file.
1303
:param contents: an iterator of strings, all of which will be written
1304
to the target destination.
1305
:param trans_id: TreeTransform handle
1306
:param mode_id: If not None, force the mode of the target file to match
1307
the mode of the object referenced by mode_id.
1308
Otherwise, we will try to preserve mode bits of an existing file.
1309
:param sha1: If the sha1 of this content is already known, pass it in.
1310
We can use it to prevent future sha1 computations.
1115
Contents is an iterator of strings, all of which will be written
1116
to the target destination.
1118
New file takes the permissions of any existing file with that id,
1119
unless mode_id is specified.
1312
1121
name = self._limbo_name(trans_id)
1313
1122
f = open(name, 'wb')
1315
unique_add(self._new_contents, trans_id, 'file')
1125
unique_add(self._new_contents, trans_id, 'file')
1127
# Clean up the file, it never got registered so
1128
# TreeTransform.finalize() won't clean it up.
1316
1133
f.writelines(contents)
1319
self._set_mtime(name)
1320
1136
self._set_mode(trans_id, mode_id, S_ISREG)
1321
# It is unfortunate we have to use lstat instead of fstat, but we just
1322
# used utime and chmod on the file, so we need the accurate final
1324
if sha1 is not None:
1325
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1327
1138
def _read_file_chunks(self, trans_id):
1328
1139
cur_file = open(self._limbo_name(trans_id), 'rb')
1398
1198
del self._limbo_children_names[trans_id]
1399
1199
delete_any(self._limbo_name(trans_id))
1401
def new_orphan(self, trans_id, parent_id):
1402
# FIXME: There is no tree config, so we use the branch one (it's weird
1403
# to define it this way as orphaning can only occur in a working tree,
1404
# but that's all we have (for now). It will find the option in
1405
# locations.conf or bazaar.conf though) -- vila 20100916
1406
conf = self._tree.branch.get_config()
1407
conf_var_name = 'bzr.transform.orphan_policy'
1408
orphan_policy = conf.get_user_option(conf_var_name)
1409
default_policy = orphaning_registry.default_key
1410
if orphan_policy is None:
1411
orphan_policy = default_policy
1412
if orphan_policy not in orphaning_registry:
1413
trace.warning('%s (from %s) is not a known policy, defaulting '
1414
'to %s' % (orphan_policy, conf_var_name, default_policy))
1415
orphan_policy = default_policy
1416
handle_orphan = orphaning_registry.get(orphan_policy)
1417
handle_orphan(self, trans_id, parent_id)
1420
class OrphaningError(errors.BzrError):
1422
# Only bugs could lead to such exception being seen by the user
1423
internal_error = True
1424
_fmt = "Error while orphaning %s in %s directory"
1426
def __init__(self, orphan, parent):
1427
errors.BzrError.__init__(self)
1428
self.orphan = orphan
1429
self.parent = parent
1432
class OrphaningForbidden(OrphaningError):
1434
_fmt = "Policy: %s doesn't allow creating orphans."
1436
def __init__(self, policy):
1437
errors.BzrError.__init__(self)
1438
self.policy = policy
1441
def move_orphan(tt, orphan_id, parent_id):
1442
"""See TreeTransformBase.new_orphan.
1444
This creates a new orphan in the `bzr-orphans` dir at the root of the
1447
:param tt: The TreeTransform orphaning `trans_id`.
1449
:param orphan_id: The trans id that should be orphaned.
1451
:param parent_id: The orphan parent trans id.
1453
# Add the orphan dir if it doesn't exist
1454
orphan_dir_basename = 'bzr-orphans'
1455
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1456
if tt.final_kind(od_id) is None:
1457
tt.create_directory(od_id)
1458
parent_path = tt._tree_id_paths[parent_id]
1459
# Find a name that doesn't exist yet in the orphan dir
1460
actual_name = tt.final_name(orphan_id)
1461
new_name = tt._available_backup_name(actual_name, od_id)
1462
tt.adjust_path(new_name, od_id, orphan_id)
1463
trace.warning('%s has been orphaned in %s'
1464
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1467
def refuse_orphan(tt, orphan_id, parent_id):
1468
"""See TreeTransformBase.new_orphan.
1470
This refuses to create orphan, letting the caller handle the conflict.
1472
raise OrphaningForbidden('never')
1475
orphaning_registry = registry.Registry()
1476
orphaning_registry.register(
1477
'conflict', refuse_orphan,
1478
'Leave orphans in place and create a conflict on the directory.')
1479
orphaning_registry.register(
1480
'move', move_orphan,
1481
'Move orphans into the bzr-orphans directory.')
1482
orphaning_registry._set_default_key('conflict')
1485
1202
class TreeTransform(DiskTreeTransform):
1486
1203
"""Represent a tree transformation.
1829
1547
tree_paths = list(self._tree_path_ids.iteritems())
1830
1548
tree_paths.sort(reverse=True)
1831
child_pb = ui.ui_factory.nested_progress_bar()
1549
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1833
for num, (path, trans_id) in enumerate(tree_paths):
1834
# do not attempt to move root into a subdirectory of itself.
1837
child_pb.update(gettext('removing file'), num, len(tree_paths))
1551
for num, data in enumerate(tree_paths):
1552
path, trans_id = data
1553
child_pb.update('removing file', num, len(tree_paths))
1838
1554
full_path = self._tree.abspath(path)
1839
1555
if trans_id in self._removed_contents:
1840
delete_path = os.path.join(self._deletiondir, trans_id)
1841
mover.pre_delete(full_path, delete_path)
1842
elif (trans_id in self._new_name
1843
or trans_id in self._new_parent):
1556
mover.pre_delete(full_path, os.path.join(self._deletiondir,
1558
elif trans_id in self._new_name or trans_id in \
1845
1561
mover.rename(full_path, self._limbo_name(trans_id))
1846
except errors.TransformRenameFailed, e:
1847
1563
if e.errno != errno.ENOENT:
1865
1581
modified_paths = []
1866
1582
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1868
child_pb = ui.ui_factory.nested_progress_bar()
1584
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1870
1586
for num, (path, trans_id) in enumerate(new_paths):
1871
1587
if (num % 10) == 0:
1872
child_pb.update(gettext('adding file'), num, len(new_paths))
1588
child_pb.update('adding file', num, len(new_paths))
1873
1589
full_path = self._tree.abspath(path)
1874
1590
if trans_id in self._needs_rename:
1876
1592
mover.rename(self._limbo_name(trans_id), full_path)
1877
except errors.TransformRenameFailed, e:
1878
1594
# We may be renaming a dangling inventory id
1879
1595
if e.errno != errno.ENOENT:
1882
1598
self.rename_count += 1
1883
# TODO: if trans_id in self._observed_sha1s, we should
1884
# re-stat the final target, since ctime will be
1885
# updated by the change.
1886
1599
if (trans_id in self._new_contents or
1887
1600
self.path_changed(trans_id)):
1888
1601
if trans_id in self._new_contents:
1889
1602
modified_paths.append(full_path)
1890
1603
if trans_id in self._new_executability:
1891
1604
self._set_executability(path, trans_id)
1892
if trans_id in self._observed_sha1s:
1893
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1894
st = osutils.lstat(full_path)
1895
self._observed_sha1s[trans_id] = (o_sha1, st)
1897
1606
child_pb.finished()
1898
for path, trans_id in new_paths:
1899
# new_paths includes stuff like workingtree conflicts. Only the
1900
# stuff in new_contents actually comes from limbo.
1901
if trans_id in self._limbo_files:
1902
del self._limbo_files[trans_id]
1903
1607
self._new_contents.clear()
1904
1608
return modified_paths
1906
def _apply_observed_sha1s(self):
1907
"""After we have finished renaming everything, update observed sha1s
1909
This has to be done after self._tree.apply_inventory_delta, otherwise
1910
it doesn't know anything about the files we are updating. Also, we want
1911
to do this as late as possible, so that most entries end up cached.
1913
# TODO: this doesn't update the stat information for directories. So
1914
# the first 'bzr status' will still need to rewrite
1915
# .bzr/checkout/dirstate. However, we at least don't need to
1916
# re-read all of the files.
1917
# TODO: If the operation took a while, we could do a time.sleep(3) here
1918
# to allow the clock to tick over and ensure we won't have any
1919
# problems. (we could observe start time, and finish time, and if
1920
# it is less than eg 10% overhead, add a sleep call.)
1921
paths = FinalPaths(self)
1922
for trans_id, observed in self._observed_sha1s.iteritems():
1923
path = paths.get_path(trans_id)
1924
# We could get the file_id, but dirstate prefers to use the path
1925
# anyway, and it is 'cheaper' to determine.
1926
# file_id = self._new_id[trans_id]
1927
self._tree._observed_sha1(None, path, observed)
1930
1611
class TransformPreview(DiskTreeTransform):
1931
1612
"""A TreeTransform for generating preview trees.
2015
1691
yield self._get_repository().revision_tree(revision_id)
2017
1693
def _get_file_revision(self, file_id, vf, tree_revision):
2018
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1694
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2019
1695
self._iter_parent_trees()]
2020
1696
vf.add_lines((file_id, tree_revision), parent_keys,
2021
self.get_file_lines(file_id))
1697
self.get_file(file_id).readlines())
2022
1698
repo = self._get_repository()
2023
1699
base_vf = repo.texts
2024
1700
if base_vf not in vf.fallback_versionedfiles:
2025
1701
vf.fallback_versionedfiles.append(base_vf)
2026
1702
return tree_revision
2028
def _stat_limbo_file(self, file_id=None, trans_id=None):
2029
if trans_id is None:
2030
trans_id = self._transform.trans_id_file_id(file_id)
1704
def _stat_limbo_file(self, file_id):
1705
trans_id = self._transform.trans_id_file_id(file_id)
2031
1706
name = self._transform._limbo_name(trans_id)
2032
1707
return os.lstat(name)
2249
1922
def get_file_size(self, file_id):
2250
1923
"""See Tree.get_file_size"""
2251
trans_id = self._transform.trans_id_file_id(file_id)
2252
kind = self._transform.final_kind(trans_id)
2255
if trans_id in self._transform._new_contents:
2256
return self._stat_limbo_file(trans_id=trans_id).st_size
2257
1924
if self.kind(file_id) == 'file':
2258
1925
return self._transform._tree.get_file_size(file_id)
2262
def get_file_verifier(self, file_id, path=None, stat_value=None):
2263
trans_id = self._transform.trans_id_file_id(file_id)
2264
kind = self._transform._new_contents.get(trans_id)
2266
return self._transform._tree.get_file_verifier(file_id)
2268
fileobj = self.get_file(file_id)
2270
return ("SHA1", sha_file(fileobj))
2274
1929
def get_file_sha1(self, file_id, path=None, stat_value=None):
2275
1930
trans_id = self._transform.trans_id_file_id(file_id)
2276
1931
kind = self._transform._new_contents.get(trans_id)
2573
2222
precomputed_delta = []
2575
2224
precomputed_delta = None
2576
# Check if tree inventory has content. If so, we populate
2577
# existing_files with the directory content. If there are no
2578
# entries we skip populating existing_files as its not used.
2579
# This improves performance and unncessary work on large
2580
# directory trees. (#501307)
2582
existing_files = set()
2583
for dir, files in wt.walkdirs():
2584
existing_files.update(f[0] for f in files)
2585
2225
for num, (tree_path, entry) in \
2586
2226
enumerate(tree.inventory.iter_entries_by_dir()):
2587
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2227
pb.update("Building tree", num - len(deferred_contents), total)
2588
2228
if entry.parent_id is None:
2590
2230
reparent = False
2668
2308
unchanged = dict(unchanged)
2669
2309
new_desired_files = []
2671
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2311
for file_id, (trans_id, tree_path) in desired_files:
2672
2312
accelerator_path = unchanged.get(file_id)
2673
2313
if accelerator_path is None:
2674
new_desired_files.append((file_id,
2675
(trans_id, tree_path, text_sha1)))
2314
new_desired_files.append((file_id, (trans_id, tree_path)))
2677
pb.update(gettext('Adding file contents'), count + offset, total)
2316
pb.update('Adding file contents', count + offset, total)
2679
2318
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2696
2335
offset += count
2697
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2336
for count, ((trans_id, tree_path), contents) in enumerate(
2698
2337
tree.iter_files_bytes(new_desired_files)):
2699
2338
if wt.supports_content_filtering():
2700
2339
filters = wt._content_filter_stack(tree_path)
2701
2340
contents = filtered_output_bytes(contents, filters,
2702
2341
ContentFilterContext(tree_path, tree))
2703
tt.create_file(contents, trans_id, sha1=text_sha1)
2704
pb.update(gettext('Adding file contents'), count + offset, total)
2342
tt.create_file(contents, trans_id)
2343
pb.update('Adding file contents', count + offset, total)
2707
2346
def _reparent_children(tt, old_parent, new_parent):
2708
2347
for child in tt.iter_tree_children(old_parent):
2709
2348
tt.adjust_path(tt.final_name(child), new_parent, child)
2712
2350
def _reparent_transform_children(tt, old_parent, new_parent):
2713
2351
by_parent = tt.by_parent()
2714
2352
for child in by_parent[old_parent]:
2715
2353
tt.adjust_path(tt.final_name(child), new_parent, child)
2716
2354
return by_parent[old_parent]
2719
2356
def _content_match(tree, entry, file_id, kind, target_path):
2720
2357
if entry.kind != kind:
2722
2359
if entry.kind == "directory":
2724
2361
if entry.kind == "file":
2725
f = file(target_path, 'rb')
2727
if tree.get_file_text(file_id) == f.read():
2362
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2731
2364
elif entry.kind == "symlink":
2732
2365
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2785
2418
raise errors.BadFileKindError(name, kind)
2421
@deprecated_function(deprecated_in((1, 9, 0)))
2422
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2423
"""Create new file contents according to an inventory entry.
2425
DEPRECATED. Use create_from_tree instead.
2427
if entry.kind == "file":
2429
lines = tree.get_file(entry.file_id).readlines()
2430
tt.create_file(lines, trans_id, mode_id=mode_id)
2431
elif entry.kind == "symlink":
2432
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2433
elif entry.kind == "directory":
2434
tt.create_directory(trans_id)
2788
2437
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2789
2438
filter_tree_path=None):
2790
2439
"""Create new file contents according to tree contents.
2932
2576
deferred_files = []
2933
2577
for id_num, (file_id, path, changed_content, versioned, parent, name,
2934
2578
kind, executable) in enumerate(change_list):
2935
target_path, wt_path = path
2936
target_versioned, wt_versioned = versioned
2937
target_parent, wt_parent = parent
2938
target_name, wt_name = name
2939
target_kind, wt_kind = kind
2940
target_executable, wt_executable = executable
2941
if skip_root and wt_parent is None:
2579
if skip_root and file_id[0] is not None and parent[0] is None:
2943
2581
trans_id = tt.trans_id_file_id(file_id)
2945
2583
if changed_content:
2946
2584
keep_content = False
2947
if wt_kind == 'file' and (backups or target_kind is None):
2585
if kind[0] == 'file' and (backups or kind[1] is None):
2948
2586
wt_sha1 = working_tree.get_file_sha1(file_id)
2949
2587
if merge_modified.get(file_id) != wt_sha1:
2950
2588
# acquire the basis tree lazily to prevent the
2953
2591
if basis_tree is None:
2954
2592
basis_tree = working_tree.basis_tree()
2955
2593
basis_tree.lock_read()
2956
if basis_tree.has_id(file_id):
2594
if file_id in basis_tree:
2957
2595
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2958
2596
keep_content = True
2959
elif target_kind is None and not target_versioned:
2597
elif kind[1] is None and not versioned[1]:
2960
2598
keep_content = True
2961
if wt_kind is not None:
2599
if kind[0] is not None:
2962
2600
if not keep_content:
2963
2601
tt.delete_contents(trans_id)
2964
elif target_kind is not None:
2965
parent_trans_id = tt.trans_id_file_id(wt_parent)
2966
backup_name = tt._available_backup_name(
2967
wt_name, parent_trans_id)
2602
elif kind[1] is not None:
2603
parent_trans_id = tt.trans_id_file_id(parent[0])
2604
by_parent = tt.by_parent()
2605
backup_name = _get_backup_name(name[0], by_parent,
2606
parent_trans_id, tt)
2968
2607
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2969
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2970
if wt_versioned and target_versioned:
2608
new_trans_id = tt.create_path(name[0], parent_trans_id)
2609
if versioned == (True, True):
2971
2610
tt.unversion_file(trans_id)
2972
2611
tt.version_file(file_id, new_trans_id)
2973
2612
# New contents should have the same unix perms as old
2975
2614
mode_id = trans_id
2976
2615
trans_id = new_trans_id
2977
if target_kind in ('directory', 'tree-reference'):
2616
if kind[1] in ('directory', 'tree-reference'):
2978
2617
tt.create_directory(trans_id)
2979
if target_kind == 'tree-reference':
2618
if kind[1] == 'tree-reference':
2980
2619
revision = target_tree.get_reference_revision(file_id,
2982
2621
tt.set_tree_reference(revision, trans_id)
2983
elif target_kind == 'symlink':
2622
elif kind[1] == 'symlink':
2984
2623
tt.create_symlink(target_tree.get_symlink_target(file_id),
2986
elif target_kind == 'file':
2625
elif kind[1] == 'file':
2987
2626
deferred_files.append((file_id, (trans_id, mode_id)))
2988
2627
if basis_tree is None:
2989
2628
basis_tree = working_tree.basis_tree()
2990
2629
basis_tree.lock_read()
2991
2630
new_sha1 = target_tree.get_file_sha1(file_id)
2992
if (basis_tree.has_id(file_id) and
2993
new_sha1 == basis_tree.get_file_sha1(file_id)):
2631
if (file_id in basis_tree and new_sha1 ==
2632
basis_tree.get_file_sha1(file_id)):
2994
2633
if file_id in merge_modified:
2995
2634
del merge_modified[file_id]
2997
2636
merge_modified[file_id] = new_sha1
2999
2638
# preserve the execute bit when backing up
3000
if keep_content and wt_executable == target_executable:
3001
tt.set_executability(target_executable, trans_id)
3002
elif target_kind is not None:
3003
raise AssertionError(target_kind)
3004
if not wt_versioned and target_versioned:
2639
if keep_content and executable[0] == executable[1]:
2640
tt.set_executability(executable[1], trans_id)
2641
elif kind[1] is not None:
2642
raise AssertionError(kind[1])
2643
if versioned == (False, True):
3005
2644
tt.version_file(file_id, trans_id)
3006
if wt_versioned and not target_versioned:
2645
if versioned == (True, False):
3007
2646
tt.unversion_file(trans_id)
3008
if (target_name is not None and
3009
(wt_name != target_name or wt_parent != target_parent)):
3010
if target_name == '' and target_parent is None:
2647
if (name[1] is not None and
2648
(name[0] != name[1] or parent[0] != parent[1])):
2649
if name[1] == '' and parent[1] is None:
3011
2650
parent_trans = ROOT_PARENT
3013
parent_trans = tt.trans_id_file_id(target_parent)
3014
if wt_parent is None and wt_versioned:
3015
tt.adjust_root_path(target_name, parent_trans)
3017
tt.adjust_path(target_name, parent_trans, trans_id)
3018
if wt_executable != target_executable and target_kind == "file":
3019
tt.set_executability(target_executable, trans_id)
2652
parent_trans = tt.trans_id_file_id(parent[1])
2653
tt.adjust_path(name[1], parent_trans, trans_id)
2654
if executable[0] != executable[1] and kind[1] == "file":
2655
tt.set_executability(executable[1], trans_id)
3020
2656
if working_tree.supports_content_filtering():
3021
2657
for index, ((trans_id, mode_id), bytes) in enumerate(
3022
2658
target_tree.iter_files_bytes(deferred_files)):
3033
2669
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3034
2670
deferred_files):
3035
2671
tt.create_file(bytes, trans_id, mode_id)
3036
tt.fixup_new_roots()
3038
2673
if basis_tree is not None:
3039
2674
basis_tree.unlock()
3040
2675
return merge_modified
3043
def resolve_conflicts(tt, pb=None, pass_func=None):
2678
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
3044
2679
"""Make many conflict-resolution attempts, but die if they fail"""
3045
2680
if pass_func is None:
3046
2681
pass_func = conflict_pass
3047
2682
new_conflicts = set()
3048
pb = ui.ui_factory.nested_progress_bar()
3050
2684
for n in range(10):
3051
pb.update(gettext('Resolution pass'), n+1, 10)
2685
pb.update('Resolution pass', n+1, 10)
3052
2686
conflicts = tt.find_conflicts()
3053
2687
if len(conflicts) == 0:
3054
2688
return new_conflicts
3055
2689
new_conflicts.update(pass_func(tt, conflicts))
3056
2690
raise MalformedTransform(conflicts=conflicts)
3061
2695
def conflict_pass(tt, conflicts, path_tree=None):
3094
2728
elif c_type == 'missing parent':
3095
2729
trans_id = conflict[1]
3096
if trans_id in tt._removed_contents:
3097
cancel_deletion = True
3098
orphans = tt._get_potential_orphans(trans_id)
3100
cancel_deletion = False
3101
# All children are orphans
3104
tt.new_orphan(o, trans_id)
3105
except OrphaningError:
3106
# Something bad happened so we cancel the directory
3107
# deletion which will leave it in place with a
3108
# conflict. The user can deal with it from there.
3109
# Note that this also catch the case where we don't
3110
# want to create orphans and leave the directory in
3112
cancel_deletion = True
3115
# Cancel the directory deletion
3116
tt.cancel_deletion(trans_id)
3117
new_conflicts.add(('deleting parent', 'Not deleting',
2731
tt.cancel_deletion(trans_id)
2732
new_conflicts.add(('deleting parent', 'Not deleting',
3122
2737
tt.final_name(trans_id)
3183
2798
modified_path = fp.get_path(conflict[2])
3184
2799
modified_id = tt.final_file_id(conflict[2])
3185
2800
if len(conflict) == 3:
3186
yield conflicts.Conflict.factory(
3187
c_type, action=action, path=modified_path, file_id=modified_id)
2801
yield Conflict.factory(c_type, action=action, path=modified_path,
2802
file_id=modified_id)
3190
2805
conflicting_path = fp.get_path(conflict[3])
3191
2806
conflicting_id = tt.final_file_id(conflict[3])
3192
yield conflicts.Conflict.factory(
3193
c_type, action=action, path=modified_path,
3194
file_id=modified_id,
3195
conflict_path=conflicting_path,
3196
conflict_file_id=conflicting_id)
2807
yield Conflict.factory(c_type, action=action, path=modified_path,
2808
file_id=modified_id,
2809
conflict_path=conflicting_path,
2810
conflict_file_id=conflicting_id)
3199
2813
class _FileMover(object):
3204
2818
self.pending_deletions = []
3206
2820
def rename(self, from_, to):
3207
"""Rename a file from one path to another."""
2821
"""Rename a file from one path to another. Functions like os.rename"""
3209
2823
os.rename(from_, to)
3210
2824
except OSError, e:
3211
2825
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3212
2826
raise errors.FileExists(to, str(e))
3213
# normal OSError doesn't include filenames so it's hard to see where
3214
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3215
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
3216
2828
self.past_renames.append((from_, to))
3218
2830
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
