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(), """
33
44
revision as _mod_revision,
48
from breezy.bzr import (
52
from breezy.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
from bzrlib.osutils import (
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 (
53
from bzrlib.progress import ProgressPhase
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
67
from .progress import ProgressPhase
64
79
ROOT_PARENT = "root-parent"
380
393
return sorted(FinalPaths(self).get_paths(new_ids))
382
395
def _inventory_altered(self):
383
"""Get the trans_ids and paths of files needing new inv entries."""
385
for id_set in [self._new_name, self._new_parent, self._new_id,
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,
386
414
self._new_executability]:
387
new_ids.update(id_set)
415
changed_ids.update(id_set)
416
# removing implies a kind change
388
417
changed_kind = set(self._removed_contents)
389
419
changed_kind.intersection_update(self._new_contents)
390
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
393
new_ids.update(changed_kind)
394
return sorted(FinalPaths(self).get_paths(new_ids))
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))
396
434
def final_kind(self, trans_id):
397
435
"""Determine the final file kind, after any changes applied.
399
Raises NoSuchFile if the file does not exist/has no contents.
400
(It is conceivable that a path would be created without the
401
corresponding contents insertion command)
437
:return: None if the file does not exist/has no contents. (It is
438
conceivable that a path would be created without the corresponding
439
contents insertion command)
403
441
if trans_id in self._new_contents:
404
442
return self._new_contents[trans_id]
405
443
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
446
return self.tree_kind(trans_id)
448
def tree_path(self, trans_id):
449
"""Determine the tree path associated with the trans_id."""
450
return self._tree_id_paths.get(trans_id)
410
452
def tree_file_id(self, trans_id):
411
453
"""Determine the file id associated with the trans_id in the tree"""
413
path = self._tree_id_paths[trans_id]
415
# the file is a new, unversioned file, or invalid trans_id
454
path = self.tree_path(trans_id)
417
457
# the file is old; the old id is still valid
418
458
if self._new_root == trans_id:
531
571
# ensure that all children are registered with the transaction
532
572
list(self.iter_tree_children(parent_id))
534
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
574
def _has_named_child(self, name, parent_id, known_children):
575
"""Does a parent already have a name child.
577
:param name: The searched for name.
579
:param parent_id: The parent for which the check is made.
581
:param known_children: The already known children. This should have
582
been recently obtained from `self.by_parent.get(parent_id)`
583
(or will be if None is passed).
585
if known_children is None:
586
known_children = self.by_parent().get(parent_id, [])
587
for child in known_children:
540
588
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
590
parent_path = self._tree_id_paths.get(parent_id, None)
591
if parent_path is None:
592
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
594
child_path = joinpath(parent_path, name)
595
child_id = self._tree_path_ids.get(child_path, None)
548
596
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
597
# Not known by the tree transform yet, check the filesystem
598
return osutils.lexists(self._tree.abspath(child_path))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
600
raise AssertionError('child_id is missing: %s, %s, %s'
601
% (name, parent_id, child_id))
603
def _available_backup_name(self, name, target_id):
604
"""Find an available backup name.
606
:param name: The basename of the file.
608
:param target_id: The directory trans_id where the backup should
611
known_children = self.by_parent().get(target_id, [])
612
return osutils.available_backup_name(
614
lambda base: self._has_named_child(
615
base, target_id, known_children))
559
617
def _parent_loops(self):
560
618
"""No entry should be its own ancestor"""
668
724
def _duplicate_ids(self):
669
725
"""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.
671
732
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
672
733
self._removed_id))
673
all_ids = self._tree.all_file_ids()
674
734
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
735
for trans_id, file_id in viewitems(self._new_id):
676
736
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
737
path = self._tree.id2path(file_id)
738
old_trans_id = self.trans_id_tree_path(path)
678
739
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
742
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
743
"""Children must have a directory parent"""
684
for parent_id, children in by_parent.iteritems():
685
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
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)
759
# The directory will be deleted
699
760
conflicts.append(('missing parent', parent_id))
700
761
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
701
763
conflicts.append(('non-directory parent', parent_id))
704
def _any_contents(self, trans_ids):
705
"""Return true if any of the trans_ids, will have contents."""
706
for trans_id in trans_ids:
708
kind = self.final_kind(trans_id)
714
766
def _set_executability(self, path, trans_id):
715
767
"""Set the executability of versioned files """
716
if supports_executable():
768
if self._tree._supports_executable():
717
769
new_executability = self._new_executability[trans_id]
718
770
abspath = self._tree.abspath(path)
719
771
current_mode = os.stat(abspath).st_mode
720
772
if new_executability:
721
773
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
775
to_mode = current_mode | (0o100 & ~umask)
724
776
# Enable x-bit for others only if they can read it.
725
if current_mode & 0004:
726
to_mode |= 0001 & ~umask
727
if current_mode & 0040:
728
to_mode |= 0010 & ~umask
777
if current_mode & 0o004:
778
to_mode |= 0o001 & ~umask
779
if current_mode & 0o040:
780
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
782
to_mode = current_mode & ~0o111
783
osutils.chmod_if_possible(abspath, to_mode)
733
785
def _new_entry(self, name, parent_id, file_id):
734
786
"""Helper function to create a new filesystem entry."""
780
832
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
783
877
def _affected_ids(self):
784
878
"""Return the set of transform ids affected by the transform"""
785
879
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
880
trans_ids.update(self._new_id)
787
881
trans_ids.update(self._removed_contents)
788
trans_ids.update(self._new_contents.keys())
789
trans_ids.update(self._new_executability.keys())
790
trans_ids.update(self._new_name.keys())
791
trans_ids.update(self._new_parent.keys())
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)
794
888
def _get_file_id_maps(self):
903
989
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)
904
997
if from_kind != to_kind:
906
999
elif to_kind in ('file', 'symlink') and (
907
to_trans_id != from_trans_id or
908
to_trans_id in self._new_contents):
1000
to_trans_id != from_trans_id
1001
or to_trans_id in self._new_contents):
910
if (not modified and from_versioned == to_versioned and
911
from_parent==to_parent and from_name == to_name and
912
from_executable == to_executable):
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):
914
results.append((file_id, (from_path, to_path), modified,
915
(from_versioned, to_versioned),
916
(from_parent, to_parent),
917
(from_name, to_name),
918
(from_kind, to_kind),
919
(from_executable, to_executable)))
920
return iter(sorted(results, key=lambda x:x[1]))
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))
922
1020
def get_preview_tree(self):
923
1021
"""Return a tree representing the result of the transform.
965
1084
return revision_id
967
1086
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1087
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1089
if path is None or self._tree.kind(path) != 'file':
972
1091
except errors.NoSuchFile:
976
1095
def _get_parents_texts(self, trans_id):
977
1096
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1097
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1100
return (self._tree.get_file_text(path),)
983
1102
def _get_parents_lines(self, trans_id):
984
1103
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1104
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1107
return (self._tree.get_file_lines(path),)
990
1109
def serialize(self, serializer):
991
1110
"""Serialize this TreeTransform.
993
1112
:param serializer: A Serialiser like pack.ContainerSerializer.
995
new_name = dict((k, v.encode('utf-8')) for k, v in
996
self._new_name.items())
997
new_executability = dict((k, int(v)) for k, v in
998
self._new_executability.items())
999
tree_path_ids = dict((k.encode('utf-8'), v)
1000
for k, v in self._tree_path_ids.items())
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]
1002
'_id_number': self._id_number,
1003
'_new_name': new_name,
1004
'_new_parent': self._new_parent,
1005
'_new_executability': new_executability,
1006
'_new_id': self._new_id,
1007
'_tree_path_ids': tree_path_ids,
1008
'_removed_id': list(self._removed_id),
1009
'_removed_contents': list(self._removed_contents),
1010
'_non_present_ids': self._non_present_ids,
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,
1012
1141
yield serializer.bytes_record(bencode.bencode(attribs),
1014
for trans_id, kind in self._new_contents.items():
1143
for trans_id, kind in sorted(viewitems(self._new_contents)):
1015
1144
if kind == 'file':
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1145
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1146
lines = cur_file.readlines()
1018
1147
parents = self._get_parents_lines(trans_id)
1019
1148
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
content = ''.join(mpdiff.to_patch())
1149
content = b''.join(mpdiff.to_patch())
1021
1150
if kind == 'directory':
1023
1152
if kind == 'symlink':
1024
1153
content = self._read_symlink_target(trans_id)
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
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')),))
1027
1159
def deserialize(self, records):
1028
1160
"""Deserialize a stored TreeTransform.
1030
1162
:param records: An iterable of (names, content) tuples, as per
1031
1163
pack.ContainerPushParser.
1033
names, content = records.next()
1165
names, content = next(records)
1034
1166
attribs = bencode.bdecode(content)
1035
self._id_number = attribs['_id_number']
1036
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1038
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1041
self._new_id = attribs['_new_id']
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
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)}
1043
1178
self._tree_path_ids = {}
1044
1179
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1180
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1046
1181
path = bytepath.decode('utf-8')
1182
trans_id = trans_id.decode('utf-8')
1047
1183
self._tree_path_ids[path] = trans_id
1048
1184
self._tree_id_paths[trans_id] = path
1049
self._removed_id = set(attribs['_removed_id'])
1050
self._removed_contents = set(attribs['_removed_contents'])
1051
self._non_present_ids = attribs['_non_present_ids']
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'])}
1052
1193
for ((trans_id, kind),), content in records:
1194
trans_id = trans_id.decode('utf-8')
1195
kind = kind.decode('ascii')
1053
1196
if kind == 'file':
1054
1197
mpdiff = multiparent.MultiParent.from_patch(content)
1055
1198
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1059
1202
if kind == 'symlink':
1060
1203
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)
1063
1245
class DiskTreeTransform(TreeTransformBase):
1064
1246
"""Tree transform storing its contents on disk."""
1066
def __init__(self, tree, limbodir, pb=None,
1067
case_sensitive=True):
1248
def __init__(self, tree, limbodir, pb=None, case_sensitive=True):
1068
1249
"""Constructor.
1069
1250
:param tree: The tree that will be transformed, but not necessarily
1070
1251
the output tree.
1173
1370
descendants.update(self._limbo_descendants(descendant))
1174
1371
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1373
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1374
"""Schedule creation of a new file.
1181
Contents is an iterator of strings, all of which will be written
1182
to the target destination.
1184
New file takes the permissions of any existing file with that id,
1185
unless mode_id is specified.
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.
1187
1387
name = self._limbo_name(trans_id)
1188
f = open(name, 'wb')
1191
unique_add(self._new_contents, trans_id, 'file')
1193
# Clean up the file, it never got registered so
1194
# TreeTransform.finalize() won't clean it up.
1388
with open(name, 'wb') as f:
1389
unique_add(self._new_contents, trans_id, 'file')
1199
1390
f.writelines(contents)
1202
1391
self._set_mtime(name)
1203
1392
self._set_mode(trans_id, mode_id, S_ISREG)
1205
def _read_file_chunks(self, trans_id):
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1208
return cur_file.readlines()
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))
1212
1399
def _read_symlink_target(self, trans_id):
1213
1400
return os.readlink(self._limbo_name(trans_id))
1274
1467
del self._limbo_children_names[trans_id]
1275
1468
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.',
1278
1547
class TreeTransform(DiskTreeTransform):
1279
1548
"""Represent a tree transformation.
1656
1912
new_paths = self.new_paths(filesystem_only=True)
1657
1913
modified_paths = []
1658
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1660
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1914
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1915
for num, (path, trans_id) in enumerate(new_paths):
1663
1916
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1917
child_pb.update(gettext('adding file'),
1918
num, len(new_paths))
1665
1919
full_path = self._tree.abspath(path)
1666
1920
if trans_id in self._needs_rename:
1668
1922
mover.rename(self._limbo_name(trans_id), full_path)
1923
except errors.TransformRenameFailed as e:
1670
1924
# We may be renaming a dangling inventory id
1671
1925
if e.errno != errno.ENOENT:
1674
1928
self.rename_count += 1
1675
if (trans_id in self._new_contents or
1676
self.path_changed(trans_id)):
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)):
1677
1934
if trans_id in self._new_contents:
1678
1935
modified_paths.append(full_path)
1679
1936
if trans_id in self._new_executability:
1680
1937
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]
1683
1947
self._new_contents.clear()
1684
1948
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)
1687
1971
class TransformPreview(DiskTreeTransform):
1688
1972
"""A TreeTransform for generating preview trees.
1965
2285
if not path.startswith(prefix):
1967
2287
path = path[len(prefix):]
1968
yield path, 'V', entry.kind, entry.file_id, entry
2288
yield path, 'V', entry.kind, entry
1970
2290
if from_dir is None and include_root is True:
1971
root_entry = inventory.make_entry('directory', '',
1972
ROOT_PARENT, self.get_root_id())
1973
yield '', 'V', 'directory', root_entry.file_id, root_entry
2291
root_entry = inventory.make_entry(
2292
'directory', '', ROOT_PARENT, self.get_root_id())
2293
yield '', 'V', 'directory', root_entry
1974
2294
entries = self._iter_entries_for_dir(from_dir or '')
1975
2295
for path, entry in entries:
1976
yield path, 'V', entry.kind, entry.file_id, entry
2296
yield path, 'V', entry.kind, entry
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2298
def kind(self, path):
2299
trans_id = self._path2trans_id(path)
2300
if trans_id is None:
2301
raise errors.NoSuchFile(path)
1980
2302
return self._transform.final_kind(trans_id)
1982
def stored_kind(self, file_id):
1983
trans_id = self._transform.trans_id_file_id(file_id)
2304
def stored_kind(self, path):
2305
trans_id = self._path2trans_id(path)
2306
if trans_id is None:
2307
raise errors.NoSuchFile(path)
1985
2309
return self._transform._new_contents[trans_id]
1986
2310
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2311
return self._transform._tree.stored_kind(path)
1989
def get_file_mtime(self, file_id, path=None):
2313
def get_file_mtime(self, path):
1990
2314
"""See Tree.get_file_mtime"""
2315
file_id = self.path2id(path)
2317
raise errors.NoSuchFile(path)
1991
2318
if not self._content_change(file_id):
1992
return self._transform._tree.get_file_mtime(file_id)
1993
return self._stat_limbo_file(file_id).st_mtime
1995
def _file_size(self, entry, stat_value):
1996
return self.get_file_size(entry.file_id)
1998
def get_file_size(self, file_id):
2319
return self._transform._tree.get_file_mtime(
2320
self._transform._tree.id2path(file_id))
2321
trans_id = self._path2trans_id(path)
2322
return self._stat_limbo_file(trans_id).st_mtime
2324
def get_file_size(self, path):
1999
2325
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2326
trans_id = self._path2trans_id(path)
2327
if trans_id is None:
2328
raise errors.NoSuchFile(path)
2329
kind = self._transform.final_kind(trans_id)
2332
if trans_id in self._transform._new_contents:
2333
return self._stat_limbo_file(trans_id).st_size
2334
if self.kind(path) == 'file':
2335
return self._transform._tree.get_file_size(path)
2005
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
trans_id = self._transform.trans_id_file_id(file_id)
2007
kind = self._transform._new_contents.get(trans_id)
2009
return self._transform._tree.get_file_sha1(file_id)
2011
fileobj = self.get_file(file_id)
2339
def get_file_verifier(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_verifier(path)
2347
with self.get_file(path) as fileobj:
2348
return ("SHA1", sha_file(fileobj))
2350
def get_file_sha1(self, path, stat_value=None):
2351
trans_id = self._path2trans_id(path)
2352
if trans_id is None:
2353
raise errors.NoSuchFile(path)
2354
kind = self._transform._new_contents.get(trans_id)
2356
return self._transform._tree.get_file_sha1(path)
2358
with self.get_file(path) as fileobj:
2013
2359
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2361
def is_executable(self, path):
2362
trans_id = self._path2trans_id(path)
2363
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2366
return self._transform._new_executability[trans_id]
2023
2367
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2369
return self._transform._tree.is_executable(path)
2370
except OSError as e:
2027
2371
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2374
except errors.NoSuchFile:
2377
def has_filename(self, path):
2378
trans_id = self._path2trans_id(path)
2379
if trans_id in self._transform._new_contents:
2381
elif trans_id in self._transform._removed_contents:
2384
return self._transform._tree.has_filename(path)
2033
2386
def path_content_summary(self, path):
2034
2387
trans_id = self._path2trans_id(path)
2035
2388
tt = self._transform
2081
2436
raise ValueError('want_unversioned is not supported')
2082
2437
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2439
def get_file(self, path):
2085
2440
"""See Tree.get_file"""
2441
file_id = self.path2id(path)
2086
2442
if not self._content_change(file_id):
2087
return self._transform._tree.get_file(file_id, path)
2088
trans_id = self._transform.trans_id_file_id(file_id)
2443
return self._transform._tree.get_file(path)
2444
trans_id = self._path2trans_id(path)
2089
2445
name = self._transform._limbo_name(trans_id)
2090
2446
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2448
def get_file_with_stat(self, path):
2449
return self.get_file(path), None
2095
def annotate_iter(self, file_id,
2451
def annotate_iter(self, path,
2096
2452
default_revision=_mod_revision.CURRENT_REVISION):
2453
file_id = self.path2id(path)
2097
2454
changes = self._iter_changes_cache.get(file_id)
2098
2455
if changes is None:
2101
changed_content, versioned, kind = (changes[2], changes[3],
2458
changed_content, versioned, kind = (
2459
changes.changed_content, changes.versioned, changes.kind)
2103
2460
if kind[1] is None:
2105
2462
get_old = (kind[0] == 'file' and versioned[0])
2107
old_annotation = self._transform._tree.annotate_iter(file_id,
2108
default_revision=default_revision)
2464
old_annotation = self._transform._tree.annotate_iter(
2465
path, default_revision=default_revision)
2110
2467
old_annotation = []
2111
2468
if changes is None:
2243
2602
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2603
generate the inventory delta.
2246
wt.lock_tree_write()
2250
if accelerator_tree is not None:
2251
accelerator_tree.lock_read()
2253
return _build_tree(tree, wt, accelerator_tree, hardlink,
2256
if accelerator_tree is not None:
2257
accelerator_tree.unlock()
2605
with cleanup.ExitStack() as exit_stack:
2606
exit_stack.enter_context(wt.lock_tree_write())
2607
exit_stack.enter_context(tree.lock_read())
2608
if accelerator_tree is not None:
2609
exit_stack.enter_context(accelerator_tree.lock_read())
2610
return _build_tree(tree, wt, accelerator_tree, hardlink,
2264
2614
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2615
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2616
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2617
if num > 0: # more than just a root
2268
2618
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
existing_files = set()
2270
for dir, files in wt.walkdirs():
2271
existing_files.update(f[0] for f in files)
2272
2619
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2620
top_pb = ui.ui_factory.nested_progress_bar()
2274
2621
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2622
if tree.get_root_id() is not None:
2276
2623
# This is kind of a hack: we should be altering the root
2277
2624
# as part of the regular tree shape diff logic.
2278
2625
# The conditional test here is to avoid doing an
2376
2732
new_desired_files = desired_files
2378
2734
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2380
in iter if not (c or e[0] != e[1])]
2736
change.path for change in iter
2737
if not (change.changed_content or change.executable[0] != change.executable[1])]
2381
2738
if accelerator_tree.supports_content_filtering():
2382
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2739
unchanged = [(tp, ap) for (tp, ap) in unchanged
2740
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2741
unchanged = dict(unchanged)
2385
2742
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2744
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2745
accelerator_path = unchanged.get(tree_path)
2389
2746
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2747
new_desired_files.append((tree_path,
2748
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2750
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2752
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2397
contents = accelerator_tree.get_file(file_id, accelerator_path)
2398
if wt.supports_content_filtering():
2399
filters = wt._content_filter_stack(tree_path)
2400
contents = filtered_output_bytes(contents, filters,
2401
ContentFilterContext(tree_path, tree))
2403
tt.create_file(contents, trans_id)
2407
except AttributeError:
2408
# after filtering, contents may no longer be file-like
2755
with accelerator_tree.get_file(accelerator_path) as f:
2756
chunks = osutils.file_iterator(f)
2757
if wt.supports_content_filtering():
2758
filters = wt._content_filter_stack(tree_path)
2759
chunks = filtered_output_bytes(chunks, filters,
2760
ContentFilterContext(tree_path, tree))
2761
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2763
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2764
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2765
tree.iter_files_bytes(new_desired_files)):
2414
2766
if wt.supports_content_filtering():
2415
2767
filters = wt._content_filter_stack(tree_path)
2416
2768
contents = filtered_output_bytes(contents, filters,
2417
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2769
ContentFilterContext(tree_path, tree))
2770
tt.create_file(contents, trans_id, sha1=text_sha1)
2771
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2774
def _reparent_children(tt, old_parent, new_parent):
2423
2775
for child in tt.iter_tree_children(old_parent):
2424
2776
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2779
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2780
by_parent = tt.by_parent()
2428
2781
for child in by_parent[old_parent]:
2429
2782
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2783
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2786
def _content_match(tree, entry, tree_path, kind, target_path):
2433
2787
if entry.kind != kind:
2435
2789
if entry.kind == "directory":
2437
2791
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2792
with open(target_path, 'rb') as f1, \
2793
tree.get_file(tree_path) as f2:
2794
if osutils.compare_files(f1, f2):
2440
2796
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2797
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2462
2818
final_parent = tt.final_parent(old_file)
2463
2819
if new_file in divert:
2464
new_name = tt.final_name(old_file)+'.diverted'
2820
new_name = tt.final_name(old_file) + '.diverted'
2465
2821
tt.adjust_path(new_name, final_parent, new_file)
2466
2822
new_conflicts.add((c_type, 'Diverted to',
2467
2823
new_file, old_file))
2469
new_name = tt.final_name(old_file)+'.moved'
2825
new_name = tt.final_name(old_file) + '.moved'
2470
2826
tt.adjust_path(new_name, final_parent, old_file)
2471
2827
new_conflicts.add((c_type, 'Moved existing file to',
2472
2828
old_file, new_file))
2473
2829
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2832
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2833
"""Create a new file according to its inventory entry"""
2478
2834
name = entry.name
2479
2835
kind = entry.kind
2480
2836
if kind == 'file':
2481
contents = tree.get_file(entry.file_id).readlines()
2482
executable = tree.is_executable(entry.file_id)
2483
return tt.new_file(name, parent_id, contents, entry.file_id,
2837
with tree.get_file(path) as f:
2838
executable = tree.is_executable(path)
2840
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2842
elif kind in ('directory', 'tree-reference'):
2486
2843
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2844
if kind == 'tree-reference':
2488
2845
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2846
return trans_id
2490
2847
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2848
target = tree.get_symlink_target(path)
2492
2849
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2851
raise errors.BadFileKindError(name, kind)
2497
@deprecated_function(deprecated_in((1, 9, 0)))
2498
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
"""Create new file contents according to an inventory entry.
2501
DEPRECATED. Use create_from_tree instead.
2503
if entry.kind == "file":
2505
lines = tree.get_file(entry.file_id).readlines()
2506
tt.create_file(lines, trans_id, mode_id=mode_id)
2507
elif entry.kind == "symlink":
2508
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2509
elif entry.kind == "directory":
2510
tt.create_directory(trans_id)
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
filter_tree_path=None):
2854
def create_from_tree(tt, trans_id, tree, path, chunks=None,
2855
filter_tree_path=None):
2515
2856
"""Create new file contents according to tree contents.
2517
2858
:param filter_tree_path: the tree path to use to lookup
2518
2859
content filters to apply to the bytes output in the working tree.
2519
2860
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2862
kind = tree.kind(path)
2522
2863
if kind == 'directory':
2523
2864
tt.create_directory(trans_id)
2524
2865
elif kind == "file":
2526
tree_file = tree.get_file(file_id)
2528
bytes = tree_file.readlines()
2532
if wt.supports_content_filtering() and filter_tree_path is not None:
2533
filters = wt._content_filter_stack(filter_tree_path)
2534
bytes = filtered_output_bytes(bytes, filters,
2535
ContentFilterContext(filter_tree_path, tree))
2536
tt.create_file(bytes, trans_id)
2867
f = tree.get_file(path)
2868
chunks = osutils.file_iterator(f)
2873
if wt.supports_content_filtering() and filter_tree_path is not None:
2874
filters = wt._content_filter_stack(filter_tree_path)
2875
chunks = filtered_output_bytes(
2877
ContentFilterContext(filter_tree_path, tree))
2878
tt.create_file(chunks, trans_id)
2537
2882
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2883
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2540
2885
raise AssertionError('Unknown kind %r' % kind)
2546
2891
tt.set_executability(entry.executable, trans_id)
2549
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2553
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
"""Produce a backup-style name that appears to be available"""
2558
yield "%s.~%d~" % (name, counter)
2560
for new_name in name_gen():
2561
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2565
def _entry_changes(file_id, entry, working_tree):
2566
"""Determine in which ways the inventory entry has changed.
2568
Returns booleans: has_contents, content_mod, meta_mod
2569
has_contents means there are currently contents, but they differ
2570
contents_mod means contents need to be modified
2571
meta_mod means the metadata needs to be modified
2573
cur_entry = working_tree.inventory[file_id]
2575
working_kind = working_tree.kind(file_id)
2578
has_contents = False
2581
if has_contents is True:
2582
if entry.kind != working_kind:
2583
contents_mod, meta_mod = True, False
2585
cur_entry._read_tree_state(working_tree.id2path(file_id),
2587
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
cur_entry._forget_tree_state()
2589
return has_contents, contents_mod, meta_mod
2592
2894
def revert(working_tree, target_tree, filenames, backups=False,
2593
2895
pb=None, change_reporter=None):
2594
2896
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2897
pb = ui.ui_factory.nested_progress_bar()
2597
tt = TreeTransform(working_tree, pb)
2599
pp = ProgressPhase("Revert phase", 3, pb)
2600
conflicts, merge_modified = _prepare_revert_transform(
2601
working_tree, target_tree, tt, filenames, backups, pp)
2603
change_reporter = delta._ChangeReporter(
2604
unversioned_filter=working_tree.is_ignored)
2605
delta.report_changes(tt.iter_changes(), change_reporter)
2606
for conflict in conflicts:
2610
working_tree.set_merge_modified(merge_modified)
2899
with target_tree.lock_read(), working_tree.get_transform(pb) as tt:
2900
pp = ProgressPhase("Revert phase", 3, pb)
2901
conflicts, merge_modified = _prepare_revert_transform(
2902
working_tree, target_tree, tt, filenames, backups, pp)
2904
change_reporter = delta._ChangeReporter(
2905
unversioned_filter=working_tree.is_ignored)
2906
delta.report_changes(tt.iter_changes(), change_reporter)
2907
for conflict in conflicts:
2908
trace.warning(text_type(conflict))
2911
if working_tree.supports_merge_modified():
2912
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2915
return conflicts
2641
2935
backups, merge_modified, basis_tree=None):
2642
2936
if basis_tree is not None:
2643
2937
basis_tree.lock_read()
2644
change_list = target_tree.iter_changes(working_tree,
2645
specific_files=specific_files, pb=pb)
2646
if target_tree.get_root_id() is None:
2938
# We ask the working_tree for its changes relative to the target, rather
2939
# than the target changes relative to the working tree. Because WT4 has an
2940
# optimizer to compare itself to a target, but no optimizer for the
2942
change_list = working_tree.iter_changes(
2943
target_tree, specific_files=specific_files, pb=pb)
2944
if not target_tree.is_versioned(u''):
2647
2945
skip_root = True
2649
2947
skip_root = False
2651
2949
deferred_files = []
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2950
for id_num, change in enumerate(change_list):
2951
file_id = change.file_id
2952
target_path, wt_path = change.path
2953
target_versioned, wt_versioned = change.versioned
2954
target_parent, wt_parent = change.parent_id
2955
target_name, wt_name = change.name
2956
target_kind, wt_kind = change.kind
2957
target_executable, wt_executable = change.executable
2958
if skip_root and wt_parent is None:
2656
2960
trans_id = tt.trans_id_file_id(file_id)
2962
if change.changed_content:
2659
2963
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
if merge_modified.get(file_id) != wt_sha1:
2964
if wt_kind == 'file' and (backups or target_kind is None):
2965
wt_sha1 = working_tree.get_file_sha1(wt_path)
2966
if merge_modified.get(wt_path) != wt_sha1:
2663
2967
# acquire the basis tree lazily to prevent the
2664
2968
# expense of accessing it when it's not needed ?
2665
2969
# (Guessing, RBC, 200702)
2666
2970
if basis_tree is None:
2667
2971
basis_tree = working_tree.basis_tree()
2668
2972
basis_tree.lock_read()
2669
if file_id in basis_tree:
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2672
elif kind[1] is None and not versioned[1]:
2674
if kind[0] is not None:
2973
basis_path = find_previous_path(
2974
working_tree, basis_tree, wt_path)
2975
if basis_path is None:
2976
if target_kind is None and not target_versioned:
2979
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2981
if wt_kind is not None:
2675
2982
if not keep_content:
2676
2983
tt.delete_contents(trans_id)
2677
elif kind[1] is not None:
2678
parent_trans_id = tt.trans_id_file_id(parent[0])
2679
by_parent = tt.by_parent()
2680
backup_name = _get_backup_name(name[0], by_parent,
2681
parent_trans_id, tt)
2984
elif target_kind is not None:
2985
parent_trans_id = tt.trans_id_file_id(wt_parent)
2986
backup_name = tt._available_backup_name(
2987
wt_name, parent_trans_id)
2682
2988
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2989
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2990
if wt_versioned and target_versioned:
2685
2991
tt.unversion_file(trans_id)
2686
2992
tt.version_file(file_id, new_trans_id)
2687
2993
# New contents should have the same unix perms as old
2689
2995
mode_id = trans_id
2690
2996
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2997
if target_kind in ('directory', 'tree-reference'):
2692
2998
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2999
if target_kind == 'tree-reference':
3000
revision = target_tree.get_reference_revision(
2696
3002
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2701
deferred_files.append((file_id, (trans_id, mode_id)))
3003
elif target_kind == 'symlink':
3004
tt.create_symlink(target_tree.get_symlink_target(
3005
target_path), trans_id)
3006
elif target_kind == 'file':
3007
deferred_files.append(
3008
(target_path, (trans_id, mode_id, file_id)))
2702
3009
if basis_tree is None:
2703
3010
basis_tree = working_tree.basis_tree()
2704
3011
basis_tree.lock_read()
2705
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2708
if file_id in merge_modified:
2709
del merge_modified[file_id]
3012
new_sha1 = target_tree.get_file_sha1(target_path)
3013
basis_path = find_previous_path(target_tree, basis_tree, target_path)
3014
if (basis_path is not None and
3015
new_sha1 == basis_tree.get_file_sha1(basis_path)):
3016
# If the new contents of the file match what is in basis,
3017
# then there is no need to store in merge_modified.
3018
if basis_path in merge_modified:
3019
del merge_modified[basis_path]
2711
merge_modified[file_id] = new_sha1
3021
merge_modified[target_path] = new_sha1
2713
3023
# preserve the execute bit when backing up
2714
if keep_content and executable[0] == executable[1]:
2715
tt.set_executability(executable[1], trans_id)
2716
elif kind[1] is not None:
2717
raise AssertionError(kind[1])
2718
if versioned == (False, True):
3024
if keep_content and wt_executable == target_executable:
3025
tt.set_executability(target_executable, trans_id)
3026
elif target_kind is not None:
3027
raise AssertionError(target_kind)
3028
if not wt_versioned and target_versioned:
2719
3029
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
3030
if wt_versioned and not target_versioned:
2721
3031
tt.unversion_file(trans_id)
2722
if (name[1] is not None and
2723
(name[0] != name[1] or parent[0] != parent[1])):
2724
if name[1] == '' and parent[1] is None:
3032
if (target_name is not None
3033
and (wt_name != target_name or wt_parent != target_parent)):
3034
if target_name == '' and target_parent is None:
2725
3035
parent_trans = ROOT_PARENT
2727
parent_trans = tt.trans_id_file_id(parent[1])
2728
if parent[0] is None and versioned[0]:
2729
tt.adjust_root_path(name[1], parent_trans)
3037
parent_trans = tt.trans_id_file_id(target_parent)
3038
if wt_parent is None and wt_versioned:
3039
tt.adjust_root_path(target_name, parent_trans)
2731
tt.adjust_path(name[1], parent_trans, trans_id)
2732
if executable[0] != executable[1] and kind[1] == "file":
2733
tt.set_executability(executable[1], trans_id)
3041
tt.adjust_path(target_name, parent_trans, trans_id)
3042
if wt_executable != target_executable and target_kind == "file":
3043
tt.set_executability(target_executable, trans_id)
2734
3044
if working_tree.supports_content_filtering():
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
target_tree.iter_files_bytes(deferred_files)):
2737
file_id = deferred_files[index][0]
3045
for (trans_id, mode_id, file_id), bytes in (
3046
target_tree.iter_files_bytes(deferred_files)):
2738
3047
# We're reverting a tree to the target tree so using the
2739
3048
# target tree to find the file path seems the best choice
2740
3049
# here IMO - Ian C 27/Oct/2009
2741
3050
filter_tree_path = target_tree.id2path(file_id)
2742
3051
filters = working_tree._content_filter_stack(filter_tree_path)
2743
bytes = filtered_output_bytes(bytes, filters,
3052
bytes = filtered_output_bytes(
2744
3054
ContentFilterContext(filter_tree_path, working_tree))
2745
3055
tt.create_file(bytes, trans_id, mode_id)
2747
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3057
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2749
3059
tt.create_file(bytes, trans_id, mode_id)
2750
3060
tt.fixup_new_roots()
added
removed
breezy/transform.py
