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.bzr import (
51
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 (
53
from .errors import (DuplicateKey, MalformedTransform,
54
ReusingTransform, CantMoveRoot,
55
ImmortalLimbo, NoFinalPath,
57
from .filters import filtered_output_bytes, ContentFilterContext
58
from .mutabletree import MutableTree
59
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
67
from .progress import ProgressPhase
65
78
ROOT_PARENT = "root-parent"
68
80
def unique_add(map, key, value):
70
82
raise DuplicateKey(key=key)
74
87
class _TransformResults(object):
75
88
def __init__(self, modified_paths, rename_count):
76
89
object.__init__(self)
381
392
return sorted(FinalPaths(self).get_paths(new_ids))
383
394
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,
395
"""Determine which trans_ids need new Inventory entries.
397
An new entry is needed when anything that would be reflected by an
398
inventory entry changes, including file name, file_id, parent file_id,
399
file kind, and the execute bit.
401
Some care is taken to return entries with real changes, not cases
402
where the value is deleted and then restored to its original value,
403
but some actually unchanged values may be returned.
405
:returns: A list of (path, trans_id) for all items requiring an
406
inventory change. Ordered by path.
409
# Find entries whose file_ids are new (or changed).
410
new_file_id = set(t for t in self._new_id
411
if self._new_id[t] != self.tree_file_id(t))
412
for id_set in [self._new_name, self._new_parent, new_file_id,
387
413
self._new_executability]:
388
new_ids.update(id_set)
414
changed_ids.update(id_set)
415
# removing implies a kind change
389
416
changed_kind = set(self._removed_contents)
390
418
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))
419
# Ignore entries that are already known to have changed.
420
changed_kind.difference_update(changed_ids)
421
# to keep only the truly changed ones
422
changed_kind = (t for t in changed_kind
423
if self.tree_kind(t) != self.final_kind(t))
424
# all kind changes will alter the inventory
425
changed_ids.update(changed_kind)
426
# To find entries with changed parent_ids, find parents which existed,
427
# but changed file_id.
428
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
429
# Now add all their children to the set.
430
for parent_trans_id in new_file_id:
431
changed_ids.update(self.iter_tree_children(parent_trans_id))
432
return sorted(FinalPaths(self).get_paths(changed_ids))
397
434
def final_kind(self, trans_id):
398
435
"""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)
437
:return: None if the file does not exist/has no contents. (It is
438
conceivable that a path would be created without the corresponding
439
contents insertion command)
404
441
if trans_id in self._new_contents:
405
442
return self._new_contents[trans_id]
406
443
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
446
return self.tree_kind(trans_id)
448
def tree_path(self, trans_id):
449
"""Determine the tree path associated with the trans_id."""
450
return self._tree_id_paths.get(trans_id)
411
452
def tree_file_id(self, trans_id):
412
453
"""Determine the file id associated with the trans_id in the tree"""
414
path = self._tree_id_paths[trans_id]
416
# the file is a new, unversioned file, or invalid trans_id
454
path = self.tree_path(trans_id)
418
457
# the file is old; the old id is still valid
419
458
if self._new_root == trans_id:
532
571
# ensure that all children are registered with the transaction
533
572
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:
574
def _has_named_child(self, name, parent_id, known_children):
575
"""Does a parent already have a name child.
577
:param name: The searched for name.
579
:param parent_id: The parent for which the check is made.
581
:param known_children: The already known children. This should have
582
been recently obtained from `self.by_parent.get(parent_id)`
583
(or will be if None is passed).
585
if known_children is None:
586
known_children = self.by_parent().get(parent_id, [])
587
for child in known_children:
541
588
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
590
parent_path = self._tree_id_paths.get(parent_id, None)
591
if parent_path is None:
592
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
594
child_path = joinpath(parent_path, name)
595
child_id = self._tree_path_ids.get(child_path, None)
549
596
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
597
# Not known by the tree transform yet, check the filesystem
598
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?
600
raise AssertionError('child_id is missing: %s, %s, %s'
601
% (name, parent_id, child_id))
603
def _available_backup_name(self, name, target_id):
604
"""Find an available backup name.
606
:param name: The basename of the file.
608
:param target_id: The directory trans_id where the backup should
611
known_children = self.by_parent().get(target_id, [])
612
return osutils.available_backup_name(
614
lambda base: self._has_named_child(
615
base, target_id, known_children))
560
617
def _parent_loops(self):
561
618
"""No entry should be its own ancestor"""
673
725
self._removed_id))
674
726
all_ids = self._tree.all_file_ids()
675
727
active_tree_ids = all_ids.difference(removed_tree_ids)
676
for trans_id, file_id in self._new_id.iteritems():
728
for trans_id, file_id in viewitems(self._new_id):
677
729
if file_id in active_tree_ids:
678
old_trans_id = self.trans_id_tree_file_id(file_id)
730
path = self._tree.id2path(file_id)
731
old_trans_id = self.trans_id_tree_path(path)
679
732
conflicts.append(('duplicate id', old_trans_id, trans_id))
682
735
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
736
"""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)
738
for parent_id, children in viewitems(by_parent):
739
if parent_id == ROOT_PARENT:
742
for child_id in children:
743
if self.final_kind(child_id) is not None:
748
# There is at least a child, so we need an existing directory to
750
kind = self.final_kind(parent_id)
752
# The directory will be deleted
700
753
conflicts.append(('missing parent', parent_id))
701
754
elif kind != "directory":
755
# Meh, we need a *directory* to put something in it
702
756
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
759
def _set_executability(self, path, trans_id):
716
760
"""Set the executability of versioned files """
717
if supports_executable():
761
if self._tree._supports_executable():
718
762
new_executability = self._new_executability[trans_id]
719
763
abspath = self._tree.abspath(path)
720
764
current_mode = os.stat(abspath).st_mode
721
765
if new_executability:
722
766
umask = os.umask(0)
724
to_mode = current_mode | (0100 & ~umask)
768
to_mode = current_mode | (0o100 & ~umask)
725
769
# 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
770
if current_mode & 0o004:
771
to_mode |= 0o001 & ~umask
772
if current_mode & 0o040:
773
to_mode |= 0o010 & ~umask
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
775
to_mode = current_mode & ~0o111
776
osutils.chmod_if_possible(abspath, to_mode)
734
778
def _new_entry(self, name, parent_id, file_id):
735
779
"""Helper function to create a new filesystem entry."""
781
825
self.create_symlink(target, trans_id)
828
def new_orphan(self, trans_id, parent_id):
829
"""Schedule an item to be orphaned.
831
When a directory is about to be removed, its children, if they are not
832
versioned are moved out of the way: they don't have a parent anymore.
834
:param trans_id: The trans_id of the existing item.
835
:param parent_id: The parent trans_id of the item.
837
raise NotImplementedError(self.new_orphan)
839
def _get_potential_orphans(self, dir_id):
840
"""Find the potential orphans in a directory.
842
A directory can't be safely deleted if there are versioned files in it.
843
If all the contained files are unversioned then they can be orphaned.
845
The 'None' return value means that the directory contains at least one
846
versioned file and should not be deleted.
848
:param dir_id: The directory trans id.
850
:return: A list of the orphan trans ids or None if at least one
851
versioned file is present.
854
# Find the potential orphans, stop if one item should be kept
855
for child_tid in self.by_parent()[dir_id]:
856
if child_tid in self._removed_contents:
857
# The child is removed as part of the transform. Since it was
858
# versioned before, it's not an orphan
860
elif self.final_file_id(child_tid) is None:
861
# The child is not versioned
862
orphans.append(child_tid)
864
# We have a versioned file here, searching for orphans is
784
870
def _affected_ids(self):
785
871
"""Return the set of transform ids affected by the transform"""
786
872
trans_ids = set(self._removed_id)
787
trans_ids.update(self._new_id.keys())
873
trans_ids.update(self._new_id)
788
874
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())
875
trans_ids.update(self._new_contents)
876
trans_ids.update(self._new_executability)
877
trans_ids.update(self._new_name)
878
trans_ids.update(self._new_parent)
795
881
def _get_file_id_maps(self):
987
1072
return revision_id
989
1074
def _text_parent(self, trans_id):
990
file_id = self.tree_file_id(trans_id)
1075
path = self.tree_path(trans_id)
992
if file_id is None or self._tree.kind(file_id) != 'file':
1077
if path is None or self._tree.kind(path) != 'file':
994
1079
except errors.NoSuchFile:
998
1083
def _get_parents_texts(self, trans_id):
999
1084
"""Get texts for compression parents of this file."""
1000
file_id = self._text_parent(trans_id)
1085
path = self._text_parent(trans_id)
1003
return (self._tree.get_file_text(file_id),)
1088
return (self._tree.get_file_text(path),)
1005
1090
def _get_parents_lines(self, trans_id):
1006
1091
"""Get lines for compression parents of this file."""
1007
file_id = self._text_parent(trans_id)
1092
path = self._text_parent(trans_id)
1010
return (self._tree.get_file_lines(file_id),)
1095
return (self._tree.get_file_lines(path),)
1012
1097
def serialize(self, serializer):
1013
1098
"""Serialize this TreeTransform.
1015
1100
:param serializer: A Serialiser like pack.ContainerSerializer.
1017
new_name = dict((k, v.encode('utf-8')) for k, v in
1018
self._new_name.items())
1019
new_executability = dict((k, int(v)) for k, v in
1020
self._new_executability.items())
1021
tree_path_ids = dict((k.encode('utf-8'), v)
1022
for k, v in self._tree_path_ids.items())
1102
new_name = {k.encode('utf-8'): v.encode('utf-8')
1103
for k, v in viewitems(self._new_name)}
1104
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1105
for k, v in viewitems(self._new_parent)}
1106
new_id = {k.encode('utf-8'): v
1107
for k, v in viewitems(self._new_id)}
1108
new_executability = {k.encode('utf-8'): int(v)
1109
for k, v in viewitems(self._new_executability)}
1110
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1111
for k, v in viewitems(self._tree_path_ids)}
1112
non_present_ids = {k: v.encode('utf-8')
1113
for k, v in viewitems(self._non_present_ids)}
1114
removed_contents = [trans_id.encode('utf-8')
1115
for trans_id in self._removed_contents]
1116
removed_id = [trans_id.encode('utf-8')
1117
for trans_id in self._removed_id]
1024
'_id_number': self._id_number,
1025
'_new_name': new_name,
1026
'_new_parent': self._new_parent,
1027
'_new_executability': new_executability,
1028
'_new_id': self._new_id,
1029
'_tree_path_ids': tree_path_ids,
1030
'_removed_id': list(self._removed_id),
1031
'_removed_contents': list(self._removed_contents),
1032
'_non_present_ids': self._non_present_ids,
1119
b'_id_number': self._id_number,
1120
b'_new_name': new_name,
1121
b'_new_parent': new_parent,
1122
b'_new_executability': new_executability,
1124
b'_tree_path_ids': tree_path_ids,
1125
b'_removed_id': removed_id,
1126
b'_removed_contents': removed_contents,
1127
b'_non_present_ids': non_present_ids,
1034
1129
yield serializer.bytes_record(bencode.bencode(attribs),
1036
for trans_id, kind in self._new_contents.items():
1131
for trans_id, kind in viewitems(self._new_contents):
1037
1132
if kind == 'file':
1038
lines = osutils.chunks_to_lines(
1039
self._read_file_chunks(trans_id))
1133
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1134
lines = cur_file.readlines()
1040
1135
parents = self._get_parents_lines(trans_id)
1041
1136
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1042
content = ''.join(mpdiff.to_patch())
1137
content = b''.join(mpdiff.to_patch())
1043
1138
if kind == 'directory':
1045
1140
if kind == 'symlink':
1046
1141
content = self._read_symlink_target(trans_id)
1047
yield serializer.bytes_record(content, ((trans_id, kind),))
1142
if not isinstance(content, bytes):
1143
content = content.encode('utf-8')
1144
yield serializer.bytes_record(
1145
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1049
1147
def deserialize(self, records):
1050
1148
"""Deserialize a stored TreeTransform.
1052
1150
:param records: An iterable of (names, content) tuples, as per
1053
1151
pack.ContainerPushParser.
1055
names, content = records.next()
1153
names, content = next(records)
1056
1154
attribs = bencode.bdecode(content)
1057
self._id_number = attribs['_id_number']
1058
self._new_name = dict((k, v.decode('utf-8'))
1059
for k, v in attribs['_new_name'].items())
1060
self._new_parent = attribs['_new_parent']
1061
self._new_executability = dict((k, bool(v)) for k, v in
1062
attribs['_new_executability'].items())
1063
self._new_id = attribs['_new_id']
1064
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1155
self._id_number = attribs[b'_id_number']
1156
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1157
for k, v in viewitems(attribs[b'_new_name'])}
1158
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1159
for k, v in viewitems(attribs[b'_new_parent'])}
1160
self._new_executability = {k.decode('utf-8'): bool(v)
1161
for k, v in viewitems(attribs[b'_new_executability'])}
1162
self._new_id = {k.decode('utf-8'): v
1163
for k, v in viewitems(attribs[b'_new_id'])}
1164
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1065
1165
self._tree_path_ids = {}
1066
1166
self._tree_id_paths = {}
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1167
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1068
1168
path = bytepath.decode('utf-8')
1169
trans_id = trans_id.decode('utf-8')
1069
1170
self._tree_path_ids[path] = trans_id
1070
1171
self._tree_id_paths[trans_id] = path
1071
self._removed_id = set(attribs['_removed_id'])
1072
self._removed_contents = set(attribs['_removed_contents'])
1073
self._non_present_ids = attribs['_non_present_ids']
1172
self._removed_id = {trans_id.decode('utf-8')
1173
for trans_id in attribs[b'_removed_id']}
1174
self._removed_contents = set(trans_id.decode('utf-8')
1175
for trans_id in attribs[b'_removed_contents'])
1176
self._non_present_ids = {k: v.decode('utf-8')
1177
for k, v in viewitems(attribs[b'_non_present_ids'])}
1074
1178
for ((trans_id, kind),), content in records:
1179
trans_id = trans_id.decode('utf-8')
1180
kind = kind.decode('ascii')
1075
1181
if kind == 'file':
1076
1182
mpdiff = multiparent.MultiParent.from_patch(content)
1077
1183
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1195
1317
descendants.update(self._limbo_descendants(descendant))
1196
1318
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1320
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1321
"""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.
1325
:param contents: an iterator of strings, all of which will be written
1326
to the target destination.
1327
:param trans_id: TreeTransform handle
1328
:param mode_id: If not None, force the mode of the target file to match
1329
the mode of the object referenced by mode_id.
1330
Otherwise, we will try to preserve mode bits of an existing file.
1331
:param sha1: If the sha1 of this content is already known, pass it in.
1332
We can use it to prevent future sha1 computations.
1209
1334
name = self._limbo_name(trans_id)
1210
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.
1335
with open(name, 'wb') as f:
1336
unique_add(self._new_contents, trans_id, 'file')
1221
1337
f.writelines(contents)
1224
1338
self._set_mtime(name)
1225
1339
self._set_mode(trans_id, mode_id, S_ISREG)
1227
def _read_file_chunks(self, trans_id):
1228
cur_file = open(self._limbo_name(trans_id), 'rb')
1230
return cur_file.readlines()
1340
# It is unfortunate we have to use lstat instead of fstat, but we just
1341
# used utime and chmod on the file, so we need the accurate final
1343
if sha1 is not None:
1344
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1234
1346
def _read_symlink_target(self, trans_id):
1235
1347
return os.readlink(self._limbo_name(trans_id))
1296
1410
del self._limbo_children_names[trans_id]
1297
1411
delete_any(self._limbo_name(trans_id))
1413
def new_orphan(self, trans_id, parent_id):
1414
conf = self._tree.get_config_stack()
1415
handle_orphan = conf.get('transform.orphan_policy')
1416
handle_orphan(self, trans_id, parent_id)
1419
class OrphaningError(errors.BzrError):
1421
# Only bugs could lead to such exception being seen by the user
1422
internal_error = True
1423
_fmt = "Error while orphaning %s in %s directory"
1425
def __init__(self, orphan, parent):
1426
errors.BzrError.__init__(self)
1427
self.orphan = orphan
1428
self.parent = parent
1431
class OrphaningForbidden(OrphaningError):
1433
_fmt = "Policy: %s doesn't allow creating orphans."
1435
def __init__(self, policy):
1436
errors.BzrError.__init__(self)
1437
self.policy = policy
1440
def move_orphan(tt, orphan_id, parent_id):
1441
"""See TreeTransformBase.new_orphan.
1443
This creates a new orphan in the `brz-orphans` dir at the root of the
1446
:param tt: The TreeTransform orphaning `trans_id`.
1448
:param orphan_id: The trans id that should be orphaned.
1450
:param parent_id: The orphan parent trans id.
1452
# Add the orphan dir if it doesn't exist
1453
orphan_dir_basename = 'brz-orphans'
1454
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1455
if tt.final_kind(od_id) is None:
1456
tt.create_directory(od_id)
1457
parent_path = tt._tree_id_paths[parent_id]
1458
# Find a name that doesn't exist yet in the orphan dir
1459
actual_name = tt.final_name(orphan_id)
1460
new_name = tt._available_backup_name(actual_name, od_id)
1461
tt.adjust_path(new_name, od_id, orphan_id)
1462
trace.warning('%s has been orphaned in %s'
1463
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1466
def refuse_orphan(tt, orphan_id, parent_id):
1467
"""See TreeTransformBase.new_orphan.
1469
This refuses to create orphan, letting the caller handle the conflict.
1471
raise OrphaningForbidden('never')
1474
orphaning_registry = registry.Registry()
1475
orphaning_registry.register(
1476
u'conflict', refuse_orphan,
1477
'Leave orphans in place and create a conflict on the directory.')
1478
orphaning_registry.register(
1479
u'move', move_orphan,
1480
'Move orphans into the brz-orphans directory.')
1481
orphaning_registry._set_default_key(u'conflict')
1484
opt_transform_orphan = _mod_config.RegistryOption(
1485
'transform.orphan_policy', orphaning_registry,
1486
help='Policy for orphaned files during transform operations.',
1300
1490
class TreeTransform(DiskTreeTransform):
1301
1491
"""Represent a tree transformation.
1593
1775
inventory_delta.append((path, None, file_id, None))
1594
1776
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1596
entries = self._tree.iter_entries_by_dir(
1597
new_path_file_ids.values())
1598
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)
1611
kind = self._tree.stored_kind(file_id)
1787
kind = self.final_kind(trans_id)
1789
kind = self._tree.stored_kind(
1790
self._tree.id2path(file_id), file_id)
1612
1791
parent_trans_id = self.final_parent(trans_id)
1613
1792
parent_file_id = new_path_file_ids.get(parent_trans_id)
1614
1793
if parent_file_id is None:
1679
1857
modified_paths = []
1680
1858
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()
1860
with ui.ui_factory.nested_progress_bar() as child_pb:
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)
1887
for path, trans_id in new_paths:
1888
# new_paths includes stuff like workingtree conflicts. Only the
1889
# stuff in new_contents actually comes from limbo.
1890
if trans_id in self._limbo_files:
1891
del self._limbo_files[trans_id]
1705
1892
self._new_contents.clear()
1706
1893
return modified_paths
1895
def _apply_observed_sha1s(self):
1896
"""After we have finished renaming everything, update observed sha1s
1898
This has to be done after self._tree.apply_inventory_delta, otherwise
1899
it doesn't know anything about the files we are updating. Also, we want
1900
to do this as late as possible, so that most entries end up cached.
1902
# TODO: this doesn't update the stat information for directories. So
1903
# the first 'bzr status' will still need to rewrite
1904
# .bzr/checkout/dirstate. However, we at least don't need to
1905
# re-read all of the files.
1906
# TODO: If the operation took a while, we could do a time.sleep(3) here
1907
# to allow the clock to tick over and ensure we won't have any
1908
# problems. (we could observe start time, and finish time, and if
1909
# it is less than eg 10% overhead, add a sleep call.)
1910
paths = FinalPaths(self)
1911
for trans_id, observed in viewitems(self._observed_sha1s):
1912
path = paths.get_path(trans_id)
1913
# We could get the file_id, but dirstate prefers to use the path
1914
# anyway, and it is 'cheaper' to determine.
1915
# file_id = self._new_id[trans_id]
1916
self._tree._observed_sha1(None, path, observed)
1709
1919
class TransformPreview(DiskTreeTransform):
1710
1920
"""A TreeTransform for generating preview trees.
1788
2001
except errors.NoSuchRevisionInTree:
1789
2002
yield self._get_repository().revision_tree(revision_id)
1791
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
self._iter_parent_trees()]
2004
def _get_file_revision(self, path, file_id, vf, tree_revision):
2006
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
2007
for t in self._iter_parent_trees()]
1794
2008
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2009
self.get_file_lines(path, file_id))
1796
2010
repo = self._get_repository()
1797
2011
base_vf = repo.texts
1798
2012
if base_vf not in vf.fallback_versionedfiles:
1799
2013
vf.fallback_versionedfiles.append(base_vf)
1800
2014
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2016
def _stat_limbo_file(self, trans_id):
1804
2017
name = self._transform._limbo_name(trans_id)
1805
2018
return os.lstat(name)
1920
2137
if self._transform.final_file_id(trans_id) is None:
1921
2138
yield self._final_paths._determine_path(trans_id)
1923
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1924
yield_parents=False):
2140
def _make_inv_entries(self, ordered_entries, specific_files=None):
1925
2141
for trans_id, parent_file_id in ordered_entries:
1926
2142
file_id = self._transform.final_file_id(trans_id)
1927
2143
if file_id is None:
1929
if (specific_file_ids is not None
1930
and file_id not in specific_file_ids):
2145
if (specific_files is not None and
2146
self._final_paths.get_path(trans_id) not in specific_files):
1933
kind = self._transform.final_kind(trans_id)
1935
kind = self._transform._tree.stored_kind(file_id)
2148
kind = self._transform.final_kind(trans_id)
2150
kind = self._transform._tree.stored_kind(
2151
self._transform._tree.id2path(file_id),
1936
2153
new_entry = inventory.make_entry(
1938
2155
self._transform.final_name(trans_id),
1962
2188
ordered_ids = self._list_files_by_dir()
1963
2189
for entry, trans_id in self._make_inv_entries(ordered_ids,
1964
specific_file_ids, yield_parents=yield_parents):
1965
yield unicode(self._final_paths.get_path(trans_id)), entry
2191
yield self._final_paths.get_path(trans_id), entry
1967
2193
def _iter_entries_for_dir(self, dir_path):
1968
2194
"""Return path, entry for items in a directory without recursing down."""
1969
dir_file_id = self.path2id(dir_path)
1970
2195
ordered_ids = []
1971
for file_id in self.iter_children(dir_file_id):
1972
trans_id = self._transform.trans_id_file_id(file_id)
1973
ordered_ids.append((trans_id, file_id))
2196
dir_trans_id = self._path2trans_id(dir_path)
2197
dir_id = self._transform.final_file_id(dir_trans_id)
2198
for child_trans_id in self._all_children(dir_trans_id):
2199
ordered_ids.append((child_trans_id, dir_id))
1974
2201
for entry, trans_id in self._make_inv_entries(ordered_ids):
1975
yield unicode(self._final_paths.get_path(trans_id)), entry
2202
path_entries.append((self._final_paths.get_path(trans_id), entry))
1977
2206
def list_files(self, include_root=False, from_dir=None, recursive=True):
1978
2207
"""See WorkingTree.list_files."""
2000
2229
for path, entry in entries:
2001
2230
yield path, 'V', entry.kind, entry.file_id, entry
2003
def kind(self, file_id):
2004
trans_id = self._transform.trans_id_file_id(file_id)
2232
def kind(self, path, file_id=None):
2233
trans_id = self._path2trans_id(path)
2234
if trans_id is None:
2235
raise errors.NoSuchFile(path)
2005
2236
return self._transform.final_kind(trans_id)
2007
def stored_kind(self, file_id):
2008
trans_id = self._transform.trans_id_file_id(file_id)
2238
def stored_kind(self, path, file_id=None):
2239
trans_id = self._path2trans_id(path)
2240
if trans_id is None:
2241
raise errors.NoSuchFile(path)
2010
2243
return self._transform._new_contents[trans_id]
2011
2244
except KeyError:
2012
return self._transform._tree.stored_kind(file_id)
2245
return self._transform._tree.stored_kind(path, file_id)
2014
def get_file_mtime(self, file_id, path=None):
2247
def get_file_mtime(self, path, file_id=None):
2015
2248
"""See Tree.get_file_mtime"""
2250
file_id = self.path2id(path)
2252
raise errors.NoSuchFile(path)
2016
2253
if not self._content_change(file_id):
2017
return self._transform._tree.get_file_mtime(file_id)
2018
return self._stat_limbo_file(file_id).st_mtime
2020
def _file_size(self, entry, stat_value):
2021
return self.get_file_size(entry.file_id)
2023
def get_file_size(self, file_id):
2254
return self._transform._tree.get_file_mtime(
2255
self._transform._tree.id2path(file_id), file_id)
2256
trans_id = self._path2trans_id(path)
2257
return self._stat_limbo_file(trans_id).st_mtime
2259
def get_file_size(self, path, file_id=None):
2024
2260
"""See Tree.get_file_size"""
2025
if self.kind(file_id) == 'file':
2026
return self._transform._tree.get_file_size(file_id)
2261
trans_id = self._path2trans_id(path)
2262
if trans_id is None:
2263
raise errors.NoSuchFile(path)
2264
kind = self._transform.final_kind(trans_id)
2267
if trans_id in self._transform._new_contents:
2268
return self._stat_limbo_file(trans_id).st_size
2269
if self.kind(path, file_id) == 'file':
2270
return self._transform._tree.get_file_size(path, file_id)
2030
def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
trans_id = self._transform.trans_id_file_id(file_id)
2032
kind = self._transform._new_contents.get(trans_id)
2034
return self._transform._tree.get_file_sha1(file_id)
2036
fileobj = self.get_file(file_id)
2274
def get_file_verifier(self, path, file_id=None, stat_value=None):
2275
trans_id = self._path2trans_id(path)
2276
if trans_id is None:
2277
raise errors.NoSuchFile(path)
2278
kind = self._transform._new_contents.get(trans_id)
2280
return self._transform._tree.get_file_verifier(path, file_id)
2282
with self.get_file(path, file_id) as fileobj:
2283
return ("SHA1", sha_file(fileobj))
2285
def get_file_sha1(self, path, file_id=None, stat_value=None):
2286
trans_id = self._path2trans_id(path)
2287
if trans_id is None:
2288
raise errors.NoSuchFile(path)
2289
kind = self._transform._new_contents.get(trans_id)
2291
return self._transform._tree.get_file_sha1(path, file_id)
2293
with self.get_file(path, file_id) as fileobj:
2038
2294
return sha_file(fileobj)
2042
def is_executable(self, file_id, path=None):
2296
def is_executable(self, path, file_id=None):
2297
trans_id = self._path2trans_id(path)
2298
if trans_id is None:
2045
trans_id = self._transform.trans_id_file_id(file_id)
2047
2301
return self._transform._new_executability[trans_id]
2048
2302
except KeyError:
2050
return self._transform._tree.is_executable(file_id, path)
2304
return self._transform._tree.is_executable(path, file_id)
2305
except OSError as e:
2052
2306
if e.errno == errno.ENOENT:
2055
except errors.NoSuchId:
2309
except errors.NoSuchFile:
2312
def has_filename(self, path):
2313
trans_id = self._path2trans_id(path)
2314
if trans_id in self._transform._new_contents:
2316
elif trans_id in self._transform._removed_contents:
2319
return self._transform._tree.has_filename(path)
2058
2321
def path_content_summary(self, path):
2059
2322
trans_id = self._path2trans_id(path)
2060
2323
tt = self._transform
2106
2371
raise ValueError('want_unversioned is not supported')
2107
2372
return self._transform.iter_changes()
2109
def get_file(self, file_id, path=None):
2374
def get_file(self, path, file_id=None):
2110
2375
"""See Tree.get_file"""
2377
file_id = self.path2id(path)
2111
2378
if not self._content_change(file_id):
2112
return self._transform._tree.get_file(file_id, path)
2113
trans_id = self._transform.trans_id_file_id(file_id)
2379
return self._transform._tree.get_file(path, file_id)
2380
trans_id = self._path2trans_id(path)
2114
2381
name = self._transform._limbo_name(trans_id)
2115
2382
return open(name, 'rb')
2117
def get_file_with_stat(self, file_id, path=None):
2118
return self.get_file(file_id, path), None
2384
def get_file_with_stat(self, path, file_id=None):
2385
return self.get_file(path, file_id), None
2120
def annotate_iter(self, file_id,
2387
def annotate_iter(self, path, file_id=None,
2121
2388
default_revision=_mod_revision.CURRENT_REVISION):
2390
file_id = self.path2id(path)
2122
2391
changes = self._iter_changes_cache.get(file_id)
2123
2392
if changes is None:
2268
2541
:param delta_from_tree: If true, build_tree may use the input Tree to
2269
2542
generate the inventory delta.
2271
wt.lock_tree_write()
2544
with wt.lock_tree_write(), tree.lock_read():
2545
if accelerator_tree is not None:
2546
accelerator_tree.lock_read()
2548
return _build_tree(tree, wt, accelerator_tree, hardlink,
2275
2551
if accelerator_tree is not None:
2276
accelerator_tree.lock_read()
2278
return _build_tree(tree, wt, accelerator_tree, hardlink,
2281
if accelerator_tree is not None:
2282
accelerator_tree.unlock()
2552
accelerator_tree.unlock()
2289
2555
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2290
2556
"""See build_tree."""
2291
for num, _unused in enumerate(wt.all_file_ids()):
2557
for num, _unused in enumerate(wt.all_versioned_paths()):
2292
2558
if num > 0: # more than just a root
2293
2559
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2294
existing_files = set()
2295
for dir, files in wt.walkdirs():
2296
existing_files.update(f[0] for f in files)
2297
2560
file_trans_id = {}
2298
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2561
top_pb = ui.ui_factory.nested_progress_bar()
2299
2562
pp = ProgressPhase("Build phase", 2, top_pb)
2300
if tree.inventory.root is not None:
2563
if tree.get_root_id() is not None:
2301
2564
# This is kind of a hack: we should be altering the root
2302
2565
# as part of the regular tree shape diff logic.
2303
2566
# The conditional test here is to avoid doing an
2314
2577
pp.next_phase()
2315
file_trans_id[wt.get_root_id()] = \
2316
tt.trans_id_tree_file_id(wt.get_root_id())
2317
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2578
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2579
with ui.ui_factory.nested_progress_bar() as pb:
2319
2580
deferred_contents = []
2321
total = len(tree.inventory)
2582
total = len(tree.all_versioned_paths())
2322
2583
if delta_from_tree:
2323
2584
precomputed_delta = []
2325
2586
precomputed_delta = None
2587
# Check if tree inventory has content. If so, we populate
2588
# existing_files with the directory content. If there are no
2589
# entries we skip populating existing_files as its not used.
2590
# This improves performance and unncessary work on large
2591
# directory trees. (#501307)
2593
existing_files = set()
2594
for dir, files in wt.walkdirs():
2595
existing_files.update(f[0] for f in files)
2326
2596
for num, (tree_path, entry) in \
2327
enumerate(tree.inventory.iter_entries_by_dir()):
2328
pb.update("Building tree", num - len(deferred_contents), total)
2597
enumerate(tree.iter_entries_by_dir()):
2598
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2329
2599
if entry.parent_id is None:
2331
2601
reparent = False
2355
2625
trans_id = tt.create_path(entry.name, parent_id)
2356
2626
file_trans_id[file_id] = trans_id
2357
2627
tt.version_file(file_id, trans_id)
2358
executable = tree.is_executable(file_id, tree_path)
2628
executable = tree.is_executable(tree_path, file_id)
2360
2630
tt.set_executability(executable, trans_id)
2361
trans_data = (trans_id, tree_path)
2362
deferred_contents.append((file_id, trans_data))
2631
trans_data = (trans_id, file_id, tree_path, entry.text_sha1)
2632
deferred_contents.append((tree_path, trans_data))
2364
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2634
file_trans_id[file_id] = new_by_entry(
2635
tree_path, tt, entry, parent_id, tree)
2367
2637
new_trans_id = file_trans_id[file_id]
2368
2638
old_parent = tt.trans_id_tree_path(tree_path)
2401
2669
new_desired_files = desired_files
2403
2671
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2404
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2672
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2405
2673
in iter if not (c or e[0] != e[1])]
2406
2674
if accelerator_tree.supports_content_filtering():
2407
unchanged = [(f, p) for (f, p) in unchanged
2408
if not accelerator_tree.iter_search_rules([p]).next()]
2675
unchanged = [(tp, ap) for (tp, ap) in unchanged
2676
if not next(accelerator_tree.iter_search_rules([ap]))]
2409
2677
unchanged = dict(unchanged)
2410
2678
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2413
accelerator_path = unchanged.get(file_id)
2680
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2681
accelerator_path = unchanged.get(tree_path)
2414
2682
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2683
new_desired_files.append((tree_path,
2684
(trans_id, file_id, tree_path, text_sha1)))
2417
pb.update('Adding file contents', count + offset, total)
2686
pb.update(gettext('Adding file contents'), count + offset, total)
2419
2688
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2422
contents = accelerator_tree.get_file(file_id, accelerator_path)
2423
if wt.supports_content_filtering():
2424
filters = wt._content_filter_stack(tree_path)
2425
contents = filtered_output_bytes(contents, filters,
2426
ContentFilterContext(tree_path, tree))
2428
tt.create_file(contents, trans_id)
2432
except AttributeError:
2433
# after filtering, contents may no longer be file-like
2691
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2692
chunks = osutils.file_iterator(f)
2693
if wt.supports_content_filtering():
2694
filters = wt._content_filter_stack(tree_path)
2695
chunks = filtered_output_bytes(chunks, filters,
2696
ContentFilterContext(tree_path, tree))
2697
tt.create_file(chunks, trans_id, sha1=text_sha1)
2436
2699
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2700
for count, ((trans_id, file_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
def _content_match(tree, entry, file_id, kind, target_path):
2722
def _content_match(tree, entry, tree_path, 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
with open(target_path, 'rb') as f1, \
2729
tree.get_file(tree_path, file_id) as f2:
2730
if osutils.compare_files(f1, f2):
2465
2732
elif entry.kind == "symlink":
2466
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2733
if tree.get_symlink_target(tree_path, file_id) == os.readlink(target_path):
2498
2765
return new_conflicts
2501
def new_by_entry(tt, entry, parent_id, tree):
2768
def new_by_entry(path, tt, entry, parent_id, tree):
2502
2769
"""Create a new file according to its inventory entry"""
2503
2770
name = entry.name
2504
2771
kind = entry.kind
2505
2772
if kind == 'file':
2506
contents = tree.get_file(entry.file_id).readlines()
2507
executable = tree.is_executable(entry.file_id)
2508
return tt.new_file(name, parent_id, contents, entry.file_id,
2773
with tree.get_file(path, entry.file_id) as f:
2774
executable = tree.is_executable(path, entry.file_id)
2776
name, parent_id, osutils.file_iterator(f), entry.file_id,
2510
2778
elif kind in ('directory', 'tree-reference'):
2511
2779
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2512
2780
if kind == 'tree-reference':
2513
2781
tt.set_tree_reference(entry.reference_revision, trans_id)
2514
2782
return trans_id
2515
2783
elif kind == 'symlink':
2516
target = tree.get_symlink_target(entry.file_id)
2784
target = tree.get_symlink_target(path, entry.file_id)
2517
2785
return tt.new_symlink(name, parent_id, target, entry.file_id)
2519
2787
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
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2790
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2539
2791
filter_tree_path=None):
2540
2792
"""Create new file contents according to tree contents.
2542
2794
:param filter_tree_path: the tree path to use to lookup
2543
2795
content filters to apply to the bytes output in the working tree.
2544
2796
This only applies if the working tree supports content filtering.
2546
kind = tree.kind(file_id)
2798
kind = tree.kind(path, file_id)
2547
2799
if kind == 'directory':
2548
2800
tt.create_directory(trans_id)
2549
2801
elif kind == "file":
2551
tree_file = tree.get_file(file_id)
2553
bytes = tree_file.readlines()
2557
if wt.supports_content_filtering() and filter_tree_path is not None:
2558
filters = wt._content_filter_stack(filter_tree_path)
2559
bytes = filtered_output_bytes(bytes, filters,
2560
ContentFilterContext(filter_tree_path, tree))
2561
tt.create_file(bytes, trans_id)
2803
f = tree.get_file(path, file_id)
2804
chunks = osutils.file_iterator(f)
2809
if wt.supports_content_filtering() and filter_tree_path is not None:
2810
filters = wt._content_filter_stack(filter_tree_path)
2811
chunks = filtered_output_bytes(chunks, filters,
2812
ContentFilterContext(filter_tree_path, tree))
2813
tt.create_file(chunks, trans_id)
2562
2817
elif kind == "symlink":
2563
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2818
tt.create_symlink(tree.get_symlink_target(path, file_id), trans_id)
2565
2820
raise AssertionError('Unknown kind %r' % kind)
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."""
2620
target_tree.lock_read()
2621
2832
pb = ui.ui_factory.nested_progress_bar()
2622
tt = TreeTransform(working_tree, pb)
2624
pp = ProgressPhase("Revert phase", 3, pb)
2625
conflicts, merge_modified = _prepare_revert_transform(
2626
working_tree, target_tree, tt, filenames, backups, pp)
2628
change_reporter = delta._ChangeReporter(
2629
unversioned_filter=working_tree.is_ignored)
2630
delta.report_changes(tt.iter_changes(), change_reporter)
2631
for conflict in conflicts:
2635
working_tree.set_merge_modified(merge_modified)
2834
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2835
pp = ProgressPhase("Revert phase", 3, pb)
2836
conflicts, merge_modified = _prepare_revert_transform(
2837
working_tree, target_tree, tt, filenames, backups, pp)
2839
change_reporter = delta._ChangeReporter(
2840
unversioned_filter=working_tree.is_ignored)
2841
delta.report_changes(tt.iter_changes(), change_reporter)
2842
for conflict in conflicts:
2843
trace.warning(text_type(conflict))
2846
if working_tree.supports_merge_modified():
2847
working_tree.set_merge_modified(merge_modified)
2637
target_tree.unlock()
2640
2850
return conflicts
2643
2853
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2644
2854
backups, pp, basis_tree=None,
2645
2855
merge_modified=None):
2646
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2856
with ui.ui_factory.nested_progress_bar() as child_pb:
2648
2857
if merge_modified is None:
2649
2858
merge_modified = working_tree.merge_modified()
2650
2859
merge_modified = _alter_files(working_tree, target_tree, tt,
2651
2860
child_pb, filenames, backups,
2652
2861
merge_modified, basis_tree)
2655
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2862
with ui.ui_factory.nested_progress_bar() as child_pb:
2657
2863
raw_conflicts = resolve_conflicts(tt, child_pb,
2658
2864
lambda t, c: conflict_pass(t, c, target_tree))
2661
2865
conflicts = cook_conflicts(raw_conflicts, tt)
2662
2866
return conflicts, merge_modified
2676
2884
deferred_files = []
2677
2885
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
2886
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2887
target_path, wt_path = path
2888
target_versioned, wt_versioned = versioned
2889
target_parent, wt_parent = parent
2890
target_name, wt_name = name
2891
target_kind, wt_kind = kind
2892
target_executable, wt_executable = executable
2893
if skip_root and wt_parent is None:
2681
2895
trans_id = tt.trans_id_file_id(file_id)
2683
2897
if changed_content:
2684
2898
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2686
wt_sha1 = working_tree.get_file_sha1(file_id)
2899
if wt_kind == 'file' and (backups or target_kind is None):
2900
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2687
2901
if merge_modified.get(file_id) != wt_sha1:
2688
2902
# acquire the basis tree lazily to prevent the
2689
2903
# expense of accessing it when it's not needed ?
2691
2905
if basis_tree is None:
2692
2906
basis_tree = working_tree.basis_tree()
2693
2907
basis_tree.lock_read()
2694
if file_id in basis_tree:
2695
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2697
elif kind[1] is None and not versioned[1]:
2699
if kind[0] is not None:
2908
basis_path = find_previous_path(working_tree, basis_tree, wt_path)
2909
if basis_path is None:
2910
if target_kind is None and not target_versioned:
2913
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2915
if wt_kind is not None:
2700
2916
if not keep_content:
2701
2917
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)
2918
elif target_kind is not None:
2919
parent_trans_id = tt.trans_id_file_id(wt_parent)
2920
backup_name = tt._available_backup_name(
2921
wt_name, parent_trans_id)
2707
2922
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):
2923
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2924
if wt_versioned and target_versioned:
2710
2925
tt.unversion_file(trans_id)
2711
2926
tt.version_file(file_id, new_trans_id)
2712
2927
# New contents should have the same unix perms as old
2714
2929
mode_id = trans_id
2715
2930
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2931
if target_kind in ('directory', 'tree-reference'):
2717
2932
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2719
revision = target_tree.get_reference_revision(file_id,
2933
if target_kind == 'tree-reference':
2934
revision = target_tree.get_reference_revision(
2935
target_path, file_id)
2721
2936
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2723
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2726
deferred_files.append((file_id, (trans_id, mode_id)))
2937
elif target_kind == 'symlink':
2938
tt.create_symlink(target_tree.get_symlink_target(
2939
target_path, file_id), trans_id)
2940
elif target_kind == 'file':
2941
deferred_files.append((target_path, (trans_id, mode_id, file_id)))
2727
2942
if basis_tree is None:
2728
2943
basis_tree = working_tree.basis_tree()
2729
2944
basis_tree.lock_read()
2730
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)):
2945
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2946
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2947
if (basis_path is not None and
2948
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2733
2949
if file_id in merge_modified:
2734
2950
del merge_modified[file_id]
2736
2952
merge_modified[file_id] = new_sha1
2738
2954
# 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):
2955
if keep_content and wt_executable == target_executable:
2956
tt.set_executability(target_executable, trans_id)
2957
elif target_kind is not None:
2958
raise AssertionError(target_kind)
2959
if not wt_versioned and target_versioned:
2744
2960
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2961
if wt_versioned and not target_versioned:
2746
2962
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:
2963
if (target_name is not None and
2964
(wt_name != target_name or wt_parent != target_parent)):
2965
if target_name == '' and target_parent is None:
2750
2966
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)
2968
parent_trans = tt.trans_id_file_id(target_parent)
2969
if wt_parent is None and wt_versioned:
2970
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)
2972
tt.adjust_path(target_name, parent_trans, trans_id)
2973
if wt_executable != target_executable and target_kind == "file":
2974
tt.set_executability(target_executable, trans_id)
2759
2975
if working_tree.supports_content_filtering():
2760
for index, ((trans_id, mode_id), bytes) in enumerate(
2976
for (trans_id, mode_id, file_id), bytes in (
2761
2977
target_tree.iter_files_bytes(deferred_files)):
2762
file_id = deferred_files[index][0]
2763
2978
# We're reverting a tree to the target tree so using the
2764
2979
# target tree to find the file path seems the best choice
2765
2980
# here IMO - Ian C 27/Oct/2009
2903
3133
modified_path = fp.get_path(conflict[2])
2904
3134
modified_id = tt.final_file_id(conflict[2])
2905
3135
if len(conflict) == 3:
2906
yield Conflict.factory(c_type, action=action, path=modified_path,
2907
file_id=modified_id)
3136
yield conflicts.Conflict.factory(
3137
c_type, action=action, path=modified_path, file_id=modified_id)
2910
3140
conflicting_path = fp.get_path(conflict[3])
2911
3141
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)
3142
yield conflicts.Conflict.factory(
3143
c_type, action=action, path=modified_path,
3144
file_id=modified_id,
3145
conflict_path=conflicting_path,
3146
conflict_file_id=conflicting_id)
2918
3149
class _FileMover(object):
added
removed
breezy/transform.py
