14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
33
43
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
from bzrlib.osutils import (
53
from .errors import (DuplicateKey, MalformedTransform,
54
ReusingTransform, CantMoveRoot,
55
ImmortalLimbo, NoFinalPath)
56
from .filters import filtered_output_bytes, ContentFilterContext
57
from .mutabletree import MutableTree
58
from .osutils import (
53
from bzrlib.progress import ProgressPhase
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
66
from .progress import ProgressPhase
64
77
ROOT_PARENT = "root-parent"
223
247
self._new_root = new_roots[0]
225
249
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
231
250
# unversion the new root's directory.
232
file_id = self.final_file_id(old_new_root)
251
if self.final_kind(self._new_root) is None:
252
file_id = self.final_file_id(old_new_root)
254
file_id = self.final_file_id(self._new_root)
233
255
if old_new_root in self._new_id:
234
256
self.cancel_versioning(old_new_root)
236
258
self.unversion_file(old_new_root)
237
259
# if, at this stage, root still has an old file_id, zap it so we can
238
260
# stick a new one in.
239
if (self.tree_file_id(self._new_root) is not None and
240
self._new_root not in self._removed_id):
261
if (self.tree_file_id(self._new_root) is not None
262
and self._new_root not in self._removed_id):
241
263
self.unversion_file(self._new_root)
242
self.version_file(file_id, self._new_root)
264
if file_id is not None:
265
self.version_file(file_id, self._new_root)
244
267
# Now move children of new root into old root directory.
245
268
# Ensure all children are registered with the transaction, but don't
380
391
return sorted(FinalPaths(self).get_paths(new_ids))
382
393
def _inventory_altered(self):
383
"""Get the trans_ids and paths of files needing new inv entries."""
385
for id_set in [self._new_name, self._new_parent, self._new_id,
394
"""Determine which trans_ids need new Inventory entries.
396
An new entry is needed when anything that would be reflected by an
397
inventory entry changes, including file name, file_id, parent file_id,
398
file kind, and the execute bit.
400
Some care is taken to return entries with real changes, not cases
401
where the value is deleted and then restored to its original value,
402
but some actually unchanged values may be returned.
404
:returns: A list of (path, trans_id) for all items requiring an
405
inventory change. Ordered by path.
408
# Find entries whose file_ids are new (or changed).
409
new_file_id = set(t for t in self._new_id
410
if self._new_id[t] != self.tree_file_id(t))
411
for id_set in [self._new_name, self._new_parent, new_file_id,
386
412
self._new_executability]:
387
new_ids.update(id_set)
413
changed_ids.update(id_set)
414
# removing implies a kind change
388
415
changed_kind = set(self._removed_contents)
389
417
changed_kind.intersection_update(self._new_contents)
390
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
393
new_ids.update(changed_kind)
394
return sorted(FinalPaths(self).get_paths(new_ids))
418
# Ignore entries that are already known to have changed.
419
changed_kind.difference_update(changed_ids)
420
# to keep only the truly changed ones
421
changed_kind = (t for t in changed_kind
422
if self.tree_kind(t) != self.final_kind(t))
423
# all kind changes will alter the inventory
424
changed_ids.update(changed_kind)
425
# To find entries with changed parent_ids, find parents which existed,
426
# but changed file_id.
427
# Now add all their children to the set.
428
for parent_trans_id in new_file_id:
429
changed_ids.update(self.iter_tree_children(parent_trans_id))
430
return sorted(FinalPaths(self).get_paths(changed_ids))
396
432
def final_kind(self, trans_id):
397
433
"""Determine the final file kind, after any changes applied.
399
Raises NoSuchFile if the file does not exist/has no contents.
400
(It is conceivable that a path would be created without the
401
corresponding contents insertion command)
435
:return: None if the file does not exist/has no contents. (It is
436
conceivable that a path would be created without the corresponding
437
contents insertion command)
403
439
if trans_id in self._new_contents:
404
440
return self._new_contents[trans_id]
405
441
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
444
return self.tree_kind(trans_id)
446
def tree_path(self, trans_id):
447
"""Determine the tree path associated with the trans_id."""
448
return self._tree_id_paths.get(trans_id)
410
450
def tree_file_id(self, trans_id):
411
451
"""Determine the file id associated with the trans_id in the tree"""
413
path = self._tree_id_paths[trans_id]
415
# the file is a new, unversioned file, or invalid trans_id
452
path = self.tree_path(trans_id)
417
455
# the file is old; the old id is still valid
418
456
if self._new_root == trans_id:
531
569
# ensure that all children are registered with the transaction
532
570
list(self.iter_tree_children(parent_id))
534
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
572
def _has_named_child(self, name, parent_id, known_children):
573
"""Does a parent already have a name child.
575
:param name: The searched for name.
577
:param parent_id: The parent for which the check is made.
579
:param known_children: The already known children. This should have
580
been recently obtained from `self.by_parent.get(parent_id)`
581
(or will be if None is passed).
583
if known_children is None:
584
known_children = self.by_parent().get(parent_id, [])
585
for child in known_children:
540
586
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
588
parent_path = self._tree_id_paths.get(parent_id, None)
589
if parent_path is None:
590
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
592
child_path = joinpath(parent_path, name)
593
child_id = self._tree_path_ids.get(child_path, None)
548
594
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
595
# Not known by the tree transform yet, check the filesystem
596
return osutils.lexists(self._tree.abspath(child_path))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
598
raise AssertionError('child_id is missing: %s, %s, %s'
599
% (name, parent_id, child_id))
601
def _available_backup_name(self, name, target_id):
602
"""Find an available backup name.
604
:param name: The basename of the file.
606
:param target_id: The directory trans_id where the backup should
609
known_children = self.by_parent().get(target_id, [])
610
return osutils.available_backup_name(
612
lambda base: self._has_named_child(
613
base, target_id, known_children))
559
615
def _parent_loops(self):
560
616
"""No entry should be its own ancestor"""
668
722
def _duplicate_ids(self):
669
723
"""Each inventory id may only be used once"""
726
all_ids = self._tree.all_file_ids()
727
except errors.UnsupportedOperation:
728
# it's okay for non-file-id trees to raise UnsupportedOperation.
671
730
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
672
731
self._removed_id))
673
all_ids = self._tree.all_file_ids()
674
732
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
733
for trans_id, file_id in viewitems(self._new_id):
676
734
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
735
path = self._tree.id2path(file_id)
736
old_trans_id = self.trans_id_tree_path(path)
678
737
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
740
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
741
"""Children must have a directory parent"""
684
for parent_id, children in by_parent.iteritems():
685
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
743
for parent_id, children in viewitems(by_parent):
744
if parent_id == ROOT_PARENT:
747
for child_id in children:
748
if self.final_kind(child_id) is not None:
753
# There is at least a child, so we need an existing directory to
755
kind = self.final_kind(parent_id)
757
# The directory will be deleted
699
758
conflicts.append(('missing parent', parent_id))
700
759
elif kind != "directory":
760
# Meh, we need a *directory* to put something in it
701
761
conflicts.append(('non-directory parent', parent_id))
704
def _any_contents(self, trans_ids):
705
"""Return true if any of the trans_ids, will have contents."""
706
for trans_id in trans_ids:
708
kind = self.final_kind(trans_id)
714
764
def _set_executability(self, path, trans_id):
715
765
"""Set the executability of versioned files """
716
if supports_executable():
766
if self._tree._supports_executable():
717
767
new_executability = self._new_executability[trans_id]
718
768
abspath = self._tree.abspath(path)
719
769
current_mode = os.stat(abspath).st_mode
720
770
if new_executability:
721
771
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
773
to_mode = current_mode | (0o100 & ~umask)
724
774
# Enable x-bit for others only if they can read it.
725
if current_mode & 0004:
726
to_mode |= 0001 & ~umask
727
if current_mode & 0040:
728
to_mode |= 0010 & ~umask
775
if current_mode & 0o004:
776
to_mode |= 0o001 & ~umask
777
if current_mode & 0o040:
778
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
780
to_mode = current_mode & ~0o111
781
osutils.chmod_if_possible(abspath, to_mode)
733
783
def _new_entry(self, name, parent_id, file_id):
734
784
"""Helper function to create a new filesystem entry."""
780
830
self.create_symlink(target, trans_id)
833
def new_orphan(self, trans_id, parent_id):
834
"""Schedule an item to be orphaned.
836
When a directory is about to be removed, its children, if they are not
837
versioned are moved out of the way: they don't have a parent anymore.
839
:param trans_id: The trans_id of the existing item.
840
:param parent_id: The parent trans_id of the item.
842
raise NotImplementedError(self.new_orphan)
844
def _get_potential_orphans(self, dir_id):
845
"""Find the potential orphans in a directory.
847
A directory can't be safely deleted if there are versioned files in it.
848
If all the contained files are unversioned then they can be orphaned.
850
The 'None' return value means that the directory contains at least one
851
versioned file and should not be deleted.
853
:param dir_id: The directory trans id.
855
:return: A list of the orphan trans ids or None if at least one
856
versioned file is present.
859
# Find the potential orphans, stop if one item should be kept
860
for child_tid in self.by_parent()[dir_id]:
861
if child_tid in self._removed_contents:
862
# The child is removed as part of the transform. Since it was
863
# versioned before, it's not an orphan
865
elif self.final_file_id(child_tid) is None:
866
# The child is not versioned
867
orphans.append(child_tid)
869
# We have a versioned file here, searching for orphans is
783
875
def _affected_ids(self):
784
876
"""Return the set of transform ids affected by the transform"""
785
877
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
878
trans_ids.update(self._new_id)
787
879
trans_ids.update(self._removed_contents)
788
trans_ids.update(self._new_contents.keys())
789
trans_ids.update(self._new_executability.keys())
790
trans_ids.update(self._new_name.keys())
791
trans_ids.update(self._new_parent.keys())
880
trans_ids.update(self._new_contents)
881
trans_ids.update(self._new_executability)
882
trans_ids.update(self._new_name)
883
trans_ids.update(self._new_parent)
794
886
def _get_file_id_maps(self):
903
987
to_path = final_paths.get_path(to_trans_id)
989
from_name, from_parent, from_kind, from_executable = \
990
self._from_file_data(from_trans_id, from_versioned, from_path)
992
to_name, to_parent, to_kind, to_executable = \
993
self._to_file_data(to_trans_id, from_trans_id, from_executable)
904
995
if from_kind != to_kind:
906
997
elif to_kind in ('file', 'symlink') and (
907
to_trans_id != from_trans_id or
908
to_trans_id in self._new_contents):
998
to_trans_id != from_trans_id
999
or to_trans_id in self._new_contents):
910
if (not modified and from_versioned == to_versioned and
911
from_parent==to_parent and from_name == to_name and
912
from_executable == to_executable):
1001
if (not modified and from_versioned == to_versioned
1002
and from_parent == to_parent and from_name == to_name
1003
and from_executable == to_executable):
914
1005
results.append((file_id, (from_path, to_path), modified,
915
(from_versioned, to_versioned),
916
(from_parent, to_parent),
917
(from_name, to_name),
918
(from_kind, to_kind),
919
(from_executable, to_executable)))
920
return iter(sorted(results, key=lambda x:x[1]))
1006
(from_versioned, to_versioned),
1007
(from_parent, to_parent),
1008
(from_name, to_name),
1009
(from_kind, to_kind),
1010
(from_executable, to_executable)))
1014
return (paths[0] or '', paths[1] or '')
1015
return iter(sorted(results, key=path_key))
922
1017
def get_preview_tree(self):
923
1018
"""Return a tree representing the result of the transform.
928
1023
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1025
def commit(self, branch, message, merge_parents=None, strict=False,
1026
timestamp=None, timezone=None, committer=None, authors=None,
1027
revprops=None, revision_id=None):
931
1028
"""Commit the result of this TreeTransform to a branch.
933
1030
:param branch: The branch to commit to.
934
1031
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1032
:param merge_parents: Additional parent revision-ids specified by
1034
:param strict: If True, abort the commit if there are unversioned
1036
:param timestamp: if not None, seconds-since-epoch for the time and
1037
date. (May be a float.)
1038
:param timezone: Optional timezone for timestamp, as an offset in
1040
:param committer: Optional committer in email-id format.
1041
(e.g. "J Random Hacker <jrandom@example.com>")
1042
:param authors: Optional list of authors in email-id format.
1043
:param revprops: Optional dictionary of revision properties.
1044
:param revision_id: Optional revision id. (Specifying a revision-id
1045
may reduce performance for some non-native formats.)
936
1046
:return: The revision_id of the revision committed.
938
1048
self._check_malformed()
965
1081
return revision_id
967
1083
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1084
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1086
if path is None or self._tree.kind(path) != 'file':
972
1088
except errors.NoSuchFile:
976
1092
def _get_parents_texts(self, trans_id):
977
1093
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1094
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1097
return (self._tree.get_file_text(path),)
983
1099
def _get_parents_lines(self, trans_id):
984
1100
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1101
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1104
return (self._tree.get_file_lines(path),)
990
1106
def serialize(self, serializer):
991
1107
"""Serialize this TreeTransform.
993
1109
:param serializer: A Serialiser like pack.ContainerSerializer.
995
new_name = dict((k, v.encode('utf-8')) for k, v in
996
self._new_name.items())
997
new_executability = dict((k, int(v)) for k, v in
998
self._new_executability.items())
999
tree_path_ids = dict((k.encode('utf-8'), v)
1000
for k, v in self._tree_path_ids.items())
1111
new_name = {k.encode('utf-8'): v.encode('utf-8')
1112
for k, v in viewitems(self._new_name)}
1113
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1114
for k, v in viewitems(self._new_parent)}
1115
new_id = {k.encode('utf-8'): v
1116
for k, v in viewitems(self._new_id)}
1117
new_executability = {k.encode('utf-8'): int(v)
1118
for k, v in viewitems(self._new_executability)}
1119
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1120
for k, v in viewitems(self._tree_path_ids)}
1121
non_present_ids = {k: v.encode('utf-8')
1122
for k, v in viewitems(self._non_present_ids)}
1123
removed_contents = [trans_id.encode('utf-8')
1124
for trans_id in self._removed_contents]
1125
removed_id = [trans_id.encode('utf-8')
1126
for trans_id in self._removed_id]
1002
'_id_number': self._id_number,
1003
'_new_name': new_name,
1004
'_new_parent': self._new_parent,
1005
'_new_executability': new_executability,
1006
'_new_id': self._new_id,
1007
'_tree_path_ids': tree_path_ids,
1008
'_removed_id': list(self._removed_id),
1009
'_removed_contents': list(self._removed_contents),
1010
'_non_present_ids': self._non_present_ids,
1128
b'_id_number': self._id_number,
1129
b'_new_name': new_name,
1130
b'_new_parent': new_parent,
1131
b'_new_executability': new_executability,
1133
b'_tree_path_ids': tree_path_ids,
1134
b'_removed_id': removed_id,
1135
b'_removed_contents': removed_contents,
1136
b'_non_present_ids': non_present_ids,
1012
1138
yield serializer.bytes_record(bencode.bencode(attribs),
1014
for trans_id, kind in self._new_contents.items():
1140
for trans_id, kind in sorted(viewitems(self._new_contents)):
1015
1141
if kind == 'file':
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1142
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1143
lines = cur_file.readlines()
1018
1144
parents = self._get_parents_lines(trans_id)
1019
1145
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
content = ''.join(mpdiff.to_patch())
1146
content = b''.join(mpdiff.to_patch())
1021
1147
if kind == 'directory':
1023
1149
if kind == 'symlink':
1024
1150
content = self._read_symlink_target(trans_id)
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
1151
if not isinstance(content, bytes):
1152
content = content.encode('utf-8')
1153
yield serializer.bytes_record(
1154
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1027
1156
def deserialize(self, records):
1028
1157
"""Deserialize a stored TreeTransform.
1030
1159
:param records: An iterable of (names, content) tuples, as per
1031
1160
pack.ContainerPushParser.
1033
names, content = records.next()
1162
names, content = next(records)
1034
1163
attribs = bencode.bdecode(content)
1035
self._id_number = attribs['_id_number']
1036
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1038
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1041
self._new_id = attribs['_new_id']
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1164
self._id_number = attribs[b'_id_number']
1165
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1166
for k, v in viewitems(attribs[b'_new_name'])}
1167
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1168
for k, v in viewitems(attribs[b'_new_parent'])}
1169
self._new_executability = {
1170
k.decode('utf-8'): bool(v)
1171
for k, v in viewitems(attribs[b'_new_executability'])}
1172
self._new_id = {k.decode('utf-8'): v
1173
for k, v in viewitems(attribs[b'_new_id'])}
1174
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1043
1175
self._tree_path_ids = {}
1044
1176
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1177
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1046
1178
path = bytepath.decode('utf-8')
1179
trans_id = trans_id.decode('utf-8')
1047
1180
self._tree_path_ids[path] = trans_id
1048
1181
self._tree_id_paths[trans_id] = path
1049
self._removed_id = set(attribs['_removed_id'])
1050
self._removed_contents = set(attribs['_removed_contents'])
1051
self._non_present_ids = attribs['_non_present_ids']
1182
self._removed_id = {trans_id.decode('utf-8')
1183
for trans_id in attribs[b'_removed_id']}
1184
self._removed_contents = set(
1185
trans_id.decode('utf-8')
1186
for trans_id in attribs[b'_removed_contents'])
1187
self._non_present_ids = {
1188
k: v.decode('utf-8')
1189
for k, v in viewitems(attribs[b'_non_present_ids'])}
1052
1190
for ((trans_id, kind),), content in records:
1191
trans_id = trans_id.decode('utf-8')
1192
kind = kind.decode('ascii')
1053
1193
if kind == 'file':
1054
1194
mpdiff = multiparent.MultiParent.from_patch(content)
1055
1195
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1173
1328
descendants.update(self._limbo_descendants(descendant))
1174
1329
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1331
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1332
"""Schedule creation of a new file.
1181
Contents is an iterator of strings, all of which will be written
1182
to the target destination.
1184
New file takes the permissions of any existing file with that id,
1185
unless mode_id is specified.
1336
:param contents: an iterator of strings, all of which will be written
1337
to the target destination.
1338
:param trans_id: TreeTransform handle
1339
:param mode_id: If not None, force the mode of the target file to match
1340
the mode of the object referenced by mode_id.
1341
Otherwise, we will try to preserve mode bits of an existing file.
1342
:param sha1: If the sha1 of this content is already known, pass it in.
1343
We can use it to prevent future sha1 computations.
1187
1345
name = self._limbo_name(trans_id)
1188
f = open(name, 'wb')
1191
unique_add(self._new_contents, trans_id, 'file')
1193
# Clean up the file, it never got registered so
1194
# TreeTransform.finalize() won't clean it up.
1346
with open(name, 'wb') as f:
1347
unique_add(self._new_contents, trans_id, 'file')
1199
1348
f.writelines(contents)
1202
1349
self._set_mtime(name)
1203
1350
self._set_mode(trans_id, mode_id, S_ISREG)
1205
def _read_file_chunks(self, trans_id):
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1208
return cur_file.readlines()
1351
# It is unfortunate we have to use lstat instead of fstat, but we just
1352
# used utime and chmod on the file, so we need the accurate final
1354
if sha1 is not None:
1355
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1212
1357
def _read_symlink_target(self, trans_id):
1213
1358
return os.readlink(self._limbo_name(trans_id))
1274
1425
del self._limbo_children_names[trans_id]
1275
1426
delete_any(self._limbo_name(trans_id))
1428
def new_orphan(self, trans_id, parent_id):
1429
conf = self._tree.get_config_stack()
1430
handle_orphan = conf.get('transform.orphan_policy')
1431
handle_orphan(self, trans_id, parent_id)
1434
class OrphaningError(errors.BzrError):
1436
# Only bugs could lead to such exception being seen by the user
1437
internal_error = True
1438
_fmt = "Error while orphaning %s in %s directory"
1440
def __init__(self, orphan, parent):
1441
errors.BzrError.__init__(self)
1442
self.orphan = orphan
1443
self.parent = parent
1446
class OrphaningForbidden(OrphaningError):
1448
_fmt = "Policy: %s doesn't allow creating orphans."
1450
def __init__(self, policy):
1451
errors.BzrError.__init__(self)
1452
self.policy = policy
1455
def move_orphan(tt, orphan_id, parent_id):
1456
"""See TreeTransformBase.new_orphan.
1458
This creates a new orphan in the `brz-orphans` dir at the root of the
1461
:param tt: The TreeTransform orphaning `trans_id`.
1463
:param orphan_id: The trans id that should be orphaned.
1465
:param parent_id: The orphan parent trans id.
1467
# Add the orphan dir if it doesn't exist
1468
orphan_dir_basename = 'brz-orphans'
1469
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1470
if tt.final_kind(od_id) is None:
1471
tt.create_directory(od_id)
1472
parent_path = tt._tree_id_paths[parent_id]
1473
# Find a name that doesn't exist yet in the orphan dir
1474
actual_name = tt.final_name(orphan_id)
1475
new_name = tt._available_backup_name(actual_name, od_id)
1476
tt.adjust_path(new_name, od_id, orphan_id)
1477
trace.warning('%s has been orphaned in %s'
1478
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1481
def refuse_orphan(tt, orphan_id, parent_id):
1482
"""See TreeTransformBase.new_orphan.
1484
This refuses to create orphan, letting the caller handle the conflict.
1486
raise OrphaningForbidden('never')
1489
orphaning_registry = registry.Registry()
1490
orphaning_registry.register(
1491
u'conflict', refuse_orphan,
1492
'Leave orphans in place and create a conflict on the directory.')
1493
orphaning_registry.register(
1494
u'move', move_orphan,
1495
'Move orphans into the brz-orphans directory.')
1496
orphaning_registry._set_default_key(u'conflict')
1499
opt_transform_orphan = _mod_config.RegistryOption(
1500
'transform.orphan_policy', orphaning_registry,
1501
help='Policy for orphaned files during transform operations.',
1278
1505
class TreeTransform(DiskTreeTransform):
1279
1506
"""Represent a tree transformation.
1571
1792
inventory_delta.append((path, None, file_id, None))
1572
1793
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)
1578
1795
for num, (path, trans_id) in enumerate(new_paths):
1579
1796
if (num % 10) == 0:
1580
child_pb.update('adding file',
1797
child_pb.update(gettext('adding file'),
1581
1798
num + len(self._removed_id), total_entries)
1582
1799
file_id = new_path_file_ids[trans_id]
1583
1800
if file_id is None:
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1802
kind = self.final_kind(trans_id)
1804
kind = self._tree.stored_kind(self._tree.id2path(file_id))
1590
1805
parent_trans_id = self.final_parent(trans_id)
1591
1806
parent_file_id = new_path_file_ids.get(parent_trans_id)
1592
1807
if parent_file_id is None:
1621
1837
If inventory_delta is None, no inventory delta generation is performed.
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))
1839
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1840
with ui.ui_factory.nested_progress_bar() as child_pb:
1841
for num, (path, trans_id) in enumerate(tree_paths):
1842
# do not attempt to move root into a subdirectory of itself.
1845
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1846
full_path = self._tree.abspath(path)
1631
1847
if trans_id in self._removed_contents:
1632
1848
delete_path = os.path.join(self._deletiondir, trans_id)
1633
1849
mover.pre_delete(full_path, delete_path)
1634
elif (trans_id in self._new_name
1635
or trans_id in self._new_parent):
1850
elif (trans_id in self._new_name or
1851
trans_id in self._new_parent):
1637
1853
mover.rename(full_path, self._limbo_name(trans_id))
1854
except errors.TransformRenameFailed as e:
1639
1855
if e.errno != errno.ENOENT:
1642
1858
self.rename_count += 1
1646
1860
def _apply_insertions(self, mover):
1647
1861
"""Perform tree operations that insert directory/inventory names.
1656
1870
new_paths = self.new_paths(filesystem_only=True)
1657
1871
modified_paths = []
1658
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1660
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1872
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1873
for num, (path, trans_id) in enumerate(new_paths):
1663
1874
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1875
child_pb.update(gettext('adding file'),
1876
num, len(new_paths))
1665
1877
full_path = self._tree.abspath(path)
1666
1878
if trans_id in self._needs_rename:
1668
1880
mover.rename(self._limbo_name(trans_id), full_path)
1881
except errors.TransformRenameFailed as e:
1670
1882
# We may be renaming a dangling inventory id
1671
1883
if e.errno != errno.ENOENT:
1674
1886
self.rename_count += 1
1675
if (trans_id in self._new_contents or
1676
self.path_changed(trans_id)):
1887
# TODO: if trans_id in self._observed_sha1s, we should
1888
# re-stat the final target, since ctime will be
1889
# updated by the change.
1890
if (trans_id in self._new_contents
1891
or self.path_changed(trans_id)):
1677
1892
if trans_id in self._new_contents:
1678
1893
modified_paths.append(full_path)
1679
1894
if trans_id in self._new_executability:
1680
1895
self._set_executability(path, trans_id)
1896
if trans_id in self._observed_sha1s:
1897
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1898
st = osutils.lstat(full_path)
1899
self._observed_sha1s[trans_id] = (o_sha1, st)
1900
for path, trans_id in new_paths:
1901
# new_paths includes stuff like workingtree conflicts. Only the
1902
# stuff in new_contents actually comes from limbo.
1903
if trans_id in self._limbo_files:
1904
del self._limbo_files[trans_id]
1683
1905
self._new_contents.clear()
1684
1906
return modified_paths
1908
def _apply_observed_sha1s(self):
1909
"""After we have finished renaming everything, update observed sha1s
1911
This has to be done after self._tree.apply_inventory_delta, otherwise
1912
it doesn't know anything about the files we are updating. Also, we want
1913
to do this as late as possible, so that most entries end up cached.
1915
# TODO: this doesn't update the stat information for directories. So
1916
# the first 'bzr status' will still need to rewrite
1917
# .bzr/checkout/dirstate. However, we at least don't need to
1918
# re-read all of the files.
1919
# TODO: If the operation took a while, we could do a time.sleep(3) here
1920
# to allow the clock to tick over and ensure we won't have any
1921
# problems. (we could observe start time, and finish time, and if
1922
# it is less than eg 10% overhead, add a sleep call.)
1923
paths = FinalPaths(self)
1924
for trans_id, observed in viewitems(self._observed_sha1s):
1925
path = paths.get_path(trans_id)
1926
self._tree._observed_sha1(path, observed)
1687
1929
class TransformPreview(DiskTreeTransform):
1688
1930
"""A TreeTransform for generating preview trees.
1766
2014
except errors.NoSuchRevisionInTree:
1767
2015
yield self._get_repository().revision_tree(revision_id)
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
def _get_file_revision(self, path, file_id, vf, tree_revision):
2019
(file_id, t.get_file_revision(t.id2path(file_id)))
2020
for t in self._iter_parent_trees()]
1772
2021
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2022
self.get_file_lines(path))
1774
2023
repo = self._get_repository()
1775
2024
base_vf = repo.texts
1776
2025
if base_vf not in vf.fallback_versionedfiles:
1777
2026
vf.fallback_versionedfiles.append(base_vf)
1778
2027
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2029
def _stat_limbo_file(self, trans_id):
1782
2030
name = self._transform._limbo_name(trans_id)
1783
2031
return os.lstat(name)
1937
2210
ordered_ids = self._list_files_by_dir()
1938
2211
for entry, trans_id in self._make_inv_entries(ordered_ids,
1939
specific_file_ids, yield_parents=yield_parents):
1940
yield unicode(self._final_paths.get_path(trans_id)), entry
2213
yield self._final_paths.get_path(trans_id), entry
1942
2215
def _iter_entries_for_dir(self, dir_path):
1943
2216
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
1945
2217
ordered_ids = []
1946
for file_id in self.iter_children(dir_file_id):
1947
trans_id = self._transform.trans_id_file_id(file_id)
1948
ordered_ids.append((trans_id, file_id))
2218
dir_trans_id = self._path2trans_id(dir_path)
2219
dir_id = self._transform.final_file_id(dir_trans_id)
2220
for child_trans_id in self._all_children(dir_trans_id):
2221
ordered_ids.append((child_trans_id, dir_id))
1949
2223
for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2224
path_entries.append((self._final_paths.get_path(trans_id), entry))
1952
2228
def list_files(self, include_root=False, from_dir=None, recursive=True):
1953
2229
"""See WorkingTree.list_files."""
1954
2230
# XXX This should behave like WorkingTree.list_files, but is really
1955
2231
# more like RevisionTree.list_files.
1965
2243
if not path.startswith(prefix):
1967
2245
path = path[len(prefix):]
1968
yield path, 'V', entry.kind, entry.file_id, entry
2246
yield path, 'V', entry.kind, entry
1970
2248
if from_dir is None and include_root is True:
1971
root_entry = inventory.make_entry('directory', '',
1972
ROOT_PARENT, self.get_root_id())
1973
yield '', 'V', 'directory', root_entry.file_id, root_entry
2249
root_entry = inventory.make_entry(
2250
'directory', '', ROOT_PARENT, self.get_root_id())
2251
yield '', 'V', 'directory', root_entry
1974
2252
entries = self._iter_entries_for_dir(from_dir or '')
1975
2253
for path, entry in entries:
1976
yield path, 'V', entry.kind, entry.file_id, entry
2254
yield path, 'V', entry.kind, entry
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2256
def kind(self, path):
2257
trans_id = self._path2trans_id(path)
2258
if trans_id is None:
2259
raise errors.NoSuchFile(path)
1980
2260
return self._transform.final_kind(trans_id)
1982
def stored_kind(self, file_id):
1983
trans_id = self._transform.trans_id_file_id(file_id)
2262
def stored_kind(self, path):
2263
trans_id = self._path2trans_id(path)
2264
if trans_id is None:
2265
raise errors.NoSuchFile(path)
1985
2267
return self._transform._new_contents[trans_id]
1986
2268
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2269
return self._transform._tree.stored_kind(path)
1989
def get_file_mtime(self, file_id, path=None):
2271
def get_file_mtime(self, path):
1990
2272
"""See Tree.get_file_mtime"""
2273
file_id = self.path2id(path)
2275
raise errors.NoSuchFile(path)
1991
2276
if not self._content_change(file_id):
1992
return self._transform._tree.get_file_mtime(file_id)
1993
return self._stat_limbo_file(file_id).st_mtime
1995
def _file_size(self, entry, stat_value):
1996
return self.get_file_size(entry.file_id)
1998
def get_file_size(self, file_id):
2277
return self._transform._tree.get_file_mtime(
2278
self._transform._tree.id2path(file_id))
2279
trans_id = self._path2trans_id(path)
2280
return self._stat_limbo_file(trans_id).st_mtime
2282
def get_file_size(self, path):
1999
2283
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2284
trans_id = self._path2trans_id(path)
2285
if trans_id is None:
2286
raise errors.NoSuchFile(path)
2287
kind = self._transform.final_kind(trans_id)
2290
if trans_id in self._transform._new_contents:
2291
return self._stat_limbo_file(trans_id).st_size
2292
if self.kind(path) == 'file':
2293
return self._transform._tree.get_file_size(path)
2005
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
trans_id = self._transform.trans_id_file_id(file_id)
2007
kind = self._transform._new_contents.get(trans_id)
2009
return self._transform._tree.get_file_sha1(file_id)
2011
fileobj = self.get_file(file_id)
2297
def get_file_verifier(self, path, stat_value=None):
2298
trans_id = self._path2trans_id(path)
2299
if trans_id is None:
2300
raise errors.NoSuchFile(path)
2301
kind = self._transform._new_contents.get(trans_id)
2303
return self._transform._tree.get_file_verifier(path)
2305
with self.get_file(path) as fileobj:
2306
return ("SHA1", sha_file(fileobj))
2308
def get_file_sha1(self, path, stat_value=None):
2309
trans_id = self._path2trans_id(path)
2310
if trans_id is None:
2311
raise errors.NoSuchFile(path)
2312
kind = self._transform._new_contents.get(trans_id)
2314
return self._transform._tree.get_file_sha1(path)
2316
with self.get_file(path) as fileobj:
2013
2317
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2319
def is_executable(self, path):
2320
trans_id = self._path2trans_id(path)
2321
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2324
return self._transform._new_executability[trans_id]
2023
2325
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2327
return self._transform._tree.is_executable(path)
2328
except OSError as e:
2027
2329
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2332
except errors.NoSuchFile:
2335
def has_filename(self, path):
2336
trans_id = self._path2trans_id(path)
2337
if trans_id in self._transform._new_contents:
2339
elif trans_id in self._transform._removed_contents:
2342
return self._transform._tree.has_filename(path)
2033
2344
def path_content_summary(self, path):
2034
2345
trans_id = self._path2trans_id(path)
2035
2346
tt = self._transform
2057
2368
executable = None
2058
2369
if kind == 'symlink':
2059
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2370
link_or_sha1 = os.readlink(limbo_name)
2371
if not isinstance(link_or_sha1, text_type):
2372
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2060
2373
executable = tt._new_executability.get(trans_id, executable)
2061
2374
return kind, size, executable, link_or_sha1
2063
2376
def iter_changes(self, from_tree, include_unchanged=False,
2064
specific_files=None, pb=None, extra_trees=None,
2065
require_versioned=True, want_unversioned=False):
2377
specific_files=None, pb=None, extra_trees=None,
2378
require_versioned=True, want_unversioned=False):
2066
2379
"""See InterTree.iter_changes.
2068
2381
This has a fast path that is only used when the from_tree matches
2069
2382
the transform tree, and no fancy options are supplied.
2071
if (from_tree is not self._transform._tree or include_unchanged or
2072
specific_files or want_unversioned):
2384
if (from_tree is not self._transform._tree or include_unchanged
2385
or specific_files or want_unversioned):
2073
2386
return tree.InterTree(from_tree, self).iter_changes(
2074
2387
include_unchanged=include_unchanged,
2075
2388
specific_files=specific_files,
2081
2394
raise ValueError('want_unversioned is not supported')
2082
2395
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2397
def get_file(self, path):
2085
2398
"""See Tree.get_file"""
2399
file_id = self.path2id(path)
2086
2400
if not self._content_change(file_id):
2087
return self._transform._tree.get_file(file_id, path)
2088
trans_id = self._transform.trans_id_file_id(file_id)
2401
return self._transform._tree.get_file(path)
2402
trans_id = self._path2trans_id(path)
2089
2403
name = self._transform._limbo_name(trans_id)
2090
2404
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2406
def get_file_with_stat(self, path):
2407
return self.get_file(path), None
2095
def annotate_iter(self, file_id,
2409
def annotate_iter(self, path,
2096
2410
default_revision=_mod_revision.CURRENT_REVISION):
2411
file_id = self.path2id(path)
2097
2412
changes = self._iter_changes_cache.get(file_id)
2098
2413
if changes is None:
2243
2560
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2561
generate the inventory delta.
2246
wt.lock_tree_write()
2563
with wt.lock_tree_write(), tree.lock_read():
2564
if accelerator_tree is not None:
2565
accelerator_tree.lock_read()
2567
return _build_tree(tree, wt, accelerator_tree, hardlink,
2250
2570
if accelerator_tree is not None:
2251
accelerator_tree.lock_read()
2253
return _build_tree(tree, wt, accelerator_tree, hardlink,
2256
if accelerator_tree is not None:
2257
accelerator_tree.unlock()
2571
accelerator_tree.unlock()
2264
2574
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2575
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2576
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2577
if num > 0: # more than just a root
2268
2578
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
existing_files = set()
2270
for dir, files in wt.walkdirs():
2271
existing_files.update(f[0] for f in files)
2272
2579
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2580
top_pb = ui.ui_factory.nested_progress_bar()
2274
2581
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2582
if tree.get_root_id() is not None:
2276
2583
# This is kind of a hack: we should be altering the root
2277
2584
# as part of the regular tree shape diff logic.
2278
2585
# The conditional test here is to avoid doing an
2289
2596
pp.next_phase()
2290
file_trans_id[wt.get_root_id()] = \
2291
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2597
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2598
with ui.ui_factory.nested_progress_bar() as pb:
2294
2599
deferred_contents = []
2296
total = len(tree.inventory)
2601
total = len(tree.all_versioned_paths())
2297
2602
if delta_from_tree:
2298
2603
precomputed_delta = []
2300
2605
precomputed_delta = None
2606
# Check if tree inventory has content. If so, we populate
2607
# existing_files with the directory content. If there are no
2608
# entries we skip populating existing_files as its not used.
2609
# This improves performance and unncessary work on large
2610
# directory trees. (#501307)
2612
existing_files = set()
2613
for dir, files in wt.walkdirs():
2614
existing_files.update(f[0] for f in files)
2301
2615
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2616
enumerate(tree.iter_entries_by_dir()):
2617
pb.update(gettext("Building tree"), num
2618
- len(deferred_contents), total)
2304
2619
if entry.parent_id is None:
2306
2621
reparent = False
2330
2646
trans_id = tt.create_path(entry.name, parent_id)
2331
2647
file_trans_id[file_id] = trans_id
2332
2648
tt.version_file(file_id, trans_id)
2333
executable = tree.is_executable(file_id, tree_path)
2649
executable = tree.is_executable(tree_path)
2335
2651
tt.set_executability(executable, trans_id)
2336
trans_data = (trans_id, tree_path)
2337
deferred_contents.append((file_id, trans_data))
2652
trans_data = (trans_id, file_id,
2653
tree_path, entry.text_sha1)
2654
deferred_contents.append((tree_path, trans_data))
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2656
file_trans_id[file_id] = new_by_entry(
2657
tree_path, tt, entry, parent_id, tree)
2342
2659
new_trans_id = file_trans_id[file_id]
2343
2660
old_parent = tt.trans_id_tree_path(tree_path)
2376
2693
new_desired_files = desired_files
2378
2695
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2696
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2380
2697
in iter if not (c or e[0] != e[1])]
2381
2698
if accelerator_tree.supports_content_filtering():
2382
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2699
unchanged = [(tp, ap) for (tp, ap) in unchanged
2700
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2701
unchanged = dict(unchanged)
2385
2702
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2704
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2705
accelerator_path = unchanged.get(tree_path)
2389
2706
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2707
new_desired_files.append((tree_path,
2708
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2710
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2712
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2397
contents = accelerator_tree.get_file(file_id, accelerator_path)
2398
if wt.supports_content_filtering():
2399
filters = wt._content_filter_stack(tree_path)
2400
contents = filtered_output_bytes(contents, filters,
2401
ContentFilterContext(tree_path, tree))
2403
tt.create_file(contents, trans_id)
2407
except AttributeError:
2408
# after filtering, contents may no longer be file-like
2715
with accelerator_tree.get_file(accelerator_path) as f:
2716
chunks = osutils.file_iterator(f)
2717
if wt.supports_content_filtering():
2718
filters = wt._content_filter_stack(tree_path)
2719
chunks = filtered_output_bytes(chunks, filters,
2720
ContentFilterContext(tree_path, tree))
2721
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2723
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2724
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2725
tree.iter_files_bytes(new_desired_files)):
2414
2726
if wt.supports_content_filtering():
2415
2727
filters = wt._content_filter_stack(tree_path)
2416
2728
contents = filtered_output_bytes(contents, filters,
2417
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2729
ContentFilterContext(tree_path, tree))
2730
tt.create_file(contents, trans_id, sha1=text_sha1)
2731
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2734
def _reparent_children(tt, old_parent, new_parent):
2423
2735
for child in tt.iter_tree_children(old_parent):
2424
2736
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2739
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2740
by_parent = tt.by_parent()
2428
2741
for child in by_parent[old_parent]:
2429
2742
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2743
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2746
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2433
2747
if entry.kind != kind:
2435
2749
if entry.kind == "directory":
2437
2751
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2752
with open(target_path, 'rb') as f1, \
2753
tree.get_file(tree_path) as f2:
2754
if osutils.compare_files(f1, f2):
2440
2756
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2757
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2462
2778
final_parent = tt.final_parent(old_file)
2463
2779
if new_file in divert:
2464
new_name = tt.final_name(old_file)+'.diverted'
2780
new_name = tt.final_name(old_file) + '.diverted'
2465
2781
tt.adjust_path(new_name, final_parent, new_file)
2466
2782
new_conflicts.add((c_type, 'Diverted to',
2467
2783
new_file, old_file))
2469
new_name = tt.final_name(old_file)+'.moved'
2785
new_name = tt.final_name(old_file) + '.moved'
2470
2786
tt.adjust_path(new_name, final_parent, old_file)
2471
2787
new_conflicts.add((c_type, 'Moved existing file to',
2472
2788
old_file, new_file))
2473
2789
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2792
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2793
"""Create a new file according to its inventory entry"""
2478
2794
name = entry.name
2479
2795
kind = entry.kind
2480
2796
if kind == 'file':
2481
contents = tree.get_file(entry.file_id).readlines()
2482
executable = tree.is_executable(entry.file_id)
2483
return tt.new_file(name, parent_id, contents, entry.file_id,
2797
with tree.get_file(path) as f:
2798
executable = tree.is_executable(path)
2800
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2802
elif kind in ('directory', 'tree-reference'):
2486
2803
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2804
if kind == 'tree-reference':
2488
2805
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2806
return trans_id
2490
2807
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2808
target = tree.get_symlink_target(path)
2492
2809
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2811
raise errors.BadFileKindError(name, kind)
2497
@deprecated_function(deprecated_in((1, 9, 0)))
2498
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
"""Create new file contents according to an inventory entry.
2501
DEPRECATED. Use create_from_tree instead.
2503
if entry.kind == "file":
2505
lines = tree.get_file(entry.file_id).readlines()
2506
tt.create_file(lines, trans_id, mode_id=mode_id)
2507
elif entry.kind == "symlink":
2508
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2509
elif entry.kind == "directory":
2510
tt.create_directory(trans_id)
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
filter_tree_path=None):
2814
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2815
filter_tree_path=None):
2515
2816
"""Create new file contents according to tree contents.
2517
2818
:param filter_tree_path: the tree path to use to lookup
2518
2819
content filters to apply to the bytes output in the working tree.
2519
2820
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2822
kind = tree.kind(path)
2522
2823
if kind == 'directory':
2523
2824
tt.create_directory(trans_id)
2524
2825
elif kind == "file":
2526
tree_file = tree.get_file(file_id)
2528
bytes = tree_file.readlines()
2532
if wt.supports_content_filtering() and filter_tree_path is not None:
2533
filters = wt._content_filter_stack(filter_tree_path)
2534
bytes = filtered_output_bytes(bytes, filters,
2535
ContentFilterContext(filter_tree_path, tree))
2536
tt.create_file(bytes, trans_id)
2827
f = tree.get_file(path)
2828
chunks = osutils.file_iterator(f)
2833
if wt.supports_content_filtering() and filter_tree_path is not None:
2834
filters = wt._content_filter_stack(filter_tree_path)
2835
chunks = filtered_output_bytes(
2837
ContentFilterContext(filter_tree_path, tree))
2838
tt.create_file(chunks, trans_id)
2537
2842
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2843
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2540
2845
raise AssertionError('Unknown kind %r' % kind)
2546
2851
tt.set_executability(entry.executable, trans_id)
2549
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2553
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
"""Produce a backup-style name that appears to be available"""
2558
yield "%s.~%d~" % (name, counter)
2560
for new_name in name_gen():
2561
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2565
def _entry_changes(file_id, entry, working_tree):
2566
"""Determine in which ways the inventory entry has changed.
2568
Returns booleans: has_contents, content_mod, meta_mod
2569
has_contents means there are currently contents, but they differ
2570
contents_mod means contents need to be modified
2571
meta_mod means the metadata needs to be modified
2573
cur_entry = working_tree.inventory[file_id]
2575
working_kind = working_tree.kind(file_id)
2578
has_contents = False
2581
if has_contents is True:
2582
if entry.kind != working_kind:
2583
contents_mod, meta_mod = True, False
2585
cur_entry._read_tree_state(working_tree.id2path(file_id),
2587
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
cur_entry._forget_tree_state()
2589
return has_contents, contents_mod, meta_mod
2592
2854
def revert(working_tree, target_tree, filenames, backups=False,
2593
2855
pb=None, change_reporter=None):
2594
2856
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2857
pb = ui.ui_factory.nested_progress_bar()
2597
tt = TreeTransform(working_tree, pb)
2599
pp = ProgressPhase("Revert phase", 3, pb)
2600
conflicts, merge_modified = _prepare_revert_transform(
2601
working_tree, target_tree, tt, filenames, backups, pp)
2603
change_reporter = delta._ChangeReporter(
2604
unversioned_filter=working_tree.is_ignored)
2605
delta.report_changes(tt.iter_changes(), change_reporter)
2606
for conflict in conflicts:
2610
working_tree.set_merge_modified(merge_modified)
2859
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2860
pp = ProgressPhase("Revert phase", 3, pb)
2861
conflicts, merge_modified = _prepare_revert_transform(
2862
working_tree, target_tree, tt, filenames, backups, pp)
2864
change_reporter = delta._ChangeReporter(
2865
unversioned_filter=working_tree.is_ignored)
2866
delta.report_changes(tt.iter_changes(), change_reporter)
2867
for conflict in conflicts:
2868
trace.warning(text_type(conflict))
2871
if working_tree.supports_merge_modified():
2872
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2875
return conflicts
2618
2878
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2879
backups, pp, basis_tree=None,
2620
2880
merge_modified=None):
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2881
with ui.ui_factory.nested_progress_bar() as child_pb:
2623
2882
if merge_modified is None:
2624
2883
merge_modified = working_tree.merge_modified()
2625
2884
merge_modified = _alter_files(working_tree, target_tree, tt,
2626
2885
child_pb, filenames, backups,
2627
2886
merge_modified, basis_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
with ui.ui_factory.nested_progress_bar() as child_pb:
2888
raw_conflicts = resolve_conflicts(
2889
tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))
2636
2890
conflicts = cook_conflicts(raw_conflicts, tt)
2637
2891
return conflicts, merge_modified
2641
2895
backups, merge_modified, basis_tree=None):
2642
2896
if basis_tree is not None:
2643
2897
basis_tree.lock_read()
2644
change_list = target_tree.iter_changes(working_tree,
2645
specific_files=specific_files, pb=pb)
2646
if target_tree.get_root_id() is None:
2898
# We ask the working_tree for its changes relative to the target, rather
2899
# than the target changes relative to the working tree. Because WT4 has an
2900
# optimizer to compare itself to a target, but no optimizer for the
2902
change_list = working_tree.iter_changes(
2903
target_tree, specific_files=specific_files, pb=pb)
2904
if not target_tree.is_versioned(u''):
2647
2905
skip_root = True
2649
2907
skip_root = False
2651
2909
deferred_files = []
2652
2910
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2911
kind, executable) in enumerate(change_list):
2912
target_path, wt_path = path
2913
target_versioned, wt_versioned = versioned
2914
target_parent, wt_parent = parent
2915
target_name, wt_name = name
2916
target_kind, wt_kind = kind
2917
target_executable, wt_executable = executable
2918
if skip_root and wt_parent is None:
2656
2920
trans_id = tt.trans_id_file_id(file_id)
2658
2922
if changed_content:
2659
2923
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2924
if wt_kind == 'file' and (backups or target_kind is None):
2925
wt_sha1 = working_tree.get_file_sha1(wt_path)
2662
2926
if merge_modified.get(file_id) != wt_sha1:
2663
2927
# acquire the basis tree lazily to prevent the
2664
2928
# expense of accessing it when it's not needed ?
2666
2930
if basis_tree is None:
2667
2931
basis_tree = working_tree.basis_tree()
2668
2932
basis_tree.lock_read()
2669
if file_id in basis_tree:
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2672
elif kind[1] is None and not versioned[1]:
2674
if kind[0] is not None:
2933
basis_path = find_previous_path(
2934
working_tree, basis_tree, wt_path)
2935
if basis_path is None:
2936
if target_kind is None and not target_versioned:
2939
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2941
if wt_kind is not None:
2675
2942
if not keep_content:
2676
2943
tt.delete_contents(trans_id)
2677
elif kind[1] is not None:
2678
parent_trans_id = tt.trans_id_file_id(parent[0])
2679
by_parent = tt.by_parent()
2680
backup_name = _get_backup_name(name[0], by_parent,
2681
parent_trans_id, tt)
2944
elif target_kind is not None:
2945
parent_trans_id = tt.trans_id_file_id(wt_parent)
2946
backup_name = tt._available_backup_name(
2947
wt_name, parent_trans_id)
2682
2948
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2949
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2950
if wt_versioned and target_versioned:
2685
2951
tt.unversion_file(trans_id)
2686
2952
tt.version_file(file_id, new_trans_id)
2687
2953
# New contents should have the same unix perms as old
2689
2955
mode_id = trans_id
2690
2956
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2957
if target_kind in ('directory', 'tree-reference'):
2692
2958
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2959
if target_kind == 'tree-reference':
2960
revision = target_tree.get_reference_revision(
2696
2962
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2701
deferred_files.append((file_id, (trans_id, mode_id)))
2963
elif target_kind == 'symlink':
2964
tt.create_symlink(target_tree.get_symlink_target(
2965
target_path), trans_id)
2966
elif target_kind == 'file':
2967
deferred_files.append(
2968
(target_path, (trans_id, mode_id, file_id)))
2702
2969
if basis_tree is None:
2703
2970
basis_tree = working_tree.basis_tree()
2704
2971
basis_tree.lock_read()
2705
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2972
new_sha1 = target_tree.get_file_sha1(target_path)
2973
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2974
if (basis_path is not None and
2975
new_sha1 == basis_tree.get_file_sha1(basis_path)):
2708
2976
if file_id in merge_modified:
2709
2977
del merge_modified[file_id]
2711
2979
merge_modified[file_id] = new_sha1
2713
2981
# preserve the execute bit when backing up
2714
if keep_content and executable[0] == executable[1]:
2715
tt.set_executability(executable[1], trans_id)
2716
elif kind[1] is not None:
2717
raise AssertionError(kind[1])
2718
if versioned == (False, True):
2982
if keep_content and wt_executable == target_executable:
2983
tt.set_executability(target_executable, trans_id)
2984
elif target_kind is not None:
2985
raise AssertionError(target_kind)
2986
if not wt_versioned and target_versioned:
2719
2987
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2988
if wt_versioned and not target_versioned:
2721
2989
tt.unversion_file(trans_id)
2722
if (name[1] is not None and
2723
(name[0] != name[1] or parent[0] != parent[1])):
2724
if name[1] == '' and parent[1] is None:
2990
if (target_name is not None
2991
and (wt_name != target_name or wt_parent != target_parent)):
2992
if target_name == '' and target_parent is None:
2725
2993
parent_trans = ROOT_PARENT
2727
parent_trans = tt.trans_id_file_id(parent[1])
2728
if parent[0] is None and versioned[0]:
2729
tt.adjust_root_path(name[1], parent_trans)
2995
parent_trans = tt.trans_id_file_id(target_parent)
2996
if wt_parent is None and wt_versioned:
2997
tt.adjust_root_path(target_name, parent_trans)
2731
tt.adjust_path(name[1], parent_trans, trans_id)
2732
if executable[0] != executable[1] and kind[1] == "file":
2733
tt.set_executability(executable[1], trans_id)
2999
tt.adjust_path(target_name, parent_trans, trans_id)
3000
if wt_executable != target_executable and target_kind == "file":
3001
tt.set_executability(target_executable, trans_id)
2734
3002
if working_tree.supports_content_filtering():
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
target_tree.iter_files_bytes(deferred_files)):
2737
file_id = deferred_files[index][0]
3003
for (trans_id, mode_id, file_id), bytes in (
3004
target_tree.iter_files_bytes(deferred_files)):
2738
3005
# We're reverting a tree to the target tree so using the
2739
3006
# target tree to find the file path seems the best choice
2740
3007
# here IMO - Ian C 27/Oct/2009
2741
3008
filter_tree_path = target_tree.id2path(file_id)
2742
3009
filters = working_tree._content_filter_stack(filter_tree_path)
2743
bytes = filtered_output_bytes(bytes, filters,
3010
bytes = filtered_output_bytes(
2744
3012
ContentFilterContext(filter_tree_path, working_tree))
2745
3013
tt.create_file(bytes, trans_id, mode_id)
2747
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3015
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2749
3017
tt.create_file(bytes, trans_id, mode_id)
2750
3018
tt.fixup_new_roots()
2920
3206
def rollback(self):
2921
3207
"""Reverse all renames that have been performed"""
2922
3208
for from_, to in reversed(self.past_renames):
2923
osutils.rename(to, from_)
3210
os.rename(to, from_)
3211
except OSError as e:
3212
raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2924
3213
# after rollback, don't reuse _FileMover
2926
pending_deletions = None
3214
self.past_renames = None
3215
self.pending_deletions = None
2928
3217
def apply_deletions(self):
2929
3218
"""Apply all marked deletions"""
2930
3219
for path in self.pending_deletions:
2931
3220
delete_any(path)
2932
3221
# after apply_deletions, don't reuse _FileMover
2934
pending_deletions = None
3222
self.past_renames = None
3223
self.pending_deletions = None
3226
def link_tree(target_tree, source_tree):
3227
"""Where possible, hard-link files in a tree to those in another tree.
3229
:param target_tree: Tree to change
3230
:param source_tree: Tree to hard-link from
3232
tt = TreeTransform(target_tree)
3234
for (file_id, paths, changed_content, versioned, parent, name, kind,
3235
executable) in target_tree.iter_changes(source_tree,
3236
include_unchanged=True):
3239
if kind != ('file', 'file'):
3241
if executable[0] != executable[1]:
3243
trans_id = tt.trans_id_tree_path(paths[1])
3244
tt.delete_contents(trans_id)
3245
tt.create_hardlink(source_tree.abspath(paths[0]), trans_id)
added
removed
breezy/transform.py
