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
42
revision as _mod_revision,
46
from breezy.bzr import (
49
from breezy.i18n import gettext
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
39
ReusingTransform, CantMoveRoot,
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
44
from bzrlib.osutils import (
51
from .errors import (DuplicateKey, MalformedTransform,
52
ReusingTransform, CantMoveRoot,
53
ImmortalLimbo, NoFinalPath,
55
from .filters import filtered_output_bytes, ContentFilterContext
56
from .mutabletree import MutableTree
57
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
65
from .progress import ProgressPhase
65
72
ROOT_PARENT = "root-parent"
68
74
def unique_add(map, key, value):
70
76
raise DuplicateKey(key=key)
74
81
class _TransformResults(object):
75
82
def __init__(self, modified_paths, rename_count):
76
83
object.__init__(self)
381
399
return sorted(FinalPaths(self).get_paths(new_ids))
383
401
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,
402
"""Determine which trans_ids need new Inventory entries.
404
An new entry is needed when anything that would be reflected by an
405
inventory entry changes, including file name, file_id, parent file_id,
406
file kind, and the execute bit.
408
Some care is taken to return entries with real changes, not cases
409
where the value is deleted and then restored to its original value,
410
but some actually unchanged values may be returned.
412
:returns: A list of (path, trans_id) for all items requiring an
413
inventory change. Ordered by path.
416
# Find entries whose file_ids are new (or changed).
417
new_file_id = set(t for t in self._new_id
418
if self._new_id[t] != self.tree_file_id(t))
419
for id_set in [self._new_name, self._new_parent, new_file_id,
387
420
self._new_executability]:
388
new_ids.update(id_set)
421
changed_ids.update(id_set)
422
# removing implies a kind change
389
423
changed_kind = set(self._removed_contents)
390
425
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))
426
# Ignore entries that are already known to have changed.
427
changed_kind.difference_update(changed_ids)
428
# to keep only the truly changed ones
429
changed_kind = (t for t in changed_kind
430
if self.tree_kind(t) != self.final_kind(t))
431
# all kind changes will alter the inventory
432
changed_ids.update(changed_kind)
433
# To find entries with changed parent_ids, find parents which existed,
434
# but changed file_id.
435
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
436
# Now add all their children to the set.
437
for parent_trans_id in new_file_id:
438
changed_ids.update(self.iter_tree_children(parent_trans_id))
439
return sorted(FinalPaths(self).get_paths(changed_ids))
397
441
def final_kind(self, trans_id):
398
442
"""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)
444
:return: None if the file does not exist/has no contents. (It is
445
conceivable that a path would be created without the corresponding
446
contents insertion command)
404
448
if trans_id in self._new_contents:
405
449
return self._new_contents[trans_id]
406
450
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
453
return self.tree_kind(trans_id)
532
576
# ensure that all children are registered with the transaction
533
577
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:
579
def _has_named_child(self, name, parent_id, known_children):
580
"""Does a parent already have a name child.
582
:param name: The searched for name.
584
:param parent_id: The parent for which the check is made.
586
:param known_children: The already known children. This should have
587
been recently obtained from `self.by_parent.get(parent_id)`
588
(or will be if None is passed).
590
if known_children is None:
591
known_children = self.by_parent().get(parent_id, [])
592
for child in known_children:
541
593
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
595
parent_path = self._tree_id_paths.get(parent_id, None)
596
if parent_path is None:
597
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
599
child_path = joinpath(parent_path, name)
600
child_id = self._tree_path_ids.get(child_path, None)
549
601
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
602
# Not known by the tree transform yet, check the filesystem
603
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?
605
raise AssertionError('child_id is missing: %s, %s, %s'
606
% (name, parent_id, child_id))
608
def _available_backup_name(self, name, target_id):
609
"""Find an available backup name.
611
:param name: The basename of the file.
613
:param target_id: The directory trans_id where the backup should
616
known_children = self.by_parent().get(target_id, [])
617
return osutils.available_backup_name(
619
lambda base: self._has_named_child(
620
base, target_id, known_children))
560
622
def _parent_loops(self):
561
623
"""No entry should be its own ancestor"""
645
700
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]
702
for children in viewvalues(by_parent):
704
for child_tid in children:
705
name = self.final_name(child_tid)
707
# Keep children only if they still exist in the end
708
if not self._case_sensitive_target:
710
name_ids.append((name, child_tid))
653
713
last_trans_id = None
654
714
for name, trans_id in name_ids:
656
kind = self.final_kind(trans_id)
715
kind = self.final_kind(trans_id)
659
716
file_id = self.final_file_id(trans_id)
660
717
if kind is None and file_id is None:
673
730
self._removed_id))
674
731
all_ids = self._tree.all_file_ids()
675
732
active_tree_ids = all_ids.difference(removed_tree_ids)
676
for trans_id, file_id in self._new_id.iteritems():
733
for trans_id, file_id in viewitems(self._new_id):
677
734
if file_id in active_tree_ids:
678
735
old_trans_id = self.trans_id_tree_file_id(file_id)
679
736
conflicts.append(('duplicate id', old_trans_id, trans_id))
682
739
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
740
"""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)
742
for parent_id, children in viewitems(by_parent):
743
if parent_id == ROOT_PARENT:
746
for child_id in children:
747
if self.final_kind(child_id) is not None:
752
# There is at least a child, so we need an existing directory to
754
kind = self.final_kind(parent_id)
756
# The directory will be deleted
700
757
conflicts.append(('missing parent', parent_id))
701
758
elif kind != "directory":
759
# Meh, we need a *directory* to put something in it
702
760
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
763
def _set_executability(self, path, trans_id):
716
764
"""Set the executability of versioned files """
717
if supports_executable():
765
if self._tree._supports_executable():
718
766
new_executability = self._new_executability[trans_id]
719
767
abspath = self._tree.abspath(path)
720
768
current_mode = os.stat(abspath).st_mode
721
769
if new_executability:
722
770
umask = os.umask(0)
724
to_mode = current_mode | (0100 & ~umask)
772
to_mode = current_mode | (0o100 & ~umask)
725
773
# 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
774
if current_mode & 0o004:
775
to_mode |= 0o001 & ~umask
776
if current_mode & 0o040:
777
to_mode |= 0o010 & ~umask
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
779
to_mode = current_mode & ~0o111
780
osutils.chmod_if_possible(abspath, to_mode)
734
782
def _new_entry(self, name, parent_id, file_id):
735
783
"""Helper function to create a new filesystem entry."""
781
829
self.create_symlink(target, trans_id)
832
def new_orphan(self, trans_id, parent_id):
833
"""Schedule an item to be orphaned.
835
When a directory is about to be removed, its children, if they are not
836
versioned are moved out of the way: they don't have a parent anymore.
838
:param trans_id: The trans_id of the existing item.
839
:param parent_id: The parent trans_id of the item.
841
raise NotImplementedError(self.new_orphan)
843
def _get_potential_orphans(self, dir_id):
844
"""Find the potential orphans in a directory.
846
A directory can't be safely deleted if there are versioned files in it.
847
If all the contained files are unversioned then they can be orphaned.
849
The 'None' return value means that the directory contains at least one
850
versioned file and should not be deleted.
852
:param dir_id: The directory trans id.
854
:return: A list of the orphan trans ids or None if at least one
855
versioned file is present.
858
# Find the potential orphans, stop if one item should be kept
859
for child_tid in self.by_parent()[dir_id]:
860
if child_tid in self._removed_contents:
861
# The child is removed as part of the transform. Since it was
862
# versioned before, it's not an orphan
864
elif self.final_file_id(child_tid) is None:
865
# The child is not versioned
866
orphans.append(child_tid)
868
# We have a versioned file here, searching for orphans is
784
874
def _affected_ids(self):
785
875
"""Return the set of transform ids affected by the transform"""
786
876
trans_ids = set(self._removed_id)
787
trans_ids.update(self._new_id.keys())
877
trans_ids.update(self._new_id)
788
878
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())
879
trans_ids.update(self._new_contents)
880
trans_ids.update(self._new_executability)
881
trans_ids.update(self._new_name)
882
trans_ids.update(self._new_parent)
795
885
def _get_file_id_maps(self):
1052
1139
:param records: An iterable of (names, content) tuples, as per
1053
1140
pack.ContainerPushParser.
1055
names, content = records.next()
1142
names, content = next(records)
1056
1143
attribs = bencode.bdecode(content)
1057
1144
self._id_number = attribs['_id_number']
1058
1145
self._new_name = dict((k, v.decode('utf-8'))
1059
for k, v in attribs['_new_name'].items())
1146
for k, v in viewitems(attribs['_new_name']))
1060
1147
self._new_parent = attribs['_new_parent']
1061
self._new_executability = dict((k, bool(v)) for k, v in
1062
attribs['_new_executability'].items())
1148
self._new_executability = dict((k, bool(v))
1149
for k, v in viewitems(attribs['_new_executability']))
1063
1150
self._new_id = attribs['_new_id']
1064
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1151
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1065
1152
self._tree_path_ids = {}
1066
1153
self._tree_id_paths = {}
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1154
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1068
1155
path = bytepath.decode('utf-8')
1069
1156
self._tree_path_ids[path] = trans_id
1070
1157
self._tree_id_paths[trans_id] = path
1195
1298
descendants.update(self._limbo_descendants(descendant))
1196
1299
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1301
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1302
"""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.
1306
:param contents: an iterator of strings, all of which will be written
1307
to the target destination.
1308
:param trans_id: TreeTransform handle
1309
:param mode_id: If not None, force the mode of the target file to match
1310
the mode of the object referenced by mode_id.
1311
Otherwise, we will try to preserve mode bits of an existing file.
1312
:param sha1: If the sha1 of this content is already known, pass it in.
1313
We can use it to prevent future sha1 computations.
1209
1315
name = self._limbo_name(trans_id)
1210
1316
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.
1318
unique_add(self._new_contents, trans_id, 'file')
1221
1319
f.writelines(contents)
1224
1322
self._set_mtime(name)
1225
1323
self._set_mode(trans_id, mode_id, S_ISREG)
1324
# It is unfortunate we have to use lstat instead of fstat, but we just
1325
# used utime and chmod on the file, so we need the accurate final
1327
if sha1 is not None:
1328
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
1330
def _read_file_chunks(self, trans_id):
1228
1331
cur_file = open(self._limbo_name(trans_id), 'rb')
1296
1401
del self._limbo_children_names[trans_id]
1297
1402
delete_any(self._limbo_name(trans_id))
1404
def new_orphan(self, trans_id, parent_id):
1405
conf = self._tree.get_config_stack()
1406
handle_orphan = conf.get('bzr.transform.orphan_policy')
1407
handle_orphan(self, trans_id, parent_id)
1410
class OrphaningError(errors.BzrError):
1412
# Only bugs could lead to such exception being seen by the user
1413
internal_error = True
1414
_fmt = "Error while orphaning %s in %s directory"
1416
def __init__(self, orphan, parent):
1417
errors.BzrError.__init__(self)
1418
self.orphan = orphan
1419
self.parent = parent
1422
class OrphaningForbidden(OrphaningError):
1424
_fmt = "Policy: %s doesn't allow creating orphans."
1426
def __init__(self, policy):
1427
errors.BzrError.__init__(self)
1428
self.policy = policy
1431
def move_orphan(tt, orphan_id, parent_id):
1432
"""See TreeTransformBase.new_orphan.
1434
This creates a new orphan in the `bzr-orphans` dir at the root of the
1437
:param tt: The TreeTransform orphaning `trans_id`.
1439
:param orphan_id: The trans id that should be orphaned.
1441
:param parent_id: The orphan parent trans id.
1443
# Add the orphan dir if it doesn't exist
1444
orphan_dir_basename = 'bzr-orphans'
1445
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1446
if tt.final_kind(od_id) is None:
1447
tt.create_directory(od_id)
1448
parent_path = tt._tree_id_paths[parent_id]
1449
# Find a name that doesn't exist yet in the orphan dir
1450
actual_name = tt.final_name(orphan_id)
1451
new_name = tt._available_backup_name(actual_name, od_id)
1452
tt.adjust_path(new_name, od_id, orphan_id)
1453
trace.warning('%s has been orphaned in %s'
1454
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1457
def refuse_orphan(tt, orphan_id, parent_id):
1458
"""See TreeTransformBase.new_orphan.
1460
This refuses to create orphan, letting the caller handle the conflict.
1462
raise OrphaningForbidden('never')
1465
orphaning_registry = registry.Registry()
1466
orphaning_registry.register(
1467
'conflict', refuse_orphan,
1468
'Leave orphans in place and create a conflict on the directory.')
1469
orphaning_registry.register(
1470
'move', move_orphan,
1471
'Move orphans into the bzr-orphans directory.')
1472
orphaning_registry._set_default_key('conflict')
1475
opt_transform_orphan = _mod_config.RegistryOption(
1476
'bzr.transform.orphan_policy', orphaning_registry,
1477
help='Policy for orphaned files during transform operations.',
1300
1481
class TreeTransform(DiskTreeTransform):
1301
1482
"""Represent a tree transformation.
1594
1773
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1596
1775
entries = self._tree.iter_entries_by_dir(
1597
new_path_file_ids.values())
1776
viewvalues(new_path_file_ids))
1598
1777
old_paths = dict((e.file_id, p) for p, e in entries)
1599
1778
final_kinds = {}
1600
1779
for num, (path, trans_id) in enumerate(new_paths):
1601
1780
if (num % 10) == 0:
1602
child_pb.update('adding file',
1781
child_pb.update(gettext('adding file'),
1603
1782
num + len(self._removed_id), total_entries)
1604
1783
file_id = new_path_file_ids[trans_id]
1605
1784
if file_id is None:
1607
1786
needs_entry = False
1609
kind = self.final_kind(trans_id)
1787
kind = self.final_kind(trans_id)
1611
1789
kind = self._tree.stored_kind(file_id)
1612
1790
parent_trans_id = self.final_parent(trans_id)
1613
1791
parent_file_id = new_path_file_ids.get(parent_trans_id)
1643
1821
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()
1823
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1824
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))
1826
for num, (path, trans_id) in enumerate(tree_paths):
1827
# do not attempt to move root into a subdirectory of itself.
1830
child_pb.update(gettext('removing file'), num, len(tree_paths))
1652
1831
full_path = self._tree.abspath(path)
1653
1832
if trans_id in self._removed_contents:
1654
1833
delete_path = os.path.join(self._deletiondir, trans_id)
1679
1858
modified_paths = []
1680
1859
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()
1861
child_pb = ui.ui_factory.nested_progress_bar()
1684
1863
for num, (path, trans_id) in enumerate(new_paths):
1685
1864
if (num % 10) == 0:
1686
child_pb.update('adding file', num, len(new_paths))
1865
child_pb.update(gettext('adding file'), num, len(new_paths))
1687
1866
full_path = self._tree.abspath(path)
1688
1867
if trans_id in self._needs_rename:
1690
1869
mover.rename(self._limbo_name(trans_id), full_path)
1870
except errors.TransformRenameFailed as e:
1692
1871
# We may be renaming a dangling inventory id
1693
1872
if e.errno != errno.ENOENT:
1696
1875
self.rename_count += 1
1876
# TODO: if trans_id in self._observed_sha1s, we should
1877
# re-stat the final target, since ctime will be
1878
# updated by the change.
1697
1879
if (trans_id in self._new_contents or
1698
1880
self.path_changed(trans_id)):
1699
1881
if trans_id in self._new_contents:
1700
1882
modified_paths.append(full_path)
1701
1883
if trans_id in self._new_executability:
1702
1884
self._set_executability(path, trans_id)
1885
if trans_id in self._observed_sha1s:
1886
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1887
st = osutils.lstat(full_path)
1888
self._observed_sha1s[trans_id] = (o_sha1, st)
1704
1890
child_pb.finished()
1891
for path, trans_id in new_paths:
1892
# new_paths includes stuff like workingtree conflicts. Only the
1893
# stuff in new_contents actually comes from limbo.
1894
if trans_id in self._limbo_files:
1895
del self._limbo_files[trans_id]
1705
1896
self._new_contents.clear()
1706
1897
return modified_paths
1899
def _apply_observed_sha1s(self):
1900
"""After we have finished renaming everything, update observed sha1s
1902
This has to be done after self._tree.apply_inventory_delta, otherwise
1903
it doesn't know anything about the files we are updating. Also, we want
1904
to do this as late as possible, so that most entries end up cached.
1906
# TODO: this doesn't update the stat information for directories. So
1907
# the first 'bzr status' will still need to rewrite
1908
# .bzr/checkout/dirstate. However, we at least don't need to
1909
# re-read all of the files.
1910
# TODO: If the operation took a while, we could do a time.sleep(3) here
1911
# to allow the clock to tick over and ensure we won't have any
1912
# problems. (we could observe start time, and finish time, and if
1913
# it is less than eg 10% overhead, add a sleep call.)
1914
paths = FinalPaths(self)
1915
for trans_id, observed in viewitems(self._observed_sha1s):
1916
path = paths.get_path(trans_id)
1917
# We could get the file_id, but dirstate prefers to use the path
1918
# anyway, and it is 'cheaper' to determine.
1919
# file_id = self._new_id[trans_id]
1920
self._tree._observed_sha1(None, path, observed)
1709
1923
class TransformPreview(DiskTreeTransform):
1710
1924
"""A TreeTransform for generating preview trees.
1789
2008
yield self._get_repository().revision_tree(revision_id)
1791
2010
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2011
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1793
2012
self._iter_parent_trees()]
1794
2013
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2014
self.get_file_lines(file_id))
1796
2015
repo = self._get_repository()
1797
2016
base_vf = repo.texts
1798
2017
if base_vf not in vf.fallback_versionedfiles:
1799
2018
vf.fallback_versionedfiles.append(base_vf)
1800
2019
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2021
def _stat_limbo_file(self, file_id=None, trans_id=None):
2022
if trans_id is None:
2023
trans_id = self._transform.trans_id_file_id(file_id)
1804
2024
name = self._transform._limbo_name(trans_id)
1805
2025
return os.lstat(name)
2023
2254
def get_file_size(self, file_id):
2024
2255
"""See Tree.get_file_size"""
2256
trans_id = self._transform.trans_id_file_id(file_id)
2257
kind = self._transform.final_kind(trans_id)
2260
if trans_id in self._transform._new_contents:
2261
return self._stat_limbo_file(trans_id=trans_id).st_size
2025
2262
if self.kind(file_id) == 'file':
2026
2263
return self._transform._tree.get_file_size(file_id)
2267
def get_file_verifier(self, file_id, path=None, stat_value=None):
2268
trans_id = self._transform.trans_id_file_id(file_id)
2269
kind = self._transform._new_contents.get(trans_id)
2271
return self._transform._tree.get_file_verifier(file_id)
2273
fileobj = self.get_file(file_id)
2275
return ("SHA1", sha_file(fileobj))
2030
2279
def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
2280
trans_id = self._transform.trans_id_file_id(file_id)
2032
2281
kind = self._transform._new_contents.get(trans_id)
2314
2569
pp.next_phase()
2315
2570
file_trans_id[wt.get_root_id()] = \
2316
2571
tt.trans_id_tree_file_id(wt.get_root_id())
2317
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2572
pb = ui.ui_factory.nested_progress_bar()
2319
2574
deferred_contents = []
2321
total = len(tree.inventory)
2576
total = len(tree.all_file_ids())
2322
2577
if delta_from_tree:
2323
2578
precomputed_delta = []
2325
2580
precomputed_delta = None
2581
# Check if tree inventory has content. If so, we populate
2582
# existing_files with the directory content. If there are no
2583
# entries we skip populating existing_files as its not used.
2584
# This improves performance and unncessary work on large
2585
# directory trees. (#501307)
2587
existing_files = set()
2588
for dir, files in wt.walkdirs():
2589
existing_files.update(f[0] for f in files)
2326
2590
for num, (tree_path, entry) in \
2327
enumerate(tree.inventory.iter_entries_by_dir()):
2328
pb.update("Building tree", num - len(deferred_contents), total)
2591
enumerate(tree.iter_entries_by_dir()):
2592
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2329
2593
if entry.parent_id is None:
2331
2595
reparent = False
2405
2669
in iter if not (c or e[0] != e[1])]
2406
2670
if accelerator_tree.supports_content_filtering():
2407
2671
unchanged = [(f, p) for (f, p) in unchanged
2408
if not accelerator_tree.iter_search_rules([p]).next()]
2672
if not next(accelerator_tree.iter_search_rules([p]))]
2409
2673
unchanged = dict(unchanged)
2410
2674
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2676
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2413
2677
accelerator_path = unchanged.get(file_id)
2414
2678
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2679
new_desired_files.append((file_id,
2680
(trans_id, tree_path, text_sha1)))
2417
pb.update('Adding file contents', count + offset, total)
2682
pb.update(gettext('Adding file contents'), count + offset, total)
2419
2684
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2436
2701
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2702
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2438
2703
tree.iter_files_bytes(new_desired_files)):
2439
2704
if wt.supports_content_filtering():
2440
2705
filters = wt._content_filter_stack(tree_path)
2441
2706
contents = filtered_output_bytes(contents, filters,
2442
2707
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2444
pb.update('Adding file contents', count + offset, total)
2708
tt.create_file(contents, trans_id, sha1=text_sha1)
2709
pb.update(gettext('Adding file contents'), count + offset, total)
2447
2712
def _reparent_children(tt, old_parent, new_parent):
2448
2713
for child in tt.iter_tree_children(old_parent):
2449
2714
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2717
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2718
by_parent = tt.by_parent()
2453
2719
for child in by_parent[old_parent]:
2454
2720
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2721
return by_parent[old_parent]
2457
2724
def _content_match(tree, entry, file_id, kind, target_path):
2458
2725
if entry.kind != kind:
2460
2727
if entry.kind == "directory":
2462
2729
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2730
f = file(target_path, 'rb')
2732
if tree.get_file_text(file_id) == f.read():
2465
2736
elif entry.kind == "symlink":
2466
2737
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2519
2790
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
2793
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2539
2794
filter_tree_path=None):
2540
2795
"""Create new file contents according to tree contents.
2571
2826
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
2829
def revert(working_tree, target_tree, filenames, backups=False,
2618
2830
pb=None, change_reporter=None):
2619
2831
"""Revert a working tree's contents to those of a target tree."""
2676
2892
deferred_files = []
2677
2893
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
2894
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2895
target_path, wt_path = path
2896
target_versioned, wt_versioned = versioned
2897
target_parent, wt_parent = parent
2898
target_name, wt_name = name
2899
target_kind, wt_kind = kind
2900
target_executable, wt_executable = executable
2901
if skip_root and wt_parent is None:
2681
2903
trans_id = tt.trans_id_file_id(file_id)
2683
2905
if changed_content:
2684
2906
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2907
if wt_kind == 'file' and (backups or target_kind is None):
2686
2908
wt_sha1 = working_tree.get_file_sha1(file_id)
2687
2909
if merge_modified.get(file_id) != wt_sha1:
2688
2910
# acquire the basis tree lazily to prevent the
2691
2913
if basis_tree is None:
2692
2914
basis_tree = working_tree.basis_tree()
2693
2915
basis_tree.lock_read()
2694
if file_id in basis_tree:
2916
if basis_tree.has_id(file_id):
2695
2917
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2696
2918
keep_content = True
2697
elif kind[1] is None and not versioned[1]:
2919
elif target_kind is None and not target_versioned:
2698
2920
keep_content = True
2699
if kind[0] is not None:
2921
if wt_kind is not None:
2700
2922
if not keep_content:
2701
2923
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)
2924
elif target_kind is not None:
2925
parent_trans_id = tt.trans_id_file_id(wt_parent)
2926
backup_name = tt._available_backup_name(
2927
wt_name, parent_trans_id)
2707
2928
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):
2929
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2930
if wt_versioned and target_versioned:
2710
2931
tt.unversion_file(trans_id)
2711
2932
tt.version_file(file_id, new_trans_id)
2712
2933
# New contents should have the same unix perms as old
2714
2935
mode_id = trans_id
2715
2936
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2937
if target_kind in ('directory', 'tree-reference'):
2717
2938
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2939
if target_kind == 'tree-reference':
2719
2940
revision = target_tree.get_reference_revision(file_id,
2721
2942
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2943
elif target_kind == 'symlink':
2723
2944
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2946
elif target_kind == 'file':
2726
2947
deferred_files.append((file_id, (trans_id, mode_id)))
2727
2948
if basis_tree is None:
2728
2949
basis_tree = working_tree.basis_tree()
2729
2950
basis_tree.lock_read()
2730
2951
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)):
2952
if (basis_tree.has_id(file_id) and
2953
new_sha1 == basis_tree.get_file_sha1(file_id)):
2733
2954
if file_id in merge_modified:
2734
2955
del merge_modified[file_id]
2736
2957
merge_modified[file_id] = new_sha1
2738
2959
# 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):
2960
if keep_content and wt_executable == target_executable:
2961
tt.set_executability(target_executable, trans_id)
2962
elif target_kind is not None:
2963
raise AssertionError(target_kind)
2964
if not wt_versioned and target_versioned:
2744
2965
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2966
if wt_versioned and not target_versioned:
2746
2967
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:
2968
if (target_name is not None and
2969
(wt_name != target_name or wt_parent != target_parent)):
2970
if target_name == '' and target_parent is None:
2750
2971
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)
2973
parent_trans = tt.trans_id_file_id(target_parent)
2974
if wt_parent is None and wt_versioned:
2975
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)
2977
tt.adjust_path(target_name, parent_trans, trans_id)
2978
if wt_executable != target_executable and target_kind == "file":
2979
tt.set_executability(target_executable, trans_id)
2759
2980
if working_tree.supports_content_filtering():
2760
2981
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
2982
target_tree.iter_files_bytes(deferred_files)):
2833
3054
elif c_type == 'missing parent':
2834
3055
trans_id = conflict[1]
2836
tt.cancel_deletion(trans_id)
2837
new_conflicts.add(('deleting parent', 'Not deleting',
3056
if trans_id in tt._removed_contents:
3057
cancel_deletion = True
3058
orphans = tt._get_potential_orphans(trans_id)
3060
cancel_deletion = False
3061
# All children are orphans
3064
tt.new_orphan(o, trans_id)
3065
except OrphaningError:
3066
# Something bad happened so we cancel the directory
3067
# deletion which will leave it in place with a
3068
# conflict. The user can deal with it from there.
3069
# Note that this also catch the case where we don't
3070
# want to create orphans and leave the directory in
3072
cancel_deletion = True
3075
# Cancel the directory deletion
3076
tt.cancel_deletion(trans_id)
3077
new_conflicts.add(('deleting parent', 'Not deleting',
2842
3082
tt.final_name(trans_id)
2903
3143
modified_path = fp.get_path(conflict[2])
2904
3144
modified_id = tt.final_file_id(conflict[2])
2905
3145
if len(conflict) == 3:
2906
yield Conflict.factory(c_type, action=action, path=modified_path,
2907
file_id=modified_id)
3146
yield conflicts.Conflict.factory(
3147
c_type, action=action, path=modified_path, file_id=modified_id)
2910
3150
conflicting_path = fp.get_path(conflict[3])
2911
3151
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)
3152
yield conflicts.Conflict.factory(
3153
c_type, action=action, path=modified_path,
3154
file_id=modified_id,
3155
conflict_path=conflicting_path,
3156
conflict_file_id=conflicting_id)
2918
3159
class _FileMover(object):
added
removed
breezy/transform.py
