14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
34
43
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
39
ReusingTransform, CantMoveRoot,
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
44
from bzrlib.osutils import (
53
from .errors import (DuplicateKey, MalformedTransform,
54
ReusingTransform, CantMoveRoot,
55
ImmortalLimbo, NoFinalPath,
57
from .filters import filtered_output_bytes, ContentFilterContext
58
from .mutabletree import MutableTree
59
from .osutils import (
54
from bzrlib.progress import ProgressPhase
55
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
67
from .progress import ProgressPhase
65
78
ROOT_PARENT = "root-parent"
224
248
self._new_root = new_roots[0]
226
250
old_new_root = new_roots[0]
227
# TODO: What to do if a old_new_root is present, but self._new_root is
228
# not listed as being removed? This code explicitly unversions
229
# the old root and versions it with the new file_id. Though that
230
# seems like an incomplete delta
232
251
# unversion the new root's directory.
233
file_id = self.final_file_id(old_new_root)
252
if self.final_kind(self._new_root) is None:
253
file_id = self.final_file_id(old_new_root)
255
file_id = self.final_file_id(self._new_root)
234
256
if old_new_root in self._new_id:
235
257
self.cancel_versioning(old_new_root)
237
259
self.unversion_file(old_new_root)
238
260
# if, at this stage, root still has an old file_id, zap it so we can
239
261
# stick a new one in.
240
if (self.tree_file_id(self._new_root) is not None and
241
self._new_root not in self._removed_id):
262
if (self.tree_file_id(self._new_root) is not None
263
and self._new_root not in self._removed_id):
242
264
self.unversion_file(self._new_root)
243
self.version_file(file_id, self._new_root)
265
if file_id is not None:
266
self.version_file(file_id, self._new_root)
245
268
# Now move children of new root into old root directory.
246
269
# Ensure all children are registered with the transaction, but don't
381
392
return sorted(FinalPaths(self).get_paths(new_ids))
383
394
def _inventory_altered(self):
384
"""Get the trans_ids and paths of files needing new inv entries."""
386
for id_set in [self._new_name, self._new_parent, self._new_id,
395
"""Determine which trans_ids need new Inventory entries.
397
An new entry is needed when anything that would be reflected by an
398
inventory entry changes, including file name, file_id, parent file_id,
399
file kind, and the execute bit.
401
Some care is taken to return entries with real changes, not cases
402
where the value is deleted and then restored to its original value,
403
but some actually unchanged values may be returned.
405
:returns: A list of (path, trans_id) for all items requiring an
406
inventory change. Ordered by path.
409
# Find entries whose file_ids are new (or changed).
410
new_file_id = set(t for t in self._new_id
411
if self._new_id[t] != self.tree_file_id(t))
412
for id_set in [self._new_name, self._new_parent, new_file_id,
387
413
self._new_executability]:
388
new_ids.update(id_set)
414
changed_ids.update(id_set)
415
# removing implies a kind change
389
416
changed_kind = set(self._removed_contents)
390
418
changed_kind.intersection_update(self._new_contents)
391
changed_kind.difference_update(new_ids)
392
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
394
new_ids.update(changed_kind)
395
return sorted(FinalPaths(self).get_paths(new_ids))
419
# Ignore entries that are already known to have changed.
420
changed_kind.difference_update(changed_ids)
421
# to keep only the truly changed ones
422
changed_kind = (t for t in changed_kind
423
if self.tree_kind(t) != self.final_kind(t))
424
# all kind changes will alter the inventory
425
changed_ids.update(changed_kind)
426
# To find entries with changed parent_ids, find parents which existed,
427
# but changed file_id.
428
# Now add all their children to the set.
429
for parent_trans_id in new_file_id:
430
changed_ids.update(self.iter_tree_children(parent_trans_id))
431
return sorted(FinalPaths(self).get_paths(changed_ids))
397
433
def final_kind(self, trans_id):
398
434
"""Determine the final file kind, after any changes applied.
400
Raises NoSuchFile if the file does not exist/has no contents.
401
(It is conceivable that a path would be created without the
402
corresponding contents insertion command)
436
:return: None if the file does not exist/has no contents. (It is
437
conceivable that a path would be created without the corresponding
438
contents insertion command)
404
440
if trans_id in self._new_contents:
405
441
return self._new_contents[trans_id]
406
442
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
445
return self.tree_kind(trans_id)
447
def tree_path(self, trans_id):
448
"""Determine the tree path associated with the trans_id."""
449
return self._tree_id_paths.get(trans_id)
411
451
def tree_file_id(self, trans_id):
412
452
"""Determine the file id associated with the trans_id in the tree"""
414
path = self._tree_id_paths[trans_id]
416
# the file is a new, unversioned file, or invalid trans_id
453
path = self.tree_path(trans_id)
418
456
# the file is old; the old id is still valid
419
457
if self._new_root == trans_id:
532
570
# ensure that all children are registered with the transaction
533
571
list(self.iter_tree_children(parent_id))
535
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
573
def _has_named_child(self, name, parent_id, known_children):
574
"""Does a parent already have a name child.
576
:param name: The searched for name.
578
:param parent_id: The parent for which the check is made.
580
:param known_children: The already known children. This should have
581
been recently obtained from `self.by_parent.get(parent_id)`
582
(or will be if None is passed).
584
if known_children is None:
585
known_children = self.by_parent().get(parent_id, [])
586
for child in known_children:
541
587
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
589
parent_path = self._tree_id_paths.get(parent_id, None)
590
if parent_path is None:
591
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
593
child_path = joinpath(parent_path, name)
594
child_id = self._tree_path_ids.get(child_path, None)
549
595
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
596
# Not known by the tree transform yet, check the filesystem
597
return osutils.lexists(self._tree.abspath(child_path))
552
if self.final_parent(child_id) != parent_id:
554
if child_id in self._removed_contents:
555
# XXX What about dangling file-ids?
599
raise AssertionError('child_id is missing: %s, %s, %s'
600
% (name, parent_id, child_id))
602
def _available_backup_name(self, name, target_id):
603
"""Find an available backup name.
605
:param name: The basename of the file.
607
:param target_id: The directory trans_id where the backup should
610
known_children = self.by_parent().get(target_id, [])
611
return osutils.available_backup_name(
613
lambda base: self._has_named_child(
614
base, target_id, known_children))
560
616
def _parent_loops(self):
561
617
"""No entry should be its own ancestor"""
673
724
self._removed_id))
674
725
all_ids = self._tree.all_file_ids()
675
726
active_tree_ids = all_ids.difference(removed_tree_ids)
676
for trans_id, file_id in self._new_id.iteritems():
727
for trans_id, file_id in viewitems(self._new_id):
677
728
if file_id in active_tree_ids:
678
old_trans_id = self.trans_id_tree_file_id(file_id)
729
path = self._tree.id2path(file_id)
730
old_trans_id = self.trans_id_tree_path(path)
679
731
conflicts.append(('duplicate id', old_trans_id, trans_id))
682
734
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
735
"""Children must have a directory parent"""
685
for parent_id, children in by_parent.iteritems():
686
if parent_id is ROOT_PARENT:
688
if not self._any_contents(children):
690
for child in children:
692
self.final_kind(child)
696
kind = self.final_kind(parent_id)
737
for parent_id, children in viewitems(by_parent):
738
if parent_id == ROOT_PARENT:
741
for child_id in children:
742
if self.final_kind(child_id) is not None:
747
# There is at least a child, so we need an existing directory to
749
kind = self.final_kind(parent_id)
751
# The directory will be deleted
700
752
conflicts.append(('missing parent', parent_id))
701
753
elif kind != "directory":
754
# Meh, we need a *directory* to put something in it
702
755
conflicts.append(('non-directory parent', parent_id))
705
def _any_contents(self, trans_ids):
706
"""Return true if any of the trans_ids, will have contents."""
707
for trans_id in trans_ids:
709
kind = self.final_kind(trans_id)
715
758
def _set_executability(self, path, trans_id):
716
759
"""Set the executability of versioned files """
717
if supports_executable():
760
if self._tree._supports_executable():
718
761
new_executability = self._new_executability[trans_id]
719
762
abspath = self._tree.abspath(path)
720
763
current_mode = os.stat(abspath).st_mode
721
764
if new_executability:
722
765
umask = os.umask(0)
724
to_mode = current_mode | (0100 & ~umask)
767
to_mode = current_mode | (0o100 & ~umask)
725
768
# Enable x-bit for others only if they can read it.
726
if current_mode & 0004:
727
to_mode |= 0001 & ~umask
728
if current_mode & 0040:
729
to_mode |= 0010 & ~umask
769
if current_mode & 0o004:
770
to_mode |= 0o001 & ~umask
771
if current_mode & 0o040:
772
to_mode |= 0o010 & ~umask
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
774
to_mode = current_mode & ~0o111
775
osutils.chmod_if_possible(abspath, to_mode)
734
777
def _new_entry(self, name, parent_id, file_id):
735
778
"""Helper function to create a new filesystem entry."""
781
824
self.create_symlink(target, trans_id)
827
def new_orphan(self, trans_id, parent_id):
828
"""Schedule an item to be orphaned.
830
When a directory is about to be removed, its children, if they are not
831
versioned are moved out of the way: they don't have a parent anymore.
833
:param trans_id: The trans_id of the existing item.
834
:param parent_id: The parent trans_id of the item.
836
raise NotImplementedError(self.new_orphan)
838
def _get_potential_orphans(self, dir_id):
839
"""Find the potential orphans in a directory.
841
A directory can't be safely deleted if there are versioned files in it.
842
If all the contained files are unversioned then they can be orphaned.
844
The 'None' return value means that the directory contains at least one
845
versioned file and should not be deleted.
847
:param dir_id: The directory trans id.
849
:return: A list of the orphan trans ids or None if at least one
850
versioned file is present.
853
# Find the potential orphans, stop if one item should be kept
854
for child_tid in self.by_parent()[dir_id]:
855
if child_tid in self._removed_contents:
856
# The child is removed as part of the transform. Since it was
857
# versioned before, it's not an orphan
859
elif self.final_file_id(child_tid) is None:
860
# The child is not versioned
861
orphans.append(child_tid)
863
# We have a versioned file here, searching for orphans is
784
869
def _affected_ids(self):
785
870
"""Return the set of transform ids affected by the transform"""
786
871
trans_ids = set(self._removed_id)
787
trans_ids.update(self._new_id.keys())
872
trans_ids.update(self._new_id)
788
873
trans_ids.update(self._removed_contents)
789
trans_ids.update(self._new_contents.keys())
790
trans_ids.update(self._new_executability.keys())
791
trans_ids.update(self._new_name.keys())
792
trans_ids.update(self._new_parent.keys())
874
trans_ids.update(self._new_contents)
875
trans_ids.update(self._new_executability)
876
trans_ids.update(self._new_name)
877
trans_ids.update(self._new_parent)
795
880
def _get_file_id_maps(self):
904
981
to_path = final_paths.get_path(to_trans_id)
983
from_name, from_parent, from_kind, from_executable = \
984
self._from_file_data(from_trans_id, from_versioned, from_path)
986
to_name, to_parent, to_kind, to_executable = \
987
self._to_file_data(to_trans_id, from_trans_id, from_executable)
905
989
if from_kind != to_kind:
907
991
elif to_kind in ('file', 'symlink') and (
908
to_trans_id != from_trans_id or
909
to_trans_id in self._new_contents):
992
to_trans_id != from_trans_id
993
or to_trans_id in self._new_contents):
911
if (not modified and from_versioned == to_versioned and
912
from_parent==to_parent and from_name == to_name and
913
from_executable == to_executable):
995
if (not modified and from_versioned == to_versioned
996
and from_parent == to_parent and from_name == to_name
997
and from_executable == to_executable):
915
999
results.append((file_id, (from_path, to_path), modified,
916
(from_versioned, to_versioned),
917
(from_parent, to_parent),
918
(from_name, to_name),
919
(from_kind, to_kind),
920
(from_executable, to_executable)))
921
return iter(sorted(results, key=lambda x:x[1]))
1000
(from_versioned, to_versioned),
1001
(from_parent, to_parent),
1002
(from_name, to_name),
1003
(from_kind, to_kind),
1004
(from_executable, to_executable)))
1008
return (paths[0] or '', paths[1] or '')
1009
return iter(sorted(results, key=path_key))
923
1011
def get_preview_tree(self):
924
1012
"""Return a tree representing the result of the transform.
987
1075
return revision_id
989
1077
def _text_parent(self, trans_id):
990
file_id = self.tree_file_id(trans_id)
1078
path = self.tree_path(trans_id)
992
if file_id is None or self._tree.kind(file_id) != 'file':
1080
if path is None or self._tree.kind(path) != 'file':
994
1082
except errors.NoSuchFile:
998
1086
def _get_parents_texts(self, trans_id):
999
1087
"""Get texts for compression parents of this file."""
1000
file_id = self._text_parent(trans_id)
1088
path = self._text_parent(trans_id)
1003
return (self._tree.get_file_text(file_id),)
1091
return (self._tree.get_file_text(path),)
1005
1093
def _get_parents_lines(self, trans_id):
1006
1094
"""Get lines for compression parents of this file."""
1007
file_id = self._text_parent(trans_id)
1095
path = self._text_parent(trans_id)
1010
return (self._tree.get_file_lines(file_id),)
1098
return (self._tree.get_file_lines(path),)
1012
1100
def serialize(self, serializer):
1013
1101
"""Serialize this TreeTransform.
1015
1103
:param serializer: A Serialiser like pack.ContainerSerializer.
1017
new_name = dict((k, v.encode('utf-8')) for k, v in
1018
self._new_name.items())
1019
new_executability = dict((k, int(v)) for k, v in
1020
self._new_executability.items())
1021
tree_path_ids = dict((k.encode('utf-8'), v)
1022
for k, v in self._tree_path_ids.items())
1105
new_name = {k.encode('utf-8'): v.encode('utf-8')
1106
for k, v in viewitems(self._new_name)}
1107
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1108
for k, v in viewitems(self._new_parent)}
1109
new_id = {k.encode('utf-8'): v
1110
for k, v in viewitems(self._new_id)}
1111
new_executability = {k.encode('utf-8'): int(v)
1112
for k, v in viewitems(self._new_executability)}
1113
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1114
for k, v in viewitems(self._tree_path_ids)}
1115
non_present_ids = {k: v.encode('utf-8')
1116
for k, v in viewitems(self._non_present_ids)}
1117
removed_contents = [trans_id.encode('utf-8')
1118
for trans_id in self._removed_contents]
1119
removed_id = [trans_id.encode('utf-8')
1120
for trans_id in self._removed_id]
1024
'_id_number': self._id_number,
1025
'_new_name': new_name,
1026
'_new_parent': self._new_parent,
1027
'_new_executability': new_executability,
1028
'_new_id': self._new_id,
1029
'_tree_path_ids': tree_path_ids,
1030
'_removed_id': list(self._removed_id),
1031
'_removed_contents': list(self._removed_contents),
1032
'_non_present_ids': self._non_present_ids,
1122
b'_id_number': self._id_number,
1123
b'_new_name': new_name,
1124
b'_new_parent': new_parent,
1125
b'_new_executability': new_executability,
1127
b'_tree_path_ids': tree_path_ids,
1128
b'_removed_id': removed_id,
1129
b'_removed_contents': removed_contents,
1130
b'_non_present_ids': non_present_ids,
1034
1132
yield serializer.bytes_record(bencode.bencode(attribs),
1036
for trans_id, kind in self._new_contents.items():
1134
for trans_id, kind in sorted(viewitems(self._new_contents)):
1037
1135
if kind == 'file':
1038
lines = osutils.chunks_to_lines(
1039
self._read_file_chunks(trans_id))
1136
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1137
lines = cur_file.readlines()
1040
1138
parents = self._get_parents_lines(trans_id)
1041
1139
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1042
content = ''.join(mpdiff.to_patch())
1140
content = b''.join(mpdiff.to_patch())
1043
1141
if kind == 'directory':
1045
1143
if kind == 'symlink':
1046
1144
content = self._read_symlink_target(trans_id)
1047
yield serializer.bytes_record(content, ((trans_id, kind),))
1145
if not isinstance(content, bytes):
1146
content = content.encode('utf-8')
1147
yield serializer.bytes_record(
1148
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1049
1150
def deserialize(self, records):
1050
1151
"""Deserialize a stored TreeTransform.
1052
1153
:param records: An iterable of (names, content) tuples, as per
1053
1154
pack.ContainerPushParser.
1055
names, content = records.next()
1156
names, content = next(records)
1056
1157
attribs = bencode.bdecode(content)
1057
self._id_number = attribs['_id_number']
1058
self._new_name = dict((k, v.decode('utf-8'))
1059
for k, v in attribs['_new_name'].items())
1060
self._new_parent = attribs['_new_parent']
1061
self._new_executability = dict((k, bool(v)) for k, v in
1062
attribs['_new_executability'].items())
1063
self._new_id = attribs['_new_id']
1064
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1158
self._id_number = attribs[b'_id_number']
1159
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1160
for k, v in viewitems(attribs[b'_new_name'])}
1161
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1162
for k, v in viewitems(attribs[b'_new_parent'])}
1163
self._new_executability = {
1164
k.decode('utf-8'): bool(v)
1165
for k, v in viewitems(attribs[b'_new_executability'])}
1166
self._new_id = {k.decode('utf-8'): v
1167
for k, v in viewitems(attribs[b'_new_id'])}
1168
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1065
1169
self._tree_path_ids = {}
1066
1170
self._tree_id_paths = {}
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1171
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1068
1172
path = bytepath.decode('utf-8')
1173
trans_id = trans_id.decode('utf-8')
1069
1174
self._tree_path_ids[path] = trans_id
1070
1175
self._tree_id_paths[trans_id] = path
1071
self._removed_id = set(attribs['_removed_id'])
1072
self._removed_contents = set(attribs['_removed_contents'])
1073
self._non_present_ids = attribs['_non_present_ids']
1176
self._removed_id = {trans_id.decode('utf-8')
1177
for trans_id in attribs[b'_removed_id']}
1178
self._removed_contents = set(
1179
trans_id.decode('utf-8')
1180
for trans_id in attribs[b'_removed_contents'])
1181
self._non_present_ids = {
1182
k: v.decode('utf-8')
1183
for k, v in viewitems(attribs[b'_non_present_ids'])}
1074
1184
for ((trans_id, kind),), content in records:
1185
trans_id = trans_id.decode('utf-8')
1186
kind = kind.decode('ascii')
1075
1187
if kind == 'file':
1076
1188
mpdiff = multiparent.MultiParent.from_patch(content)
1077
1189
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1195
1323
descendants.update(self._limbo_descendants(descendant))
1196
1324
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1326
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1327
"""Schedule creation of a new file.
1203
Contents is an iterator of strings, all of which will be written
1204
to the target destination.
1206
New file takes the permissions of any existing file with that id,
1207
unless mode_id is specified.
1331
:param contents: an iterator of strings, all of which will be written
1332
to the target destination.
1333
:param trans_id: TreeTransform handle
1334
:param mode_id: If not None, force the mode of the target file to match
1335
the mode of the object referenced by mode_id.
1336
Otherwise, we will try to preserve mode bits of an existing file.
1337
:param sha1: If the sha1 of this content is already known, pass it in.
1338
We can use it to prevent future sha1 computations.
1209
1340
name = self._limbo_name(trans_id)
1210
f = open(name, 'wb')
1213
unique_add(self._new_contents, trans_id, 'file')
1215
# Clean up the file, it never got registered so
1216
# TreeTransform.finalize() won't clean it up.
1341
with open(name, 'wb') as f:
1342
unique_add(self._new_contents, trans_id, 'file')
1221
1343
f.writelines(contents)
1224
1344
self._set_mtime(name)
1225
1345
self._set_mode(trans_id, mode_id, S_ISREG)
1227
def _read_file_chunks(self, trans_id):
1228
cur_file = open(self._limbo_name(trans_id), 'rb')
1230
return cur_file.readlines()
1346
# It is unfortunate we have to use lstat instead of fstat, but we just
1347
# used utime and chmod on the file, so we need the accurate final
1349
if sha1 is not None:
1350
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1234
1352
def _read_symlink_target(self, trans_id):
1235
1353
return os.readlink(self._limbo_name(trans_id))
1296
1416
del self._limbo_children_names[trans_id]
1297
1417
delete_any(self._limbo_name(trans_id))
1419
def new_orphan(self, trans_id, parent_id):
1420
conf = self._tree.get_config_stack()
1421
handle_orphan = conf.get('transform.orphan_policy')
1422
handle_orphan(self, trans_id, parent_id)
1425
class OrphaningError(errors.BzrError):
1427
# Only bugs could lead to such exception being seen by the user
1428
internal_error = True
1429
_fmt = "Error while orphaning %s in %s directory"
1431
def __init__(self, orphan, parent):
1432
errors.BzrError.__init__(self)
1433
self.orphan = orphan
1434
self.parent = parent
1437
class OrphaningForbidden(OrphaningError):
1439
_fmt = "Policy: %s doesn't allow creating orphans."
1441
def __init__(self, policy):
1442
errors.BzrError.__init__(self)
1443
self.policy = policy
1446
def move_orphan(tt, orphan_id, parent_id):
1447
"""See TreeTransformBase.new_orphan.
1449
This creates a new orphan in the `brz-orphans` dir at the root of the
1452
:param tt: The TreeTransform orphaning `trans_id`.
1454
:param orphan_id: The trans id that should be orphaned.
1456
:param parent_id: The orphan parent trans id.
1458
# Add the orphan dir if it doesn't exist
1459
orphan_dir_basename = 'brz-orphans'
1460
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1461
if tt.final_kind(od_id) is None:
1462
tt.create_directory(od_id)
1463
parent_path = tt._tree_id_paths[parent_id]
1464
# Find a name that doesn't exist yet in the orphan dir
1465
actual_name = tt.final_name(orphan_id)
1466
new_name = tt._available_backup_name(actual_name, od_id)
1467
tt.adjust_path(new_name, od_id, orphan_id)
1468
trace.warning('%s has been orphaned in %s'
1469
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1472
def refuse_orphan(tt, orphan_id, parent_id):
1473
"""See TreeTransformBase.new_orphan.
1475
This refuses to create orphan, letting the caller handle the conflict.
1477
raise OrphaningForbidden('never')
1480
orphaning_registry = registry.Registry()
1481
orphaning_registry.register(
1482
u'conflict', refuse_orphan,
1483
'Leave orphans in place and create a conflict on the directory.')
1484
orphaning_registry.register(
1485
u'move', move_orphan,
1486
'Move orphans into the brz-orphans directory.')
1487
orphaning_registry._set_default_key(u'conflict')
1490
opt_transform_orphan = _mod_config.RegistryOption(
1491
'transform.orphan_policy', orphaning_registry,
1492
help='Policy for orphaned files during transform operations.',
1300
1496
class TreeTransform(DiskTreeTransform):
1301
1497
"""Represent a tree transformation.
1593
1783
inventory_delta.append((path, None, file_id, None))
1594
1784
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1596
entries = self._tree.iter_entries_by_dir(
1597
new_path_file_ids.values())
1598
old_paths = dict((e.file_id, p) for p, e in entries)
1600
1786
for num, (path, trans_id) in enumerate(new_paths):
1601
1787
if (num % 10) == 0:
1602
child_pb.update('adding file',
1788
child_pb.update(gettext('adding file'),
1603
1789
num + len(self._removed_id), total_entries)
1604
1790
file_id = new_path_file_ids[trans_id]
1605
1791
if file_id is None:
1609
kind = self.final_kind(trans_id)
1611
kind = self._tree.stored_kind(file_id)
1793
kind = self.final_kind(trans_id)
1795
kind = self._tree.stored_kind(
1796
self._tree.id2path(file_id), file_id)
1612
1797
parent_trans_id = self.final_parent(trans_id)
1613
1798
parent_file_id = new_path_file_ids.get(parent_trans_id)
1614
1799
if parent_file_id is None:
1643
1829
If inventory_delta is None, no inventory delta generation is performed.
1645
tree_paths = list(self._tree_path_ids.iteritems())
1646
tree_paths.sort(reverse=True)
1647
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1649
for num, data in enumerate(tree_paths):
1650
path, trans_id = data
1651
child_pb.update('removing file', num, len(tree_paths))
1831
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1832
with ui.ui_factory.nested_progress_bar() as child_pb:
1833
for num, (path, trans_id) in enumerate(tree_paths):
1834
# do not attempt to move root into a subdirectory of itself.
1837
child_pb.update(gettext('removing file'), num, len(tree_paths))
1652
1838
full_path = self._tree.abspath(path)
1653
1839
if trans_id in self._removed_contents:
1654
1840
delete_path = os.path.join(self._deletiondir, trans_id)
1655
1841
mover.pre_delete(full_path, delete_path)
1656
elif (trans_id in self._new_name
1657
or trans_id in self._new_parent):
1842
elif (trans_id in self._new_name or
1843
trans_id in self._new_parent):
1659
1845
mover.rename(full_path, self._limbo_name(trans_id))
1846
except errors.TransformRenameFailed as e:
1661
1847
if e.errno != errno.ENOENT:
1664
1850
self.rename_count += 1
1668
1852
def _apply_insertions(self, mover):
1669
1853
"""Perform tree operations that insert directory/inventory names.
1678
1862
new_paths = self.new_paths(filesystem_only=True)
1679
1863
modified_paths = []
1680
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1682
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1864
with ui.ui_factory.nested_progress_bar() as child_pb:
1684
1865
for num, (path, trans_id) in enumerate(new_paths):
1685
1866
if (num % 10) == 0:
1686
child_pb.update('adding file', num, len(new_paths))
1867
child_pb.update(gettext('adding file'),
1868
num, len(new_paths))
1687
1869
full_path = self._tree.abspath(path)
1688
1870
if trans_id in self._needs_rename:
1690
1872
mover.rename(self._limbo_name(trans_id), full_path)
1873
except errors.TransformRenameFailed as e:
1692
1874
# We may be renaming a dangling inventory id
1693
1875
if e.errno != errno.ENOENT:
1696
1878
self.rename_count += 1
1697
if (trans_id in self._new_contents or
1698
self.path_changed(trans_id)):
1879
# TODO: if trans_id in self._observed_sha1s, we should
1880
# re-stat the final target, since ctime will be
1881
# updated by the change.
1882
if (trans_id in self._new_contents
1883
or self.path_changed(trans_id)):
1699
1884
if trans_id in self._new_contents:
1700
1885
modified_paths.append(full_path)
1701
1886
if trans_id in self._new_executability:
1702
1887
self._set_executability(path, trans_id)
1888
if trans_id in self._observed_sha1s:
1889
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1890
st = osutils.lstat(full_path)
1891
self._observed_sha1s[trans_id] = (o_sha1, st)
1892
for path, trans_id in new_paths:
1893
# new_paths includes stuff like workingtree conflicts. Only the
1894
# stuff in new_contents actually comes from limbo.
1895
if trans_id in self._limbo_files:
1896
del self._limbo_files[trans_id]
1705
1897
self._new_contents.clear()
1706
1898
return modified_paths
1900
def _apply_observed_sha1s(self):
1901
"""After we have finished renaming everything, update observed sha1s
1903
This has to be done after self._tree.apply_inventory_delta, otherwise
1904
it doesn't know anything about the files we are updating. Also, we want
1905
to do this as late as possible, so that most entries end up cached.
1907
# TODO: this doesn't update the stat information for directories. So
1908
# the first 'bzr status' will still need to rewrite
1909
# .bzr/checkout/dirstate. However, we at least don't need to
1910
# re-read all of the files.
1911
# TODO: If the operation took a while, we could do a time.sleep(3) here
1912
# to allow the clock to tick over and ensure we won't have any
1913
# problems. (we could observe start time, and finish time, and if
1914
# it is less than eg 10% overhead, add a sleep call.)
1915
paths = FinalPaths(self)
1916
for trans_id, observed in viewitems(self._observed_sha1s):
1917
path = paths.get_path(trans_id)
1918
self._tree._observed_sha1(path, observed)
1709
1921
class TransformPreview(DiskTreeTransform):
1710
1922
"""A TreeTransform for generating preview trees.
1788
2006
except errors.NoSuchRevisionInTree:
1789
2007
yield self._get_repository().revision_tree(revision_id)
1791
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
self._iter_parent_trees()]
2009
def _get_file_revision(self, path, file_id, vf, tree_revision):
2011
(file_id, t.get_file_revision(t.id2path(file_id)))
2012
for t in self._iter_parent_trees()]
1794
2013
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2014
self.get_file_lines(path))
1796
2015
repo = self._get_repository()
1797
2016
base_vf = repo.texts
1798
2017
if base_vf not in vf.fallback_versionedfiles:
1799
2018
vf.fallback_versionedfiles.append(base_vf)
1800
2019
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2021
def _stat_limbo_file(self, trans_id):
1804
2022
name = self._transform._limbo_name(trans_id)
1805
2023
return os.lstat(name)
1962
2193
ordered_ids = self._list_files_by_dir()
1963
2194
for entry, trans_id in self._make_inv_entries(ordered_ids,
1964
specific_file_ids, yield_parents=yield_parents):
1965
yield unicode(self._final_paths.get_path(trans_id)), entry
2196
yield self._final_paths.get_path(trans_id), entry
1967
2198
def _iter_entries_for_dir(self, dir_path):
1968
2199
"""Return path, entry for items in a directory without recursing down."""
1969
dir_file_id = self.path2id(dir_path)
1970
2200
ordered_ids = []
1971
for file_id in self.iter_children(dir_file_id):
1972
trans_id = self._transform.trans_id_file_id(file_id)
1973
ordered_ids.append((trans_id, file_id))
2201
dir_trans_id = self._path2trans_id(dir_path)
2202
dir_id = self._transform.final_file_id(dir_trans_id)
2203
for child_trans_id in self._all_children(dir_trans_id):
2204
ordered_ids.append((child_trans_id, dir_id))
1974
2206
for entry, trans_id in self._make_inv_entries(ordered_ids):
1975
yield unicode(self._final_paths.get_path(trans_id)), entry
2207
path_entries.append((self._final_paths.get_path(trans_id), entry))
1977
2211
def list_files(self, include_root=False, from_dir=None, recursive=True):
1978
2212
"""See WorkingTree.list_files."""
1995
2229
if from_dir is None and include_root is True:
1996
2230
root_entry = inventory.make_entry('directory', '',
1997
ROOT_PARENT, self.get_root_id())
2231
ROOT_PARENT, self.get_root_id())
1998
2232
yield '', 'V', 'directory', root_entry.file_id, root_entry
1999
2233
entries = self._iter_entries_for_dir(from_dir or '')
2000
2234
for path, entry in entries:
2001
2235
yield path, 'V', entry.kind, entry.file_id, entry
2003
def kind(self, file_id):
2004
trans_id = self._transform.trans_id_file_id(file_id)
2237
def kind(self, path):
2238
trans_id = self._path2trans_id(path)
2239
if trans_id is None:
2240
raise errors.NoSuchFile(path)
2005
2241
return self._transform.final_kind(trans_id)
2007
def stored_kind(self, file_id):
2008
trans_id = self._transform.trans_id_file_id(file_id)
2243
def stored_kind(self, path):
2244
trans_id = self._path2trans_id(path)
2245
if trans_id is None:
2246
raise errors.NoSuchFile(path)
2010
2248
return self._transform._new_contents[trans_id]
2011
2249
except KeyError:
2012
return self._transform._tree.stored_kind(file_id)
2250
return self._transform._tree.stored_kind(path)
2014
def get_file_mtime(self, file_id, path=None):
2252
def get_file_mtime(self, path):
2015
2253
"""See Tree.get_file_mtime"""
2254
file_id = self.path2id(path)
2256
raise errors.NoSuchFile(path)
2016
2257
if not self._content_change(file_id):
2017
return self._transform._tree.get_file_mtime(file_id)
2018
return self._stat_limbo_file(file_id).st_mtime
2020
def _file_size(self, entry, stat_value):
2021
return self.get_file_size(entry.file_id)
2023
def get_file_size(self, file_id):
2258
return self._transform._tree.get_file_mtime(
2259
self._transform._tree.id2path(file_id))
2260
trans_id = self._path2trans_id(path)
2261
return self._stat_limbo_file(trans_id).st_mtime
2263
def get_file_size(self, path):
2024
2264
"""See Tree.get_file_size"""
2025
if self.kind(file_id) == 'file':
2026
return self._transform._tree.get_file_size(file_id)
2265
trans_id = self._path2trans_id(path)
2266
if trans_id is None:
2267
raise errors.NoSuchFile(path)
2268
kind = self._transform.final_kind(trans_id)
2271
if trans_id in self._transform._new_contents:
2272
return self._stat_limbo_file(trans_id).st_size
2273
if self.kind(path) == 'file':
2274
return self._transform._tree.get_file_size(path)
2030
def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
trans_id = self._transform.trans_id_file_id(file_id)
2032
kind = self._transform._new_contents.get(trans_id)
2034
return self._transform._tree.get_file_sha1(file_id)
2036
fileobj = self.get_file(file_id)
2278
def get_file_verifier(self, path, stat_value=None):
2279
trans_id = self._path2trans_id(path)
2280
if trans_id is None:
2281
raise errors.NoSuchFile(path)
2282
kind = self._transform._new_contents.get(trans_id)
2284
return self._transform._tree.get_file_verifier(path)
2286
with self.get_file(path) as fileobj:
2287
return ("SHA1", sha_file(fileobj))
2289
def get_file_sha1(self, path, stat_value=None):
2290
trans_id = self._path2trans_id(path)
2291
if trans_id is None:
2292
raise errors.NoSuchFile(path)
2293
kind = self._transform._new_contents.get(trans_id)
2295
return self._transform._tree.get_file_sha1(path)
2297
with self.get_file(path) as fileobj:
2038
2298
return sha_file(fileobj)
2042
def is_executable(self, file_id, path=None):
2300
def is_executable(self, path):
2301
trans_id = self._path2trans_id(path)
2302
if trans_id is None:
2045
trans_id = self._transform.trans_id_file_id(file_id)
2047
2305
return self._transform._new_executability[trans_id]
2048
2306
except KeyError:
2050
return self._transform._tree.is_executable(file_id, path)
2308
return self._transform._tree.is_executable(path)
2309
except OSError as e:
2052
2310
if e.errno == errno.ENOENT:
2055
except errors.NoSuchId:
2313
except errors.NoSuchFile:
2316
def has_filename(self, path):
2317
trans_id = self._path2trans_id(path)
2318
if trans_id in self._transform._new_contents:
2320
elif trans_id in self._transform._removed_contents:
2323
return self._transform._tree.has_filename(path)
2058
2325
def path_content_summary(self, path):
2059
2326
trans_id = self._path2trans_id(path)
2060
2327
tt = self._transform
2082
2349
executable = None
2083
2350
if kind == 'symlink':
2084
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2351
link_or_sha1 = os.readlink(limbo_name)
2352
if not isinstance(link_or_sha1, text_type):
2353
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2085
2354
executable = tt._new_executability.get(trans_id, executable)
2086
2355
return kind, size, executable, link_or_sha1
2088
2357
def iter_changes(self, from_tree, include_unchanged=False,
2089
specific_files=None, pb=None, extra_trees=None,
2090
require_versioned=True, want_unversioned=False):
2358
specific_files=None, pb=None, extra_trees=None,
2359
require_versioned=True, want_unversioned=False):
2091
2360
"""See InterTree.iter_changes.
2093
2362
This has a fast path that is only used when the from_tree matches
2094
2363
the transform tree, and no fancy options are supplied.
2096
if (from_tree is not self._transform._tree or include_unchanged or
2097
specific_files or want_unversioned):
2365
if (from_tree is not self._transform._tree or include_unchanged
2366
or specific_files or want_unversioned):
2098
2367
return tree.InterTree(from_tree, self).iter_changes(
2099
2368
include_unchanged=include_unchanged,
2100
2369
specific_files=specific_files,
2106
2375
raise ValueError('want_unversioned is not supported')
2107
2376
return self._transform.iter_changes()
2109
def get_file(self, file_id, path=None):
2378
def get_file(self, path):
2110
2379
"""See Tree.get_file"""
2380
file_id = self.path2id(path)
2111
2381
if not self._content_change(file_id):
2112
return self._transform._tree.get_file(file_id, path)
2113
trans_id = self._transform.trans_id_file_id(file_id)
2382
return self._transform._tree.get_file(path)
2383
trans_id = self._path2trans_id(path)
2114
2384
name = self._transform._limbo_name(trans_id)
2115
2385
return open(name, 'rb')
2117
def get_file_with_stat(self, file_id, path=None):
2118
return self.get_file(file_id, path), None
2387
def get_file_with_stat(self, path):
2388
return self.get_file(path), None
2120
def annotate_iter(self, file_id,
2390
def annotate_iter(self, path,
2121
2391
default_revision=_mod_revision.CURRENT_REVISION):
2392
file_id = self.path2id(path)
2122
2393
changes = self._iter_changes_cache.get(file_id)
2123
2394
if changes is None:
2268
2541
:param delta_from_tree: If true, build_tree may use the input Tree to
2269
2542
generate the inventory delta.
2271
wt.lock_tree_write()
2544
with wt.lock_tree_write(), tree.lock_read():
2545
if accelerator_tree is not None:
2546
accelerator_tree.lock_read()
2548
return _build_tree(tree, wt, accelerator_tree, hardlink,
2275
2551
if accelerator_tree is not None:
2276
accelerator_tree.lock_read()
2278
return _build_tree(tree, wt, accelerator_tree, hardlink,
2281
if accelerator_tree is not None:
2282
accelerator_tree.unlock()
2552
accelerator_tree.unlock()
2289
2555
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2290
2556
"""See build_tree."""
2291
for num, _unused in enumerate(wt.all_file_ids()):
2557
for num, _unused in enumerate(wt.all_versioned_paths()):
2292
2558
if num > 0: # more than just a root
2293
2559
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2294
existing_files = set()
2295
for dir, files in wt.walkdirs():
2296
existing_files.update(f[0] for f in files)
2297
2560
file_trans_id = {}
2298
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2561
top_pb = ui.ui_factory.nested_progress_bar()
2299
2562
pp = ProgressPhase("Build phase", 2, top_pb)
2300
if tree.inventory.root is not None:
2563
if tree.get_root_id() is not None:
2301
2564
# This is kind of a hack: we should be altering the root
2302
2565
# as part of the regular tree shape diff logic.
2303
2566
# The conditional test here is to avoid doing an
2314
2577
pp.next_phase()
2315
file_trans_id[wt.get_root_id()] = \
2316
tt.trans_id_tree_file_id(wt.get_root_id())
2317
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2578
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2579
with ui.ui_factory.nested_progress_bar() as pb:
2319
2580
deferred_contents = []
2321
total = len(tree.inventory)
2582
total = len(tree.all_versioned_paths())
2322
2583
if delta_from_tree:
2323
2584
precomputed_delta = []
2325
2586
precomputed_delta = None
2587
# Check if tree inventory has content. If so, we populate
2588
# existing_files with the directory content. If there are no
2589
# entries we skip populating existing_files as its not used.
2590
# This improves performance and unncessary work on large
2591
# directory trees. (#501307)
2593
existing_files = set()
2594
for dir, files in wt.walkdirs():
2595
existing_files.update(f[0] for f in files)
2326
2596
for num, (tree_path, entry) in \
2327
enumerate(tree.inventory.iter_entries_by_dir()):
2328
pb.update("Building tree", num - len(deferred_contents), total)
2597
enumerate(tree.iter_entries_by_dir()):
2598
pb.update(gettext("Building tree"), num
2599
- len(deferred_contents), total)
2329
2600
if entry.parent_id is None:
2331
2602
reparent = False
2355
2626
trans_id = tt.create_path(entry.name, parent_id)
2356
2627
file_trans_id[file_id] = trans_id
2357
2628
tt.version_file(file_id, trans_id)
2358
executable = tree.is_executable(file_id, tree_path)
2629
executable = tree.is_executable(tree_path)
2360
2631
tt.set_executability(executable, trans_id)
2361
trans_data = (trans_id, tree_path)
2362
deferred_contents.append((file_id, trans_data))
2632
trans_data = (trans_id, file_id,
2633
tree_path, entry.text_sha1)
2634
deferred_contents.append((tree_path, trans_data))
2364
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2636
file_trans_id[file_id] = new_by_entry(
2637
tree_path, tt, entry, parent_id, tree)
2367
2639
new_trans_id = file_trans_id[file_id]
2368
2640
old_parent = tt.trans_id_tree_path(tree_path)
2401
2673
new_desired_files = desired_files
2403
2675
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2404
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2676
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2405
2677
in iter if not (c or e[0] != e[1])]
2406
2678
if accelerator_tree.supports_content_filtering():
2407
unchanged = [(f, p) for (f, p) in unchanged
2408
if not accelerator_tree.iter_search_rules([p]).next()]
2679
unchanged = [(tp, ap) for (tp, ap) in unchanged
2680
if not next(accelerator_tree.iter_search_rules([ap]))]
2409
2681
unchanged = dict(unchanged)
2410
2682
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2413
accelerator_path = unchanged.get(file_id)
2684
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2685
accelerator_path = unchanged.get(tree_path)
2414
2686
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2687
new_desired_files.append((tree_path,
2688
(trans_id, file_id, tree_path, text_sha1)))
2417
pb.update('Adding file contents', count + offset, total)
2690
pb.update(gettext('Adding file contents'), count + offset, total)
2419
2692
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2422
contents = accelerator_tree.get_file(file_id, accelerator_path)
2423
if wt.supports_content_filtering():
2424
filters = wt._content_filter_stack(tree_path)
2425
contents = filtered_output_bytes(contents, filters,
2426
ContentFilterContext(tree_path, tree))
2428
tt.create_file(contents, trans_id)
2432
except AttributeError:
2433
# after filtering, contents may no longer be file-like
2695
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2696
chunks = osutils.file_iterator(f)
2697
if wt.supports_content_filtering():
2698
filters = wt._content_filter_stack(tree_path)
2699
chunks = filtered_output_bytes(chunks, filters,
2700
ContentFilterContext(tree_path, tree))
2701
tt.create_file(chunks, trans_id, sha1=text_sha1)
2436
2703
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2704
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2438
2705
tree.iter_files_bytes(new_desired_files)):
2439
2706
if wt.supports_content_filtering():
2440
2707
filters = wt._content_filter_stack(tree_path)
2441
2708
contents = filtered_output_bytes(contents, filters,
2442
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2444
pb.update('Adding file contents', count + offset, total)
2709
ContentFilterContext(tree_path, tree))
2710
tt.create_file(contents, trans_id, sha1=text_sha1)
2711
pb.update(gettext('Adding file contents'), count + offset, total)
2447
2714
def _reparent_children(tt, old_parent, new_parent):
2448
2715
for child in tt.iter_tree_children(old_parent):
2449
2716
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2719
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2720
by_parent = tt.by_parent()
2453
2721
for child in by_parent[old_parent]:
2454
2722
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2723
return by_parent[old_parent]
2457
def _content_match(tree, entry, file_id, kind, target_path):
2726
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2458
2727
if entry.kind != kind:
2460
2729
if entry.kind == "directory":
2462
2731
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2732
with open(target_path, 'rb') as f1, \
2733
tree.get_file(tree_path) as f2:
2734
if osutils.compare_files(f1, f2):
2465
2736
elif entry.kind == "symlink":
2466
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2737
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2487
2758
final_parent = tt.final_parent(old_file)
2488
2759
if new_file in divert:
2489
new_name = tt.final_name(old_file)+'.diverted'
2760
new_name = tt.final_name(old_file) + '.diverted'
2490
2761
tt.adjust_path(new_name, final_parent, new_file)
2491
2762
new_conflicts.add((c_type, 'Diverted to',
2492
2763
new_file, old_file))
2494
new_name = tt.final_name(old_file)+'.moved'
2765
new_name = tt.final_name(old_file) + '.moved'
2495
2766
tt.adjust_path(new_name, final_parent, old_file)
2496
2767
new_conflicts.add((c_type, 'Moved existing file to',
2497
2768
old_file, new_file))
2498
2769
return new_conflicts
2501
def new_by_entry(tt, entry, parent_id, tree):
2772
def new_by_entry(path, tt, entry, parent_id, tree):
2502
2773
"""Create a new file according to its inventory entry"""
2503
2774
name = entry.name
2504
2775
kind = entry.kind
2505
2776
if kind == 'file':
2506
contents = tree.get_file(entry.file_id).readlines()
2507
executable = tree.is_executable(entry.file_id)
2508
return tt.new_file(name, parent_id, contents, entry.file_id,
2777
with tree.get_file(path) as f:
2778
executable = tree.is_executable(path)
2780
name, parent_id, osutils.file_iterator(f), entry.file_id,
2510
2782
elif kind in ('directory', 'tree-reference'):
2511
2783
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2512
2784
if kind == 'tree-reference':
2513
2785
tt.set_tree_reference(entry.reference_revision, trans_id)
2514
2786
return trans_id
2515
2787
elif kind == 'symlink':
2516
target = tree.get_symlink_target(entry.file_id)
2788
target = tree.get_symlink_target(path)
2517
2789
return tt.new_symlink(name, parent_id, target, entry.file_id)
2519
2791
raise errors.BadFileKindError(name, kind)
2522
@deprecated_function(deprecated_in((1, 9, 0)))
2523
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2524
"""Create new file contents according to an inventory entry.
2526
DEPRECATED. Use create_from_tree instead.
2528
if entry.kind == "file":
2530
lines = tree.get_file(entry.file_id).readlines()
2531
tt.create_file(lines, trans_id, mode_id=mode_id)
2532
elif entry.kind == "symlink":
2533
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2534
elif entry.kind == "directory":
2535
tt.create_directory(trans_id)
2538
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2539
filter_tree_path=None):
2794
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2795
filter_tree_path=None):
2540
2796
"""Create new file contents according to tree contents.
2542
2798
:param filter_tree_path: the tree path to use to lookup
2543
2799
content filters to apply to the bytes output in the working tree.
2544
2800
This only applies if the working tree supports content filtering.
2546
kind = tree.kind(file_id)
2802
kind = tree.kind(path)
2547
2803
if kind == 'directory':
2548
2804
tt.create_directory(trans_id)
2549
2805
elif kind == "file":
2551
tree_file = tree.get_file(file_id)
2553
bytes = tree_file.readlines()
2557
if wt.supports_content_filtering() and filter_tree_path is not None:
2558
filters = wt._content_filter_stack(filter_tree_path)
2559
bytes = filtered_output_bytes(bytes, filters,
2560
ContentFilterContext(filter_tree_path, tree))
2561
tt.create_file(bytes, trans_id)
2807
f = tree.get_file(path)
2808
chunks = osutils.file_iterator(f)
2813
if wt.supports_content_filtering() and filter_tree_path is not None:
2814
filters = wt._content_filter_stack(filter_tree_path)
2815
chunks = filtered_output_bytes(
2817
ContentFilterContext(filter_tree_path, tree))
2818
tt.create_file(chunks, trans_id)
2562
2822
elif kind == "symlink":
2563
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2823
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2565
2825
raise AssertionError('Unknown kind %r' % kind)
2571
2831
tt.set_executability(entry.executable, trans_id)
2574
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2575
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2578
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2579
"""Produce a backup-style name that appears to be available"""
2583
yield "%s.~%d~" % (name, counter)
2585
for new_name in name_gen():
2586
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2590
def _entry_changes(file_id, entry, working_tree):
2591
"""Determine in which ways the inventory entry has changed.
2593
Returns booleans: has_contents, content_mod, meta_mod
2594
has_contents means there are currently contents, but they differ
2595
contents_mod means contents need to be modified
2596
meta_mod means the metadata needs to be modified
2598
cur_entry = working_tree.inventory[file_id]
2600
working_kind = working_tree.kind(file_id)
2603
has_contents = False
2606
if has_contents is True:
2607
if entry.kind != working_kind:
2608
contents_mod, meta_mod = True, False
2610
cur_entry._read_tree_state(working_tree.id2path(file_id),
2612
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2613
cur_entry._forget_tree_state()
2614
return has_contents, contents_mod, meta_mod
2617
2834
def revert(working_tree, target_tree, filenames, backups=False,
2618
2835
pb=None, change_reporter=None):
2619
2836
"""Revert a working tree's contents to those of a target tree."""
2620
target_tree.lock_read()
2621
2837
pb = ui.ui_factory.nested_progress_bar()
2622
tt = TreeTransform(working_tree, pb)
2624
pp = ProgressPhase("Revert phase", 3, pb)
2625
conflicts, merge_modified = _prepare_revert_transform(
2626
working_tree, target_tree, tt, filenames, backups, pp)
2628
change_reporter = delta._ChangeReporter(
2629
unversioned_filter=working_tree.is_ignored)
2630
delta.report_changes(tt.iter_changes(), change_reporter)
2631
for conflict in conflicts:
2635
working_tree.set_merge_modified(merge_modified)
2839
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2840
pp = ProgressPhase("Revert phase", 3, pb)
2841
conflicts, merge_modified = _prepare_revert_transform(
2842
working_tree, target_tree, tt, filenames, backups, pp)
2844
change_reporter = delta._ChangeReporter(
2845
unversioned_filter=working_tree.is_ignored)
2846
delta.report_changes(tt.iter_changes(), change_reporter)
2847
for conflict in conflicts:
2848
trace.warning(text_type(conflict))
2851
if working_tree.supports_merge_modified():
2852
working_tree.set_merge_modified(merge_modified)
2637
target_tree.unlock()
2640
2855
return conflicts
2643
2858
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2644
2859
backups, pp, basis_tree=None,
2645
2860
merge_modified=None):
2646
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2861
with ui.ui_factory.nested_progress_bar() as child_pb:
2648
2862
if merge_modified is None:
2649
2863
merge_modified = working_tree.merge_modified()
2650
2864
merge_modified = _alter_files(working_tree, target_tree, tt,
2651
2865
child_pb, filenames, backups,
2652
2866
merge_modified, basis_tree)
2655
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2657
raw_conflicts = resolve_conflicts(tt, child_pb,
2658
lambda t, c: conflict_pass(t, c, target_tree))
2867
with ui.ui_factory.nested_progress_bar() as child_pb:
2868
raw_conflicts = resolve_conflicts(
2869
tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))
2661
2870
conflicts = cook_conflicts(raw_conflicts, tt)
2662
2871
return conflicts, merge_modified
2666
2875
backups, merge_modified, basis_tree=None):
2667
2876
if basis_tree is not None:
2668
2877
basis_tree.lock_read()
2669
change_list = target_tree.iter_changes(working_tree,
2670
specific_files=specific_files, pb=pb)
2671
if target_tree.get_root_id() is None:
2878
# We ask the working_tree for its changes relative to the target, rather
2879
# than the target changes relative to the working tree. Because WT4 has an
2880
# optimizer to compare itself to a target, but no optimizer for the
2882
change_list = working_tree.iter_changes(
2883
target_tree, specific_files=specific_files, pb=pb)
2884
if not target_tree.is_versioned(u''):
2672
2885
skip_root = True
2674
2887
skip_root = False
2676
2889
deferred_files = []
2677
2890
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2891
kind, executable) in enumerate(change_list):
2892
target_path, wt_path = path
2893
target_versioned, wt_versioned = versioned
2894
target_parent, wt_parent = parent
2895
target_name, wt_name = name
2896
target_kind, wt_kind = kind
2897
target_executable, wt_executable = executable
2898
if skip_root and wt_parent is None:
2681
2900
trans_id = tt.trans_id_file_id(file_id)
2683
2902
if changed_content:
2684
2903
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2686
wt_sha1 = working_tree.get_file_sha1(file_id)
2904
if wt_kind == 'file' and (backups or target_kind is None):
2905
wt_sha1 = working_tree.get_file_sha1(wt_path)
2687
2906
if merge_modified.get(file_id) != wt_sha1:
2688
2907
# acquire the basis tree lazily to prevent the
2689
2908
# expense of accessing it when it's not needed ?
2691
2910
if basis_tree is None:
2692
2911
basis_tree = working_tree.basis_tree()
2693
2912
basis_tree.lock_read()
2694
if file_id in basis_tree:
2695
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2697
elif kind[1] is None and not versioned[1]:
2699
if kind[0] is not None:
2913
basis_path = find_previous_path(
2914
working_tree, basis_tree, wt_path)
2915
if basis_path is None:
2916
if target_kind is None and not target_versioned:
2919
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2921
if wt_kind is not None:
2700
2922
if not keep_content:
2701
2923
tt.delete_contents(trans_id)
2702
elif kind[1] is not None:
2703
parent_trans_id = tt.trans_id_file_id(parent[0])
2704
by_parent = tt.by_parent()
2705
backup_name = _get_backup_name(name[0], by_parent,
2706
parent_trans_id, tt)
2924
elif target_kind is not None:
2925
parent_trans_id = tt.trans_id_file_id(wt_parent)
2926
backup_name = tt._available_backup_name(
2927
wt_name, parent_trans_id)
2707
2928
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2708
new_trans_id = tt.create_path(name[0], parent_trans_id)
2709
if versioned == (True, True):
2929
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2930
if wt_versioned and target_versioned:
2710
2931
tt.unversion_file(trans_id)
2711
2932
tt.version_file(file_id, new_trans_id)
2712
2933
# New contents should have the same unix perms as old
2714
2935
mode_id = trans_id
2715
2936
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2937
if target_kind in ('directory', 'tree-reference'):
2717
2938
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2719
revision = target_tree.get_reference_revision(file_id,
2939
if target_kind == 'tree-reference':
2940
revision = target_tree.get_reference_revision(
2721
2942
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2723
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2726
deferred_files.append((file_id, (trans_id, mode_id)))
2943
elif target_kind == 'symlink':
2944
tt.create_symlink(target_tree.get_symlink_target(
2945
target_path), trans_id)
2946
elif target_kind == 'file':
2947
deferred_files.append(
2948
(target_path, (trans_id, mode_id, file_id)))
2727
2949
if basis_tree is None:
2728
2950
basis_tree = working_tree.basis_tree()
2729
2951
basis_tree.lock_read()
2730
new_sha1 = target_tree.get_file_sha1(file_id)
2731
if (file_id in basis_tree and new_sha1 ==
2732
basis_tree.get_file_sha1(file_id)):
2952
new_sha1 = target_tree.get_file_sha1(target_path)
2953
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2954
if (basis_path is not None and
2955
new_sha1 == basis_tree.get_file_sha1(basis_path)):
2733
2956
if file_id in merge_modified:
2734
2957
del merge_modified[file_id]
2736
2959
merge_modified[file_id] = new_sha1
2738
2961
# preserve the execute bit when backing up
2739
if keep_content and executable[0] == executable[1]:
2740
tt.set_executability(executable[1], trans_id)
2741
elif kind[1] is not None:
2742
raise AssertionError(kind[1])
2743
if versioned == (False, True):
2962
if keep_content and wt_executable == target_executable:
2963
tt.set_executability(target_executable, trans_id)
2964
elif target_kind is not None:
2965
raise AssertionError(target_kind)
2966
if not wt_versioned and target_versioned:
2744
2967
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
2968
if wt_versioned and not target_versioned:
2746
2969
tt.unversion_file(trans_id)
2747
if (name[1] is not None and
2748
(name[0] != name[1] or parent[0] != parent[1])):
2749
if name[1] == '' and parent[1] is None:
2970
if (target_name is not None
2971
and (wt_name != target_name or wt_parent != target_parent)):
2972
if target_name == '' and target_parent is None:
2750
2973
parent_trans = ROOT_PARENT
2752
parent_trans = tt.trans_id_file_id(parent[1])
2753
if parent[0] is None and versioned[0]:
2754
tt.adjust_root_path(name[1], parent_trans)
2975
parent_trans = tt.trans_id_file_id(target_parent)
2976
if wt_parent is None and wt_versioned:
2977
tt.adjust_root_path(target_name, parent_trans)
2756
tt.adjust_path(name[1], parent_trans, trans_id)
2757
if executable[0] != executable[1] and kind[1] == "file":
2758
tt.set_executability(executable[1], trans_id)
2979
tt.adjust_path(target_name, parent_trans, trans_id)
2980
if wt_executable != target_executable and target_kind == "file":
2981
tt.set_executability(target_executable, trans_id)
2759
2982
if working_tree.supports_content_filtering():
2760
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
target_tree.iter_files_bytes(deferred_files)):
2762
file_id = deferred_files[index][0]
2983
for (trans_id, mode_id, file_id), bytes in (
2984
target_tree.iter_files_bytes(deferred_files)):
2763
2985
# We're reverting a tree to the target tree so using the
2764
2986
# target tree to find the file path seems the best choice
2765
2987
# here IMO - Ian C 27/Oct/2009
2766
2988
filter_tree_path = target_tree.id2path(file_id)
2767
2989
filters = working_tree._content_filter_stack(filter_tree_path)
2768
bytes = filtered_output_bytes(bytes, filters,
2990
bytes = filtered_output_bytes(
2769
2992
ContentFilterContext(filter_tree_path, working_tree))
2770
2993
tt.create_file(bytes, trans_id, mode_id)
2772
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2995
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2774
2997
tt.create_file(bytes, trans_id, mode_id)
2775
2998
tt.fixup_new_roots()
2945
3186
def rollback(self):
2946
3187
"""Reverse all renames that have been performed"""
2947
3188
for from_, to in reversed(self.past_renames):
2948
osutils.rename(to, from_)
3190
os.rename(to, from_)
3191
except OSError as e:
3192
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2949
3193
# after rollback, don't reuse _FileMover
2951
pending_deletions = None
3194
self.past_renames = None
3195
self.pending_deletions = None
2953
3197
def apply_deletions(self):
2954
3198
"""Apply all marked deletions"""
2955
3199
for path in self.pending_deletions:
2956
3200
delete_any(path)
2957
3201
# after apply_deletions, don't reuse _FileMover
2959
pending_deletions = None
3202
self.past_renames = None
3203
self.pending_deletions = None
3206
def link_tree(target_tree, source_tree):
3207
"""Where possible, hard-link files in a tree to those in another tree.
3209
:param target_tree: Tree to change
3210
:param source_tree: Tree to hard-link from
3212
tt = TreeTransform(target_tree)
3214
for (file_id, paths, changed_content, versioned, parent, name, kind,
3215
executable) in target_tree.iter_changes(source_tree,
3216
include_unchanged=True):
3219
if kind != ('file', 'file'):
3221
if executable[0] != executable[1]:
3223
trans_id = tt.trans_id_tree_path(paths[1])
3224
tt.delete_contents(trans_id)
3225
tt.create_hardlink(source_tree.abspath(paths[0]), trans_id)
added
removed
breezy/transform.py
