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"
224
248
self._new_root = new_roots[0]
226
250
old_new_root = new_roots[0]
227
# TODO: What to do if a old_new_root is present, but self._new_root is
228
# not listed as being removed? This code explicitly unversions
229
# the old root and versions it with the new file_id. Though that
230
# seems like an incomplete delta
232
251
# unversion the new root's directory.
233
file_id = self.final_file_id(old_new_root)
252
if self.final_kind(self._new_root) is None:
253
file_id = self.final_file_id(old_new_root)
255
file_id = self.final_file_id(self._new_root)
234
256
if old_new_root in self._new_id:
235
257
self.cancel_versioning(old_new_root)
237
259
self.unversion_file(old_new_root)
238
260
# if, at this stage, root still has an old file_id, zap it so we can
239
261
# stick a new one in.
240
if (self.tree_file_id(self._new_root) is not None and
241
self._new_root not in self._removed_id):
262
if (self.tree_file_id(self._new_root) is not None
263
and self._new_root not in self._removed_id):
242
264
self.unversion_file(self._new_root)
243
self.version_file(file_id, self._new_root)
265
if file_id is not None:
266
self.version_file(file_id, self._new_root)
245
268
# Now move children of new root into old root directory.
246
269
# Ensure all children are registered with the transaction, but don't
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
# Now add all their children to the set.
429
for parent_trans_id in new_file_id:
430
changed_ids.update(self.iter_tree_children(parent_trans_id))
431
return sorted(FinalPaths(self).get_paths(changed_ids))
397
433
def final_kind(self, trans_id):
398
434
"""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)
436
:return: None if the file does not exist/has no contents. (It is
437
conceivable that a path would be created without the corresponding
438
contents insertion command)
404
440
if trans_id in self._new_contents:
405
441
return self._new_contents[trans_id]
406
442
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
445
return self.tree_kind(trans_id)
447
def tree_path(self, trans_id):
448
"""Determine the tree path associated with the trans_id."""
449
return self._tree_id_paths.get(trans_id)
411
451
def tree_file_id(self, trans_id):
412
452
"""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
453
path = self.tree_path(trans_id)
418
456
# the file is old; the old id is still valid
419
457
if self._new_root == trans_id:
532
570
# ensure that all children are registered with the transaction
533
571
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:
573
def _has_named_child(self, name, parent_id, known_children):
574
"""Does a parent already have a name child.
576
:param name: The searched for name.
578
:param parent_id: The parent for which the check is made.
580
:param known_children: The already known children. This should have
581
been recently obtained from `self.by_parent.get(parent_id)`
582
(or will be if None is passed).
584
if known_children is None:
585
known_children = self.by_parent().get(parent_id, [])
586
for child in known_children:
541
587
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
589
parent_path = self._tree_id_paths.get(parent_id, None)
590
if parent_path is None:
591
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
593
child_path = joinpath(parent_path, name)
594
child_id = self._tree_path_ids.get(child_path, None)
549
595
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
596
# Not known by the tree transform yet, check the filesystem
597
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?
599
raise AssertionError('child_id is missing: %s, %s, %s'
600
% (name, parent_id, child_id))
602
def _available_backup_name(self, name, target_id):
603
"""Find an available backup name.
605
:param name: The basename of the file.
607
:param target_id: The directory trans_id where the backup should
610
known_children = self.by_parent().get(target_id, [])
611
return osutils.available_backup_name(
613
lambda base: self._has_named_child(
614
base, target_id, known_children))
560
616
def _parent_loops(self):
561
617
"""No entry should be its own ancestor"""
669
720
def _duplicate_ids(self):
670
721
"""Each inventory id may only be used once"""
724
all_ids = self._tree.all_file_ids()
725
except errors.UnsupportedOperation:
726
# it's okay for non-file-id trees to raise UnsupportedOperation.
672
728
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
673
729
self._removed_id))
674
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
old_trans_id = self.trans_id_tree_file_id(file_id)
733
path = self._tree.id2path(file_id)
734
old_trans_id = self.trans_id_tree_path(path)
679
735
conflicts.append(('duplicate id', old_trans_id, trans_id))
682
738
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
739
"""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)
741
for parent_id, children in viewitems(by_parent):
742
if parent_id == ROOT_PARENT:
745
for child_id in children:
746
if self.final_kind(child_id) is not None:
751
# There is at least a child, so we need an existing directory to
753
kind = self.final_kind(parent_id)
755
# The directory will be deleted
700
756
conflicts.append(('missing parent', parent_id))
701
757
elif kind != "directory":
758
# Meh, we need a *directory* to put something in it
702
759
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
762
def _set_executability(self, path, trans_id):
716
763
"""Set the executability of versioned files """
717
if supports_executable():
764
if self._tree._supports_executable():
718
765
new_executability = self._new_executability[trans_id]
719
766
abspath = self._tree.abspath(path)
720
767
current_mode = os.stat(abspath).st_mode
721
768
if new_executability:
722
769
umask = os.umask(0)
724
to_mode = current_mode | (0100 & ~umask)
771
to_mode = current_mode | (0o100 & ~umask)
725
772
# 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
773
if current_mode & 0o004:
774
to_mode |= 0o001 & ~umask
775
if current_mode & 0o040:
776
to_mode |= 0o010 & ~umask
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
778
to_mode = current_mode & ~0o111
779
osutils.chmod_if_possible(abspath, to_mode)
734
781
def _new_entry(self, name, parent_id, file_id):
735
782
"""Helper function to create a new filesystem entry."""
781
828
self.create_symlink(target, trans_id)
831
def new_orphan(self, trans_id, parent_id):
832
"""Schedule an item to be orphaned.
834
When a directory is about to be removed, its children, if they are not
835
versioned are moved out of the way: they don't have a parent anymore.
837
:param trans_id: The trans_id of the existing item.
838
:param parent_id: The parent trans_id of the item.
840
raise NotImplementedError(self.new_orphan)
842
def _get_potential_orphans(self, dir_id):
843
"""Find the potential orphans in a directory.
845
A directory can't be safely deleted if there are versioned files in it.
846
If all the contained files are unversioned then they can be orphaned.
848
The 'None' return value means that the directory contains at least one
849
versioned file and should not be deleted.
851
:param dir_id: The directory trans id.
853
:return: A list of the orphan trans ids or None if at least one
854
versioned file is present.
857
# Find the potential orphans, stop if one item should be kept
858
for child_tid in self.by_parent()[dir_id]:
859
if child_tid in self._removed_contents:
860
# The child is removed as part of the transform. Since it was
861
# versioned before, it's not an orphan
863
elif self.final_file_id(child_tid) is None:
864
# The child is not versioned
865
orphans.append(child_tid)
867
# We have a versioned file here, searching for orphans is
784
873
def _affected_ids(self):
785
874
"""Return the set of transform ids affected by the transform"""
786
875
trans_ids = set(self._removed_id)
787
trans_ids.update(self._new_id.keys())
876
trans_ids.update(self._new_id)
788
877
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())
878
trans_ids.update(self._new_contents)
879
trans_ids.update(self._new_executability)
880
trans_ids.update(self._new_name)
881
trans_ids.update(self._new_parent)
795
884
def _get_file_id_maps(self):
904
985
to_path = final_paths.get_path(to_trans_id)
987
from_name, from_parent, from_kind, from_executable = \
988
self._from_file_data(from_trans_id, from_versioned, from_path)
990
to_name, to_parent, to_kind, to_executable = \
991
self._to_file_data(to_trans_id, from_trans_id, from_executable)
905
993
if from_kind != to_kind:
907
995
elif to_kind in ('file', 'symlink') and (
908
to_trans_id != from_trans_id or
909
to_trans_id in self._new_contents):
996
to_trans_id != from_trans_id
997
or to_trans_id in self._new_contents):
911
if (not modified and from_versioned == to_versioned and
912
from_parent==to_parent and from_name == to_name and
913
from_executable == to_executable):
999
if (not modified and from_versioned == to_versioned
1000
and from_parent == to_parent and from_name == to_name
1001
and from_executable == to_executable):
915
1003
results.append((file_id, (from_path, to_path), modified,
916
(from_versioned, to_versioned),
917
(from_parent, to_parent),
918
(from_name, to_name),
919
(from_kind, to_kind),
920
(from_executable, to_executable)))
921
return iter(sorted(results, key=lambda x:x[1]))
1004
(from_versioned, to_versioned),
1005
(from_parent, to_parent),
1006
(from_name, to_name),
1007
(from_kind, to_kind),
1008
(from_executable, to_executable)))
1012
return (paths[0] or '', paths[1] or '')
1013
return iter(sorted(results, key=path_key))
923
1015
def get_preview_tree(self):
924
1016
"""Return a tree representing the result of the transform.
987
1079
return revision_id
989
1081
def _text_parent(self, trans_id):
990
file_id = self.tree_file_id(trans_id)
1082
path = self.tree_path(trans_id)
992
if file_id is None or self._tree.kind(file_id) != 'file':
1084
if path is None or self._tree.kind(path) != 'file':
994
1086
except errors.NoSuchFile:
998
1090
def _get_parents_texts(self, trans_id):
999
1091
"""Get texts for compression parents of this file."""
1000
file_id = self._text_parent(trans_id)
1092
path = self._text_parent(trans_id)
1003
return (self._tree.get_file_text(file_id),)
1095
return (self._tree.get_file_text(path),)
1005
1097
def _get_parents_lines(self, trans_id):
1006
1098
"""Get lines for compression parents of this file."""
1007
file_id = self._text_parent(trans_id)
1099
path = self._text_parent(trans_id)
1010
return (self._tree.get_file_lines(file_id),)
1102
return (self._tree.get_file_lines(path),)
1012
1104
def serialize(self, serializer):
1013
1105
"""Serialize this TreeTransform.
1015
1107
: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())
1109
new_name = {k.encode('utf-8'): v.encode('utf-8')
1110
for k, v in viewitems(self._new_name)}
1111
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1112
for k, v in viewitems(self._new_parent)}
1113
new_id = {k.encode('utf-8'): v
1114
for k, v in viewitems(self._new_id)}
1115
new_executability = {k.encode('utf-8'): int(v)
1116
for k, v in viewitems(self._new_executability)}
1117
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1118
for k, v in viewitems(self._tree_path_ids)}
1119
non_present_ids = {k: v.encode('utf-8')
1120
for k, v in viewitems(self._non_present_ids)}
1121
removed_contents = [trans_id.encode('utf-8')
1122
for trans_id in self._removed_contents]
1123
removed_id = [trans_id.encode('utf-8')
1124
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,
1126
b'_id_number': self._id_number,
1127
b'_new_name': new_name,
1128
b'_new_parent': new_parent,
1129
b'_new_executability': new_executability,
1131
b'_tree_path_ids': tree_path_ids,
1132
b'_removed_id': removed_id,
1133
b'_removed_contents': removed_contents,
1134
b'_non_present_ids': non_present_ids,
1034
1136
yield serializer.bytes_record(bencode.bencode(attribs),
1036
for trans_id, kind in self._new_contents.items():
1138
for trans_id, kind in sorted(viewitems(self._new_contents)):
1037
1139
if kind == 'file':
1038
lines = osutils.chunks_to_lines(
1039
self._read_file_chunks(trans_id))
1140
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1141
lines = cur_file.readlines()
1040
1142
parents = self._get_parents_lines(trans_id)
1041
1143
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1042
content = ''.join(mpdiff.to_patch())
1144
content = b''.join(mpdiff.to_patch())
1043
1145
if kind == 'directory':
1045
1147
if kind == 'symlink':
1046
1148
content = self._read_symlink_target(trans_id)
1047
yield serializer.bytes_record(content, ((trans_id, kind),))
1149
if not isinstance(content, bytes):
1150
content = content.encode('utf-8')
1151
yield serializer.bytes_record(
1152
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1049
1154
def deserialize(self, records):
1050
1155
"""Deserialize a stored TreeTransform.
1052
1157
:param records: An iterable of (names, content) tuples, as per
1053
1158
pack.ContainerPushParser.
1055
names, content = records.next()
1160
names, content = next(records)
1056
1161
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())
1162
self._id_number = attribs[b'_id_number']
1163
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1164
for k, v in viewitems(attribs[b'_new_name'])}
1165
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1166
for k, v in viewitems(attribs[b'_new_parent'])}
1167
self._new_executability = {
1168
k.decode('utf-8'): bool(v)
1169
for k, v in viewitems(attribs[b'_new_executability'])}
1170
self._new_id = {k.decode('utf-8'): v
1171
for k, v in viewitems(attribs[b'_new_id'])}
1172
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1065
1173
self._tree_path_ids = {}
1066
1174
self._tree_id_paths = {}
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1175
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1068
1176
path = bytepath.decode('utf-8')
1177
trans_id = trans_id.decode('utf-8')
1069
1178
self._tree_path_ids[path] = trans_id
1070
1179
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']
1180
self._removed_id = {trans_id.decode('utf-8')
1181
for trans_id in attribs[b'_removed_id']}
1182
self._removed_contents = set(
1183
trans_id.decode('utf-8')
1184
for trans_id in attribs[b'_removed_contents'])
1185
self._non_present_ids = {
1186
k: v.decode('utf-8')
1187
for k, v in viewitems(attribs[b'_non_present_ids'])}
1074
1188
for ((trans_id, kind),), content in records:
1189
trans_id = trans_id.decode('utf-8')
1190
kind = kind.decode('ascii')
1075
1191
if kind == 'file':
1076
1192
mpdiff = multiparent.MultiParent.from_patch(content)
1077
1193
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1195
1327
descendants.update(self._limbo_descendants(descendant))
1196
1328
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1330
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1331
"""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.
1335
:param contents: an iterator of strings, all of which will be written
1336
to the target destination.
1337
:param trans_id: TreeTransform handle
1338
:param mode_id: If not None, force the mode of the target file to match
1339
the mode of the object referenced by mode_id.
1340
Otherwise, we will try to preserve mode bits of an existing file.
1341
:param sha1: If the sha1 of this content is already known, pass it in.
1342
We can use it to prevent future sha1 computations.
1209
1344
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.
1345
with open(name, 'wb') as f:
1346
unique_add(self._new_contents, trans_id, 'file')
1221
1347
f.writelines(contents)
1224
1348
self._set_mtime(name)
1225
1349
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()
1350
# It is unfortunate we have to use lstat instead of fstat, but we just
1351
# used utime and chmod on the file, so we need the accurate final
1353
if sha1 is not None:
1354
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1234
1356
def _read_symlink_target(self, trans_id):
1235
1357
return os.readlink(self._limbo_name(trans_id))
1296
1420
del self._limbo_children_names[trans_id]
1297
1421
delete_any(self._limbo_name(trans_id))
1423
def new_orphan(self, trans_id, parent_id):
1424
conf = self._tree.get_config_stack()
1425
handle_orphan = conf.get('transform.orphan_policy')
1426
handle_orphan(self, trans_id, parent_id)
1429
class OrphaningError(errors.BzrError):
1431
# Only bugs could lead to such exception being seen by the user
1432
internal_error = True
1433
_fmt = "Error while orphaning %s in %s directory"
1435
def __init__(self, orphan, parent):
1436
errors.BzrError.__init__(self)
1437
self.orphan = orphan
1438
self.parent = parent
1441
class OrphaningForbidden(OrphaningError):
1443
_fmt = "Policy: %s doesn't allow creating orphans."
1445
def __init__(self, policy):
1446
errors.BzrError.__init__(self)
1447
self.policy = policy
1450
def move_orphan(tt, orphan_id, parent_id):
1451
"""See TreeTransformBase.new_orphan.
1453
This creates a new orphan in the `brz-orphans` dir at the root of the
1456
:param tt: The TreeTransform orphaning `trans_id`.
1458
:param orphan_id: The trans id that should be orphaned.
1460
:param parent_id: The orphan parent trans id.
1462
# Add the orphan dir if it doesn't exist
1463
orphan_dir_basename = 'brz-orphans'
1464
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1465
if tt.final_kind(od_id) is None:
1466
tt.create_directory(od_id)
1467
parent_path = tt._tree_id_paths[parent_id]
1468
# Find a name that doesn't exist yet in the orphan dir
1469
actual_name = tt.final_name(orphan_id)
1470
new_name = tt._available_backup_name(actual_name, od_id)
1471
tt.adjust_path(new_name, od_id, orphan_id)
1472
trace.warning('%s has been orphaned in %s'
1473
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1476
def refuse_orphan(tt, orphan_id, parent_id):
1477
"""See TreeTransformBase.new_orphan.
1479
This refuses to create orphan, letting the caller handle the conflict.
1481
raise OrphaningForbidden('never')
1484
orphaning_registry = registry.Registry()
1485
orphaning_registry.register(
1486
u'conflict', refuse_orphan,
1487
'Leave orphans in place and create a conflict on the directory.')
1488
orphaning_registry.register(
1489
u'move', move_orphan,
1490
'Move orphans into the brz-orphans directory.')
1491
orphaning_registry._set_default_key(u'conflict')
1494
opt_transform_orphan = _mod_config.RegistryOption(
1495
'transform.orphan_policy', orphaning_registry,
1496
help='Policy for orphaned files during transform operations.',
1300
1500
class TreeTransform(DiskTreeTransform):
1301
1501
"""Represent a tree transformation.
1593
1787
inventory_delta.append((path, None, file_id, None))
1594
1788
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)
1600
1790
for num, (path, trans_id) in enumerate(new_paths):
1601
1791
if (num % 10) == 0:
1602
child_pb.update('adding file',
1792
child_pb.update(gettext('adding file'),
1603
1793
num + len(self._removed_id), total_entries)
1604
1794
file_id = new_path_file_ids[trans_id]
1605
1795
if file_id is None:
1609
kind = self.final_kind(trans_id)
1611
kind = self._tree.stored_kind(file_id)
1797
kind = self.final_kind(trans_id)
1799
kind = self._tree.stored_kind(self._tree.id2path(file_id))
1612
1800
parent_trans_id = self.final_parent(trans_id)
1613
1801
parent_file_id = new_path_file_ids.get(parent_trans_id)
1614
1802
if parent_file_id is None:
1643
1832
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()
1649
for num, data in enumerate(tree_paths):
1650
path, trans_id = data
1651
child_pb.update('removing file', num, len(tree_paths))
1834
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1835
with ui.ui_factory.nested_progress_bar() as child_pb:
1836
for num, (path, trans_id) in enumerate(tree_paths):
1837
# do not attempt to move root into a subdirectory of itself.
1840
child_pb.update(gettext('removing file'), num, len(tree_paths))
1652
1841
full_path = self._tree.abspath(path)
1653
1842
if trans_id in self._removed_contents:
1654
1843
delete_path = os.path.join(self._deletiondir, trans_id)
1655
1844
mover.pre_delete(full_path, delete_path)
1656
elif (trans_id in self._new_name
1657
or trans_id in self._new_parent):
1845
elif (trans_id in self._new_name or
1846
trans_id in self._new_parent):
1659
1848
mover.rename(full_path, self._limbo_name(trans_id))
1849
except errors.TransformRenameFailed as e:
1661
1850
if e.errno != errno.ENOENT:
1664
1853
self.rename_count += 1
1668
1855
def _apply_insertions(self, mover):
1669
1856
"""Perform tree operations that insert directory/inventory names.
1678
1865
new_paths = self.new_paths(filesystem_only=True)
1679
1866
modified_paths = []
1680
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()
1867
with ui.ui_factory.nested_progress_bar() as child_pb:
1684
1868
for num, (path, trans_id) in enumerate(new_paths):
1685
1869
if (num % 10) == 0:
1686
child_pb.update('adding file', num, len(new_paths))
1870
child_pb.update(gettext('adding file'),
1871
num, len(new_paths))
1687
1872
full_path = self._tree.abspath(path)
1688
1873
if trans_id in self._needs_rename:
1690
1875
mover.rename(self._limbo_name(trans_id), full_path)
1876
except errors.TransformRenameFailed as e:
1692
1877
# We may be renaming a dangling inventory id
1693
1878
if e.errno != errno.ENOENT:
1696
1881
self.rename_count += 1
1697
if (trans_id in self._new_contents or
1698
self.path_changed(trans_id)):
1882
# TODO: if trans_id in self._observed_sha1s, we should
1883
# re-stat the final target, since ctime will be
1884
# updated by the change.
1885
if (trans_id in self._new_contents
1886
or self.path_changed(trans_id)):
1699
1887
if trans_id in self._new_contents:
1700
1888
modified_paths.append(full_path)
1701
1889
if trans_id in self._new_executability:
1702
1890
self._set_executability(path, trans_id)
1891
if trans_id in self._observed_sha1s:
1892
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1893
st = osutils.lstat(full_path)
1894
self._observed_sha1s[trans_id] = (o_sha1, st)
1895
for path, trans_id in new_paths:
1896
# new_paths includes stuff like workingtree conflicts. Only the
1897
# stuff in new_contents actually comes from limbo.
1898
if trans_id in self._limbo_files:
1899
del self._limbo_files[trans_id]
1705
1900
self._new_contents.clear()
1706
1901
return modified_paths
1903
def _apply_observed_sha1s(self):
1904
"""After we have finished renaming everything, update observed sha1s
1906
This has to be done after self._tree.apply_inventory_delta, otherwise
1907
it doesn't know anything about the files we are updating. Also, we want
1908
to do this as late as possible, so that most entries end up cached.
1910
# TODO: this doesn't update the stat information for directories. So
1911
# the first 'bzr status' will still need to rewrite
1912
# .bzr/checkout/dirstate. However, we at least don't need to
1913
# re-read all of the files.
1914
# TODO: If the operation took a while, we could do a time.sleep(3) here
1915
# to allow the clock to tick over and ensure we won't have any
1916
# problems. (we could observe start time, and finish time, and if
1917
# it is less than eg 10% overhead, add a sleep call.)
1918
paths = FinalPaths(self)
1919
for trans_id, observed in viewitems(self._observed_sha1s):
1920
path = paths.get_path(trans_id)
1921
self._tree._observed_sha1(path, observed)
1709
1924
class TransformPreview(DiskTreeTransform):
1710
1925
"""A TreeTransform for generating preview trees.
1788
2009
except errors.NoSuchRevisionInTree:
1789
2010
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()]
2012
def _get_file_revision(self, path, file_id, vf, tree_revision):
2014
(file_id, t.get_file_revision(t.id2path(file_id)))
2015
for t in self._iter_parent_trees()]
1794
2016
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2017
self.get_file_lines(path))
1796
2018
repo = self._get_repository()
1797
2019
base_vf = repo.texts
1798
2020
if base_vf not in vf.fallback_versionedfiles:
1799
2021
vf.fallback_versionedfiles.append(base_vf)
1800
2022
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2024
def _stat_limbo_file(self, trans_id):
1804
2025
name = self._transform._limbo_name(trans_id)
1805
2026
return os.lstat(name)
1962
2205
ordered_ids = self._list_files_by_dir()
1963
2206
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
2208
yield self._final_paths.get_path(trans_id), entry
1967
2210
def _iter_entries_for_dir(self, dir_path):
1968
2211
"""Return path, entry for items in a directory without recursing down."""
1969
dir_file_id = self.path2id(dir_path)
1970
2212
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))
2213
dir_trans_id = self._path2trans_id(dir_path)
2214
dir_id = self._transform.final_file_id(dir_trans_id)
2215
for child_trans_id in self._all_children(dir_trans_id):
2216
ordered_ids.append((child_trans_id, dir_id))
1974
2218
for entry, trans_id in self._make_inv_entries(ordered_ids):
1975
yield unicode(self._final_paths.get_path(trans_id)), entry
2219
path_entries.append((self._final_paths.get_path(trans_id), entry))
1977
2223
def list_files(self, include_root=False, from_dir=None, recursive=True):
1978
2224
"""See WorkingTree.list_files."""
1979
2225
# XXX This should behave like WorkingTree.list_files, but is really
1980
2226
# more like RevisionTree.list_files.
1990
2238
if not path.startswith(prefix):
1992
2240
path = path[len(prefix):]
1993
yield path, 'V', entry.kind, entry.file_id, entry
2241
yield path, 'V', entry.kind, entry
1995
2243
if from_dir is None and include_root is True:
1996
root_entry = inventory.make_entry('directory', '',
1997
ROOT_PARENT, self.get_root_id())
1998
yield '', 'V', 'directory', root_entry.file_id, root_entry
2244
root_entry = inventory.make_entry(
2245
'directory', '', ROOT_PARENT, self.get_root_id())
2246
yield '', 'V', 'directory', root_entry
1999
2247
entries = self._iter_entries_for_dir(from_dir or '')
2000
2248
for path, entry in entries:
2001
yield path, 'V', entry.kind, entry.file_id, entry
2249
yield path, 'V', entry.kind, entry
2003
def kind(self, file_id):
2004
trans_id = self._transform.trans_id_file_id(file_id)
2251
def kind(self, path):
2252
trans_id = self._path2trans_id(path)
2253
if trans_id is None:
2254
raise errors.NoSuchFile(path)
2005
2255
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)
2257
def stored_kind(self, path):
2258
trans_id = self._path2trans_id(path)
2259
if trans_id is None:
2260
raise errors.NoSuchFile(path)
2010
2262
return self._transform._new_contents[trans_id]
2011
2263
except KeyError:
2012
return self._transform._tree.stored_kind(file_id)
2264
return self._transform._tree.stored_kind(path)
2014
def get_file_mtime(self, file_id, path=None):
2266
def get_file_mtime(self, path):
2015
2267
"""See Tree.get_file_mtime"""
2268
file_id = self.path2id(path)
2270
raise errors.NoSuchFile(path)
2016
2271
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):
2272
return self._transform._tree.get_file_mtime(
2273
self._transform._tree.id2path(file_id))
2274
trans_id = self._path2trans_id(path)
2275
return self._stat_limbo_file(trans_id).st_mtime
2277
def get_file_size(self, path):
2024
2278
"""See Tree.get_file_size"""
2025
if self.kind(file_id) == 'file':
2026
return self._transform._tree.get_file_size(file_id)
2279
trans_id = self._path2trans_id(path)
2280
if trans_id is None:
2281
raise errors.NoSuchFile(path)
2282
kind = self._transform.final_kind(trans_id)
2285
if trans_id in self._transform._new_contents:
2286
return self._stat_limbo_file(trans_id).st_size
2287
if self.kind(path) == 'file':
2288
return self._transform._tree.get_file_size(path)
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)
2292
def get_file_verifier(self, path, stat_value=None):
2293
trans_id = self._path2trans_id(path)
2294
if trans_id is None:
2295
raise errors.NoSuchFile(path)
2296
kind = self._transform._new_contents.get(trans_id)
2298
return self._transform._tree.get_file_verifier(path)
2300
with self.get_file(path) as fileobj:
2301
return ("SHA1", sha_file(fileobj))
2303
def get_file_sha1(self, path, stat_value=None):
2304
trans_id = self._path2trans_id(path)
2305
if trans_id is None:
2306
raise errors.NoSuchFile(path)
2307
kind = self._transform._new_contents.get(trans_id)
2309
return self._transform._tree.get_file_sha1(path)
2311
with self.get_file(path) as fileobj:
2038
2312
return sha_file(fileobj)
2042
def is_executable(self, file_id, path=None):
2314
def is_executable(self, path):
2315
trans_id = self._path2trans_id(path)
2316
if trans_id is None:
2045
trans_id = self._transform.trans_id_file_id(file_id)
2047
2319
return self._transform._new_executability[trans_id]
2048
2320
except KeyError:
2050
return self._transform._tree.is_executable(file_id, path)
2322
return self._transform._tree.is_executable(path)
2323
except OSError as e:
2052
2324
if e.errno == errno.ENOENT:
2055
except errors.NoSuchId:
2327
except errors.NoSuchFile:
2330
def has_filename(self, path):
2331
trans_id = self._path2trans_id(path)
2332
if trans_id in self._transform._new_contents:
2334
elif trans_id in self._transform._removed_contents:
2337
return self._transform._tree.has_filename(path)
2058
2339
def path_content_summary(self, path):
2059
2340
trans_id = self._path2trans_id(path)
2060
2341
tt = self._transform
2082
2363
executable = None
2083
2364
if kind == 'symlink':
2084
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2365
link_or_sha1 = os.readlink(limbo_name)
2366
if not isinstance(link_or_sha1, text_type):
2367
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2085
2368
executable = tt._new_executability.get(trans_id, executable)
2086
2369
return kind, size, executable, link_or_sha1
2088
2371
def iter_changes(self, from_tree, include_unchanged=False,
2089
specific_files=None, pb=None, extra_trees=None,
2090
require_versioned=True, want_unversioned=False):
2372
specific_files=None, pb=None, extra_trees=None,
2373
require_versioned=True, want_unversioned=False):
2091
2374
"""See InterTree.iter_changes.
2093
2376
This has a fast path that is only used when the from_tree matches
2094
2377
the transform tree, and no fancy options are supplied.
2096
if (from_tree is not self._transform._tree or include_unchanged or
2097
specific_files or want_unversioned):
2379
if (from_tree is not self._transform._tree or include_unchanged
2380
or specific_files or want_unversioned):
2098
2381
return tree.InterTree(from_tree, self).iter_changes(
2099
2382
include_unchanged=include_unchanged,
2100
2383
specific_files=specific_files,
2106
2389
raise ValueError('want_unversioned is not supported')
2107
2390
return self._transform.iter_changes()
2109
def get_file(self, file_id, path=None):
2392
def get_file(self, path):
2110
2393
"""See Tree.get_file"""
2394
file_id = self.path2id(path)
2111
2395
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)
2396
return self._transform._tree.get_file(path)
2397
trans_id = self._path2trans_id(path)
2114
2398
name = self._transform._limbo_name(trans_id)
2115
2399
return open(name, 'rb')
2117
def get_file_with_stat(self, file_id, path=None):
2118
return self.get_file(file_id, path), None
2401
def get_file_with_stat(self, path):
2402
return self.get_file(path), None
2120
def annotate_iter(self, file_id,
2404
def annotate_iter(self, path,
2121
2405
default_revision=_mod_revision.CURRENT_REVISION):
2406
file_id = self.path2id(path)
2122
2407
changes = self._iter_changes_cache.get(file_id)
2123
2408
if changes is None:
2268
2555
:param delta_from_tree: If true, build_tree may use the input Tree to
2269
2556
generate the inventory delta.
2271
wt.lock_tree_write()
2558
with wt.lock_tree_write(), tree.lock_read():
2559
if accelerator_tree is not None:
2560
accelerator_tree.lock_read()
2562
return _build_tree(tree, wt, accelerator_tree, hardlink,
2275
2565
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()
2566
accelerator_tree.unlock()
2289
2569
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2290
2570
"""See build_tree."""
2291
for num, _unused in enumerate(wt.all_file_ids()):
2571
for num, _unused in enumerate(wt.all_versioned_paths()):
2292
2572
if num > 0: # more than just a root
2293
2573
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
2574
file_trans_id = {}
2298
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2575
top_pb = ui.ui_factory.nested_progress_bar()
2299
2576
pp = ProgressPhase("Build phase", 2, top_pb)
2300
if tree.inventory.root is not None:
2577
if tree.get_root_id() is not None:
2301
2578
# This is kind of a hack: we should be altering the root
2302
2579
# as part of the regular tree shape diff logic.
2303
2580
# The conditional test here is to avoid doing an
2314
2591
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()
2592
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2593
with ui.ui_factory.nested_progress_bar() as pb:
2319
2594
deferred_contents = []
2321
total = len(tree.inventory)
2596
total = len(tree.all_versioned_paths())
2322
2597
if delta_from_tree:
2323
2598
precomputed_delta = []
2325
2600
precomputed_delta = None
2601
# Check if tree inventory has content. If so, we populate
2602
# existing_files with the directory content. If there are no
2603
# entries we skip populating existing_files as its not used.
2604
# This improves performance and unncessary work on large
2605
# directory trees. (#501307)
2607
existing_files = set()
2608
for dir, files in wt.walkdirs():
2609
existing_files.update(f[0] for f in files)
2326
2610
for num, (tree_path, entry) in \
2327
enumerate(tree.inventory.iter_entries_by_dir()):
2328
pb.update("Building tree", num - len(deferred_contents), total)
2611
enumerate(tree.iter_entries_by_dir()):
2612
pb.update(gettext("Building tree"), num
2613
- len(deferred_contents), total)
2329
2614
if entry.parent_id is None:
2331
2616
reparent = False
2355
2641
trans_id = tt.create_path(entry.name, parent_id)
2356
2642
file_trans_id[file_id] = trans_id
2357
2643
tt.version_file(file_id, trans_id)
2358
executable = tree.is_executable(file_id, tree_path)
2644
executable = tree.is_executable(tree_path)
2360
2646
tt.set_executability(executable, trans_id)
2361
trans_data = (trans_id, tree_path)
2362
deferred_contents.append((file_id, trans_data))
2647
trans_data = (trans_id, file_id,
2648
tree_path, entry.text_sha1)
2649
deferred_contents.append((tree_path, trans_data))
2364
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2651
file_trans_id[file_id] = new_by_entry(
2652
tree_path, tt, entry, parent_id, tree)
2367
2654
new_trans_id = file_trans_id[file_id]
2368
2655
old_parent = tt.trans_id_tree_path(tree_path)
2401
2688
new_desired_files = desired_files
2403
2690
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2404
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2691
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2405
2692
in iter if not (c or e[0] != e[1])]
2406
2693
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()]
2694
unchanged = [(tp, ap) for (tp, ap) in unchanged
2695
if not next(accelerator_tree.iter_search_rules([ap]))]
2409
2696
unchanged = dict(unchanged)
2410
2697
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2413
accelerator_path = unchanged.get(file_id)
2699
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2700
accelerator_path = unchanged.get(tree_path)
2414
2701
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2702
new_desired_files.append((tree_path,
2703
(trans_id, file_id, tree_path, text_sha1)))
2417
pb.update('Adding file contents', count + offset, total)
2705
pb.update(gettext('Adding file contents'), count + offset, total)
2419
2707
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
2710
with accelerator_tree.get_file(accelerator_path) as f:
2711
chunks = osutils.file_iterator(f)
2712
if wt.supports_content_filtering():
2713
filters = wt._content_filter_stack(tree_path)
2714
chunks = filtered_output_bytes(chunks, filters,
2715
ContentFilterContext(tree_path, tree))
2716
tt.create_file(chunks, trans_id, sha1=text_sha1)
2436
2718
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2719
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2438
2720
tree.iter_files_bytes(new_desired_files)):
2439
2721
if wt.supports_content_filtering():
2440
2722
filters = wt._content_filter_stack(tree_path)
2441
2723
contents = filtered_output_bytes(contents, filters,
2442
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2444
pb.update('Adding file contents', count + offset, total)
2724
ContentFilterContext(tree_path, tree))
2725
tt.create_file(contents, trans_id, sha1=text_sha1)
2726
pb.update(gettext('Adding file contents'), count + offset, total)
2447
2729
def _reparent_children(tt, old_parent, new_parent):
2448
2730
for child in tt.iter_tree_children(old_parent):
2449
2731
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2734
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2735
by_parent = tt.by_parent()
2453
2736
for child in by_parent[old_parent]:
2454
2737
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2738
return by_parent[old_parent]
2457
def _content_match(tree, entry, file_id, kind, target_path):
2741
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2458
2742
if entry.kind != kind:
2460
2744
if entry.kind == "directory":
2462
2746
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2747
with open(target_path, 'rb') as f1, \
2748
tree.get_file(tree_path) as f2:
2749
if osutils.compare_files(f1, f2):
2465
2751
elif entry.kind == "symlink":
2466
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2752
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2487
2773
final_parent = tt.final_parent(old_file)
2488
2774
if new_file in divert:
2489
new_name = tt.final_name(old_file)+'.diverted'
2775
new_name = tt.final_name(old_file) + '.diverted'
2490
2776
tt.adjust_path(new_name, final_parent, new_file)
2491
2777
new_conflicts.add((c_type, 'Diverted to',
2492
2778
new_file, old_file))
2494
new_name = tt.final_name(old_file)+'.moved'
2780
new_name = tt.final_name(old_file) + '.moved'
2495
2781
tt.adjust_path(new_name, final_parent, old_file)
2496
2782
new_conflicts.add((c_type, 'Moved existing file to',
2497
2783
old_file, new_file))
2498
2784
return new_conflicts
2501
def new_by_entry(tt, entry, parent_id, tree):
2787
def new_by_entry(path, tt, entry, parent_id, tree):
2502
2788
"""Create a new file according to its inventory entry"""
2503
2789
name = entry.name
2504
2790
kind = entry.kind
2505
2791
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,
2792
with tree.get_file(path) as f:
2793
executable = tree.is_executable(path)
2795
name, parent_id, osutils.file_iterator(f), entry.file_id,
2510
2797
elif kind in ('directory', 'tree-reference'):
2511
2798
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2512
2799
if kind == 'tree-reference':
2513
2800
tt.set_tree_reference(entry.reference_revision, trans_id)
2514
2801
return trans_id
2515
2802
elif kind == 'symlink':
2516
target = tree.get_symlink_target(entry.file_id)
2803
target = tree.get_symlink_target(path)
2517
2804
return tt.new_symlink(name, parent_id, target, entry.file_id)
2519
2806
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,
2539
filter_tree_path=None):
2809
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2810
filter_tree_path=None):
2540
2811
"""Create new file contents according to tree contents.
2542
2813
:param filter_tree_path: the tree path to use to lookup
2543
2814
content filters to apply to the bytes output in the working tree.
2544
2815
This only applies if the working tree supports content filtering.
2546
kind = tree.kind(file_id)
2817
kind = tree.kind(path)
2547
2818
if kind == 'directory':
2548
2819
tt.create_directory(trans_id)
2549
2820
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)
2822
f = tree.get_file(path)
2823
chunks = osutils.file_iterator(f)
2828
if wt.supports_content_filtering() and filter_tree_path is not None:
2829
filters = wt._content_filter_stack(filter_tree_path)
2830
chunks = filtered_output_bytes(
2832
ContentFilterContext(filter_tree_path, tree))
2833
tt.create_file(chunks, trans_id)
2562
2837
elif kind == "symlink":
2563
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2838
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2565
2840
raise AssertionError('Unknown kind %r' % kind)
2571
2846
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
2849
def revert(working_tree, target_tree, filenames, backups=False,
2618
2850
pb=None, change_reporter=None):
2619
2851
"""Revert a working tree's contents to those of a target tree."""
2620
target_tree.lock_read()
2621
2852
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)
2854
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2855
pp = ProgressPhase("Revert phase", 3, pb)
2856
conflicts, merge_modified = _prepare_revert_transform(
2857
working_tree, target_tree, tt, filenames, backups, pp)
2859
change_reporter = delta._ChangeReporter(
2860
unversioned_filter=working_tree.is_ignored)
2861
delta.report_changes(tt.iter_changes(), change_reporter)
2862
for conflict in conflicts:
2863
trace.warning(text_type(conflict))
2866
if working_tree.supports_merge_modified():
2867
working_tree.set_merge_modified(merge_modified)
2637
target_tree.unlock()
2640
2870
return conflicts
2643
2873
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2644
2874
backups, pp, basis_tree=None,
2645
2875
merge_modified=None):
2646
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2876
with ui.ui_factory.nested_progress_bar() as child_pb:
2648
2877
if merge_modified is None:
2649
2878
merge_modified = working_tree.merge_modified()
2650
2879
merge_modified = _alter_files(working_tree, target_tree, tt,
2651
2880
child_pb, filenames, backups,
2652
2881
merge_modified, basis_tree)
2655
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2657
raw_conflicts = resolve_conflicts(tt, child_pb,
2658
lambda t, c: conflict_pass(t, c, target_tree))
2882
with ui.ui_factory.nested_progress_bar() as child_pb:
2883
raw_conflicts = resolve_conflicts(
2884
tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))
2661
2885
conflicts = cook_conflicts(raw_conflicts, tt)
2662
2886
return conflicts, merge_modified
2666
2890
backups, merge_modified, basis_tree=None):
2667
2891
if basis_tree is not None:
2668
2892
basis_tree.lock_read()
2669
change_list = target_tree.iter_changes(working_tree,
2670
specific_files=specific_files, pb=pb)
2671
if target_tree.get_root_id() is None:
2893
# We ask the working_tree for its changes relative to the target, rather
2894
# than the target changes relative to the working tree. Because WT4 has an
2895
# optimizer to compare itself to a target, but no optimizer for the
2897
change_list = working_tree.iter_changes(
2898
target_tree, specific_files=specific_files, pb=pb)
2899
if not target_tree.is_versioned(u''):
2672
2900
skip_root = True
2674
2902
skip_root = False
2676
2904
deferred_files = []
2677
2905
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2906
kind, executable) in enumerate(change_list):
2907
target_path, wt_path = path
2908
target_versioned, wt_versioned = versioned
2909
target_parent, wt_parent = parent
2910
target_name, wt_name = name
2911
target_kind, wt_kind = kind
2912
target_executable, wt_executable = executable
2913
if skip_root and wt_parent is None:
2681
2915
trans_id = tt.trans_id_file_id(file_id)
2683
2917
if changed_content:
2684
2918
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)
2919
if wt_kind == 'file' and (backups or target_kind is None):
2920
wt_sha1 = working_tree.get_file_sha1(wt_path)
2687
2921
if merge_modified.get(file_id) != wt_sha1:
2688
2922
# acquire the basis tree lazily to prevent the
2689
2923
# expense of accessing it when it's not needed ?
2691
2925
if basis_tree is None:
2692
2926
basis_tree = working_tree.basis_tree()
2693
2927
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:
2928
basis_path = find_previous_path(
2929
working_tree, basis_tree, wt_path)
2930
if basis_path is None:
2931
if target_kind is None and not target_versioned:
2934
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2936
if wt_kind is not None:
2700
2937
if not keep_content:
2701
2938
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)
2939
elif target_kind is not None:
2940
parent_trans_id = tt.trans_id_file_id(wt_parent)
2941
backup_name = tt._available_backup_name(
2942
wt_name, parent_trans_id)
2707
2943
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):
2944
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2945
if wt_versioned and target_versioned:
2710
2946
tt.unversion_file(trans_id)
2711
2947
tt.version_file(file_id, new_trans_id)
2712
2948
# New contents should have the same unix perms as old
2714
2950
mode_id = trans_id
2715
2951
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2952
if target_kind in ('directory', 'tree-reference'):
2717
2953
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2719
revision = target_tree.get_reference_revision(file_id,
2954
if target_kind == 'tree-reference':
2955
revision = target_tree.get_reference_revision(
2721
2957
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)))
2958
elif target_kind == 'symlink':
2959
tt.create_symlink(target_tree.get_symlink_target(
2960
target_path), trans_id)
2961
elif target_kind == 'file':
2962
deferred_files.append(
2963
(target_path, (trans_id, mode_id, file_id)))
2727
2964
if basis_tree is None:
2728
2965
basis_tree = working_tree.basis_tree()
2729
2966
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)):
2967
new_sha1 = target_tree.get_file_sha1(target_path)
2968
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2969
if (basis_path is not None and
2970
new_sha1 == basis_tree.get_file_sha1(basis_path)):
2733
2971
if file_id in merge_modified:
2734
2972
del merge_modified[file_id]
2736
2974
merge_modified[file_id] = new_sha1
2738
2976
# 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):
2977
if keep_content and wt_executable == target_executable:
2978
tt.set_executability(target_executable, trans_id)
2979
elif target_kind is not None:
2980
raise AssertionError(target_kind)
2981
if not wt_versioned and target_versioned:
2744
2982
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2983
if wt_versioned and not target_versioned:
2746
2984
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:
2985
if (target_name is not None
2986
and (wt_name != target_name or wt_parent != target_parent)):
2987
if target_name == '' and target_parent is None:
2750
2988
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)
2990
parent_trans = tt.trans_id_file_id(target_parent)
2991
if wt_parent is None and wt_versioned:
2992
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)
2994
tt.adjust_path(target_name, parent_trans, trans_id)
2995
if wt_executable != target_executable and target_kind == "file":
2996
tt.set_executability(target_executable, trans_id)
2759
2997
if working_tree.supports_content_filtering():
2760
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
target_tree.iter_files_bytes(deferred_files)):
2762
file_id = deferred_files[index][0]
2998
for (trans_id, mode_id, file_id), bytes in (
2999
target_tree.iter_files_bytes(deferred_files)):
2763
3000
# We're reverting a tree to the target tree so using the
2764
3001
# target tree to find the file path seems the best choice
2765
3002
# here IMO - Ian C 27/Oct/2009
2766
3003
filter_tree_path = target_tree.id2path(file_id)
2767
3004
filters = working_tree._content_filter_stack(filter_tree_path)
2768
bytes = filtered_output_bytes(bytes, filters,
3005
bytes = filtered_output_bytes(
2769
3007
ContentFilterContext(filter_tree_path, working_tree))
2770
3008
tt.create_file(bytes, trans_id, mode_id)
2772
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3010
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2774
3012
tt.create_file(bytes, trans_id, mode_id)
2775
3013
tt.fixup_new_roots()
2945
3201
def rollback(self):
2946
3202
"""Reverse all renames that have been performed"""
2947
3203
for from_, to in reversed(self.past_renames):
2948
osutils.rename(to, from_)
3205
os.rename(to, from_)
3206
except OSError as e:
3207
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2949
3208
# after rollback, don't reuse _FileMover
2951
pending_deletions = None
3209
self.past_renames = None
3210
self.pending_deletions = None
2953
3212
def apply_deletions(self):
2954
3213
"""Apply all marked deletions"""
2955
3214
for path in self.pending_deletions:
2956
3215
delete_any(path)
2957
3216
# after apply_deletions, don't reuse _FileMover
2959
pending_deletions = None
3217
self.past_renames = None
3218
self.pending_deletions = None
3221
def link_tree(target_tree, source_tree):
3222
"""Where possible, hard-link files in a tree to those in another tree.
3224
:param target_tree: Tree to change
3225
:param source_tree: Tree to hard-link from
3227
tt = TreeTransform(target_tree)
3229
for (file_id, paths, changed_content, versioned, parent, name, kind,
3230
executable) in target_tree.iter_changes(source_tree,
3231
include_unchanged=True):
3234
if kind != ('file', 'file'):
3236
if executable[0] != executable[1]:
3238
trans_id = tt.trans_id_tree_path(paths[1])
3239
tt.delete_contents(trans_id)
3240
tt.create_hardlink(source_tree.abspath(paths[0]), trans_id)
added
removed
breezy/transform.py
