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
21
19
from stat import S_ISREG, S_IEXEC
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
44
34
revision as _mod_revision,
48
from breezy.bzr import (
52
from breezy.i18n import gettext
54
from .errors import (DuplicateKey, MalformedTransform,
55
ReusingTransform, CantMoveRoot,
56
ImmortalLimbo, NoFinalPath)
57
from .filters import filtered_output_bytes, ContentFilterContext
58
from .mutabletree import MutableTree
59
from .osutils import (
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 (
67
from .progress import ProgressPhase
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
79
65
ROOT_PARENT = "root-parent"
393
381
return sorted(FinalPaths(self).get_paths(new_ids))
395
383
def _inventory_altered(self):
396
"""Determine which trans_ids need new Inventory entries.
398
An new entry is needed when anything that would be reflected by an
399
inventory entry changes, including file name, file_id, parent file_id,
400
file kind, and the execute bit.
402
Some care is taken to return entries with real changes, not cases
403
where the value is deleted and then restored to its original value,
404
but some actually unchanged values may be returned.
406
:returns: A list of (path, trans_id) for all items requiring an
407
inventory change. Ordered by path.
410
# Find entries whose file_ids are new (or changed).
411
new_file_id = set(t for t in self._new_id
412
if self._new_id[t] != self.tree_file_id(t))
413
for id_set in [self._new_name, self._new_parent, new_file_id,
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,
414
387
self._new_executability]:
415
changed_ids.update(id_set)
416
# removing implies a kind change
388
new_ids.update(id_set)
417
389
changed_kind = set(self._removed_contents)
419
390
changed_kind.intersection_update(self._new_contents)
420
# Ignore entries that are already known to have changed.
421
changed_kind.difference_update(changed_ids)
422
# to keep only the truly changed ones
423
changed_kind = (t for t in changed_kind
424
if self.tree_kind(t) != self.final_kind(t))
425
# all kind changes will alter the inventory
426
changed_ids.update(changed_kind)
427
# To find entries with changed parent_ids, find parents which existed,
428
# but changed file_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))
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))
434
397
def final_kind(self, trans_id):
435
398
"""Determine the final file kind, after any changes applied.
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)
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)
441
404
if trans_id in self._new_contents:
442
405
return self._new_contents[trans_id]
443
406
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
446
409
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)
452
411
def tree_file_id(self, trans_id):
453
412
"""Determine the file id associated with the trans_id in the tree"""
454
path = self.tree_path(trans_id)
414
path = self._tree_id_paths[trans_id]
416
# the file is a new, unversioned file, or invalid trans_id
457
418
# the file is old; the old id is still valid
458
419
if self._new_root == trans_id:
459
return self._tree.path2id('')
420
return self._tree.get_root_id()
460
421
return self._tree.path2id(path)
462
423
def final_file_id(self, trans_id):
571
532
# ensure that all children are registered with the transaction
572
533
list(self.iter_tree_children(parent_id))
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:
535
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
588
541
if self.final_name(child) == name:
590
parent_path = self._tree_id_paths.get(parent_id, None)
591
if parent_path is None:
592
# No parent... no children
544
path = self._tree_id_paths[parent_id]
594
child_path = joinpath(parent_path, name)
595
child_id = self._tree_path_ids.get(child_path, None)
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
596
549
if child_id is None:
597
# Not known by the tree transform yet, check the filesystem
598
return osutils.lexists(self._tree.abspath(child_path))
550
return lexists(self._tree.abspath(childpath))
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))
552
if self.final_parent(child_id) != parent_id:
554
if child_id in self._removed_contents:
555
# XXX What about dangling file-ids?
617
560
def _parent_loops(self):
618
561
"""No entry should be its own ancestor"""
724
669
def _duplicate_ids(self):
725
670
"""Each inventory id may only be used once"""
728
all_ids = self._tree.all_file_ids()
729
except errors.UnsupportedOperation:
730
# it's okay for non-file-id trees to raise UnsupportedOperation.
732
672
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
733
673
self._removed_id))
674
all_ids = self._tree.all_file_ids()
734
675
active_tree_ids = all_ids.difference(removed_tree_ids)
735
for trans_id, file_id in viewitems(self._new_id):
676
for trans_id, file_id in self._new_id.iteritems():
736
677
if file_id in active_tree_ids:
737
path = self._tree.id2path(file_id)
738
old_trans_id = self.trans_id_tree_path(path)
678
old_trans_id = self.trans_id_tree_file_id(file_id)
739
679
conflicts.append(('duplicate id', old_trans_id, trans_id))
742
682
def _parent_type_conflicts(self, by_parent):
743
"""Children must have a directory parent"""
683
"""parents must have directory 'contents'."""
745
for parent_id, children in viewitems(by_parent):
746
if parent_id == ROOT_PARENT:
749
for child_id in children:
750
if self.final_kind(child_id) is not None:
755
# There is at least a child, so we need an existing directory to
757
kind = self.final_kind(parent_id)
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)
759
# The directory will be deleted
760
700
conflicts.append(('missing parent', parent_id))
761
701
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
763
702
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)
766
715
def _set_executability(self, path, trans_id):
767
716
"""Set the executability of versioned files """
768
if self._tree._supports_executable():
717
if supports_executable():
769
718
new_executability = self._new_executability[trans_id]
770
719
abspath = self._tree.abspath(path)
771
720
current_mode = os.stat(abspath).st_mode
772
721
if new_executability:
773
722
umask = os.umask(0)
775
to_mode = current_mode | (0o100 & ~umask)
724
to_mode = current_mode | (0100 & ~umask)
776
725
# Enable x-bit for others only if they can read it.
777
if current_mode & 0o004:
778
to_mode |= 0o001 & ~umask
779
if current_mode & 0o040:
780
to_mode |= 0o010 & ~umask
726
if current_mode & 0004:
727
to_mode |= 0001 & ~umask
728
if current_mode & 0040:
729
to_mode |= 0010 & ~umask
782
to_mode = current_mode & ~0o111
783
osutils.chmod_if_possible(abspath, to_mode)
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
785
734
def _new_entry(self, name, parent_id, file_id):
786
735
"""Helper function to create a new filesystem entry."""
832
781
self.create_symlink(target, trans_id)
835
def new_orphan(self, trans_id, parent_id):
836
"""Schedule an item to be orphaned.
838
When a directory is about to be removed, its children, if they are not
839
versioned are moved out of the way: they don't have a parent anymore.
841
:param trans_id: The trans_id of the existing item.
842
:param parent_id: The parent trans_id of the item.
844
raise NotImplementedError(self.new_orphan)
846
def _get_potential_orphans(self, dir_id):
847
"""Find the potential orphans in a directory.
849
A directory can't be safely deleted if there are versioned files in it.
850
If all the contained files are unversioned then they can be orphaned.
852
The 'None' return value means that the directory contains at least one
853
versioned file and should not be deleted.
855
:param dir_id: The directory trans id.
857
:return: A list of the orphan trans ids or None if at least one
858
versioned file is present.
861
# Find the potential orphans, stop if one item should be kept
862
for child_tid in self.by_parent()[dir_id]:
863
if child_tid in self._removed_contents:
864
# The child is removed as part of the transform. Since it was
865
# versioned before, it's not an orphan
867
elif self.final_file_id(child_tid) is None:
868
# The child is not versioned
869
orphans.append(child_tid)
871
# We have a versioned file here, searching for orphans is
877
784
def _affected_ids(self):
878
785
"""Return the set of transform ids affected by the transform"""
879
786
trans_ids = set(self._removed_id)
880
trans_ids.update(self._new_id)
787
trans_ids.update(self._new_id.keys())
881
788
trans_ids.update(self._removed_contents)
882
trans_ids.update(self._new_contents)
883
trans_ids.update(self._new_executability)
884
trans_ids.update(self._new_name)
885
trans_ids.update(self._new_parent)
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())
888
795
def _get_file_id_maps(self):
989
904
to_path = final_paths.get_path(to_trans_id)
991
from_name, from_parent, from_kind, from_executable = \
992
self._from_file_data(from_trans_id, from_versioned, from_path)
994
to_name, to_parent, to_kind, to_executable = \
995
self._to_file_data(to_trans_id, from_trans_id, from_executable)
997
905
if from_kind != to_kind:
999
907
elif to_kind in ('file', 'symlink') and (
1000
to_trans_id != from_trans_id
1001
or to_trans_id in self._new_contents):
908
to_trans_id != from_trans_id or
909
to_trans_id in self._new_contents):
1003
if (not modified and from_versioned == to_versioned
1004
and from_parent == to_parent and from_name == to_name
1005
and from_executable == to_executable):
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):
1009
file_id, (from_path, to_path), modified,
1010
(from_versioned, to_versioned),
1011
(from_parent, to_parent),
1012
(from_name, to_name),
1013
(from_kind, to_kind),
1014
(from_executable, to_executable)))
1017
return (c.path[0] or '', c.path[1] or '')
1018
return iter(sorted(results, key=path_key))
915
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]))
1020
923
def get_preview_tree(self):
1021
924
"""Return a tree representing the result of the transform.
1084
987
return revision_id
1086
989
def _text_parent(self, trans_id):
1087
path = self.tree_path(trans_id)
990
file_id = self.tree_file_id(trans_id)
1089
if path is None or self._tree.kind(path) != 'file':
992
if file_id is None or self._tree.kind(file_id) != 'file':
1091
994
except errors.NoSuchFile:
1095
998
def _get_parents_texts(self, trans_id):
1096
999
"""Get texts for compression parents of this file."""
1097
path = self._text_parent(trans_id)
1000
file_id = self._text_parent(trans_id)
1100
return (self._tree.get_file_text(path),)
1003
return (self._tree.get_file_text(file_id),)
1102
1005
def _get_parents_lines(self, trans_id):
1103
1006
"""Get lines for compression parents of this file."""
1104
path = self._text_parent(trans_id)
1007
file_id = self._text_parent(trans_id)
1107
return (self._tree.get_file_lines(path),)
1010
return (self._tree.get_file_lines(file_id),)
1109
1012
def serialize(self, serializer):
1110
1013
"""Serialize this TreeTransform.
1112
1015
:param serializer: A Serialiser like pack.ContainerSerializer.
1114
new_name = {k.encode('utf-8'): v.encode('utf-8')
1115
for k, v in viewitems(self._new_name)}
1116
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1117
for k, v in viewitems(self._new_parent)}
1118
new_id = {k.encode('utf-8'): v
1119
for k, v in viewitems(self._new_id)}
1120
new_executability = {k.encode('utf-8'): int(v)
1121
for k, v in viewitems(self._new_executability)}
1122
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1123
for k, v in viewitems(self._tree_path_ids)}
1124
non_present_ids = {k: v.encode('utf-8')
1125
for k, v in viewitems(self._non_present_ids)}
1126
removed_contents = [trans_id.encode('utf-8')
1127
for trans_id in self._removed_contents]
1128
removed_id = [trans_id.encode('utf-8')
1129
for trans_id in self._removed_id]
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())
1131
b'_id_number': self._id_number,
1132
b'_new_name': new_name,
1133
b'_new_parent': new_parent,
1134
b'_new_executability': new_executability,
1136
b'_tree_path_ids': tree_path_ids,
1137
b'_removed_id': removed_id,
1138
b'_removed_contents': removed_contents,
1139
b'_non_present_ids': non_present_ids,
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,
1141
1034
yield serializer.bytes_record(bencode.bencode(attribs),
1143
for trans_id, kind in sorted(viewitems(self._new_contents)):
1036
for trans_id, kind in self._new_contents.items():
1144
1037
if kind == 'file':
1145
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1146
lines = cur_file.readlines()
1038
lines = osutils.chunks_to_lines(
1039
self._read_file_chunks(trans_id))
1147
1040
parents = self._get_parents_lines(trans_id)
1148
1041
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1149
content = b''.join(mpdiff.to_patch())
1042
content = ''.join(mpdiff.to_patch())
1150
1043
if kind == 'directory':
1152
1045
if kind == 'symlink':
1153
1046
content = self._read_symlink_target(trans_id)
1154
if not isinstance(content, bytes):
1155
content = content.encode('utf-8')
1156
yield serializer.bytes_record(
1157
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1047
yield serializer.bytes_record(content, ((trans_id, kind),))
1159
1049
def deserialize(self, records):
1160
1050
"""Deserialize a stored TreeTransform.
1162
1052
:param records: An iterable of (names, content) tuples, as per
1163
1053
pack.ContainerPushParser.
1165
names, content = next(records)
1055
names, content = records.next()
1166
1056
attribs = bencode.bdecode(content)
1167
self._id_number = attribs[b'_id_number']
1168
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1169
for k, v in viewitems(attribs[b'_new_name'])}
1170
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1171
for k, v in viewitems(attribs[b'_new_parent'])}
1172
self._new_executability = {
1173
k.decode('utf-8'): bool(v)
1174
for k, v in viewitems(attribs[b'_new_executability'])}
1175
self._new_id = {k.decode('utf-8'): v
1176
for k, v in viewitems(attribs[b'_new_id'])}
1177
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
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())
1178
1065
self._tree_path_ids = {}
1179
1066
self._tree_id_paths = {}
1180
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1181
1068
path = bytepath.decode('utf-8')
1182
trans_id = trans_id.decode('utf-8')
1183
1069
self._tree_path_ids[path] = trans_id
1184
1070
self._tree_id_paths[trans_id] = path
1185
self._removed_id = {trans_id.decode('utf-8')
1186
for trans_id in attribs[b'_removed_id']}
1187
self._removed_contents = set(
1188
trans_id.decode('utf-8')
1189
for trans_id in attribs[b'_removed_contents'])
1190
self._non_present_ids = {
1191
k: v.decode('utf-8')
1192
for k, v in viewitems(attribs[b'_non_present_ids'])}
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']
1193
1074
for ((trans_id, kind),), content in records:
1194
trans_id = trans_id.decode('utf-8')
1195
kind = kind.decode('ascii')
1196
1075
if kind == 'file':
1197
1076
mpdiff = multiparent.MultiParent.from_patch(content)
1198
1077
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1202
1081
if kind == 'symlink':
1203
1082
self.create_symlink(content.decode('utf-8'), trans_id)
1205
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1206
"""Schedule creation of a new file.
1210
:param contents: an iterator of strings, all of which will be written
1211
to the target destination.
1212
:param trans_id: TreeTransform handle
1213
:param mode_id: If not None, force the mode of the target file to match
1214
the mode of the object referenced by mode_id.
1215
Otherwise, we will try to preserve mode bits of an existing file.
1216
:param sha1: If the sha1 of this content is already known, pass it in.
1217
We can use it to prevent future sha1 computations.
1219
raise NotImplementedError(self.create_file)
1221
def create_directory(self, trans_id):
1222
"""Schedule creation of a new directory.
1224
See also new_directory.
1226
raise NotImplementedError(self.create_directory)
1228
def create_symlink(self, target, trans_id):
1229
"""Schedule creation of a new symbolic link.
1231
target is a bytestring.
1232
See also new_symlink.
1234
raise NotImplementedError(self.create_symlink)
1236
def create_hardlink(self, path, trans_id):
1237
"""Schedule creation of a hard link"""
1238
raise NotImplementedError(self.create_hardlink)
1240
def cancel_creation(self, trans_id):
1241
"""Cancel the creation of new file contents."""
1242
raise NotImplementedError(self.cancel_creation)
1245
1085
class DiskTreeTransform(TreeTransformBase):
1246
1086
"""Tree transform storing its contents on disk."""
1248
def __init__(self, tree, limbodir, pb=None, case_sensitive=True):
1088
def __init__(self, tree, limbodir, pb=None,
1089
case_sensitive=True):
1249
1090
"""Constructor.
1250
1091
:param tree: The tree that will be transformed, but not necessarily
1251
1092
the output tree.
1370
1195
descendants.update(self._limbo_descendants(descendant))
1371
1196
return descendants
1373
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1198
def create_file(self, contents, trans_id, mode_id=None):
1374
1199
"""Schedule creation of a new file.
1378
:param contents: an iterator of strings, all of which will be written
1379
to the target destination.
1380
:param trans_id: TreeTransform handle
1381
:param mode_id: If not None, force the mode of the target file to match
1382
the mode of the object referenced by mode_id.
1383
Otherwise, we will try to preserve mode bits of an existing file.
1384
:param sha1: If the sha1 of this content is already known, pass it in.
1385
We can use it to prevent future sha1 computations.
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.
1387
1209
name = self._limbo_name(trans_id)
1388
with open(name, 'wb') as f:
1389
unique_add(self._new_contents, trans_id, 'file')
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.
1390
1221
f.writelines(contents)
1391
1224
self._set_mtime(name)
1392
1225
self._set_mode(trans_id, mode_id, S_ISREG)
1393
# It is unfortunate we have to use lstat instead of fstat, but we just
1394
# used utime and chmod on the file, so we need the accurate final
1396
if sha1 is not None:
1397
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
def _read_file_chunks(self, trans_id):
1228
cur_file = open(self._limbo_name(trans_id), 'rb')
1230
return cur_file.readlines()
1399
1234
def _read_symlink_target(self, trans_id):
1400
1235
return os.readlink(self._limbo_name(trans_id))
1467
1296
del self._limbo_children_names[trans_id]
1468
1297
delete_any(self._limbo_name(trans_id))
1470
def new_orphan(self, trans_id, parent_id):
1471
conf = self._tree.get_config_stack()
1472
handle_orphan = conf.get('transform.orphan_policy')
1473
handle_orphan(self, trans_id, parent_id)
1476
class OrphaningError(errors.BzrError):
1478
# Only bugs could lead to such exception being seen by the user
1479
internal_error = True
1480
_fmt = "Error while orphaning %s in %s directory"
1482
def __init__(self, orphan, parent):
1483
errors.BzrError.__init__(self)
1484
self.orphan = orphan
1485
self.parent = parent
1488
class OrphaningForbidden(OrphaningError):
1490
_fmt = "Policy: %s doesn't allow creating orphans."
1492
def __init__(self, policy):
1493
errors.BzrError.__init__(self)
1494
self.policy = policy
1497
def move_orphan(tt, orphan_id, parent_id):
1498
"""See TreeTransformBase.new_orphan.
1500
This creates a new orphan in the `brz-orphans` dir at the root of the
1503
:param tt: The TreeTransform orphaning `trans_id`.
1505
:param orphan_id: The trans id that should be orphaned.
1507
:param parent_id: The orphan parent trans id.
1509
# Add the orphan dir if it doesn't exist
1510
orphan_dir_basename = 'brz-orphans'
1511
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1512
if tt.final_kind(od_id) is None:
1513
tt.create_directory(od_id)
1514
parent_path = tt._tree_id_paths[parent_id]
1515
# Find a name that doesn't exist yet in the orphan dir
1516
actual_name = tt.final_name(orphan_id)
1517
new_name = tt._available_backup_name(actual_name, od_id)
1518
tt.adjust_path(new_name, od_id, orphan_id)
1519
trace.warning('%s has been orphaned in %s'
1520
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1523
def refuse_orphan(tt, orphan_id, parent_id):
1524
"""See TreeTransformBase.new_orphan.
1526
This refuses to create orphan, letting the caller handle the conflict.
1528
raise OrphaningForbidden('never')
1531
orphaning_registry = registry.Registry()
1532
orphaning_registry.register(
1533
u'conflict', refuse_orphan,
1534
'Leave orphans in place and create a conflict on the directory.')
1535
orphaning_registry.register(
1536
u'move', move_orphan,
1537
'Move orphans into the brz-orphans directory.')
1538
orphaning_registry._set_default_key(u'conflict')
1541
opt_transform_orphan = _mod_config.RegistryOption(
1542
'transform.orphan_policy', orphaning_registry,
1543
help='Policy for orphaned files during transform operations.',
1547
1300
class TreeTransform(DiskTreeTransform):
1548
1301
"""Represent a tree transformation.
1912
1678
new_paths = self.new_paths(filesystem_only=True)
1913
1679
modified_paths = []
1914
with ui.ui_factory.nested_progress_bar() as child_pb:
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()
1915
1684
for num, (path, trans_id) in enumerate(new_paths):
1916
1685
if (num % 10) == 0:
1917
child_pb.update(gettext('adding file'),
1918
num, len(new_paths))
1686
child_pb.update('adding file', num, len(new_paths))
1919
1687
full_path = self._tree.abspath(path)
1920
1688
if trans_id in self._needs_rename:
1922
1690
mover.rename(self._limbo_name(trans_id), full_path)
1923
except errors.TransformRenameFailed as e:
1691
except errors.TransformRenameFailed, e:
1924
1692
# We may be renaming a dangling inventory id
1925
1693
if e.errno != errno.ENOENT:
1928
1696
self.rename_count += 1
1929
# TODO: if trans_id in self._observed_sha1s, we should
1930
# re-stat the final target, since ctime will be
1931
# updated by the change.
1932
if (trans_id in self._new_contents
1933
or self.path_changed(trans_id)):
1697
if (trans_id in self._new_contents or
1698
self.path_changed(trans_id)):
1934
1699
if trans_id in self._new_contents:
1935
1700
modified_paths.append(full_path)
1936
1701
if trans_id in self._new_executability:
1937
1702
self._set_executability(path, trans_id)
1938
if trans_id in self._observed_sha1s:
1939
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1940
st = osutils.lstat(full_path)
1941
self._observed_sha1s[trans_id] = (o_sha1, st)
1942
for path, trans_id in new_paths:
1943
# new_paths includes stuff like workingtree conflicts. Only the
1944
# stuff in new_contents actually comes from limbo.
1945
if trans_id in self._limbo_files:
1946
del self._limbo_files[trans_id]
1947
1705
self._new_contents.clear()
1948
1706
return modified_paths
1950
def _apply_observed_sha1s(self):
1951
"""After we have finished renaming everything, update observed sha1s
1953
This has to be done after self._tree.apply_inventory_delta, otherwise
1954
it doesn't know anything about the files we are updating. Also, we want
1955
to do this as late as possible, so that most entries end up cached.
1957
# TODO: this doesn't update the stat information for directories. So
1958
# the first 'bzr status' will still need to rewrite
1959
# .bzr/checkout/dirstate. However, we at least don't need to
1960
# re-read all of the files.
1961
# TODO: If the operation took a while, we could do a time.sleep(3) here
1962
# to allow the clock to tick over and ensure we won't have any
1963
# problems. (we could observe start time, and finish time, and if
1964
# it is less than eg 10% overhead, add a sleep call.)
1965
paths = FinalPaths(self)
1966
for trans_id, observed in viewitems(self._observed_sha1s):
1967
path = paths.get_path(trans_id)
1968
self._tree._observed_sha1(path, observed)
1971
1709
class TransformPreview(DiskTreeTransform):
1972
1710
"""A TreeTransform for generating preview trees.
2097
1826
def lock_read(self):
2098
1827
# Perhaps in theory, this should lock the TreeTransform?
2099
return lock.LogicalLockResult(self.unlock)
2101
1830
def unlock(self):
2105
def root_inventory(self):
1834
def inventory(self):
2106
1835
"""This Tree does not use inventory as its backing data."""
2107
raise NotImplementedError(_PreviewTree.root_inventory)
1836
raise NotImplementedError(_PreviewTree.inventory)
1838
def get_root_id(self):
1839
return self._transform.final_file_id(self._transform.root)
2109
1841
def all_file_ids(self):
2110
1842
tree_ids = set(self._transform._tree.all_file_ids())
2111
1843
tree_ids.difference_update(self._transform.tree_file_id(t)
2112
1844
for t in self._transform._removed_id)
2113
tree_ids.update(viewvalues(self._transform._new_id))
1845
tree_ids.update(self._transform._new_id.values())
2114
1846
return tree_ids
2116
def all_versioned_paths(self):
2117
tree_paths = set(self._transform._tree.all_versioned_paths())
2119
tree_paths.difference_update(
2120
self._transform.trans_id_tree_path(t)
2121
for t in self._transform._removed_id)
2124
self._final_paths._determine_path(t)
2125
for t in self._transform._new_id)
1849
return iter(self.all_file_ids())
1851
def _has_id(self, file_id, fallback_check):
1852
if file_id in self._transform._r_new_id:
1854
elif file_id in set([self._transform.tree_file_id(trans_id) for
1855
trans_id in self._transform._removed_id]):
1858
return fallback_check(file_id)
1860
def has_id(self, file_id):
1861
return self._has_id(file_id, self._transform._tree.has_id)
1863
def has_or_had_id(self, file_id):
1864
return self._has_id(file_id, self._transform._tree.has_or_had_id)
2129
1866
def _path2trans_id(self, path):
2130
1867
# We must not use None here, because that is a valid value to store.
2236
1962
ordered_ids = self._list_files_by_dir()
2237
1963
for entry, trans_id in self._make_inv_entries(ordered_ids,
2239
yield self._final_paths.get_path(trans_id), entry
1964
specific_file_ids, yield_parents=yield_parents):
1965
yield unicode(self._final_paths.get_path(trans_id)), entry
2241
1967
def _iter_entries_for_dir(self, dir_path):
2242
1968
"""Return path, entry for items in a directory without recursing down."""
1969
dir_file_id = self.path2id(dir_path)
2243
1970
ordered_ids = []
2244
dir_trans_id = self._path2trans_id(dir_path)
2245
dir_id = self._transform.final_file_id(dir_trans_id)
2246
for child_trans_id in self._all_children(dir_trans_id):
2247
ordered_ids.append((child_trans_id, dir_id))
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))
2249
1974
for entry, trans_id in self._make_inv_entries(ordered_ids):
2250
path_entries.append((self._final_paths.get_path(trans_id), entry))
1975
yield unicode(self._final_paths.get_path(trans_id)), entry
2254
def list_files(self, include_root=False, from_dir=None, recursive=True,
2255
recurse_nested=False):
1977
def list_files(self, include_root=False, from_dir=None, recursive=True):
2256
1978
"""See WorkingTree.list_files."""
2258
raise NotImplementedError(
2259
'follow tree references not yet supported')
2261
1979
# XXX This should behave like WorkingTree.list_files, but is really
2262
1980
# more like RevisionTree.list_files.
2274
1990
if not path.startswith(prefix):
2276
1992
path = path[len(prefix):]
2277
yield path, 'V', entry.kind, entry
1993
yield path, 'V', entry.kind, entry.file_id, entry
2279
1995
if from_dir is None and include_root is True:
2280
root_entry = inventory.make_entry(
2281
'directory', '', ROOT_PARENT, self.path2id(''))
2282
yield '', 'V', 'directory', root_entry
1996
root_entry = inventory.make_entry('directory', '',
1997
ROOT_PARENT, self.get_root_id())
1998
yield '', 'V', 'directory', root_entry.file_id, root_entry
2283
1999
entries = self._iter_entries_for_dir(from_dir or '')
2284
2000
for path, entry in entries:
2285
yield path, 'V', entry.kind, entry
2001
yield path, 'V', entry.kind, entry.file_id, entry
2287
def kind(self, path):
2288
trans_id = self._path2trans_id(path)
2289
if trans_id is None:
2290
raise errors.NoSuchFile(path)
2003
def kind(self, file_id):
2004
trans_id = self._transform.trans_id_file_id(file_id)
2291
2005
return self._transform.final_kind(trans_id)
2293
def stored_kind(self, path):
2294
trans_id = self._path2trans_id(path)
2295
if trans_id is None:
2296
raise errors.NoSuchFile(path)
2007
def stored_kind(self, file_id):
2008
trans_id = self._transform.trans_id_file_id(file_id)
2298
2010
return self._transform._new_contents[trans_id]
2299
2011
except KeyError:
2300
return self._transform._tree.stored_kind(path)
2012
return self._transform._tree.stored_kind(file_id)
2302
def get_file_mtime(self, path):
2014
def get_file_mtime(self, file_id, path=None):
2303
2015
"""See Tree.get_file_mtime"""
2304
file_id = self.path2id(path)
2306
raise errors.NoSuchFile(path)
2307
2016
if not self._content_change(file_id):
2308
return self._transform._tree.get_file_mtime(
2309
self._transform._tree.id2path(file_id))
2310
trans_id = self._path2trans_id(path)
2311
return self._stat_limbo_file(trans_id).st_mtime
2313
def get_file_size(self, path):
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):
2314
2024
"""See Tree.get_file_size"""
2315
trans_id = self._path2trans_id(path)
2316
if trans_id is None:
2317
raise errors.NoSuchFile(path)
2318
kind = self._transform.final_kind(trans_id)
2321
if trans_id in self._transform._new_contents:
2322
return self._stat_limbo_file(trans_id).st_size
2323
if self.kind(path) == 'file':
2324
return self._transform._tree.get_file_size(path)
2025
if self.kind(file_id) == 'file':
2026
return self._transform._tree.get_file_size(file_id)
2328
def get_file_verifier(self, path, stat_value=None):
2329
trans_id = self._path2trans_id(path)
2330
if trans_id is None:
2331
raise errors.NoSuchFile(path)
2332
kind = self._transform._new_contents.get(trans_id)
2334
return self._transform._tree.get_file_verifier(path)
2336
with self.get_file(path) as fileobj:
2337
return ("SHA1", sha_file(fileobj))
2339
def get_file_sha1(self, path, stat_value=None):
2340
trans_id = self._path2trans_id(path)
2341
if trans_id is None:
2342
raise errors.NoSuchFile(path)
2343
kind = self._transform._new_contents.get(trans_id)
2345
return self._transform._tree.get_file_sha1(path)
2347
with self.get_file(path) as fileobj:
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)
2348
2038
return sha_file(fileobj)
2350
def get_reference_revision(self, path):
2351
trans_id = self._path2trans_id(path)
2352
if trans_id is None:
2353
raise errors.NoSuchFile(path)
2354
reference_revision = self._transform._new_reference_revision.get(trans_id)
2355
if reference_revision is None:
2356
return self._transform._tree.get_reference_revision(path)
2357
return reference_revision
2359
def is_executable(self, path):
2360
trans_id = self._path2trans_id(path)
2361
if trans_id is None:
2042
def is_executable(self, file_id, path=None):
2045
trans_id = self._transform.trans_id_file_id(file_id)
2364
2047
return self._transform._new_executability[trans_id]
2365
2048
except KeyError:
2367
return self._transform._tree.is_executable(path)
2368
except OSError as e:
2050
return self._transform._tree.is_executable(file_id, path)
2369
2052
if e.errno == errno.ENOENT:
2372
except errors.NoSuchFile:
2055
except errors.NoSuchId:
2375
def has_filename(self, path):
2376
trans_id = self._path2trans_id(path)
2377
if trans_id in self._transform._new_contents:
2379
elif trans_id in self._transform._removed_contents:
2382
return self._transform._tree.has_filename(path)
2384
2058
def path_content_summary(self, path):
2385
2059
trans_id = self._path2trans_id(path)
2386
2060
tt = self._transform
2434
2106
raise ValueError('want_unversioned is not supported')
2435
2107
return self._transform.iter_changes()
2437
def get_file(self, path):
2109
def get_file(self, file_id, path=None):
2438
2110
"""See Tree.get_file"""
2439
file_id = self.path2id(path)
2440
2111
if not self._content_change(file_id):
2441
return self._transform._tree.get_file(path)
2442
trans_id = self._path2trans_id(path)
2112
return self._transform._tree.get_file(file_id, path)
2113
trans_id = self._transform.trans_id_file_id(file_id)
2443
2114
name = self._transform._limbo_name(trans_id)
2444
2115
return open(name, 'rb')
2446
def get_file_with_stat(self, path):
2447
return self.get_file(path), None
2117
def get_file_with_stat(self, file_id, path=None):
2118
return self.get_file(file_id, path), None
2449
def annotate_iter(self, path,
2120
def annotate_iter(self, file_id,
2450
2121
default_revision=_mod_revision.CURRENT_REVISION):
2451
file_id = self.path2id(path)
2452
2122
changes = self._iter_changes_cache.get(file_id)
2453
2123
if changes is None:
2456
changed_content, versioned, kind = (
2457
changes.changed_content, changes.versioned, changes.kind)
2126
changed_content, versioned, kind = (changes[2], changes[3],
2458
2128
if kind[1] is None:
2460
2130
get_old = (kind[0] == 'file' and versioned[0])
2462
old_annotation = self._transform._tree.annotate_iter(
2463
path, default_revision=default_revision)
2132
old_annotation = self._transform._tree.annotate_iter(file_id,
2133
default_revision=default_revision)
2465
2135
old_annotation = []
2466
2136
if changes is None:
2593
2268
:param delta_from_tree: If true, build_tree may use the input Tree to
2594
2269
generate the inventory delta.
2596
with cleanup.ExitStack() as exit_stack:
2597
exit_stack.enter_context(wt.lock_tree_write())
2598
exit_stack.enter_context(tree.lock_read())
2599
if accelerator_tree is not None:
2600
exit_stack.enter_context(accelerator_tree.lock_read())
2601
return _build_tree(tree, wt, accelerator_tree, hardlink,
2271
wt.lock_tree_write()
2275
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()
2605
2289
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2606
2290
"""See build_tree."""
2607
for num, _unused in enumerate(wt.all_versioned_paths()):
2291
for num, _unused in enumerate(wt.all_file_ids()):
2608
2292
if num > 0: # more than just a root
2609
2293
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2610
2294
file_trans_id = {}
2611
top_pb = ui.ui_factory.nested_progress_bar()
2295
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2612
2296
pp = ProgressPhase("Build phase", 2, top_pb)
2613
if tree.path2id('') is not None:
2297
if tree.inventory.root is not None:
2614
2298
# This is kind of a hack: we should be altering the root
2615
2299
# as part of the regular tree shape diff logic.
2616
2300
# The conditional test here is to avoid doing an
2723
2407
new_desired_files = desired_files
2725
2409
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2727
change.path for change in iter
2728
if not (change.changed_content or change.executable[0] != change.executable[1])]
2410
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2411
in iter if not (c or e[0] != e[1])]
2729
2412
if accelerator_tree.supports_content_filtering():
2730
unchanged = [(tp, ap) for (tp, ap) in unchanged
2731
if not next(accelerator_tree.iter_search_rules([ap]))]
2413
unchanged = [(f, p) for (f, p) in unchanged
2414
if not accelerator_tree.iter_search_rules([p]).next()]
2732
2415
unchanged = dict(unchanged)
2733
2416
new_desired_files = []
2735
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2736
accelerator_path = unchanged.get(tree_path)
2418
for file_id, (trans_id, tree_path) in desired_files:
2419
accelerator_path = unchanged.get(file_id)
2737
2420
if accelerator_path is None:
2738
new_desired_files.append((tree_path,
2739
(trans_id, file_id, tree_path, text_sha1)))
2421
new_desired_files.append((file_id, (trans_id, tree_path)))
2741
pb.update(gettext('Adding file contents'), count + offset, total)
2423
pb.update('Adding file contents', count + offset, total)
2743
2425
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2746
with accelerator_tree.get_file(accelerator_path) as f:
2747
chunks = osutils.file_iterator(f)
2748
if wt.supports_content_filtering():
2749
filters = wt._content_filter_stack(tree_path)
2750
chunks = filtered_output_bytes(chunks, filters,
2751
ContentFilterContext(tree_path, tree))
2752
tt.create_file(chunks, trans_id, sha1=text_sha1)
2428
contents = accelerator_tree.get_file(file_id, accelerator_path)
2429
if wt.supports_content_filtering():
2430
filters = wt._content_filter_stack(tree_path)
2431
contents = filtered_output_bytes(contents, filters,
2432
ContentFilterContext(tree_path, tree))
2434
tt.create_file(contents, trans_id)
2438
except AttributeError:
2439
# after filtering, contents may no longer be file-like
2754
2442
offset += count
2755
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2443
for count, ((trans_id, tree_path), contents) in enumerate(
2756
2444
tree.iter_files_bytes(new_desired_files)):
2757
2445
if wt.supports_content_filtering():
2758
2446
filters = wt._content_filter_stack(tree_path)
2759
2447
contents = filtered_output_bytes(contents, filters,
2760
ContentFilterContext(tree_path, tree))
2761
tt.create_file(contents, trans_id, sha1=text_sha1)
2762
pb.update(gettext('Adding file contents'), count + offset, total)
2448
ContentFilterContext(tree_path, tree))
2449
tt.create_file(contents, trans_id)
2450
pb.update('Adding file contents', count + offset, total)
2765
2453
def _reparent_children(tt, old_parent, new_parent):
2766
2454
for child in tt.iter_tree_children(old_parent):
2767
2455
tt.adjust_path(tt.final_name(child), new_parent, child)
2770
2457
def _reparent_transform_children(tt, old_parent, new_parent):
2771
2458
by_parent = tt.by_parent()
2772
2459
for child in by_parent[old_parent]:
2773
2460
tt.adjust_path(tt.final_name(child), new_parent, child)
2774
2461
return by_parent[old_parent]
2777
def _content_match(tree, entry, tree_path, kind, target_path):
2463
def _content_match(tree, entry, file_id, kind, target_path):
2778
2464
if entry.kind != kind:
2780
2466
if entry.kind == "directory":
2782
2468
if entry.kind == "file":
2783
with open(target_path, 'rb') as f1, \
2784
tree.get_file(tree_path) as f2:
2785
if osutils.compare_files(f1, f2):
2469
f = file(target_path, 'rb')
2471
if tree.get_file_text(file_id) == f.read():
2787
2475
elif entry.kind == "symlink":
2788
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2476
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2809
2497
final_parent = tt.final_parent(old_file)
2810
2498
if new_file in divert:
2811
new_name = tt.final_name(old_file) + '.diverted'
2499
new_name = tt.final_name(old_file)+'.diverted'
2812
2500
tt.adjust_path(new_name, final_parent, new_file)
2813
2501
new_conflicts.add((c_type, 'Diverted to',
2814
2502
new_file, old_file))
2816
new_name = tt.final_name(old_file) + '.moved'
2504
new_name = tt.final_name(old_file)+'.moved'
2817
2505
tt.adjust_path(new_name, final_parent, old_file)
2818
2506
new_conflicts.add((c_type, 'Moved existing file to',
2819
2507
old_file, new_file))
2820
2508
return new_conflicts
2823
def new_by_entry(path, tt, entry, parent_id, tree):
2511
def new_by_entry(tt, entry, parent_id, tree):
2824
2512
"""Create a new file according to its inventory entry"""
2825
2513
name = entry.name
2826
2514
kind = entry.kind
2827
2515
if kind == 'file':
2828
with tree.get_file(path) as f:
2829
executable = tree.is_executable(path)
2831
name, parent_id, osutils.file_iterator(f), entry.file_id,
2516
contents = tree.get_file(entry.file_id).readlines()
2517
executable = tree.is_executable(entry.file_id)
2518
return tt.new_file(name, parent_id, contents, entry.file_id,
2833
2520
elif kind in ('directory', 'tree-reference'):
2834
2521
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2835
2522
if kind == 'tree-reference':
2836
2523
tt.set_tree_reference(entry.reference_revision, trans_id)
2837
2524
return trans_id
2838
2525
elif kind == 'symlink':
2839
target = tree.get_symlink_target(path)
2526
target = tree.get_symlink_target(entry.file_id)
2840
2527
return tt.new_symlink(name, parent_id, target, entry.file_id)
2842
2529
raise errors.BadFileKindError(name, kind)
2845
def create_from_tree(tt, trans_id, tree, path, chunks=None,
2846
filter_tree_path=None):
2532
@deprecated_function(deprecated_in((1, 9, 0)))
2533
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2534
"""Create new file contents according to an inventory entry.
2536
DEPRECATED. Use create_from_tree instead.
2538
if entry.kind == "file":
2540
lines = tree.get_file(entry.file_id).readlines()
2541
tt.create_file(lines, trans_id, mode_id=mode_id)
2542
elif entry.kind == "symlink":
2543
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2544
elif entry.kind == "directory":
2545
tt.create_directory(trans_id)
2548
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2549
filter_tree_path=None):
2847
2550
"""Create new file contents according to tree contents.
2849
2552
:param filter_tree_path: the tree path to use to lookup
2850
2553
content filters to apply to the bytes output in the working tree.
2851
2554
This only applies if the working tree supports content filtering.
2853
kind = tree.kind(path)
2556
kind = tree.kind(file_id)
2854
2557
if kind == 'directory':
2855
2558
tt.create_directory(trans_id)
2856
2559
elif kind == "file":
2858
f = tree.get_file(path)
2859
chunks = osutils.file_iterator(f)
2864
if wt.supports_content_filtering() and filter_tree_path is not None:
2865
filters = wt._content_filter_stack(filter_tree_path)
2866
chunks = filtered_output_bytes(
2868
ContentFilterContext(filter_tree_path, tree))
2869
tt.create_file(chunks, trans_id)
2561
tree_file = tree.get_file(file_id)
2563
bytes = tree_file.readlines()
2567
if wt.supports_content_filtering() and filter_tree_path is not None:
2568
filters = wt._content_filter_stack(filter_tree_path)
2569
bytes = filtered_output_bytes(bytes, filters,
2570
ContentFilterContext(filter_tree_path, tree))
2571
tt.create_file(bytes, trans_id)
2873
2572
elif kind == "symlink":
2874
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2573
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2876
2575
raise AssertionError('Unknown kind %r' % kind)
2882
2581
tt.set_executability(entry.executable, trans_id)
2584
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2585
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2588
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2589
"""Produce a backup-style name that appears to be available"""
2593
yield "%s.~%d~" % (name, counter)
2595
for new_name in name_gen():
2596
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2600
def _entry_changes(file_id, entry, working_tree):
2601
"""Determine in which ways the inventory entry has changed.
2603
Returns booleans: has_contents, content_mod, meta_mod
2604
has_contents means there are currently contents, but they differ
2605
contents_mod means contents need to be modified
2606
meta_mod means the metadata needs to be modified
2608
cur_entry = working_tree.inventory[file_id]
2610
working_kind = working_tree.kind(file_id)
2613
has_contents = False
2616
if has_contents is True:
2617
if entry.kind != working_kind:
2618
contents_mod, meta_mod = True, False
2620
cur_entry._read_tree_state(working_tree.id2path(file_id),
2622
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2623
cur_entry._forget_tree_state()
2624
return has_contents, contents_mod, meta_mod
2885
2627
def revert(working_tree, target_tree, filenames, backups=False,
2886
2628
pb=None, change_reporter=None):
2887
2629
"""Revert a working tree's contents to those of a target tree."""
2630
target_tree.lock_read()
2888
2631
pb = ui.ui_factory.nested_progress_bar()
2632
tt = TreeTransform(working_tree, pb)
2890
with target_tree.lock_read(), working_tree.get_transform(pb) as tt:
2891
pp = ProgressPhase("Revert phase", 3, pb)
2892
conflicts, merge_modified = _prepare_revert_transform(
2893
working_tree, target_tree, tt, filenames, backups, pp)
2895
change_reporter = delta._ChangeReporter(
2896
unversioned_filter=working_tree.is_ignored)
2897
delta.report_changes(tt.iter_changes(), change_reporter)
2898
for conflict in conflicts:
2899
trace.warning(text_type(conflict))
2902
if working_tree.supports_merge_modified():
2903
working_tree.set_merge_modified(merge_modified)
2634
pp = ProgressPhase("Revert phase", 3, pb)
2635
conflicts, merge_modified = _prepare_revert_transform(
2636
working_tree, target_tree, tt, filenames, backups, pp)
2638
change_reporter = delta._ChangeReporter(
2639
unversioned_filter=working_tree.is_ignored)
2640
delta.report_changes(tt.iter_changes(), change_reporter)
2641
for conflict in conflicts:
2645
working_tree.set_merge_modified(merge_modified)
2647
target_tree.unlock()
2906
2650
return conflicts
2926
2676
backups, merge_modified, basis_tree=None):
2927
2677
if basis_tree is not None:
2928
2678
basis_tree.lock_read()
2929
# We ask the working_tree for its changes relative to the target, rather
2930
# than the target changes relative to the working tree. Because WT4 has an
2931
# optimizer to compare itself to a target, but no optimizer for the
2933
change_list = working_tree.iter_changes(
2934
target_tree, specific_files=specific_files, pb=pb)
2935
if not target_tree.is_versioned(u''):
2679
change_list = target_tree.iter_changes(working_tree,
2680
specific_files=specific_files, pb=pb)
2681
if target_tree.get_root_id() is None:
2936
2682
skip_root = True
2938
2684
skip_root = False
2940
2686
deferred_files = []
2941
for id_num, change in enumerate(change_list):
2942
file_id = change.file_id
2943
target_path, wt_path = change.path
2944
target_versioned, wt_versioned = change.versioned
2945
target_parent, wt_parent = change.parent_id
2946
target_name, wt_name = change.name
2947
target_kind, wt_kind = change.kind
2948
target_executable, wt_executable = change.executable
2949
if skip_root and wt_parent is None:
2687
for id_num, (file_id, path, changed_content, versioned, parent, name,
2688
kind, executable) in enumerate(change_list):
2689
if skip_root and file_id[0] is not None and parent[0] is None:
2951
2691
trans_id = tt.trans_id_file_id(file_id)
2953
if change.changed_content:
2954
2694
keep_content = False
2955
if wt_kind == 'file' and (backups or target_kind is None):
2956
wt_sha1 = working_tree.get_file_sha1(wt_path)
2957
if merge_modified.get(wt_path) != wt_sha1:
2695
if kind[0] == 'file' and (backups or kind[1] is None):
2696
wt_sha1 = working_tree.get_file_sha1(file_id)
2697
if merge_modified.get(file_id) != wt_sha1:
2958
2698
# acquire the basis tree lazily to prevent the
2959
2699
# expense of accessing it when it's not needed ?
2960
2700
# (Guessing, RBC, 200702)
2961
2701
if basis_tree is None:
2962
2702
basis_tree = working_tree.basis_tree()
2963
2703
basis_tree.lock_read()
2964
basis_inter = InterTree.get(basis_tree, working_tree)
2965
basis_path = basis_inter.find_source_path(wt_path)
2966
if basis_path is None:
2967
if target_kind is None and not target_versioned:
2970
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2972
if wt_kind is not None:
2704
if file_id in basis_tree:
2705
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2707
elif kind[1] is None and not versioned[1]:
2709
if kind[0] is not None:
2973
2710
if not keep_content:
2974
2711
tt.delete_contents(trans_id)
2975
elif target_kind is not None:
2976
parent_trans_id = tt.trans_id_file_id(wt_parent)
2977
backup_name = tt._available_backup_name(
2978
wt_name, parent_trans_id)
2712
elif kind[1] is not None:
2713
parent_trans_id = tt.trans_id_file_id(parent[0])
2714
by_parent = tt.by_parent()
2715
backup_name = _get_backup_name(name[0], by_parent,
2716
parent_trans_id, tt)
2979
2717
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2980
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2981
if wt_versioned and target_versioned:
2718
new_trans_id = tt.create_path(name[0], parent_trans_id)
2719
if versioned == (True, True):
2982
2720
tt.unversion_file(trans_id)
2983
2721
tt.version_file(file_id, new_trans_id)
2984
2722
# New contents should have the same unix perms as old
2986
2724
mode_id = trans_id
2987
2725
trans_id = new_trans_id
2988
if target_kind in ('directory', 'tree-reference'):
2726
if kind[1] in ('directory', 'tree-reference'):
2989
2727
tt.create_directory(trans_id)
2990
if target_kind == 'tree-reference':
2991
revision = target_tree.get_reference_revision(
2728
if kind[1] == 'tree-reference':
2729
revision = target_tree.get_reference_revision(file_id,
2993
2731
tt.set_tree_reference(revision, trans_id)
2994
elif target_kind == 'symlink':
2995
tt.create_symlink(target_tree.get_symlink_target(
2996
target_path), trans_id)
2997
elif target_kind == 'file':
2998
deferred_files.append(
2999
(target_path, (trans_id, mode_id, file_id)))
2732
elif kind[1] == 'symlink':
2733
tt.create_symlink(target_tree.get_symlink_target(file_id),
2735
elif kind[1] == 'file':
2736
deferred_files.append((file_id, (trans_id, mode_id)))
3000
2737
if basis_tree is None:
3001
2738
basis_tree = working_tree.basis_tree()
3002
2739
basis_tree.lock_read()
3003
new_sha1 = target_tree.get_file_sha1(target_path)
3004
basis_inter = InterTree.get(basis_tree, target_tree)
3005
basis_path = basis_inter.find_source_path(target_path)
3006
if (basis_path is not None and
3007
new_sha1 == basis_tree.get_file_sha1(basis_path)):
3008
# If the new contents of the file match what is in basis,
3009
# then there is no need to store in merge_modified.
3010
if basis_path in merge_modified:
3011
del merge_modified[basis_path]
2740
new_sha1 = target_tree.get_file_sha1(file_id)
2741
if (file_id in basis_tree and new_sha1 ==
2742
basis_tree.get_file_sha1(file_id)):
2743
if file_id in merge_modified:
2744
del merge_modified[file_id]
3013
merge_modified[target_path] = new_sha1
2746
merge_modified[file_id] = new_sha1
3015
2748
# preserve the execute bit when backing up
3016
if keep_content and wt_executable == target_executable:
3017
tt.set_executability(target_executable, trans_id)
3018
elif target_kind is not None:
3019
raise AssertionError(target_kind)
3020
if not wt_versioned and target_versioned:
2749
if keep_content and executable[0] == executable[1]:
2750
tt.set_executability(executable[1], trans_id)
2751
elif kind[1] is not None:
2752
raise AssertionError(kind[1])
2753
if versioned == (False, True):
3021
2754
tt.version_file(file_id, trans_id)
3022
if wt_versioned and not target_versioned:
2755
if versioned == (True, False):
3023
2756
tt.unversion_file(trans_id)
3024
if (target_name is not None
3025
and (wt_name != target_name or wt_parent != target_parent)):
3026
if target_name == '' and target_parent is None:
2757
if (name[1] is not None and
2758
(name[0] != name[1] or parent[0] != parent[1])):
2759
if name[1] == '' and parent[1] is None:
3027
2760
parent_trans = ROOT_PARENT
3029
parent_trans = tt.trans_id_file_id(target_parent)
3030
if wt_parent is None and wt_versioned:
3031
tt.adjust_root_path(target_name, parent_trans)
2762
parent_trans = tt.trans_id_file_id(parent[1])
2763
if parent[0] is None and versioned[0]:
2764
tt.adjust_root_path(name[1], parent_trans)
3033
tt.adjust_path(target_name, parent_trans, trans_id)
3034
if wt_executable != target_executable and target_kind == "file":
3035
tt.set_executability(target_executable, trans_id)
2766
tt.adjust_path(name[1], parent_trans, trans_id)
2767
if executable[0] != executable[1] and kind[1] == "file":
2768
tt.set_executability(executable[1], trans_id)
3036
2769
if working_tree.supports_content_filtering():
3037
for (trans_id, mode_id, file_id), bytes in (
3038
target_tree.iter_files_bytes(deferred_files)):
2770
for index, ((trans_id, mode_id), bytes) in enumerate(
2771
target_tree.iter_files_bytes(deferred_files)):
2772
file_id = deferred_files[index][0]
3039
2773
# We're reverting a tree to the target tree so using the
3040
2774
# target tree to find the file path seems the best choice
3041
2775
# here IMO - Ian C 27/Oct/2009
3042
2776
filter_tree_path = target_tree.id2path(file_id)
3043
2777
filters = working_tree._content_filter_stack(filter_tree_path)
3044
bytes = filtered_output_bytes(
2778
bytes = filtered_output_bytes(bytes, filters,
3046
2779
ContentFilterContext(filter_tree_path, working_tree))
3047
2780
tt.create_file(bytes, trans_id, mode_id)
3049
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2782
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3051
2784
tt.create_file(bytes, trans_id, mode_id)
3052
2785
tt.fixup_new_roots()
3241
2958
"""Reverse all renames that have been performed"""
3242
2959
for from_, to in reversed(self.past_renames):
3244
os.rename(to, from_)
3245
except OSError as e:
3246
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2961
osutils.rename(to, from_)
2962
except (OSError, IOError), e:
2963
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
3247
2964
# after rollback, don't reuse _FileMover
3248
self.past_renames = None
3249
self.pending_deletions = None
2966
pending_deletions = None
3251
2968
def apply_deletions(self):
3252
2969
"""Apply all marked deletions"""
3253
2970
for path in self.pending_deletions:
3254
2971
delete_any(path)
3255
2972
# after apply_deletions, don't reuse _FileMover
3256
self.past_renames = None
3257
self.pending_deletions = None
3260
def link_tree(target_tree, source_tree):
3261
"""Where possible, hard-link files in a tree to those in another tree.
3263
:param target_tree: Tree to change
3264
:param source_tree: Tree to hard-link from
3266
with target_tree.get_transform() as tt:
3267
for change in target_tree.iter_changes(source_tree, include_unchanged=True):
3268
if change.changed_content:
3270
if change.kind != ('file', 'file'):
3272
if change.executable[0] != change.executable[1]:
3274
trans_id = tt.trans_id_tree_path(change.path[1])
3275
tt.delete_contents(trans_id)
3276
tt.create_hardlink(source_tree.abspath(change.path[0]), trans_id)
2974
pending_deletions = None
added
removed
bzrlib/transform.py
