14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
34
43
revision as _mod_revision,
47
from breezy.i18n import gettext
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
49
from .errors import (DuplicateKey, MalformedTransform,
39
50
ReusingTransform, CantMoveRoot,
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
51
ImmortalLimbo, NoFinalPath,
41
52
UnableCreateSymlink)
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
44
from bzrlib.osutils import (
53
from .filters import filtered_output_bytes, ContentFilterContext
54
from .mutabletree import MutableTree
55
from .osutils import (
54
from bzrlib.progress import ProgressPhase
55
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
63
from .progress import ProgressPhase
65
70
ROOT_PARENT = "root-parent"
68
72
def unique_add(map, key, value):
70
74
raise DuplicateKey(key=key)
74
79
class _TransformResults(object):
75
80
def __init__(self, modified_paths, rename_count):
76
81
object.__init__(self)
381
397
return sorted(FinalPaths(self).get_paths(new_ids))
383
399
def _inventory_altered(self):
384
"""Get the trans_ids and paths of files needing new inv entries."""
386
for id_set in [self._new_name, self._new_parent, self._new_id,
400
"""Determine which trans_ids need new Inventory entries.
402
An new entry is needed when anything that would be reflected by an
403
inventory entry changes, including file name, file_id, parent file_id,
404
file kind, and the execute bit.
406
Some care is taken to return entries with real changes, not cases
407
where the value is deleted and then restored to its original value,
408
but some actually unchanged values may be returned.
410
:returns: A list of (path, trans_id) for all items requiring an
411
inventory change. Ordered by path.
414
# Find entries whose file_ids are new (or changed).
415
new_file_id = set(t for t in self._new_id
416
if self._new_id[t] != self.tree_file_id(t))
417
for id_set in [self._new_name, self._new_parent, new_file_id,
387
418
self._new_executability]:
388
new_ids.update(id_set)
419
changed_ids.update(id_set)
420
# removing implies a kind change
389
421
changed_kind = set(self._removed_contents)
390
423
changed_kind.intersection_update(self._new_contents)
391
changed_kind.difference_update(new_ids)
392
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
394
new_ids.update(changed_kind)
395
return sorted(FinalPaths(self).get_paths(new_ids))
424
# Ignore entries that are already known to have changed.
425
changed_kind.difference_update(changed_ids)
426
# to keep only the truly changed ones
427
changed_kind = (t for t in changed_kind
428
if self.tree_kind(t) != self.final_kind(t))
429
# all kind changes will alter the inventory
430
changed_ids.update(changed_kind)
431
# To find entries with changed parent_ids, find parents which existed,
432
# but changed file_id.
433
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
434
# Now add all their children to the set.
435
for parent_trans_id in new_file_id:
436
changed_ids.update(self.iter_tree_children(parent_trans_id))
437
return sorted(FinalPaths(self).get_paths(changed_ids))
397
439
def final_kind(self, trans_id):
398
440
"""Determine the final file kind, after any changes applied.
400
Raises NoSuchFile if the file does not exist/has no contents.
401
(It is conceivable that a path would be created without the
402
corresponding contents insertion command)
442
:return: None if the file does not exist/has no contents. (It is
443
conceivable that a path would be created without the corresponding
444
contents insertion command)
404
446
if trans_id in self._new_contents:
405
447
return self._new_contents[trans_id]
406
448
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
451
return self.tree_kind(trans_id)
532
574
# ensure that all children are registered with the transaction
533
575
list(self.iter_tree_children(parent_id))
535
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
577
def _has_named_child(self, name, parent_id, known_children):
578
"""Does a parent already have a name child.
580
:param name: The searched for name.
582
:param parent_id: The parent for which the check is made.
584
:param known_children: The already known children. This should have
585
been recently obtained from `self.by_parent.get(parent_id)`
586
(or will be if None is passed).
588
if known_children is None:
589
known_children = self.by_parent().get(parent_id, [])
590
for child in known_children:
541
591
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
593
parent_path = self._tree_id_paths.get(parent_id, None)
594
if parent_path is None:
595
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
597
child_path = joinpath(parent_path, name)
598
child_id = self._tree_path_ids.get(child_path, None)
549
599
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
600
# Not known by the tree transform yet, check the filesystem
601
return osutils.lexists(self._tree.abspath(child_path))
552
if self.final_parent(child_id) != parent_id:
554
if child_id in self._removed_contents:
555
# XXX What about dangling file-ids?
603
raise AssertionError('child_id is missing: %s, %s, %s'
604
% (name, parent_id, child_id))
606
def _available_backup_name(self, name, target_id):
607
"""Find an available backup name.
609
:param name: The basename of the file.
611
:param target_id: The directory trans_id where the backup should
614
known_children = self.by_parent().get(target_id, [])
615
return osutils.available_backup_name(
617
lambda base: self._has_named_child(
618
base, target_id, known_children))
560
620
def _parent_loops(self):
561
621
"""No entry should be its own ancestor"""
645
698
if (self._new_name, self._new_parent) == ({}, {}):
647
for children in by_parent.itervalues():
648
name_ids = [(self.final_name(t), t) for t in children]
649
if not self._case_sensitive_target:
650
name_ids = [(n.lower(), t) for n, t in name_ids]
700
for children in viewvalues(by_parent):
702
for child_tid in children:
703
name = self.final_name(child_tid)
705
# Keep children only if they still exist in the end
706
if not self._case_sensitive_target:
708
name_ids.append((name, child_tid))
653
711
last_trans_id = None
654
712
for name, trans_id in name_ids:
656
kind = self.final_kind(trans_id)
713
kind = self.final_kind(trans_id)
659
714
file_id = self.final_file_id(trans_id)
660
715
if kind is None and file_id is None:
673
728
self._removed_id))
674
729
all_ids = self._tree.all_file_ids()
675
730
active_tree_ids = all_ids.difference(removed_tree_ids)
676
for trans_id, file_id in self._new_id.iteritems():
731
for trans_id, file_id in viewitems(self._new_id):
677
732
if file_id in active_tree_ids:
678
733
old_trans_id = self.trans_id_tree_file_id(file_id)
679
734
conflicts.append(('duplicate id', old_trans_id, trans_id))
682
737
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
738
"""Children must have a directory parent"""
685
for parent_id, children in by_parent.iteritems():
686
if parent_id is ROOT_PARENT:
688
if not self._any_contents(children):
690
for child in children:
692
self.final_kind(child)
696
kind = self.final_kind(parent_id)
740
for parent_id, children in viewitems(by_parent):
741
if parent_id == ROOT_PARENT:
744
for child_id in children:
745
if self.final_kind(child_id) is not None:
750
# There is at least a child, so we need an existing directory to
752
kind = self.final_kind(parent_id)
754
# The directory will be deleted
700
755
conflicts.append(('missing parent', parent_id))
701
756
elif kind != "directory":
757
# Meh, we need a *directory* to put something in it
702
758
conflicts.append(('non-directory parent', parent_id))
705
def _any_contents(self, trans_ids):
706
"""Return true if any of the trans_ids, will have contents."""
707
for trans_id in trans_ids:
709
kind = self.final_kind(trans_id)
715
761
def _set_executability(self, path, trans_id):
716
762
"""Set the executability of versioned files """
717
if supports_executable():
763
if self._tree._supports_executable():
718
764
new_executability = self._new_executability[trans_id]
719
765
abspath = self._tree.abspath(path)
720
766
current_mode = os.stat(abspath).st_mode
721
767
if new_executability:
722
768
umask = os.umask(0)
724
to_mode = current_mode | (0100 & ~umask)
770
to_mode = current_mode | (0o100 & ~umask)
725
771
# Enable x-bit for others only if they can read it.
726
if current_mode & 0004:
727
to_mode |= 0001 & ~umask
728
if current_mode & 0040:
729
to_mode |= 0010 & ~umask
772
if current_mode & 0o004:
773
to_mode |= 0o001 & ~umask
774
if current_mode & 0o040:
775
to_mode |= 0o010 & ~umask
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
777
to_mode = current_mode & ~0o111
778
osutils.chmod_if_possible(abspath, to_mode)
734
780
def _new_entry(self, name, parent_id, file_id):
735
781
"""Helper function to create a new filesystem entry."""
781
827
self.create_symlink(target, trans_id)
830
def new_orphan(self, trans_id, parent_id):
831
"""Schedule an item to be orphaned.
833
When a directory is about to be removed, its children, if they are not
834
versioned are moved out of the way: they don't have a parent anymore.
836
:param trans_id: The trans_id of the existing item.
837
:param parent_id: The parent trans_id of the item.
839
raise NotImplementedError(self.new_orphan)
841
def _get_potential_orphans(self, dir_id):
842
"""Find the potential orphans in a directory.
844
A directory can't be safely deleted if there are versioned files in it.
845
If all the contained files are unversioned then they can be orphaned.
847
The 'None' return value means that the directory contains at least one
848
versioned file and should not be deleted.
850
:param dir_id: The directory trans id.
852
:return: A list of the orphan trans ids or None if at least one
853
versioned file is present.
856
# Find the potential orphans, stop if one item should be kept
857
for child_tid in self.by_parent()[dir_id]:
858
if child_tid in self._removed_contents:
859
# The child is removed as part of the transform. Since it was
860
# versioned before, it's not an orphan
862
elif self.final_file_id(child_tid) is None:
863
# The child is not versioned
864
orphans.append(child_tid)
866
# We have a versioned file here, searching for orphans is
784
872
def _affected_ids(self):
785
873
"""Return the set of transform ids affected by the transform"""
786
874
trans_ids = set(self._removed_id)
787
trans_ids.update(self._new_id.keys())
875
trans_ids.update(self._new_id)
788
876
trans_ids.update(self._removed_contents)
789
trans_ids.update(self._new_contents.keys())
790
trans_ids.update(self._new_executability.keys())
791
trans_ids.update(self._new_name.keys())
792
trans_ids.update(self._new_parent.keys())
877
trans_ids.update(self._new_contents)
878
trans_ids.update(self._new_executability)
879
trans_ids.update(self._new_name)
880
trans_ids.update(self._new_parent)
795
883
def _get_file_id_maps(self):
1052
1137
:param records: An iterable of (names, content) tuples, as per
1053
1138
pack.ContainerPushParser.
1055
names, content = records.next()
1140
names, content = next(records)
1056
1141
attribs = bencode.bdecode(content)
1057
1142
self._id_number = attribs['_id_number']
1058
1143
self._new_name = dict((k, v.decode('utf-8'))
1059
for k, v in attribs['_new_name'].items())
1144
for k, v in viewitems(attribs['_new_name']))
1060
1145
self._new_parent = attribs['_new_parent']
1061
self._new_executability = dict((k, bool(v)) for k, v in
1062
attribs['_new_executability'].items())
1146
self._new_executability = dict((k, bool(v))
1147
for k, v in viewitems(attribs['_new_executability']))
1063
1148
self._new_id = attribs['_new_id']
1064
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1149
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1065
1150
self._tree_path_ids = {}
1066
1151
self._tree_id_paths = {}
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1152
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1068
1153
path = bytepath.decode('utf-8')
1069
1154
self._tree_path_ids[path] = trans_id
1070
1155
self._tree_id_paths[trans_id] = path
1195
1296
descendants.update(self._limbo_descendants(descendant))
1196
1297
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1299
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1300
"""Schedule creation of a new file.
1203
Contents is an iterator of strings, all of which will be written
1204
to the target destination.
1206
New file takes the permissions of any existing file with that id,
1207
unless mode_id is specified.
1304
:param contents: an iterator of strings, all of which will be written
1305
to the target destination.
1306
:param trans_id: TreeTransform handle
1307
:param mode_id: If not None, force the mode of the target file to match
1308
the mode of the object referenced by mode_id.
1309
Otherwise, we will try to preserve mode bits of an existing file.
1310
:param sha1: If the sha1 of this content is already known, pass it in.
1311
We can use it to prevent future sha1 computations.
1209
1313
name = self._limbo_name(trans_id)
1210
1314
f = open(name, 'wb')
1213
unique_add(self._new_contents, trans_id, 'file')
1215
# Clean up the file, it never got registered so
1216
# TreeTransform.finalize() won't clean it up.
1316
unique_add(self._new_contents, trans_id, 'file')
1221
1317
f.writelines(contents)
1224
1320
self._set_mtime(name)
1225
1321
self._set_mode(trans_id, mode_id, S_ISREG)
1322
# It is unfortunate we have to use lstat instead of fstat, but we just
1323
# used utime and chmod on the file, so we need the accurate final
1325
if sha1 is not None:
1326
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
1328
def _read_file_chunks(self, trans_id):
1228
1329
cur_file = open(self._limbo_name(trans_id), 'rb')
1296
1399
del self._limbo_children_names[trans_id]
1297
1400
delete_any(self._limbo_name(trans_id))
1402
def new_orphan(self, trans_id, parent_id):
1403
conf = self._tree.get_config_stack()
1404
handle_orphan = conf.get('bzr.transform.orphan_policy')
1405
handle_orphan(self, trans_id, parent_id)
1408
class OrphaningError(errors.BzrError):
1410
# Only bugs could lead to such exception being seen by the user
1411
internal_error = True
1412
_fmt = "Error while orphaning %s in %s directory"
1414
def __init__(self, orphan, parent):
1415
errors.BzrError.__init__(self)
1416
self.orphan = orphan
1417
self.parent = parent
1420
class OrphaningForbidden(OrphaningError):
1422
_fmt = "Policy: %s doesn't allow creating orphans."
1424
def __init__(self, policy):
1425
errors.BzrError.__init__(self)
1426
self.policy = policy
1429
def move_orphan(tt, orphan_id, parent_id):
1430
"""See TreeTransformBase.new_orphan.
1432
This creates a new orphan in the `bzr-orphans` dir at the root of the
1435
:param tt: The TreeTransform orphaning `trans_id`.
1437
:param orphan_id: The trans id that should be orphaned.
1439
:param parent_id: The orphan parent trans id.
1441
# Add the orphan dir if it doesn't exist
1442
orphan_dir_basename = 'bzr-orphans'
1443
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1444
if tt.final_kind(od_id) is None:
1445
tt.create_directory(od_id)
1446
parent_path = tt._tree_id_paths[parent_id]
1447
# Find a name that doesn't exist yet in the orphan dir
1448
actual_name = tt.final_name(orphan_id)
1449
new_name = tt._available_backup_name(actual_name, od_id)
1450
tt.adjust_path(new_name, od_id, orphan_id)
1451
trace.warning('%s has been orphaned in %s'
1452
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1455
def refuse_orphan(tt, orphan_id, parent_id):
1456
"""See TreeTransformBase.new_orphan.
1458
This refuses to create orphan, letting the caller handle the conflict.
1460
raise OrphaningForbidden('never')
1463
orphaning_registry = registry.Registry()
1464
orphaning_registry.register(
1465
'conflict', refuse_orphan,
1466
'Leave orphans in place and create a conflict on the directory.')
1467
orphaning_registry.register(
1468
'move', move_orphan,
1469
'Move orphans into the bzr-orphans directory.')
1470
orphaning_registry._set_default_key('conflict')
1473
opt_transform_orphan = _mod_config.RegistryOption(
1474
'bzr.transform.orphan_policy', orphaning_registry,
1475
help='Policy for orphaned files during transform operations.',
1300
1479
class TreeTransform(DiskTreeTransform):
1301
1480
"""Represent a tree transformation.
1594
1771
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1596
1773
entries = self._tree.iter_entries_by_dir(
1597
new_path_file_ids.values())
1774
viewvalues(new_path_file_ids))
1598
1775
old_paths = dict((e.file_id, p) for p, e in entries)
1599
1776
final_kinds = {}
1600
1777
for num, (path, trans_id) in enumerate(new_paths):
1601
1778
if (num % 10) == 0:
1602
child_pb.update('adding file',
1779
child_pb.update(gettext('adding file'),
1603
1780
num + len(self._removed_id), total_entries)
1604
1781
file_id = new_path_file_ids[trans_id]
1605
1782
if file_id is None:
1607
1784
needs_entry = False
1609
kind = self.final_kind(trans_id)
1785
kind = self.final_kind(trans_id)
1611
1787
kind = self._tree.stored_kind(file_id)
1612
1788
parent_trans_id = self.final_parent(trans_id)
1613
1789
parent_file_id = new_path_file_ids.get(parent_trans_id)
1643
1819
If inventory_delta is None, no inventory delta generation is performed.
1645
tree_paths = list(self._tree_path_ids.iteritems())
1646
tree_paths.sort(reverse=True)
1647
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1821
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1822
child_pb = ui.ui_factory.nested_progress_bar()
1649
for num, data in enumerate(tree_paths):
1650
path, trans_id = data
1651
child_pb.update('removing file', num, len(tree_paths))
1824
for num, (path, trans_id) in enumerate(tree_paths):
1825
# do not attempt to move root into a subdirectory of itself.
1828
child_pb.update(gettext('removing file'), num, len(tree_paths))
1652
1829
full_path = self._tree.abspath(path)
1653
1830
if trans_id in self._removed_contents:
1654
1831
delete_path = os.path.join(self._deletiondir, trans_id)
1679
1856
modified_paths = []
1680
1857
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1682
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1859
child_pb = ui.ui_factory.nested_progress_bar()
1684
1861
for num, (path, trans_id) in enumerate(new_paths):
1685
1862
if (num % 10) == 0:
1686
child_pb.update('adding file', num, len(new_paths))
1863
child_pb.update(gettext('adding file'), num, len(new_paths))
1687
1864
full_path = self._tree.abspath(path)
1688
1865
if trans_id in self._needs_rename:
1690
1867
mover.rename(self._limbo_name(trans_id), full_path)
1868
except errors.TransformRenameFailed as e:
1692
1869
# We may be renaming a dangling inventory id
1693
1870
if e.errno != errno.ENOENT:
1696
1873
self.rename_count += 1
1874
# TODO: if trans_id in self._observed_sha1s, we should
1875
# re-stat the final target, since ctime will be
1876
# updated by the change.
1697
1877
if (trans_id in self._new_contents or
1698
1878
self.path_changed(trans_id)):
1699
1879
if trans_id in self._new_contents:
1700
1880
modified_paths.append(full_path)
1701
1881
if trans_id in self._new_executability:
1702
1882
self._set_executability(path, trans_id)
1883
if trans_id in self._observed_sha1s:
1884
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1885
st = osutils.lstat(full_path)
1886
self._observed_sha1s[trans_id] = (o_sha1, st)
1704
1888
child_pb.finished()
1889
for path, trans_id in new_paths:
1890
# new_paths includes stuff like workingtree conflicts. Only the
1891
# stuff in new_contents actually comes from limbo.
1892
if trans_id in self._limbo_files:
1893
del self._limbo_files[trans_id]
1705
1894
self._new_contents.clear()
1706
1895
return modified_paths
1897
def _apply_observed_sha1s(self):
1898
"""After we have finished renaming everything, update observed sha1s
1900
This has to be done after self._tree.apply_inventory_delta, otherwise
1901
it doesn't know anything about the files we are updating. Also, we want
1902
to do this as late as possible, so that most entries end up cached.
1904
# TODO: this doesn't update the stat information for directories. So
1905
# the first 'bzr status' will still need to rewrite
1906
# .bzr/checkout/dirstate. However, we at least don't need to
1907
# re-read all of the files.
1908
# TODO: If the operation took a while, we could do a time.sleep(3) here
1909
# to allow the clock to tick over and ensure we won't have any
1910
# problems. (we could observe start time, and finish time, and if
1911
# it is less than eg 10% overhead, add a sleep call.)
1912
paths = FinalPaths(self)
1913
for trans_id, observed in viewitems(self._observed_sha1s):
1914
path = paths.get_path(trans_id)
1915
# We could get the file_id, but dirstate prefers to use the path
1916
# anyway, and it is 'cheaper' to determine.
1917
# file_id = self._new_id[trans_id]
1918
self._tree._observed_sha1(None, path, observed)
1709
1921
class TransformPreview(DiskTreeTransform):
1710
1922
"""A TreeTransform for generating preview trees.
1789
2006
yield self._get_repository().revision_tree(revision_id)
1791
2008
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2009
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1793
2010
self._iter_parent_trees()]
1794
2011
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2012
self.get_file_lines(file_id))
1796
2013
repo = self._get_repository()
1797
2014
base_vf = repo.texts
1798
2015
if base_vf not in vf.fallback_versionedfiles:
1799
2016
vf.fallback_versionedfiles.append(base_vf)
1800
2017
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2019
def _stat_limbo_file(self, file_id=None, trans_id=None):
2020
if trans_id is None:
2021
trans_id = self._transform.trans_id_file_id(file_id)
1804
2022
name = self._transform._limbo_name(trans_id)
1805
2023
return os.lstat(name)
2023
2252
def get_file_size(self, file_id):
2024
2253
"""See Tree.get_file_size"""
2254
trans_id = self._transform.trans_id_file_id(file_id)
2255
kind = self._transform.final_kind(trans_id)
2258
if trans_id in self._transform._new_contents:
2259
return self._stat_limbo_file(trans_id=trans_id).st_size
2025
2260
if self.kind(file_id) == 'file':
2026
2261
return self._transform._tree.get_file_size(file_id)
2265
def get_file_verifier(self, file_id, path=None, stat_value=None):
2266
trans_id = self._transform.trans_id_file_id(file_id)
2267
kind = self._transform._new_contents.get(trans_id)
2269
return self._transform._tree.get_file_verifier(file_id)
2271
fileobj = self.get_file(file_id)
2273
return ("SHA1", sha_file(fileobj))
2030
2277
def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
2278
trans_id = self._transform.trans_id_file_id(file_id)
2032
2279
kind = self._transform._new_contents.get(trans_id)
2314
2567
pp.next_phase()
2315
2568
file_trans_id[wt.get_root_id()] = \
2316
2569
tt.trans_id_tree_file_id(wt.get_root_id())
2317
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2570
pb = ui.ui_factory.nested_progress_bar()
2319
2572
deferred_contents = []
2321
total = len(tree.inventory)
2574
total = len(tree.all_file_ids())
2322
2575
if delta_from_tree:
2323
2576
precomputed_delta = []
2325
2578
precomputed_delta = None
2579
# Check if tree inventory has content. If so, we populate
2580
# existing_files with the directory content. If there are no
2581
# entries we skip populating existing_files as its not used.
2582
# This improves performance and unncessary work on large
2583
# directory trees. (#501307)
2585
existing_files = set()
2586
for dir, files in wt.walkdirs():
2587
existing_files.update(f[0] for f in files)
2326
2588
for num, (tree_path, entry) in \
2327
enumerate(tree.inventory.iter_entries_by_dir()):
2328
pb.update("Building tree", num - len(deferred_contents), total)
2589
enumerate(tree.iter_entries_by_dir()):
2590
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2329
2591
if entry.parent_id is None:
2331
2593
reparent = False
2405
2667
in iter if not (c or e[0] != e[1])]
2406
2668
if accelerator_tree.supports_content_filtering():
2407
2669
unchanged = [(f, p) for (f, p) in unchanged
2408
if not accelerator_tree.iter_search_rules([p]).next()]
2670
if not next(accelerator_tree.iter_search_rules([p]))]
2409
2671
unchanged = dict(unchanged)
2410
2672
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2674
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2413
2675
accelerator_path = unchanged.get(file_id)
2414
2676
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2677
new_desired_files.append((file_id,
2678
(trans_id, tree_path, text_sha1)))
2417
pb.update('Adding file contents', count + offset, total)
2680
pb.update(gettext('Adding file contents'), count + offset, total)
2419
2682
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2436
2699
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2700
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2438
2701
tree.iter_files_bytes(new_desired_files)):
2439
2702
if wt.supports_content_filtering():
2440
2703
filters = wt._content_filter_stack(tree_path)
2441
2704
contents = filtered_output_bytes(contents, filters,
2442
2705
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2444
pb.update('Adding file contents', count + offset, total)
2706
tt.create_file(contents, trans_id, sha1=text_sha1)
2707
pb.update(gettext('Adding file contents'), count + offset, total)
2447
2710
def _reparent_children(tt, old_parent, new_parent):
2448
2711
for child in tt.iter_tree_children(old_parent):
2449
2712
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2715
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2716
by_parent = tt.by_parent()
2453
2717
for child in by_parent[old_parent]:
2454
2718
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2719
return by_parent[old_parent]
2457
2722
def _content_match(tree, entry, file_id, kind, target_path):
2458
2723
if entry.kind != kind:
2460
2725
if entry.kind == "directory":
2462
2727
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2728
f = file(target_path, 'rb')
2730
if tree.get_file_text(file_id) == f.read():
2465
2734
elif entry.kind == "symlink":
2466
2735
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2519
2788
raise errors.BadFileKindError(name, kind)
2522
@deprecated_function(deprecated_in((1, 9, 0)))
2523
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2524
"""Create new file contents according to an inventory entry.
2526
DEPRECATED. Use create_from_tree instead.
2528
if entry.kind == "file":
2530
lines = tree.get_file(entry.file_id).readlines()
2531
tt.create_file(lines, trans_id, mode_id=mode_id)
2532
elif entry.kind == "symlink":
2533
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2534
elif entry.kind == "directory":
2535
tt.create_directory(trans_id)
2538
2791
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2539
2792
filter_tree_path=None):
2540
2793
"""Create new file contents according to tree contents.
2571
2824
tt.set_executability(entry.executable, trans_id)
2574
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2575
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2578
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2579
"""Produce a backup-style name that appears to be available"""
2583
yield "%s.~%d~" % (name, counter)
2585
for new_name in name_gen():
2586
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2590
def _entry_changes(file_id, entry, working_tree):
2591
"""Determine in which ways the inventory entry has changed.
2593
Returns booleans: has_contents, content_mod, meta_mod
2594
has_contents means there are currently contents, but they differ
2595
contents_mod means contents need to be modified
2596
meta_mod means the metadata needs to be modified
2598
cur_entry = working_tree.inventory[file_id]
2600
working_kind = working_tree.kind(file_id)
2603
has_contents = False
2606
if has_contents is True:
2607
if entry.kind != working_kind:
2608
contents_mod, meta_mod = True, False
2610
cur_entry._read_tree_state(working_tree.id2path(file_id),
2612
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2613
cur_entry._forget_tree_state()
2614
return has_contents, contents_mod, meta_mod
2617
2827
def revert(working_tree, target_tree, filenames, backups=False,
2618
2828
pb=None, change_reporter=None):
2619
2829
"""Revert a working tree's contents to those of a target tree."""
2676
2890
deferred_files = []
2677
2891
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
2892
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2893
target_path, wt_path = path
2894
target_versioned, wt_versioned = versioned
2895
target_parent, wt_parent = parent
2896
target_name, wt_name = name
2897
target_kind, wt_kind = kind
2898
target_executable, wt_executable = executable
2899
if skip_root and wt_parent is None:
2681
2901
trans_id = tt.trans_id_file_id(file_id)
2683
2903
if changed_content:
2684
2904
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2905
if wt_kind == 'file' and (backups or target_kind is None):
2686
2906
wt_sha1 = working_tree.get_file_sha1(file_id)
2687
2907
if merge_modified.get(file_id) != wt_sha1:
2688
2908
# acquire the basis tree lazily to prevent the
2691
2911
if basis_tree is None:
2692
2912
basis_tree = working_tree.basis_tree()
2693
2913
basis_tree.lock_read()
2694
if file_id in basis_tree:
2914
if basis_tree.has_id(file_id):
2695
2915
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2696
2916
keep_content = True
2697
elif kind[1] is None and not versioned[1]:
2917
elif target_kind is None and not target_versioned:
2698
2918
keep_content = True
2699
if kind[0] is not None:
2919
if wt_kind is not None:
2700
2920
if not keep_content:
2701
2921
tt.delete_contents(trans_id)
2702
elif kind[1] is not None:
2703
parent_trans_id = tt.trans_id_file_id(parent[0])
2704
by_parent = tt.by_parent()
2705
backup_name = _get_backup_name(name[0], by_parent,
2706
parent_trans_id, tt)
2922
elif target_kind is not None:
2923
parent_trans_id = tt.trans_id_file_id(wt_parent)
2924
backup_name = tt._available_backup_name(
2925
wt_name, parent_trans_id)
2707
2926
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2708
new_trans_id = tt.create_path(name[0], parent_trans_id)
2709
if versioned == (True, True):
2927
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2928
if wt_versioned and target_versioned:
2710
2929
tt.unversion_file(trans_id)
2711
2930
tt.version_file(file_id, new_trans_id)
2712
2931
# New contents should have the same unix perms as old
2714
2933
mode_id = trans_id
2715
2934
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2935
if target_kind in ('directory', 'tree-reference'):
2717
2936
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2937
if target_kind == 'tree-reference':
2719
2938
revision = target_tree.get_reference_revision(file_id,
2721
2940
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2941
elif target_kind == 'symlink':
2723
2942
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2944
elif target_kind == 'file':
2726
2945
deferred_files.append((file_id, (trans_id, mode_id)))
2727
2946
if basis_tree is None:
2728
2947
basis_tree = working_tree.basis_tree()
2729
2948
basis_tree.lock_read()
2730
2949
new_sha1 = target_tree.get_file_sha1(file_id)
2731
if (file_id in basis_tree and new_sha1 ==
2732
basis_tree.get_file_sha1(file_id)):
2950
if (basis_tree.has_id(file_id) and
2951
new_sha1 == basis_tree.get_file_sha1(file_id)):
2733
2952
if file_id in merge_modified:
2734
2953
del merge_modified[file_id]
2736
2955
merge_modified[file_id] = new_sha1
2738
2957
# preserve the execute bit when backing up
2739
if keep_content and executable[0] == executable[1]:
2740
tt.set_executability(executable[1], trans_id)
2741
elif kind[1] is not None:
2742
raise AssertionError(kind[1])
2743
if versioned == (False, True):
2958
if keep_content and wt_executable == target_executable:
2959
tt.set_executability(target_executable, trans_id)
2960
elif target_kind is not None:
2961
raise AssertionError(target_kind)
2962
if not wt_versioned and target_versioned:
2744
2963
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2964
if wt_versioned and not target_versioned:
2746
2965
tt.unversion_file(trans_id)
2747
if (name[1] is not None and
2748
(name[0] != name[1] or parent[0] != parent[1])):
2749
if name[1] == '' and parent[1] is None:
2966
if (target_name is not None and
2967
(wt_name != target_name or wt_parent != target_parent)):
2968
if target_name == '' and target_parent is None:
2750
2969
parent_trans = ROOT_PARENT
2752
parent_trans = tt.trans_id_file_id(parent[1])
2753
if parent[0] is None and versioned[0]:
2754
tt.adjust_root_path(name[1], parent_trans)
2971
parent_trans = tt.trans_id_file_id(target_parent)
2972
if wt_parent is None and wt_versioned:
2973
tt.adjust_root_path(target_name, parent_trans)
2756
tt.adjust_path(name[1], parent_trans, trans_id)
2757
if executable[0] != executable[1] and kind[1] == "file":
2758
tt.set_executability(executable[1], trans_id)
2975
tt.adjust_path(target_name, parent_trans, trans_id)
2976
if wt_executable != target_executable and target_kind == "file":
2977
tt.set_executability(target_executable, trans_id)
2759
2978
if working_tree.supports_content_filtering():
2760
2979
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
2980
target_tree.iter_files_bytes(deferred_files)):
2833
3052
elif c_type == 'missing parent':
2834
3053
trans_id = conflict[1]
2836
tt.cancel_deletion(trans_id)
2837
new_conflicts.add(('deleting parent', 'Not deleting',
3054
if trans_id in tt._removed_contents:
3055
cancel_deletion = True
3056
orphans = tt._get_potential_orphans(trans_id)
3058
cancel_deletion = False
3059
# All children are orphans
3062
tt.new_orphan(o, trans_id)
3063
except OrphaningError:
3064
# Something bad happened so we cancel the directory
3065
# deletion which will leave it in place with a
3066
# conflict. The user can deal with it from there.
3067
# Note that this also catch the case where we don't
3068
# want to create orphans and leave the directory in
3070
cancel_deletion = True
3073
# Cancel the directory deletion
3074
tt.cancel_deletion(trans_id)
3075
new_conflicts.add(('deleting parent', 'Not deleting',
2842
3080
tt.final_name(trans_id)
2903
3141
modified_path = fp.get_path(conflict[2])
2904
3142
modified_id = tt.final_file_id(conflict[2])
2905
3143
if len(conflict) == 3:
2906
yield Conflict.factory(c_type, action=action, path=modified_path,
2907
file_id=modified_id)
3144
yield conflicts.Conflict.factory(
3145
c_type, action=action, path=modified_path, file_id=modified_id)
2910
3148
conflicting_path = fp.get_path(conflict[3])
2911
3149
conflicting_id = tt.final_file_id(conflict[3])
2912
yield Conflict.factory(c_type, action=action, path=modified_path,
2913
file_id=modified_id,
2914
conflict_path=conflicting_path,
2915
conflict_file_id=conflicting_id)
3150
yield conflicts.Conflict.factory(
3151
c_type, action=action, path=modified_path,
3152
file_id=modified_id,
3153
conflict_path=conflicting_path,
3154
conflict_file_id=conflicting_id)
2918
3157
class _FileMover(object):
added
removed
breezy/transform.py
