14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
21
19
from stat import S_ISREG, S_IEXEC
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
43
33
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
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 (
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 (
67
from .progress import ProgressPhase
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
78
64
ROOT_PARENT = "root-parent"
248
223
self._new_root = new_roots[0]
250
225
old_new_root = new_roots[0]
226
# TODO: What to do if a old_new_root is present, but self._new_root is
227
# not listed as being removed? This code explicitly unversions
228
# the old root and versions it with the new file_id. Though that
229
# seems like an incomplete delta
251
231
# unversion the new root's directory.
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)
232
file_id = self.final_file_id(old_new_root)
256
233
if old_new_root in self._new_id:
257
234
self.cancel_versioning(old_new_root)
259
236
self.unversion_file(old_new_root)
260
237
# if, at this stage, root still has an old file_id, zap it so we can
261
238
# stick a new one in.
262
if (self.tree_file_id(self._new_root) is not None
263
and self._new_root not in self._removed_id):
239
if (self.tree_file_id(self._new_root) is not None and
240
self._new_root not in self._removed_id):
264
241
self.unversion_file(self._new_root)
265
if file_id is not None:
266
self.version_file(file_id, self._new_root)
242
self.version_file(file_id, self._new_root)
268
244
# Now move children of new root into old root directory.
269
245
# Ensure all children are registered with the transaction, but don't
392
380
return sorted(FinalPaths(self).get_paths(new_ids))
394
382
def _inventory_altered(self):
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,
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,
413
386
self._new_executability]:
414
changed_ids.update(id_set)
415
# removing implies a kind change
387
new_ids.update(id_set)
416
388
changed_kind = set(self._removed_contents)
418
389
changed_kind.intersection_update(self._new_contents)
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))
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))
433
396
def final_kind(self, trans_id):
434
397
"""Determine the final file kind, after any changes applied.
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)
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)
440
403
if trans_id in self._new_contents:
441
404
return self._new_contents[trans_id]
442
405
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
445
408
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)
451
410
def tree_file_id(self, trans_id):
452
411
"""Determine the file id associated with the trans_id in the tree"""
453
path = self.tree_path(trans_id)
413
path = self._tree_id_paths[trans_id]
415
# the file is a new, unversioned file, or invalid trans_id
456
417
# the file is old; the old id is still valid
457
418
if self._new_root == trans_id:
570
531
# ensure that all children are registered with the transaction
571
532
list(self.iter_tree_children(parent_id))
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:
534
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
587
540
if self.final_name(child) == name:
589
parent_path = self._tree_id_paths.get(parent_id, None)
590
if parent_path is None:
591
# No parent... no children
543
path = self._tree_id_paths[parent_id]
593
child_path = joinpath(parent_path, name)
594
child_id = self._tree_path_ids.get(child_path, None)
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
595
548
if child_id is None:
596
# Not known by the tree transform yet, check the filesystem
597
return osutils.lexists(self._tree.abspath(child_path))
549
return lexists(self._tree.abspath(childpath))
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))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
616
559
def _parent_loops(self):
617
560
"""No entry should be its own ancestor"""
720
668
def _duplicate_ids(self):
721
669
"""Each inventory id may only be used once"""
724
all_ids = self._tree.all_file_ids()
725
except errors.UnsupportedOperation:
726
# it's okay for non-file-id trees to raise UnsupportedOperation.
728
671
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
729
672
self._removed_id))
673
all_ids = self._tree.all_file_ids()
730
674
active_tree_ids = all_ids.difference(removed_tree_ids)
731
for trans_id, file_id in viewitems(self._new_id):
675
for trans_id, file_id in self._new_id.iteritems():
732
676
if file_id in active_tree_ids:
733
path = self._tree.id2path(file_id)
734
old_trans_id = self.trans_id_tree_path(path)
677
old_trans_id = self.trans_id_tree_file_id(file_id)
735
678
conflicts.append(('duplicate id', old_trans_id, trans_id))
738
681
def _parent_type_conflicts(self, by_parent):
739
"""Children must have a directory parent"""
682
"""parents must have directory 'contents'."""
741
for parent_id, children in viewitems(by_parent):
742
if parent_id == ROOT_PARENT:
745
for child_id in children:
746
if self.final_kind(child_id) is not None:
751
# There is at least a child, so we need an existing directory to
753
kind = self.final_kind(parent_id)
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)
755
# The directory will be deleted
756
699
conflicts.append(('missing parent', parent_id))
757
700
elif kind != "directory":
758
# Meh, we need a *directory* to put something in it
759
701
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)
762
714
def _set_executability(self, path, trans_id):
763
715
"""Set the executability of versioned files """
764
if self._tree._supports_executable():
716
if supports_executable():
765
717
new_executability = self._new_executability[trans_id]
766
718
abspath = self._tree.abspath(path)
767
719
current_mode = os.stat(abspath).st_mode
768
720
if new_executability:
769
721
umask = os.umask(0)
771
to_mode = current_mode | (0o100 & ~umask)
723
to_mode = current_mode | (0100 & ~umask)
772
724
# Enable x-bit for others only if they can read it.
773
if current_mode & 0o004:
774
to_mode |= 0o001 & ~umask
775
if current_mode & 0o040:
776
to_mode |= 0o010 & ~umask
725
if current_mode & 0004:
726
to_mode |= 0001 & ~umask
727
if current_mode & 0040:
728
to_mode |= 0010 & ~umask
778
to_mode = current_mode & ~0o111
779
osutils.chmod_if_possible(abspath, to_mode)
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
781
733
def _new_entry(self, name, parent_id, file_id):
782
734
"""Helper function to create a new filesystem entry."""
828
780
self.create_symlink(target, trans_id)
831
def new_orphan(self, trans_id, parent_id):
832
"""Schedule an item to be orphaned.
834
When a directory is about to be removed, its children, if they are not
835
versioned are moved out of the way: they don't have a parent anymore.
837
:param trans_id: The trans_id of the existing item.
838
:param parent_id: The parent trans_id of the item.
840
raise NotImplementedError(self.new_orphan)
842
def _get_potential_orphans(self, dir_id):
843
"""Find the potential orphans in a directory.
845
A directory can't be safely deleted if there are versioned files in it.
846
If all the contained files are unversioned then they can be orphaned.
848
The 'None' return value means that the directory contains at least one
849
versioned file and should not be deleted.
851
:param dir_id: The directory trans id.
853
:return: A list of the orphan trans ids or None if at least one
854
versioned file is present.
857
# Find the potential orphans, stop if one item should be kept
858
for child_tid in self.by_parent()[dir_id]:
859
if child_tid in self._removed_contents:
860
# The child is removed as part of the transform. Since it was
861
# versioned before, it's not an orphan
863
elif self.final_file_id(child_tid) is None:
864
# The child is not versioned
865
orphans.append(child_tid)
867
# We have a versioned file here, searching for orphans is
873
783
def _affected_ids(self):
874
784
"""Return the set of transform ids affected by the transform"""
875
785
trans_ids = set(self._removed_id)
876
trans_ids.update(self._new_id)
786
trans_ids.update(self._new_id.keys())
877
787
trans_ids.update(self._removed_contents)
878
trans_ids.update(self._new_contents)
879
trans_ids.update(self._new_executability)
880
trans_ids.update(self._new_name)
881
trans_ids.update(self._new_parent)
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())
884
794
def _get_file_id_maps(self):
985
903
to_path = final_paths.get_path(to_trans_id)
987
from_name, from_parent, from_kind, from_executable = \
988
self._from_file_data(from_trans_id, from_versioned, from_path)
990
to_name, to_parent, to_kind, to_executable = \
991
self._to_file_data(to_trans_id, from_trans_id, from_executable)
993
904
if from_kind != to_kind:
995
906
elif to_kind in ('file', 'symlink') and (
996
to_trans_id != from_trans_id
997
or to_trans_id in self._new_contents):
907
to_trans_id != from_trans_id or
908
to_trans_id in self._new_contents):
999
if (not modified and from_versioned == to_versioned
1000
and from_parent == to_parent and from_name == to_name
1001
and from_executable == to_executable):
910
if (not modified and from_versioned == to_versioned and
911
from_parent==to_parent and from_name == to_name and
912
from_executable == to_executable):
1003
914
results.append((file_id, (from_path, to_path), modified,
1004
(from_versioned, to_versioned),
1005
(from_parent, to_parent),
1006
(from_name, to_name),
1007
(from_kind, to_kind),
1008
(from_executable, to_executable)))
1012
return (paths[0] or '', paths[1] or '')
1013
return iter(sorted(results, key=path_key))
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]))
1015
922
def get_preview_tree(self):
1016
923
"""Return a tree representing the result of the transform.
1021
928
return _PreviewTree(self)
1023
def commit(self, branch, message, merge_parents=None, strict=False,
1024
timestamp=None, timezone=None, committer=None, authors=None,
1025
revprops=None, revision_id=None):
930
def commit(self, branch, message, merge_parents=None, strict=False):
1026
931
"""Commit the result of this TreeTransform to a branch.
1028
933
:param branch: The branch to commit to.
1029
934
:param message: The message to attach to the commit.
1030
:param merge_parents: Additional parent revision-ids specified by
1032
:param strict: If True, abort the commit if there are unversioned
1034
:param timestamp: if not None, seconds-since-epoch for the time and
1035
date. (May be a float.)
1036
:param timezone: Optional timezone for timestamp, as an offset in
1038
:param committer: Optional committer in email-id format.
1039
(e.g. "J Random Hacker <jrandom@example.com>")
1040
:param authors: Optional list of authors in email-id format.
1041
:param revprops: Optional dictionary of revision properties.
1042
:param revision_id: Optional revision id. (Specifying a revision-id
1043
may reduce performance for some non-native formats.)
935
:param merge_parents: Additional parents specified by pending merges.
1044
936
:return: The revision_id of the revision committed.
1046
938
self._check_malformed()
1079
965
return revision_id
1081
967
def _text_parent(self, trans_id):
1082
path = self.tree_path(trans_id)
968
file_id = self.tree_file_id(trans_id)
1084
if path is None or self._tree.kind(path) != 'file':
970
if file_id is None or self._tree.kind(file_id) != 'file':
1086
972
except errors.NoSuchFile:
1090
976
def _get_parents_texts(self, trans_id):
1091
977
"""Get texts for compression parents of this file."""
1092
path = self._text_parent(trans_id)
978
file_id = self._text_parent(trans_id)
1095
return (self._tree.get_file_text(path),)
981
return (self._tree.get_file_text(file_id),)
1097
983
def _get_parents_lines(self, trans_id):
1098
984
"""Get lines for compression parents of this file."""
1099
path = self._text_parent(trans_id)
985
file_id = self._text_parent(trans_id)
1102
return (self._tree.get_file_lines(path),)
988
return (self._tree.get_file_lines(file_id),)
1104
990
def serialize(self, serializer):
1105
991
"""Serialize this TreeTransform.
1107
993
:param serializer: A Serialiser like pack.ContainerSerializer.
1109
new_name = {k.encode('utf-8'): v.encode('utf-8')
1110
for k, v in viewitems(self._new_name)}
1111
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1112
for k, v in viewitems(self._new_parent)}
1113
new_id = {k.encode('utf-8'): v
1114
for k, v in viewitems(self._new_id)}
1115
new_executability = {k.encode('utf-8'): int(v)
1116
for k, v in viewitems(self._new_executability)}
1117
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1118
for k, v in viewitems(self._tree_path_ids)}
1119
non_present_ids = {k: v.encode('utf-8')
1120
for k, v in viewitems(self._non_present_ids)}
1121
removed_contents = [trans_id.encode('utf-8')
1122
for trans_id in self._removed_contents]
1123
removed_id = [trans_id.encode('utf-8')
1124
for trans_id in self._removed_id]
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())
1126
b'_id_number': self._id_number,
1127
b'_new_name': new_name,
1128
b'_new_parent': new_parent,
1129
b'_new_executability': new_executability,
1131
b'_tree_path_ids': tree_path_ids,
1132
b'_removed_id': removed_id,
1133
b'_removed_contents': removed_contents,
1134
b'_non_present_ids': non_present_ids,
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,
1136
1012
yield serializer.bytes_record(bencode.bencode(attribs),
1138
for trans_id, kind in sorted(viewitems(self._new_contents)):
1014
for trans_id, kind in self._new_contents.items():
1139
1015
if kind == 'file':
1140
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1141
lines = cur_file.readlines()
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1142
1018
parents = self._get_parents_lines(trans_id)
1143
1019
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1144
content = b''.join(mpdiff.to_patch())
1020
content = ''.join(mpdiff.to_patch())
1145
1021
if kind == 'directory':
1147
1023
if kind == 'symlink':
1148
1024
content = self._read_symlink_target(trans_id)
1149
if not isinstance(content, bytes):
1150
content = content.encode('utf-8')
1151
yield serializer.bytes_record(
1152
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
1154
1027
def deserialize(self, records):
1155
1028
"""Deserialize a stored TreeTransform.
1157
1030
:param records: An iterable of (names, content) tuples, as per
1158
1031
pack.ContainerPushParser.
1160
names, content = next(records)
1033
names, content = records.next()
1161
1034
attribs = bencode.bdecode(content)
1162
self._id_number = attribs[b'_id_number']
1163
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1164
for k, v in viewitems(attribs[b'_new_name'])}
1165
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1166
for k, v in viewitems(attribs[b'_new_parent'])}
1167
self._new_executability = {
1168
k.decode('utf-8'): bool(v)
1169
for k, v in viewitems(attribs[b'_new_executability'])}
1170
self._new_id = {k.decode('utf-8'): v
1171
for k, v in viewitems(attribs[b'_new_id'])}
1172
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
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())
1173
1043
self._tree_path_ids = {}
1174
1044
self._tree_id_paths = {}
1175
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1176
1046
path = bytepath.decode('utf-8')
1177
trans_id = trans_id.decode('utf-8')
1178
1047
self._tree_path_ids[path] = trans_id
1179
1048
self._tree_id_paths[trans_id] = path
1180
self._removed_id = {trans_id.decode('utf-8')
1181
for trans_id in attribs[b'_removed_id']}
1182
self._removed_contents = set(
1183
trans_id.decode('utf-8')
1184
for trans_id in attribs[b'_removed_contents'])
1185
self._non_present_ids = {
1186
k: v.decode('utf-8')
1187
for k, v in viewitems(attribs[b'_non_present_ids'])}
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']
1188
1052
for ((trans_id, kind),), content in records:
1189
trans_id = trans_id.decode('utf-8')
1190
kind = kind.decode('ascii')
1191
1053
if kind == 'file':
1192
1054
mpdiff = multiparent.MultiParent.from_patch(content)
1193
1055
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1327
1173
descendants.update(self._limbo_descendants(descendant))
1328
1174
return descendants
1330
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1176
def create_file(self, contents, trans_id, mode_id=None):
1331
1177
"""Schedule creation of a new file.
1335
:param contents: an iterator of strings, all of which will be written
1336
to the target destination.
1337
:param trans_id: TreeTransform handle
1338
:param mode_id: If not None, force the mode of the target file to match
1339
the mode of the object referenced by mode_id.
1340
Otherwise, we will try to preserve mode bits of an existing file.
1341
:param sha1: If the sha1 of this content is already known, pass it in.
1342
We can use it to prevent future sha1 computations.
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.
1344
1187
name = self._limbo_name(trans_id)
1345
with open(name, 'wb') as f:
1346
unique_add(self._new_contents, trans_id, 'file')
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.
1347
1199
f.writelines(contents)
1348
1202
self._set_mtime(name)
1349
1203
self._set_mode(trans_id, mode_id, S_ISREG)
1350
# It is unfortunate we have to use lstat instead of fstat, but we just
1351
# used utime and chmod on the file, so we need the accurate final
1353
if sha1 is not None:
1354
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
def _read_file_chunks(self, trans_id):
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1208
return cur_file.readlines()
1356
1212
def _read_symlink_target(self, trans_id):
1357
1213
return os.readlink(self._limbo_name(trans_id))
1420
1274
del self._limbo_children_names[trans_id]
1421
1275
delete_any(self._limbo_name(trans_id))
1423
def new_orphan(self, trans_id, parent_id):
1424
conf = self._tree.get_config_stack()
1425
handle_orphan = conf.get('transform.orphan_policy')
1426
handle_orphan(self, trans_id, parent_id)
1429
class OrphaningError(errors.BzrError):
1431
# Only bugs could lead to such exception being seen by the user
1432
internal_error = True
1433
_fmt = "Error while orphaning %s in %s directory"
1435
def __init__(self, orphan, parent):
1436
errors.BzrError.__init__(self)
1437
self.orphan = orphan
1438
self.parent = parent
1441
class OrphaningForbidden(OrphaningError):
1443
_fmt = "Policy: %s doesn't allow creating orphans."
1445
def __init__(self, policy):
1446
errors.BzrError.__init__(self)
1447
self.policy = policy
1450
def move_orphan(tt, orphan_id, parent_id):
1451
"""See TreeTransformBase.new_orphan.
1453
This creates a new orphan in the `brz-orphans` dir at the root of the
1456
:param tt: The TreeTransform orphaning `trans_id`.
1458
:param orphan_id: The trans id that should be orphaned.
1460
:param parent_id: The orphan parent trans id.
1462
# Add the orphan dir if it doesn't exist
1463
orphan_dir_basename = 'brz-orphans'
1464
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1465
if tt.final_kind(od_id) is None:
1466
tt.create_directory(od_id)
1467
parent_path = tt._tree_id_paths[parent_id]
1468
# Find a name that doesn't exist yet in the orphan dir
1469
actual_name = tt.final_name(orphan_id)
1470
new_name = tt._available_backup_name(actual_name, od_id)
1471
tt.adjust_path(new_name, od_id, orphan_id)
1472
trace.warning('%s has been orphaned in %s'
1473
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1476
def refuse_orphan(tt, orphan_id, parent_id):
1477
"""See TreeTransformBase.new_orphan.
1479
This refuses to create orphan, letting the caller handle the conflict.
1481
raise OrphaningForbidden('never')
1484
orphaning_registry = registry.Registry()
1485
orphaning_registry.register(
1486
u'conflict', refuse_orphan,
1487
'Leave orphans in place and create a conflict on the directory.')
1488
orphaning_registry.register(
1489
u'move', move_orphan,
1490
'Move orphans into the brz-orphans directory.')
1491
orphaning_registry._set_default_key(u'conflict')
1494
opt_transform_orphan = _mod_config.RegistryOption(
1495
'transform.orphan_policy', orphaning_registry,
1496
help='Policy for orphaned files during transform operations.',
1500
1278
class TreeTransform(DiskTreeTransform):
1501
1279
"""Represent a tree transformation.
1787
1571
inventory_delta.append((path, None, file_id, None))
1788
1572
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1574
entries = self._tree.iter_entries_by_dir(
1575
new_path_file_ids.values())
1576
old_paths = dict((e.file_id, p) for p, e in entries)
1790
1578
for num, (path, trans_id) in enumerate(new_paths):
1791
1579
if (num % 10) == 0:
1792
child_pb.update(gettext('adding file'),
1580
child_pb.update('adding file',
1793
1581
num + len(self._removed_id), total_entries)
1794
1582
file_id = new_path_file_ids[trans_id]
1795
1583
if file_id is None:
1797
kind = self.final_kind(trans_id)
1799
kind = self._tree.stored_kind(
1800
self._tree.id2path(file_id), file_id)
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1801
1590
parent_trans_id = self.final_parent(trans_id)
1802
1591
parent_file_id = new_path_file_ids.get(parent_trans_id)
1803
1592
if parent_file_id is None:
1833
1621
If inventory_delta is None, no inventory delta generation is performed.
1835
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1836
with ui.ui_factory.nested_progress_bar() as child_pb:
1837
for num, (path, trans_id) in enumerate(tree_paths):
1838
# do not attempt to move root into a subdirectory of itself.
1841
child_pb.update(gettext('removing file'), num, len(tree_paths))
1623
tree_paths = list(self._tree_path_ids.iteritems())
1624
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1629
child_pb.update('removing file', num, len(tree_paths))
1842
1630
full_path = self._tree.abspath(path)
1843
1631
if trans_id in self._removed_contents:
1844
1632
delete_path = os.path.join(self._deletiondir, trans_id)
1845
1633
mover.pre_delete(full_path, delete_path)
1846
elif (trans_id in self._new_name or
1847
trans_id in self._new_parent):
1634
elif (trans_id in self._new_name
1635
or trans_id in self._new_parent):
1849
1637
mover.rename(full_path, self._limbo_name(trans_id))
1850
except errors.TransformRenameFailed as e:
1851
1639
if e.errno != errno.ENOENT:
1854
1642
self.rename_count += 1
1856
1646
def _apply_insertions(self, mover):
1857
1647
"""Perform tree operations that insert directory/inventory names.
1866
1656
new_paths = self.new_paths(filesystem_only=True)
1867
1657
modified_paths = []
1868
with ui.ui_factory.nested_progress_bar() as child_pb:
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()
1869
1662
for num, (path, trans_id) in enumerate(new_paths):
1870
1663
if (num % 10) == 0:
1871
child_pb.update(gettext('adding file'),
1872
num, len(new_paths))
1664
child_pb.update('adding file', num, len(new_paths))
1873
1665
full_path = self._tree.abspath(path)
1874
1666
if trans_id in self._needs_rename:
1876
1668
mover.rename(self._limbo_name(trans_id), full_path)
1877
except errors.TransformRenameFailed as e:
1878
1670
# We may be renaming a dangling inventory id
1879
1671
if e.errno != errno.ENOENT:
1882
1674
self.rename_count += 1
1883
# TODO: if trans_id in self._observed_sha1s, we should
1884
# re-stat the final target, since ctime will be
1885
# updated by the change.
1886
if (trans_id in self._new_contents
1887
or self.path_changed(trans_id)):
1675
if (trans_id in self._new_contents or
1676
self.path_changed(trans_id)):
1888
1677
if trans_id in self._new_contents:
1889
1678
modified_paths.append(full_path)
1890
1679
if trans_id in self._new_executability:
1891
1680
self._set_executability(path, trans_id)
1892
if trans_id in self._observed_sha1s:
1893
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1894
st = osutils.lstat(full_path)
1895
self._observed_sha1s[trans_id] = (o_sha1, st)
1896
for path, trans_id in new_paths:
1897
# new_paths includes stuff like workingtree conflicts. Only the
1898
# stuff in new_contents actually comes from limbo.
1899
if trans_id in self._limbo_files:
1900
del self._limbo_files[trans_id]
1901
1683
self._new_contents.clear()
1902
1684
return modified_paths
1904
def _apply_observed_sha1s(self):
1905
"""After we have finished renaming everything, update observed sha1s
1907
This has to be done after self._tree.apply_inventory_delta, otherwise
1908
it doesn't know anything about the files we are updating. Also, we want
1909
to do this as late as possible, so that most entries end up cached.
1911
# TODO: this doesn't update the stat information for directories. So
1912
# the first 'bzr status' will still need to rewrite
1913
# .bzr/checkout/dirstate. However, we at least don't need to
1914
# re-read all of the files.
1915
# TODO: If the operation took a while, we could do a time.sleep(3) here
1916
# to allow the clock to tick over and ensure we won't have any
1917
# problems. (we could observe start time, and finish time, and if
1918
# it is less than eg 10% overhead, add a sleep call.)
1919
paths = FinalPaths(self)
1920
for trans_id, observed in viewitems(self._observed_sha1s):
1921
path = paths.get_path(trans_id)
1922
self._tree._observed_sha1(path, observed)
1925
1687
class TransformPreview(DiskTreeTransform):
1926
1688
"""A TreeTransform for generating preview trees.
2010
1766
except errors.NoSuchRevisionInTree:
2011
1767
yield self._get_repository().revision_tree(revision_id)
2013
def _get_file_revision(self, path, file_id, vf, tree_revision):
2015
(file_id, t.get_file_revision(t.id2path(file_id)))
2016
for t in self._iter_parent_trees()]
1769
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1771
self._iter_parent_trees()]
2017
1772
vf.add_lines((file_id, tree_revision), parent_keys,
2018
self.get_file_lines(path))
1773
self.get_file(file_id).readlines())
2019
1774
repo = self._get_repository()
2020
1775
base_vf = repo.texts
2021
1776
if base_vf not in vf.fallback_versionedfiles:
2022
1777
vf.fallback_versionedfiles.append(base_vf)
2023
1778
return tree_revision
2025
def _stat_limbo_file(self, trans_id):
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2026
1782
name = self._transform._limbo_name(trans_id)
2027
1783
return os.lstat(name)
2207
1937
ordered_ids = self._list_files_by_dir()
2208
1938
for entry, trans_id in self._make_inv_entries(ordered_ids,
2210
yield self._final_paths.get_path(trans_id), entry
1939
specific_file_ids, yield_parents=yield_parents):
1940
yield unicode(self._final_paths.get_path(trans_id)), entry
2212
1942
def _iter_entries_for_dir(self, dir_path):
2213
1943
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
2214
1945
ordered_ids = []
2215
dir_trans_id = self._path2trans_id(dir_path)
2216
dir_id = self._transform.final_file_id(dir_trans_id)
2217
for child_trans_id in self._all_children(dir_trans_id):
2218
ordered_ids.append((child_trans_id, dir_id))
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))
2220
1949
for entry, trans_id in self._make_inv_entries(ordered_ids):
2221
path_entries.append((self._final_paths.get_path(trans_id), entry))
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2225
1952
def list_files(self, include_root=False, from_dir=None, recursive=True):
2226
1953
"""See WorkingTree.list_files."""
2227
1954
# XXX This should behave like WorkingTree.list_files, but is really
2228
1955
# more like RevisionTree.list_files.
2245
1970
if from_dir is None and include_root is True:
2246
1971
root_entry = inventory.make_entry('directory', '',
2247
ROOT_PARENT, self.get_root_id())
1972
ROOT_PARENT, self.get_root_id())
2248
1973
yield '', 'V', 'directory', root_entry.file_id, root_entry
2249
1974
entries = self._iter_entries_for_dir(from_dir or '')
2250
1975
for path, entry in entries:
2251
1976
yield path, 'V', entry.kind, entry.file_id, entry
2253
def kind(self, path):
2254
trans_id = self._path2trans_id(path)
2255
if trans_id is None:
2256
raise errors.NoSuchFile(path)
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2257
1980
return self._transform.final_kind(trans_id)
2259
def stored_kind(self, path):
2260
trans_id = self._path2trans_id(path)
2261
if trans_id is None:
2262
raise errors.NoSuchFile(path)
1982
def stored_kind(self, file_id):
1983
trans_id = self._transform.trans_id_file_id(file_id)
2264
1985
return self._transform._new_contents[trans_id]
2265
1986
except KeyError:
2266
return self._transform._tree.stored_kind(path)
1987
return self._transform._tree.stored_kind(file_id)
2268
def get_file_mtime(self, path):
1989
def get_file_mtime(self, file_id, path=None):
2269
1990
"""See Tree.get_file_mtime"""
2270
file_id = self.path2id(path)
2272
raise errors.NoSuchFile(path)
2273
1991
if not self._content_change(file_id):
2274
return self._transform._tree.get_file_mtime(
2275
self._transform._tree.id2path(file_id))
2276
trans_id = self._path2trans_id(path)
2277
return self._stat_limbo_file(trans_id).st_mtime
2279
def get_file_size(self, path):
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):
2280
1999
"""See Tree.get_file_size"""
2281
trans_id = self._path2trans_id(path)
2282
if trans_id is None:
2283
raise errors.NoSuchFile(path)
2284
kind = self._transform.final_kind(trans_id)
2287
if trans_id in self._transform._new_contents:
2288
return self._stat_limbo_file(trans_id).st_size
2289
if self.kind(path) == 'file':
2290
return self._transform._tree.get_file_size(path)
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2294
def get_file_verifier(self, path, stat_value=None):
2295
trans_id = self._path2trans_id(path)
2296
if trans_id is None:
2297
raise errors.NoSuchFile(path)
2298
kind = self._transform._new_contents.get(trans_id)
2300
return self._transform._tree.get_file_verifier(path)
2302
with self.get_file(path) as fileobj:
2303
return ("SHA1", sha_file(fileobj))
2305
def get_file_sha1(self, path, stat_value=None):
2306
trans_id = self._path2trans_id(path)
2307
if trans_id is None:
2308
raise errors.NoSuchFile(path)
2309
kind = self._transform._new_contents.get(trans_id)
2311
return self._transform._tree.get_file_sha1(path)
2313
with self.get_file(path) as fileobj:
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)
2314
2013
return sha_file(fileobj)
2316
def is_executable(self, path):
2317
trans_id = self._path2trans_id(path)
2318
if trans_id is None:
2017
def is_executable(self, file_id, path=None):
2020
trans_id = self._transform.trans_id_file_id(file_id)
2321
2022
return self._transform._new_executability[trans_id]
2322
2023
except KeyError:
2324
return self._transform._tree.is_executable(path)
2325
except OSError as e:
2025
return self._transform._tree.is_executable(file_id, path)
2326
2027
if e.errno == errno.ENOENT:
2329
except errors.NoSuchFile:
2030
except errors.NoSuchId:
2332
def has_filename(self, path):
2333
trans_id = self._path2trans_id(path)
2334
if trans_id in self._transform._new_contents:
2336
elif trans_id in self._transform._removed_contents:
2339
return self._transform._tree.has_filename(path)
2341
2033
def path_content_summary(self, path):
2342
2034
trans_id = self._path2trans_id(path)
2343
2035
tt = self._transform
2365
2057
executable = None
2366
2058
if kind == 'symlink':
2367
link_or_sha1 = os.readlink(limbo_name)
2368
if not isinstance(link_or_sha1, text_type):
2369
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2059
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2370
2060
executable = tt._new_executability.get(trans_id, executable)
2371
2061
return kind, size, executable, link_or_sha1
2373
2063
def iter_changes(self, from_tree, include_unchanged=False,
2374
specific_files=None, pb=None, extra_trees=None,
2375
require_versioned=True, want_unversioned=False):
2064
specific_files=None, pb=None, extra_trees=None,
2065
require_versioned=True, want_unversioned=False):
2376
2066
"""See InterTree.iter_changes.
2378
2068
This has a fast path that is only used when the from_tree matches
2379
2069
the transform tree, and no fancy options are supplied.
2381
if (from_tree is not self._transform._tree or include_unchanged
2382
or specific_files or want_unversioned):
2071
if (from_tree is not self._transform._tree or include_unchanged or
2072
specific_files or want_unversioned):
2383
2073
return tree.InterTree(from_tree, self).iter_changes(
2384
2074
include_unchanged=include_unchanged,
2385
2075
specific_files=specific_files,
2391
2081
raise ValueError('want_unversioned is not supported')
2392
2082
return self._transform.iter_changes()
2394
def get_file(self, path):
2084
def get_file(self, file_id, path=None):
2395
2085
"""See Tree.get_file"""
2396
file_id = self.path2id(path)
2397
2086
if not self._content_change(file_id):
2398
return self._transform._tree.get_file(path)
2399
trans_id = self._path2trans_id(path)
2087
return self._transform._tree.get_file(file_id, path)
2088
trans_id = self._transform.trans_id_file_id(file_id)
2400
2089
name = self._transform._limbo_name(trans_id)
2401
2090
return open(name, 'rb')
2403
def get_file_with_stat(self, path):
2404
return self.get_file(path), None
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2406
def annotate_iter(self, path,
2095
def annotate_iter(self, file_id,
2407
2096
default_revision=_mod_revision.CURRENT_REVISION):
2408
file_id = self.path2id(path)
2409
2097
changes = self._iter_changes_cache.get(file_id)
2410
2098
if changes is None:
2557
2243
:param delta_from_tree: If true, build_tree may use the input Tree to
2558
2244
generate the inventory delta.
2560
with wt.lock_tree_write(), tree.lock_read():
2561
if accelerator_tree is not None:
2562
accelerator_tree.lock_read()
2246
wt.lock_tree_write()
2564
return _build_tree(tree, wt, accelerator_tree, hardlink,
2567
2250
if accelerator_tree is not None:
2568
accelerator_tree.unlock()
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()
2571
2264
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2572
2265
"""See build_tree."""
2573
for num, _unused in enumerate(wt.all_versioned_paths()):
2266
for num, _unused in enumerate(wt.all_file_ids()):
2574
2267
if num > 0: # more than just a root
2575
2268
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)
2576
2272
file_trans_id = {}
2577
top_pb = ui.ui_factory.nested_progress_bar()
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2578
2274
pp = ProgressPhase("Build phase", 2, top_pb)
2579
if tree.get_root_id() is not None:
2275
if tree.inventory.root is not None:
2580
2276
# This is kind of a hack: we should be altering the root
2581
2277
# as part of the regular tree shape diff logic.
2582
2278
# The conditional test here is to avoid doing an
2593
2289
pp.next_phase()
2594
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2595
with ui.ui_factory.nested_progress_bar() as pb:
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()
2596
2294
deferred_contents = []
2598
total = len(tree.all_versioned_paths())
2296
total = len(tree.inventory)
2599
2297
if delta_from_tree:
2600
2298
precomputed_delta = []
2602
2300
precomputed_delta = None
2603
# Check if tree inventory has content. If so, we populate
2604
# existing_files with the directory content. If there are no
2605
# entries we skip populating existing_files as its not used.
2606
# This improves performance and unncessary work on large
2607
# directory trees. (#501307)
2609
existing_files = set()
2610
for dir, files in wt.walkdirs():
2611
existing_files.update(f[0] for f in files)
2612
2301
for num, (tree_path, entry) in \
2613
enumerate(tree.iter_entries_by_dir()):
2614
pb.update(gettext("Building tree"), num
2615
- len(deferred_contents), total)
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2616
2304
if entry.parent_id is None:
2618
2306
reparent = False
2643
2330
trans_id = tt.create_path(entry.name, parent_id)
2644
2331
file_trans_id[file_id] = trans_id
2645
2332
tt.version_file(file_id, trans_id)
2646
executable = tree.is_executable(tree_path)
2333
executable = tree.is_executable(file_id, tree_path)
2648
2335
tt.set_executability(executable, trans_id)
2649
trans_data = (trans_id, file_id,
2650
tree_path, entry.text_sha1)
2651
deferred_contents.append((tree_path, trans_data))
2336
trans_data = (trans_id, tree_path)
2337
deferred_contents.append((file_id, trans_data))
2653
file_trans_id[file_id] = new_by_entry(
2654
tree_path, tt, entry, parent_id, tree)
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2656
2342
new_trans_id = file_trans_id[file_id]
2657
2343
old_parent = tt.trans_id_tree_path(tree_path)
2690
2376
new_desired_files = desired_files
2692
2378
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2693
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2694
2380
in iter if not (c or e[0] != e[1])]
2695
2381
if accelerator_tree.supports_content_filtering():
2696
unchanged = [(tp, ap) for (tp, ap) in unchanged
2697
if not next(accelerator_tree.iter_search_rules([ap]))]
2382
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2698
2384
unchanged = dict(unchanged)
2699
2385
new_desired_files = []
2701
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2702
accelerator_path = unchanged.get(tree_path)
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2703
2389
if accelerator_path is None:
2704
new_desired_files.append((tree_path,
2705
(trans_id, file_id, tree_path, text_sha1)))
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2707
pb.update(gettext('Adding file contents'), count + offset, total)
2392
pb.update('Adding file contents', count + offset, total)
2709
2394
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2712
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2713
chunks = osutils.file_iterator(f)
2714
if wt.supports_content_filtering():
2715
filters = wt._content_filter_stack(tree_path)
2716
chunks = filtered_output_bytes(chunks, filters,
2717
ContentFilterContext(tree_path, tree))
2718
tt.create_file(chunks, trans_id, sha1=text_sha1)
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
2720
2411
offset += count
2721
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2722
2413
tree.iter_files_bytes(new_desired_files)):
2723
2414
if wt.supports_content_filtering():
2724
2415
filters = wt._content_filter_stack(tree_path)
2725
2416
contents = filtered_output_bytes(contents, filters,
2726
ContentFilterContext(tree_path, tree))
2727
tt.create_file(contents, trans_id, sha1=text_sha1)
2728
pb.update(gettext('Adding file contents'), count + offset, total)
2417
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2731
2422
def _reparent_children(tt, old_parent, new_parent):
2732
2423
for child in tt.iter_tree_children(old_parent):
2733
2424
tt.adjust_path(tt.final_name(child), new_parent, child)
2736
2426
def _reparent_transform_children(tt, old_parent, new_parent):
2737
2427
by_parent = tt.by_parent()
2738
2428
for child in by_parent[old_parent]:
2739
2429
tt.adjust_path(tt.final_name(child), new_parent, child)
2740
2430
return by_parent[old_parent]
2743
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2432
def _content_match(tree, entry, file_id, kind, target_path):
2744
2433
if entry.kind != kind:
2746
2435
if entry.kind == "directory":
2748
2437
if entry.kind == "file":
2749
with open(target_path, 'rb') as f1, \
2750
tree.get_file(tree_path) as f2:
2751
if osutils.compare_files(f1, f2):
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2753
2440
elif entry.kind == "symlink":
2754
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2775
2462
final_parent = tt.final_parent(old_file)
2776
2463
if new_file in divert:
2777
new_name = tt.final_name(old_file) + '.diverted'
2464
new_name = tt.final_name(old_file)+'.diverted'
2778
2465
tt.adjust_path(new_name, final_parent, new_file)
2779
2466
new_conflicts.add((c_type, 'Diverted to',
2780
2467
new_file, old_file))
2782
new_name = tt.final_name(old_file) + '.moved'
2469
new_name = tt.final_name(old_file)+'.moved'
2783
2470
tt.adjust_path(new_name, final_parent, old_file)
2784
2471
new_conflicts.add((c_type, 'Moved existing file to',
2785
2472
old_file, new_file))
2786
2473
return new_conflicts
2789
def new_by_entry(path, tt, entry, parent_id, tree):
2476
def new_by_entry(tt, entry, parent_id, tree):
2790
2477
"""Create a new file according to its inventory entry"""
2791
2478
name = entry.name
2792
2479
kind = entry.kind
2793
2480
if kind == 'file':
2794
with tree.get_file(path) as f:
2795
executable = tree.is_executable(path)
2797
name, parent_id, osutils.file_iterator(f), entry.file_id,
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,
2799
2485
elif kind in ('directory', 'tree-reference'):
2800
2486
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2801
2487
if kind == 'tree-reference':
2802
2488
tt.set_tree_reference(entry.reference_revision, trans_id)
2803
2489
return trans_id
2804
2490
elif kind == 'symlink':
2805
target = tree.get_symlink_target(path)
2491
target = tree.get_symlink_target(entry.file_id)
2806
2492
return tt.new_symlink(name, parent_id, target, entry.file_id)
2808
2494
raise errors.BadFileKindError(name, kind)
2811
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2812
filter_tree_path=None):
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):
2813
2515
"""Create new file contents according to tree contents.
2815
2517
:param filter_tree_path: the tree path to use to lookup
2816
2518
content filters to apply to the bytes output in the working tree.
2817
2519
This only applies if the working tree supports content filtering.
2819
kind = tree.kind(path)
2521
kind = tree.kind(file_id)
2820
2522
if kind == 'directory':
2821
2523
tt.create_directory(trans_id)
2822
2524
elif kind == "file":
2824
f = tree.get_file(path)
2825
chunks = osutils.file_iterator(f)
2830
if wt.supports_content_filtering() and filter_tree_path is not None:
2831
filters = wt._content_filter_stack(filter_tree_path)
2832
chunks = filtered_output_bytes(
2834
ContentFilterContext(filter_tree_path, tree))
2835
tt.create_file(chunks, trans_id)
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)
2839
2537
elif kind == "symlink":
2840
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2842
2540
raise AssertionError('Unknown kind %r' % kind)
2848
2546
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
2851
2592
def revert(working_tree, target_tree, filenames, backups=False,
2852
2593
pb=None, change_reporter=None):
2853
2594
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2854
2596
pb = ui.ui_factory.nested_progress_bar()
2597
tt = TreeTransform(working_tree, pb)
2856
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2857
pp = ProgressPhase("Revert phase", 3, pb)
2858
conflicts, merge_modified = _prepare_revert_transform(
2859
working_tree, target_tree, tt, filenames, backups, pp)
2861
change_reporter = delta._ChangeReporter(
2862
unversioned_filter=working_tree.is_ignored)
2863
delta.report_changes(tt.iter_changes(), change_reporter)
2864
for conflict in conflicts:
2865
trace.warning(text_type(conflict))
2868
if working_tree.supports_merge_modified():
2869
working_tree.set_merge_modified(merge_modified)
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)
2612
target_tree.unlock()
2872
2615
return conflicts
2875
2618
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2876
2619
backups, pp, basis_tree=None,
2877
2620
merge_modified=None):
2878
with ui.ui_factory.nested_progress_bar() as child_pb:
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2879
2623
if merge_modified is None:
2880
2624
merge_modified = working_tree.merge_modified()
2881
2625
merge_modified = _alter_files(working_tree, target_tree, tt,
2882
2626
child_pb, filenames, backups,
2883
2627
merge_modified, basis_tree)
2884
with ui.ui_factory.nested_progress_bar() as child_pb:
2885
raw_conflicts = resolve_conflicts(
2886
tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))
2630
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2632
raw_conflicts = resolve_conflicts(tt, child_pb,
2633
lambda t, c: conflict_pass(t, c, target_tree))
2887
2636
conflicts = cook_conflicts(raw_conflicts, tt)
2888
2637
return conflicts, merge_modified
2892
2641
backups, merge_modified, basis_tree=None):
2893
2642
if basis_tree is not None:
2894
2643
basis_tree.lock_read()
2895
# We ask the working_tree for its changes relative to the target, rather
2896
# than the target changes relative to the working tree. Because WT4 has an
2897
# optimizer to compare itself to a target, but no optimizer for the
2899
change_list = working_tree.iter_changes(
2900
target_tree, specific_files=specific_files, pb=pb)
2901
if not target_tree.is_versioned(u''):
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:
2902
2647
skip_root = True
2904
2649
skip_root = False
2906
2651
deferred_files = []
2907
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2908
kind, executable) in enumerate(change_list):
2909
target_path, wt_path = path
2910
target_versioned, wt_versioned = versioned
2911
target_parent, wt_parent = parent
2912
target_name, wt_name = name
2913
target_kind, wt_kind = kind
2914
target_executable, wt_executable = executable
2915
if skip_root and wt_parent is None:
2653
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2917
2656
trans_id = tt.trans_id_file_id(file_id)
2919
2658
if changed_content:
2920
2659
keep_content = False
2921
if wt_kind == 'file' and (backups or target_kind is None):
2922
wt_sha1 = working_tree.get_file_sha1(wt_path)
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2923
2662
if merge_modified.get(file_id) != wt_sha1:
2924
2663
# acquire the basis tree lazily to prevent the
2925
2664
# expense of accessing it when it's not needed ?
2927
2666
if basis_tree is None:
2928
2667
basis_tree = working_tree.basis_tree()
2929
2668
basis_tree.lock_read()
2930
basis_path = find_previous_path(
2931
working_tree, basis_tree, wt_path)
2932
if basis_path is None:
2933
if target_kind is None and not target_versioned:
2936
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2938
if wt_kind is not None:
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:
2939
2675
if not keep_content:
2940
2676
tt.delete_contents(trans_id)
2941
elif target_kind is not None:
2942
parent_trans_id = tt.trans_id_file_id(wt_parent)
2943
backup_name = tt._available_backup_name(
2944
wt_name, parent_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)
2945
2682
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2946
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2947
if wt_versioned and target_versioned:
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2948
2685
tt.unversion_file(trans_id)
2949
2686
tt.version_file(file_id, new_trans_id)
2950
2687
# New contents should have the same unix perms as old
2952
2689
mode_id = trans_id
2953
2690
trans_id = new_trans_id
2954
if target_kind in ('directory', 'tree-reference'):
2691
if kind[1] in ('directory', 'tree-reference'):
2955
2692
tt.create_directory(trans_id)
2956
if target_kind == 'tree-reference':
2957
revision = target_tree.get_reference_revision(
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2959
2696
tt.set_tree_reference(revision, trans_id)
2960
elif target_kind == 'symlink':
2961
tt.create_symlink(target_tree.get_symlink_target(
2962
target_path), trans_id)
2963
elif target_kind == 'file':
2964
deferred_files.append(
2965
(target_path, (trans_id, mode_id, file_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)))
2966
2702
if basis_tree is None:
2967
2703
basis_tree = working_tree.basis_tree()
2968
2704
basis_tree.lock_read()
2969
new_sha1 = target_tree.get_file_sha1(target_path)
2970
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2971
if (basis_path is not None and
2972
new_sha1 == basis_tree.get_file_sha1(basis_path)):
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)):
2973
2708
if file_id in merge_modified:
2974
2709
del merge_modified[file_id]
2976
2711
merge_modified[file_id] = new_sha1
2978
2713
# preserve the execute bit when backing up
2979
if keep_content and wt_executable == target_executable:
2980
tt.set_executability(target_executable, trans_id)
2981
elif target_kind is not None:
2982
raise AssertionError(target_kind)
2983
if not wt_versioned and target_versioned:
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):
2984
2719
tt.version_file(file_id, trans_id)
2985
if wt_versioned and not target_versioned:
2720
if versioned == (True, False):
2986
2721
tt.unversion_file(trans_id)
2987
if (target_name is not None
2988
and (wt_name != target_name or wt_parent != target_parent)):
2989
if target_name == '' and target_parent is None:
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:
2990
2725
parent_trans = ROOT_PARENT
2992
parent_trans = tt.trans_id_file_id(target_parent)
2993
if wt_parent is None and wt_versioned:
2994
tt.adjust_root_path(target_name, parent_trans)
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)
2996
tt.adjust_path(target_name, parent_trans, trans_id)
2997
if wt_executable != target_executable and target_kind == "file":
2998
tt.set_executability(target_executable, trans_id)
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)
2999
2734
if working_tree.supports_content_filtering():
3000
for (trans_id, mode_id, file_id), bytes in (
3001
target_tree.iter_files_bytes(deferred_files)):
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]
3002
2738
# We're reverting a tree to the target tree so using the
3003
2739
# target tree to find the file path seems the best choice
3004
2740
# here IMO - Ian C 27/Oct/2009
3005
2741
filter_tree_path = target_tree.id2path(file_id)
3006
2742
filters = working_tree._content_filter_stack(filter_tree_path)
3007
bytes = filtered_output_bytes(
2743
bytes = filtered_output_bytes(bytes, filters,
3009
2744
ContentFilterContext(filter_tree_path, working_tree))
3010
2745
tt.create_file(bytes, trans_id, mode_id)
3012
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2747
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3014
2749
tt.create_file(bytes, trans_id, mode_id)
3015
2750
tt.fixup_new_roots()
3203
2920
def rollback(self):
3204
2921
"""Reverse all renames that have been performed"""
3205
2922
for from_, to in reversed(self.past_renames):
3207
os.rename(to, from_)
3208
except OSError as e:
3209
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2923
osutils.rename(to, from_)
3210
2924
# after rollback, don't reuse _FileMover
3211
self.past_renames = None
3212
self.pending_deletions = None
2926
pending_deletions = None
3214
2928
def apply_deletions(self):
3215
2929
"""Apply all marked deletions"""
3216
2930
for path in self.pending_deletions:
3217
2931
delete_any(path)
3218
2932
# after apply_deletions, don't reuse _FileMover
3219
self.past_renames = None
3220
self.pending_deletions = None
3223
def link_tree(target_tree, source_tree):
3224
"""Where possible, hard-link files in a tree to those in another tree.
3226
:param target_tree: Tree to change
3227
:param source_tree: Tree to hard-link from
3229
tt = TreeTransform(target_tree)
3231
for (file_id, paths, changed_content, versioned, parent, name, kind,
3232
executable) in target_tree.iter_changes(source_tree,
3233
include_unchanged=True):
3236
if kind != ('file', 'file'):
3238
if executable[0] != executable[1]:
3240
trans_id = tt.trans_id_tree_path(paths[1])
3241
tt.delete_contents(trans_id)
3242
tt.create_hardlink(source_tree.abspath(paths[0]), trans_id)
2934
pending_deletions = None
added
removed
bzrlib/transform.py
