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
19
20
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
24
config as _mod_config,
31
lazy_import.lazy_import(globals(), """
33
42
revision as _mod_revision,
46
from breezy.bzr import (
50
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 (
52
from .errors import (DuplicateKey, MalformedTransform,
53
ReusingTransform, CantMoveRoot,
54
ImmortalLimbo, NoFinalPath)
55
from .filters import filtered_output_bytes, ContentFilterContext
56
from .mutabletree import MutableTree
57
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
65
from .progress import ProgressPhase
64
72
ROOT_PARENT = "root-parent"
380
386
return sorted(FinalPaths(self).get_paths(new_ids))
382
388
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,
389
"""Determine which trans_ids need new Inventory entries.
391
An new entry is needed when anything that would be reflected by an
392
inventory entry changes, including file name, file_id, parent file_id,
393
file kind, and the execute bit.
395
Some care is taken to return entries with real changes, not cases
396
where the value is deleted and then restored to its original value,
397
but some actually unchanged values may be returned.
399
:returns: A list of (path, trans_id) for all items requiring an
400
inventory change. Ordered by path.
403
# Find entries whose file_ids are new (or changed).
404
new_file_id = set(t for t in self._new_id
405
if self._new_id[t] != self.tree_file_id(t))
406
for id_set in [self._new_name, self._new_parent, new_file_id,
386
407
self._new_executability]:
387
new_ids.update(id_set)
408
changed_ids.update(id_set)
409
# removing implies a kind change
388
410
changed_kind = set(self._removed_contents)
389
412
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))
413
# Ignore entries that are already known to have changed.
414
changed_kind.difference_update(changed_ids)
415
# to keep only the truly changed ones
416
changed_kind = (t for t in changed_kind
417
if self.tree_kind(t) != self.final_kind(t))
418
# all kind changes will alter the inventory
419
changed_ids.update(changed_kind)
420
# To find entries with changed parent_ids, find parents which existed,
421
# but changed file_id.
422
# Now add all their children to the set.
423
for parent_trans_id in new_file_id:
424
changed_ids.update(self.iter_tree_children(parent_trans_id))
425
return sorted(FinalPaths(self).get_paths(changed_ids))
396
427
def final_kind(self, trans_id):
397
428
"""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)
430
:return: None if the file does not exist/has no contents. (It is
431
conceivable that a path would be created without the corresponding
432
contents insertion command)
403
434
if trans_id in self._new_contents:
404
435
return self._new_contents[trans_id]
405
436
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
439
return self.tree_kind(trans_id)
441
def tree_path(self, trans_id):
442
"""Determine the tree path associated with the trans_id."""
443
return self._tree_id_paths.get(trans_id)
410
445
def tree_file_id(self, trans_id):
411
446
"""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
447
path = self.tree_path(trans_id)
417
450
# the file is old; the old id is still valid
418
451
if self._new_root == trans_id:
419
return self._tree.get_root_id()
452
return self._tree.path2id('')
420
453
return self._tree.path2id(path)
422
455
def final_file_id(self, trans_id):
531
564
# ensure that all children are registered with the transaction
532
565
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:
567
def _has_named_child(self, name, parent_id, known_children):
568
"""Does a parent already have a name child.
570
:param name: The searched for name.
572
:param parent_id: The parent for which the check is made.
574
:param known_children: The already known children. This should have
575
been recently obtained from `self.by_parent.get(parent_id)`
576
(or will be if None is passed).
578
if known_children is None:
579
known_children = self.by_parent().get(parent_id, [])
580
for child in known_children:
540
581
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
583
parent_path = self._tree_id_paths.get(parent_id, None)
584
if parent_path is None:
585
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
587
child_path = joinpath(parent_path, name)
588
child_id = self._tree_path_ids.get(child_path, None)
548
589
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
590
# Not known by the tree transform yet, check the filesystem
591
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?
593
raise AssertionError('child_id is missing: %s, %s, %s'
594
% (name, parent_id, child_id))
596
def _available_backup_name(self, name, target_id):
597
"""Find an available backup name.
599
:param name: The basename of the file.
601
:param target_id: The directory trans_id where the backup should
604
known_children = self.by_parent().get(target_id, [])
605
return osutils.available_backup_name(
607
lambda base: self._has_named_child(
608
base, target_id, known_children))
559
610
def _parent_loops(self):
560
611
"""No entry should be its own ancestor"""
668
717
def _duplicate_ids(self):
669
718
"""Each inventory id may only be used once"""
721
all_ids = self._tree.all_file_ids()
722
except errors.UnsupportedOperation:
723
# it's okay for non-file-id trees to raise UnsupportedOperation.
671
725
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
672
726
self._removed_id))
673
all_ids = self._tree.all_file_ids()
674
727
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
728
for trans_id, file_id in self._new_id.items():
676
729
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
730
path = self._tree.id2path(file_id)
731
old_trans_id = self.trans_id_tree_path(path)
678
732
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
735
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
736
"""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)
738
for parent_id, children in by_parent.items():
739
if parent_id == ROOT_PARENT:
742
for child_id in children:
743
if self.final_kind(child_id) is not None:
748
# There is at least a child, so we need an existing directory to
750
kind = self.final_kind(parent_id)
752
# The directory will be deleted
699
753
conflicts.append(('missing parent', parent_id))
700
754
elif kind != "directory":
755
# Meh, we need a *directory* to put something in it
701
756
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
759
def _set_executability(self, path, trans_id):
715
760
"""Set the executability of versioned files """
716
if supports_executable():
761
if self._tree._supports_executable():
717
762
new_executability = self._new_executability[trans_id]
718
763
abspath = self._tree.abspath(path)
719
764
current_mode = os.stat(abspath).st_mode
720
765
if new_executability:
721
766
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
768
to_mode = current_mode | (0o100 & ~umask)
724
769
# 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
770
if current_mode & 0o004:
771
to_mode |= 0o001 & ~umask
772
if current_mode & 0o040:
773
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
775
to_mode = current_mode & ~0o111
776
osutils.chmod_if_possible(abspath, to_mode)
733
778
def _new_entry(self, name, parent_id, file_id):
734
779
"""Helper function to create a new filesystem entry."""
780
825
self.create_symlink(target, trans_id)
828
def new_orphan(self, trans_id, parent_id):
829
"""Schedule an item to be orphaned.
831
When a directory is about to be removed, its children, if they are not
832
versioned are moved out of the way: they don't have a parent anymore.
834
:param trans_id: The trans_id of the existing item.
835
:param parent_id: The parent trans_id of the item.
837
raise NotImplementedError(self.new_orphan)
839
def _get_potential_orphans(self, dir_id):
840
"""Find the potential orphans in a directory.
842
A directory can't be safely deleted if there are versioned files in it.
843
If all the contained files are unversioned then they can be orphaned.
845
The 'None' return value means that the directory contains at least one
846
versioned file and should not be deleted.
848
:param dir_id: The directory trans id.
850
:return: A list of the orphan trans ids or None if at least one
851
versioned file is present.
854
# Find the potential orphans, stop if one item should be kept
855
for child_tid in self.by_parent()[dir_id]:
856
if child_tid in self._removed_contents:
857
# The child is removed as part of the transform. Since it was
858
# versioned before, it's not an orphan
860
elif self.final_file_id(child_tid) is None:
861
# The child is not versioned
862
orphans.append(child_tid)
864
# We have a versioned file here, searching for orphans is
783
870
def _affected_ids(self):
784
871
"""Return the set of transform ids affected by the transform"""
785
872
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
873
trans_ids.update(self._new_id)
787
874
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())
875
trans_ids.update(self._new_contents)
876
trans_ids.update(self._new_executability)
877
trans_ids.update(self._new_name)
878
trans_ids.update(self._new_parent)
794
881
def _get_file_id_maps(self):
903
982
to_path = final_paths.get_path(to_trans_id)
984
from_name, from_parent, from_kind, from_executable = \
985
self._from_file_data(from_trans_id, from_versioned, from_path)
987
to_name, to_parent, to_kind, to_executable = \
988
self._to_file_data(to_trans_id, from_trans_id, from_executable)
904
990
if from_kind != to_kind:
906
992
elif to_kind in ('file', 'symlink') and (
907
to_trans_id != from_trans_id or
908
to_trans_id in self._new_contents):
993
to_trans_id != from_trans_id
994
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):
996
if (not modified and from_versioned == to_versioned
997
and from_parent == to_parent and from_name == to_name
998
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]))
1002
file_id, (from_path, to_path), modified,
1003
(from_versioned, to_versioned),
1004
(from_parent, to_parent),
1005
(from_name, to_name),
1006
(from_kind, to_kind),
1007
(from_executable, to_executable)))
1010
return (c.path[0] or '', c.path[1] or '')
1011
return iter(sorted(results, key=path_key))
922
1013
def get_preview_tree(self):
923
1014
"""Return a tree representing the result of the transform.
965
1077
return revision_id
967
1079
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1080
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1082
if path is None or self._tree.kind(path) != 'file':
972
1084
except errors.NoSuchFile:
976
1088
def _get_parents_texts(self, trans_id):
977
1089
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1090
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1093
return (self._tree.get_file_text(path),)
983
1095
def _get_parents_lines(self, trans_id):
984
1096
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1097
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1100
return (self._tree.get_file_lines(path),)
990
1102
def serialize(self, serializer):
991
1103
"""Serialize this TreeTransform.
993
1105
: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())
1107
new_name = {k.encode('utf-8'): v.encode('utf-8')
1108
for k, v in self._new_name.items()}
1109
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1110
for k, v in self._new_parent.items()}
1111
new_id = {k.encode('utf-8'): v
1112
for k, v in self._new_id.items()}
1113
new_executability = {k.encode('utf-8'): int(v)
1114
for k, v in self._new_executability.items()}
1115
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1116
for k, v in self._tree_path_ids.items()}
1117
non_present_ids = {k: v.encode('utf-8')
1118
for k, v in self._non_present_ids.items()}
1119
removed_contents = [trans_id.encode('utf-8')
1120
for trans_id in self._removed_contents]
1121
removed_id = [trans_id.encode('utf-8')
1122
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,
1124
b'_id_number': self._id_number,
1125
b'_new_name': new_name,
1126
b'_new_parent': new_parent,
1127
b'_new_executability': new_executability,
1129
b'_tree_path_ids': tree_path_ids,
1130
b'_removed_id': removed_id,
1131
b'_removed_contents': removed_contents,
1132
b'_non_present_ids': non_present_ids,
1012
1134
yield serializer.bytes_record(bencode.bencode(attribs),
1014
for trans_id, kind in self._new_contents.items():
1136
for trans_id, kind in sorted(self._new_contents.items()):
1015
1137
if kind == 'file':
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1138
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1139
lines = cur_file.readlines()
1018
1140
parents = self._get_parents_lines(trans_id)
1019
1141
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
content = ''.join(mpdiff.to_patch())
1142
content = b''.join(mpdiff.to_patch())
1021
1143
if kind == 'directory':
1023
1145
if kind == 'symlink':
1024
1146
content = self._read_symlink_target(trans_id)
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
1147
if not isinstance(content, bytes):
1148
content = content.encode('utf-8')
1149
yield serializer.bytes_record(
1150
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1027
1152
def deserialize(self, records):
1028
1153
"""Deserialize a stored TreeTransform.
1030
1155
:param records: An iterable of (names, content) tuples, as per
1031
1156
pack.ContainerPushParser.
1033
names, content = records.next()
1158
names, content = next(records)
1034
1159
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())
1160
self._id_number = attribs[b'_id_number']
1161
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1162
for k, v in attribs[b'_new_name'].items()}
1163
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1164
for k, v in attribs[b'_new_parent'].items()}
1165
self._new_executability = {
1166
k.decode('utf-8'): bool(v)
1167
for k, v in attribs[b'_new_executability'].items()}
1168
self._new_id = {k.decode('utf-8'): v
1169
for k, v in attribs[b'_new_id'].items()}
1170
self._r_new_id = {v: k for k, v in self._new_id.items()}
1043
1171
self._tree_path_ids = {}
1044
1172
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1173
for bytepath, trans_id in attribs[b'_tree_path_ids'].items():
1046
1174
path = bytepath.decode('utf-8')
1175
trans_id = trans_id.decode('utf-8')
1047
1176
self._tree_path_ids[path] = trans_id
1048
1177
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']
1178
self._removed_id = {trans_id.decode('utf-8')
1179
for trans_id in attribs[b'_removed_id']}
1180
self._removed_contents = set(
1181
trans_id.decode('utf-8')
1182
for trans_id in attribs[b'_removed_contents'])
1183
self._non_present_ids = {
1184
k: v.decode('utf-8')
1185
for k, v in attribs[b'_non_present_ids'].items()}
1052
1186
for ((trans_id, kind),), content in records:
1187
trans_id = trans_id.decode('utf-8')
1188
kind = kind.decode('ascii')
1053
1189
if kind == 'file':
1054
1190
mpdiff = multiparent.MultiParent.from_patch(content)
1055
1191
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1059
1195
if kind == 'symlink':
1060
1196
self.create_symlink(content.decode('utf-8'), trans_id)
1198
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
"""Schedule creation of a new file.
1203
:param contents: an iterator of strings, all of which will be written
1204
to the target destination.
1205
:param trans_id: TreeTransform handle
1206
:param mode_id: If not None, force the mode of the target file to match
1207
the mode of the object referenced by mode_id.
1208
Otherwise, we will try to preserve mode bits of an existing file.
1209
:param sha1: If the sha1 of this content is already known, pass it in.
1210
We can use it to prevent future sha1 computations.
1212
raise NotImplementedError(self.create_file)
1214
def create_directory(self, trans_id):
1215
"""Schedule creation of a new directory.
1217
See also new_directory.
1219
raise NotImplementedError(self.create_directory)
1221
def create_symlink(self, target, trans_id):
1222
"""Schedule creation of a new symbolic link.
1224
target is a bytestring.
1225
See also new_symlink.
1227
raise NotImplementedError(self.create_symlink)
1229
def create_hardlink(self, path, trans_id):
1230
"""Schedule creation of a hard link"""
1231
raise NotImplementedError(self.create_hardlink)
1233
def cancel_creation(self, trans_id):
1234
"""Cancel the creation of new file contents."""
1235
raise NotImplementedError(self.cancel_creation)
1063
1238
class DiskTreeTransform(TreeTransformBase):
1064
1239
"""Tree transform storing its contents on disk."""
1066
def __init__(self, tree, limbodir, pb=None,
1067
case_sensitive=True):
1241
def __init__(self, tree, limbodir, pb=None, case_sensitive=True):
1068
1242
"""Constructor.
1069
1243
:param tree: The tree that will be transformed, but not necessarily
1070
1244
the output tree.
1173
1363
descendants.update(self._limbo_descendants(descendant))
1174
1364
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1366
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1367
"""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.
1371
:param contents: an iterator of strings, all of which will be written
1372
to the target destination.
1373
:param trans_id: TreeTransform handle
1374
:param mode_id: If not None, force the mode of the target file to match
1375
the mode of the object referenced by mode_id.
1376
Otherwise, we will try to preserve mode bits of an existing file.
1377
:param sha1: If the sha1 of this content is already known, pass it in.
1378
We can use it to prevent future sha1 computations.
1187
1380
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.
1381
with open(name, 'wb') as f:
1382
unique_add(self._new_contents, trans_id, 'file')
1199
1383
f.writelines(contents)
1202
1384
self._set_mtime(name)
1203
1385
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()
1386
# It is unfortunate we have to use lstat instead of fstat, but we just
1387
# used utime and chmod on the file, so we need the accurate final
1389
if sha1 is not None:
1390
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1212
1392
def _read_symlink_target(self, trans_id):
1213
1393
return os.readlink(self._limbo_name(trans_id))
1274
1460
del self._limbo_children_names[trans_id]
1275
1461
delete_any(self._limbo_name(trans_id))
1463
def new_orphan(self, trans_id, parent_id):
1464
conf = self._tree.get_config_stack()
1465
handle_orphan = conf.get('transform.orphan_policy')
1466
handle_orphan(self, trans_id, parent_id)
1469
class OrphaningError(errors.BzrError):
1471
# Only bugs could lead to such exception being seen by the user
1472
internal_error = True
1473
_fmt = "Error while orphaning %s in %s directory"
1475
def __init__(self, orphan, parent):
1476
errors.BzrError.__init__(self)
1477
self.orphan = orphan
1478
self.parent = parent
1481
class OrphaningForbidden(OrphaningError):
1483
_fmt = "Policy: %s doesn't allow creating orphans."
1485
def __init__(self, policy):
1486
errors.BzrError.__init__(self)
1487
self.policy = policy
1490
def move_orphan(tt, orphan_id, parent_id):
1491
"""See TreeTransformBase.new_orphan.
1493
This creates a new orphan in the `brz-orphans` dir at the root of the
1496
:param tt: The TreeTransform orphaning `trans_id`.
1498
:param orphan_id: The trans id that should be orphaned.
1500
:param parent_id: The orphan parent trans id.
1502
# Add the orphan dir if it doesn't exist
1503
orphan_dir_basename = 'brz-orphans'
1504
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1505
if tt.final_kind(od_id) is None:
1506
tt.create_directory(od_id)
1507
parent_path = tt._tree_id_paths[parent_id]
1508
# Find a name that doesn't exist yet in the orphan dir
1509
actual_name = tt.final_name(orphan_id)
1510
new_name = tt._available_backup_name(actual_name, od_id)
1511
tt.adjust_path(new_name, od_id, orphan_id)
1512
trace.warning('%s has been orphaned in %s'
1513
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1516
def refuse_orphan(tt, orphan_id, parent_id):
1517
"""See TreeTransformBase.new_orphan.
1519
This refuses to create orphan, letting the caller handle the conflict.
1521
raise OrphaningForbidden('never')
1524
orphaning_registry = registry.Registry()
1525
orphaning_registry.register(
1526
u'conflict', refuse_orphan,
1527
'Leave orphans in place and create a conflict on the directory.')
1528
orphaning_registry.register(
1529
u'move', move_orphan,
1530
'Move orphans into the brz-orphans directory.')
1531
orphaning_registry._set_default_key(u'conflict')
1534
opt_transform_orphan = _mod_config.RegistryOption(
1535
'transform.orphan_policy', orphaning_registry,
1536
help='Policy for orphaned files during transform operations.',
1278
1540
class TreeTransform(DiskTreeTransform):
1279
1541
"""Represent a tree transformation.
1656
1905
new_paths = self.new_paths(filesystem_only=True)
1657
1906
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()
1907
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1908
for num, (path, trans_id) in enumerate(new_paths):
1663
1909
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1910
child_pb.update(gettext('adding file'),
1911
num, len(new_paths))
1665
1912
full_path = self._tree.abspath(path)
1666
1913
if trans_id in self._needs_rename:
1668
1915
mover.rename(self._limbo_name(trans_id), full_path)
1916
except errors.TransformRenameFailed as e:
1670
1917
# We may be renaming a dangling inventory id
1671
1918
if e.errno != errno.ENOENT:
1674
1921
self.rename_count += 1
1675
if (trans_id in self._new_contents or
1676
self.path_changed(trans_id)):
1922
# TODO: if trans_id in self._observed_sha1s, we should
1923
# re-stat the final target, since ctime will be
1924
# updated by the change.
1925
if (trans_id in self._new_contents
1926
or self.path_changed(trans_id)):
1677
1927
if trans_id in self._new_contents:
1678
1928
modified_paths.append(full_path)
1679
1929
if trans_id in self._new_executability:
1680
1930
self._set_executability(path, trans_id)
1931
if trans_id in self._observed_sha1s:
1932
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1933
st = osutils.lstat(full_path)
1934
self._observed_sha1s[trans_id] = (o_sha1, st)
1935
for path, trans_id in new_paths:
1936
# new_paths includes stuff like workingtree conflicts. Only the
1937
# stuff in new_contents actually comes from limbo.
1938
if trans_id in self._limbo_files:
1939
del self._limbo_files[trans_id]
1683
1940
self._new_contents.clear()
1684
1941
return modified_paths
1943
def _apply_observed_sha1s(self):
1944
"""After we have finished renaming everything, update observed sha1s
1946
This has to be done after self._tree.apply_inventory_delta, otherwise
1947
it doesn't know anything about the files we are updating. Also, we want
1948
to do this as late as possible, so that most entries end up cached.
1950
# TODO: this doesn't update the stat information for directories. So
1951
# the first 'bzr status' will still need to rewrite
1952
# .bzr/checkout/dirstate. However, we at least don't need to
1953
# re-read all of the files.
1954
# TODO: If the operation took a while, we could do a time.sleep(3) here
1955
# to allow the clock to tick over and ensure we won't have any
1956
# problems. (we could observe start time, and finish time, and if
1957
# it is less than eg 10% overhead, add a sleep call.)
1958
paths = FinalPaths(self)
1959
for trans_id, observed in self._observed_sha1s.items():
1960
path = paths.get_path(trans_id)
1961
self._tree._observed_sha1(path, observed)
1687
1964
class TransformPreview(DiskTreeTransform):
1688
1965
"""A TreeTransform for generating preview trees.
1937
2229
ordered_ids = self._list_files_by_dir()
1938
2230
for entry, trans_id in self._make_inv_entries(ordered_ids,
1939
specific_file_ids, yield_parents=yield_parents):
1940
yield unicode(self._final_paths.get_path(trans_id)), entry
2232
yield self._final_paths.get_path(trans_id), entry
1942
2234
def _iter_entries_for_dir(self, dir_path):
1943
2235
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
1945
2236
ordered_ids = []
1946
for file_id in self.iter_children(dir_file_id):
1947
trans_id = self._transform.trans_id_file_id(file_id)
1948
ordered_ids.append((trans_id, file_id))
2237
dir_trans_id = self._path2trans_id(dir_path)
2238
dir_id = self._transform.final_file_id(dir_trans_id)
2239
for child_trans_id in self._all_children(dir_trans_id):
2240
ordered_ids.append((child_trans_id, dir_id))
1949
2242
for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2243
path_entries.append((self._final_paths.get_path(trans_id), entry))
1952
def list_files(self, include_root=False, from_dir=None, recursive=True):
2247
def list_files(self, include_root=False, from_dir=None, recursive=True,
2248
recurse_nested=False):
1953
2249
"""See WorkingTree.list_files."""
2251
raise NotImplementedError(
2252
'follow tree references not yet supported')
1954
2254
# XXX This should behave like WorkingTree.list_files, but is really
1955
2255
# more like RevisionTree.list_files.
1965
2267
if not path.startswith(prefix):
1967
2269
path = path[len(prefix):]
1968
yield path, 'V', entry.kind, entry.file_id, entry
2270
yield path, 'V', entry.kind, entry
1970
2272
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
2273
root_entry = inventory.make_entry(
2274
'directory', '', ROOT_PARENT, self.path2id(''))
2275
yield '', 'V', 'directory', root_entry
1974
2276
entries = self._iter_entries_for_dir(from_dir or '')
1975
2277
for path, entry in entries:
1976
yield path, 'V', entry.kind, entry.file_id, entry
2278
yield path, 'V', entry.kind, entry
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2280
def kind(self, path):
2281
trans_id = self._path2trans_id(path)
2282
if trans_id is None:
2283
raise errors.NoSuchFile(path)
1980
2284
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)
2286
def stored_kind(self, path):
2287
trans_id = self._path2trans_id(path)
2288
if trans_id is None:
2289
raise errors.NoSuchFile(path)
1985
2291
return self._transform._new_contents[trans_id]
1986
2292
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2293
return self._transform._tree.stored_kind(path)
1989
def get_file_mtime(self, file_id, path=None):
2295
def get_file_mtime(self, path):
1990
2296
"""See Tree.get_file_mtime"""
2297
file_id = self.path2id(path)
2299
raise errors.NoSuchFile(path)
1991
2300
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):
2301
return self._transform._tree.get_file_mtime(
2302
self._transform._tree.id2path(file_id))
2303
trans_id = self._path2trans_id(path)
2304
return self._stat_limbo_file(trans_id).st_mtime
2306
def get_file_size(self, path):
1999
2307
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2308
trans_id = self._path2trans_id(path)
2309
if trans_id is None:
2310
raise errors.NoSuchFile(path)
2311
kind = self._transform.final_kind(trans_id)
2314
if trans_id in self._transform._new_contents:
2315
return self._stat_limbo_file(trans_id).st_size
2316
if self.kind(path) == 'file':
2317
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)
2321
def get_file_verifier(self, path, stat_value=None):
2322
trans_id = self._path2trans_id(path)
2323
if trans_id is None:
2324
raise errors.NoSuchFile(path)
2325
kind = self._transform._new_contents.get(trans_id)
2327
return self._transform._tree.get_file_verifier(path)
2329
with self.get_file(path) as fileobj:
2330
return ("SHA1", sha_file(fileobj))
2332
def get_file_sha1(self, path, stat_value=None):
2333
trans_id = self._path2trans_id(path)
2334
if trans_id is None:
2335
raise errors.NoSuchFile(path)
2336
kind = self._transform._new_contents.get(trans_id)
2338
return self._transform._tree.get_file_sha1(path)
2340
with self.get_file(path) as fileobj:
2013
2341
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2343
def get_reference_revision(self, path):
2344
trans_id = self._path2trans_id(path)
2345
if trans_id is None:
2346
raise errors.NoSuchFile(path)
2347
reference_revision = self._transform._new_reference_revision.get(trans_id)
2348
if reference_revision is None:
2349
return self._transform._tree.get_reference_revision(path)
2350
return reference_revision
2352
def is_executable(self, path):
2353
trans_id = self._path2trans_id(path)
2354
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2357
return self._transform._new_executability[trans_id]
2023
2358
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2360
return self._transform._tree.is_executable(path)
2361
except OSError as e:
2027
2362
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2365
except errors.NoSuchFile:
2368
def has_filename(self, path):
2369
trans_id = self._path2trans_id(path)
2370
if trans_id in self._transform._new_contents:
2372
elif trans_id in self._transform._removed_contents:
2375
return self._transform._tree.has_filename(path)
2033
2377
def path_content_summary(self, path):
2034
2378
trans_id = self._path2trans_id(path)
2035
2379
tt = self._transform
2081
2427
raise ValueError('want_unversioned is not supported')
2082
2428
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2430
def get_file(self, path):
2085
2431
"""See Tree.get_file"""
2432
file_id = self.path2id(path)
2086
2433
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)
2434
return self._transform._tree.get_file(path)
2435
trans_id = self._path2trans_id(path)
2089
2436
name = self._transform._limbo_name(trans_id)
2090
2437
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2439
def get_file_with_stat(self, path):
2440
return self.get_file(path), None
2095
def annotate_iter(self, file_id,
2442
def annotate_iter(self, path,
2096
2443
default_revision=_mod_revision.CURRENT_REVISION):
2444
file_id = self.path2id(path)
2097
2445
changes = self._iter_changes_cache.get(file_id)
2098
2446
if changes is None:
2101
changed_content, versioned, kind = (changes[2], changes[3],
2449
changed_content, versioned, kind = (
2450
changes.changed_content, changes.versioned, changes.kind)
2103
2451
if kind[1] is None:
2105
2453
get_old = (kind[0] == 'file' and versioned[0])
2107
old_annotation = self._transform._tree.annotate_iter(file_id,
2108
default_revision=default_revision)
2455
old_annotation = self._transform._tree.annotate_iter(
2456
path, default_revision=default_revision)
2110
2458
old_annotation = []
2111
2459
if changes is None:
2243
2586
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2587
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()
2589
with contextlib.ExitStack() as exit_stack:
2590
exit_stack.enter_context(wt.lock_tree_write())
2591
exit_stack.enter_context(tree.lock_read())
2592
if accelerator_tree is not None:
2593
exit_stack.enter_context(accelerator_tree.lock_read())
2594
return _build_tree(tree, wt, accelerator_tree, hardlink,
2264
2598
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2599
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2600
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2601
if num > 0: # more than just a root
2268
2602
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
2603
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2604
top_pb = ui.ui_factory.nested_progress_bar()
2274
2605
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2606
if tree.path2id('') is not None:
2276
2607
# This is kind of a hack: we should be altering the root
2277
2608
# as part of the regular tree shape diff logic.
2278
2609
# The conditional test here is to avoid doing an
2280
2611
# is set within the tree, nor setting the root and thus
2281
2612
# marking the tree as dirty, because we use two different
2282
2613
# idioms here: tree interfaces and inventory interfaces.
2283
if wt.get_root_id() != tree.get_root_id():
2284
wt.set_root_id(tree.get_root_id())
2614
if wt.path2id('') != tree.path2id(''):
2615
wt.set_root_id(tree.path2id(''))
2286
tt = TreeTransform(wt)
2617
tt = wt.get_transform()
2289
2620
pp.next_phase()
2290
file_trans_id[wt.get_root_id()] = \
2291
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2621
file_trans_id[wt.path2id('')] = tt.trans_id_tree_path('')
2622
with ui.ui_factory.nested_progress_bar() as pb:
2294
2623
deferred_contents = []
2296
total = len(tree.inventory)
2625
total = len(tree.all_versioned_paths())
2297
2626
if delta_from_tree:
2298
2627
precomputed_delta = []
2300
2629
precomputed_delta = None
2630
# Check if tree inventory has content. If so, we populate
2631
# existing_files with the directory content. If there are no
2632
# entries we skip populating existing_files as its not used.
2633
# This improves performance and unncessary work on large
2634
# directory trees. (#501307)
2636
existing_files = set()
2637
for dir, files in wt.walkdirs():
2638
existing_files.update(f[0] for f in files)
2301
2639
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2640
enumerate(tree.iter_entries_by_dir()):
2641
pb.update(gettext("Building tree"), num
2642
- len(deferred_contents), total)
2304
2643
if entry.parent_id is None:
2306
2645
reparent = False
2376
2716
new_desired_files = desired_files
2378
2718
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])]
2720
change.path for change in iter
2721
if not (change.changed_content or change.executable[0] != change.executable[1])]
2381
2722
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()]
2723
unchanged = [(tp, ap) for (tp, ap) in unchanged
2724
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2725
unchanged = dict(unchanged)
2385
2726
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2728
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2729
accelerator_path = unchanged.get(tree_path)
2389
2730
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2731
new_desired_files.append((tree_path,
2732
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2734
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2736
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
2739
with accelerator_tree.get_file(accelerator_path) as f:
2740
chunks = osutils.file_iterator(f)
2741
if wt.supports_content_filtering():
2742
filters = wt._content_filter_stack(tree_path)
2743
chunks = filtered_output_bytes(chunks, filters,
2744
ContentFilterContext(tree_path, tree))
2745
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2747
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2748
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2749
tree.iter_files_bytes(new_desired_files)):
2414
2750
if wt.supports_content_filtering():
2415
2751
filters = wt._content_filter_stack(tree_path)
2416
2752
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)
2753
ContentFilterContext(tree_path, tree))
2754
tt.create_file(contents, trans_id, sha1=text_sha1)
2755
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2758
def _reparent_children(tt, old_parent, new_parent):
2423
2759
for child in tt.iter_tree_children(old_parent):
2424
2760
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2763
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2764
by_parent = tt.by_parent()
2428
2765
for child in by_parent[old_parent]:
2429
2766
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2767
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2770
def _content_match(tree, entry, tree_path, kind, target_path):
2433
2771
if entry.kind != kind:
2435
2773
if entry.kind == "directory":
2437
2775
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2776
with open(target_path, 'rb') as f1, \
2777
tree.get_file(tree_path) as f2:
2778
if osutils.compare_files(f1, f2):
2440
2780
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2781
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2462
2802
final_parent = tt.final_parent(old_file)
2463
2803
if new_file in divert:
2464
new_name = tt.final_name(old_file)+'.diverted'
2804
new_name = tt.final_name(old_file) + '.diverted'
2465
2805
tt.adjust_path(new_name, final_parent, new_file)
2466
2806
new_conflicts.add((c_type, 'Diverted to',
2467
2807
new_file, old_file))
2469
new_name = tt.final_name(old_file)+'.moved'
2809
new_name = tt.final_name(old_file) + '.moved'
2470
2810
tt.adjust_path(new_name, final_parent, old_file)
2471
2811
new_conflicts.add((c_type, 'Moved existing file to',
2472
2812
old_file, new_file))
2473
2813
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2816
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2817
"""Create a new file according to its inventory entry"""
2478
2818
name = entry.name
2479
2819
kind = entry.kind
2480
2820
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,
2821
with tree.get_file(path) as f:
2822
executable = tree.is_executable(path)
2824
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2826
elif kind in ('directory', 'tree-reference'):
2486
2827
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2828
if kind == 'tree-reference':
2488
2829
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2830
return trans_id
2490
2831
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2832
target = tree.get_symlink_target(path)
2492
2833
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2835
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):
2838
def create_from_tree(tt, trans_id, tree, path, chunks=None,
2839
filter_tree_path=None):
2515
2840
"""Create new file contents according to tree contents.
2517
2842
:param filter_tree_path: the tree path to use to lookup
2518
2843
content filters to apply to the bytes output in the working tree.
2519
2844
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2846
kind = tree.kind(path)
2522
2847
if kind == 'directory':
2523
2848
tt.create_directory(trans_id)
2524
2849
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)
2851
f = tree.get_file(path)
2852
chunks = osutils.file_iterator(f)
2857
if wt.supports_content_filtering() and filter_tree_path is not None:
2858
filters = wt._content_filter_stack(filter_tree_path)
2859
chunks = filtered_output_bytes(
2861
ContentFilterContext(filter_tree_path, tree))
2862
tt.create_file(chunks, trans_id)
2537
2866
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2867
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2540
2869
raise AssertionError('Unknown kind %r' % kind)
2546
2875
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
2878
def revert(working_tree, target_tree, filenames, backups=False,
2593
2879
pb=None, change_reporter=None):
2594
2880
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2881
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)
2883
with target_tree.lock_read(), working_tree.get_transform(pb) as tt:
2884
pp = ProgressPhase("Revert phase", 3, pb)
2885
conflicts, merge_modified = _prepare_revert_transform(
2886
working_tree, target_tree, tt, filenames, backups, pp)
2888
change_reporter = delta._ChangeReporter(
2889
unversioned_filter=working_tree.is_ignored)
2890
delta.report_changes(tt.iter_changes(), change_reporter)
2891
for conflict in conflicts:
2892
trace.warning(str(conflict))
2895
if working_tree.supports_merge_modified():
2896
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2899
return conflicts
2641
2919
backups, merge_modified, basis_tree=None):
2642
2920
if basis_tree is not None:
2643
2921
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:
2922
# We ask the working_tree for its changes relative to the target, rather
2923
# than the target changes relative to the working tree. Because WT4 has an
2924
# optimizer to compare itself to a target, but no optimizer for the
2926
change_list = working_tree.iter_changes(
2927
target_tree, specific_files=specific_files, pb=pb)
2928
if not target_tree.is_versioned(u''):
2647
2929
skip_root = True
2649
2931
skip_root = False
2651
2933
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:
2934
for id_num, change in enumerate(change_list):
2935
file_id = change.file_id
2936
target_path, wt_path = change.path
2937
target_versioned, wt_versioned = change.versioned
2938
target_parent, wt_parent = change.parent_id
2939
target_name, wt_name = change.name
2940
target_kind, wt_kind = change.kind
2941
target_executable, wt_executable = change.executable
2942
if skip_root and wt_parent is None:
2656
2944
trans_id = tt.trans_id_file_id(file_id)
2946
if change.changed_content:
2659
2947
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:
2948
if wt_kind == 'file' and (backups or target_kind is None):
2949
wt_sha1 = working_tree.get_file_sha1(wt_path)
2950
if merge_modified.get(wt_path) != wt_sha1:
2663
2951
# acquire the basis tree lazily to prevent the
2664
2952
# expense of accessing it when it's not needed ?
2665
2953
# (Guessing, RBC, 200702)
2666
2954
if basis_tree is None:
2667
2955
basis_tree = working_tree.basis_tree()
2668
2956
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:
2957
basis_inter = InterTree.get(basis_tree, working_tree)
2958
basis_path = basis_inter.find_source_path(wt_path)
2959
if basis_path is None:
2960
if target_kind is None and not target_versioned:
2963
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2965
if wt_kind is not None:
2675
2966
if not keep_content:
2676
2967
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)
2968
elif target_kind is not None:
2969
parent_trans_id = tt.trans_id_file_id(wt_parent)
2970
backup_name = tt._available_backup_name(
2971
wt_name, parent_trans_id)
2682
2972
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):
2973
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2974
if wt_versioned and target_versioned:
2685
2975
tt.unversion_file(trans_id)
2686
2976
tt.version_file(file_id, new_trans_id)
2687
2977
# New contents should have the same unix perms as old
2689
2979
mode_id = trans_id
2690
2980
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2981
if target_kind in ('directory', 'tree-reference'):
2692
2982
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2983
if target_kind == 'tree-reference':
2984
revision = target_tree.get_reference_revision(
2696
2986
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)))
2987
elif target_kind == 'symlink':
2988
tt.create_symlink(target_tree.get_symlink_target(
2989
target_path), trans_id)
2990
elif target_kind == 'file':
2991
deferred_files.append(
2992
(target_path, (trans_id, mode_id, file_id)))
2702
2993
if basis_tree is None:
2703
2994
basis_tree = working_tree.basis_tree()
2704
2995
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]
2996
new_sha1 = target_tree.get_file_sha1(target_path)
2997
basis_inter = InterTree.get(basis_tree, target_tree)
2998
basis_path = basis_inter.find_source_path(target_path)
2999
if (basis_path is not None and
3000
new_sha1 == basis_tree.get_file_sha1(basis_path)):
3001
# If the new contents of the file match what is in basis,
3002
# then there is no need to store in merge_modified.
3003
if basis_path in merge_modified:
3004
del merge_modified[basis_path]
2711
merge_modified[file_id] = new_sha1
3006
merge_modified[target_path] = new_sha1
2713
3008
# 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):
3009
if keep_content and wt_executable == target_executable:
3010
tt.set_executability(target_executable, trans_id)
3011
elif target_kind is not None:
3012
raise AssertionError(target_kind)
3013
if not wt_versioned and target_versioned:
2719
3014
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
3015
if wt_versioned and not target_versioned:
2721
3016
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:
3017
if (target_name is not None
3018
and (wt_name != target_name or wt_parent != target_parent)):
3019
if target_name == '' and target_parent is None:
2725
3020
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)
3022
parent_trans = tt.trans_id_file_id(target_parent)
3023
if wt_parent is None and wt_versioned:
3024
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)
3026
tt.adjust_path(target_name, parent_trans, trans_id)
3027
if wt_executable != target_executable and target_kind == "file":
3028
tt.set_executability(target_executable, trans_id)
2734
3029
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]
3030
for (trans_id, mode_id, file_id), bytes in (
3031
target_tree.iter_files_bytes(deferred_files)):
2738
3032
# We're reverting a tree to the target tree so using the
2739
3033
# target tree to find the file path seems the best choice
2740
3034
# here IMO - Ian C 27/Oct/2009
2741
3035
filter_tree_path = target_tree.id2path(file_id)
2742
3036
filters = working_tree._content_filter_stack(filter_tree_path)
2743
bytes = filtered_output_bytes(bytes, filters,
3037
bytes = filtered_output_bytes(
2744
3039
ContentFilterContext(filter_tree_path, working_tree))
2745
3040
tt.create_file(bytes, trans_id, mode_id)
2747
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3042
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2749
3044
tt.create_file(bytes, trans_id, mode_id)
2750
3045
tt.fixup_new_roots()
added
removed
breezy/transform.py
