14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
33
44
revision as _mod_revision,
48
from breezy.bzr import (
52
from breezy.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
from bzrlib.osutils import (
54
from .errors import (DuplicateKey,
56
BzrError, InternalBzrError)
57
from .filters import filtered_output_bytes, ContentFilterContext
58
from .mutabletree import MutableTree
59
from .osutils import (
53
from bzrlib.progress import ProgressPhase
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
67
from .progress import ProgressPhase
64
79
ROOT_PARENT = "root-parent"
82
class NoFinalPath(BzrError):
84
_fmt = ("No final name for trans_id %(trans_id)r\n"
85
"file-id: %(file_id)r\n"
86
"root trans-id: %(root_trans_id)r\n")
88
def __init__(self, trans_id, transform):
89
self.trans_id = trans_id
90
self.file_id = transform.final_file_id(trans_id)
91
self.root_trans_id = transform.root
94
class ReusingTransform(BzrError):
96
_fmt = "Attempt to reuse a transform that has already been applied."
99
class MalformedTransform(InternalBzrError):
101
_fmt = "Tree transform is malformed %(conflicts)r"
104
class ImmortalLimbo(BzrError):
106
_fmt = """Unable to delete transform temporary directory %(limbo_dir)s.
107
Please examine %(limbo_dir)s to see if it contains any files you wish to
108
keep, and delete it when you are done."""
110
def __init__(self, limbo_dir):
111
BzrError.__init__(self)
112
self.limbo_dir = limbo_dir
67
115
def unique_add(map, key, value):
69
117
raise DuplicateKey(key=key)
380
426
return sorted(FinalPaths(self).get_paths(new_ids))
382
428
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,
429
"""Determine which trans_ids need new Inventory entries.
431
An new entry is needed when anything that would be reflected by an
432
inventory entry changes, including file name, file_id, parent file_id,
433
file kind, and the execute bit.
435
Some care is taken to return entries with real changes, not cases
436
where the value is deleted and then restored to its original value,
437
but some actually unchanged values may be returned.
439
:returns: A list of (path, trans_id) for all items requiring an
440
inventory change. Ordered by path.
443
# Find entries whose file_ids are new (or changed).
444
new_file_id = set(t for t in self._new_id
445
if self._new_id[t] != self.tree_file_id(t))
446
for id_set in [self._new_name, self._new_parent, new_file_id,
386
447
self._new_executability]:
387
new_ids.update(id_set)
448
changed_ids.update(id_set)
449
# removing implies a kind change
388
450
changed_kind = set(self._removed_contents)
389
452
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))
453
# Ignore entries that are already known to have changed.
454
changed_kind.difference_update(changed_ids)
455
# to keep only the truly changed ones
456
changed_kind = (t for t in changed_kind
457
if self.tree_kind(t) != self.final_kind(t))
458
# all kind changes will alter the inventory
459
changed_ids.update(changed_kind)
460
# To find entries with changed parent_ids, find parents which existed,
461
# but changed file_id.
462
# Now add all their children to the set.
463
for parent_trans_id in new_file_id:
464
changed_ids.update(self.iter_tree_children(parent_trans_id))
465
return sorted(FinalPaths(self).get_paths(changed_ids))
396
467
def final_kind(self, trans_id):
397
468
"""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)
470
:return: None if the file does not exist/has no contents. (It is
471
conceivable that a path would be created without the corresponding
472
contents insertion command)
403
474
if trans_id in self._new_contents:
404
475
return self._new_contents[trans_id]
405
476
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
479
return self.tree_kind(trans_id)
481
def tree_path(self, trans_id):
482
"""Determine the tree path associated with the trans_id."""
483
return self._tree_id_paths.get(trans_id)
410
485
def tree_file_id(self, trans_id):
411
486
"""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
487
path = self.tree_path(trans_id)
417
490
# the file is old; the old id is still valid
418
491
if self._new_root == trans_id:
419
return self._tree.get_root_id()
492
return self._tree.path2id('')
420
493
return self._tree.path2id(path)
422
495
def final_file_id(self, trans_id):
531
604
# ensure that all children are registered with the transaction
532
605
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:
607
def _has_named_child(self, name, parent_id, known_children):
608
"""Does a parent already have a name child.
610
:param name: The searched for name.
612
:param parent_id: The parent for which the check is made.
614
:param known_children: The already known children. This should have
615
been recently obtained from `self.by_parent.get(parent_id)`
616
(or will be if None is passed).
618
if known_children is None:
619
known_children = self.by_parent().get(parent_id, [])
620
for child in known_children:
540
621
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
623
parent_path = self._tree_id_paths.get(parent_id, None)
624
if parent_path is None:
625
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
627
child_path = joinpath(parent_path, name)
628
child_id = self._tree_path_ids.get(child_path, None)
548
629
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
630
# Not known by the tree transform yet, check the filesystem
631
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?
633
raise AssertionError('child_id is missing: %s, %s, %s'
634
% (name, parent_id, child_id))
636
def _available_backup_name(self, name, target_id):
637
"""Find an available backup name.
639
:param name: The basename of the file.
641
:param target_id: The directory trans_id where the backup should
644
known_children = self.by_parent().get(target_id, [])
645
return osutils.available_backup_name(
647
lambda base: self._has_named_child(
648
base, target_id, known_children))
559
650
def _parent_loops(self):
560
651
"""No entry should be its own ancestor"""
668
757
def _duplicate_ids(self):
669
758
"""Each inventory id may only be used once"""
761
all_ids = self._tree.all_file_ids()
762
except errors.UnsupportedOperation:
763
# it's okay for non-file-id trees to raise UnsupportedOperation.
671
765
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
672
766
self._removed_id))
673
all_ids = self._tree.all_file_ids()
674
767
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
768
for trans_id, file_id in viewitems(self._new_id):
676
769
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
770
path = self._tree.id2path(file_id)
771
old_trans_id = self.trans_id_tree_path(path)
678
772
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
775
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
776
"""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)
778
for parent_id, children in viewitems(by_parent):
779
if parent_id == ROOT_PARENT:
782
for child_id in children:
783
if self.final_kind(child_id) is not None:
788
# There is at least a child, so we need an existing directory to
790
kind = self.final_kind(parent_id)
792
# The directory will be deleted
699
793
conflicts.append(('missing parent', parent_id))
700
794
elif kind != "directory":
795
# Meh, we need a *directory* to put something in it
701
796
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
799
def _set_executability(self, path, trans_id):
715
800
"""Set the executability of versioned files """
716
if supports_executable():
801
if self._tree._supports_executable():
717
802
new_executability = self._new_executability[trans_id]
718
803
abspath = self._tree.abspath(path)
719
804
current_mode = os.stat(abspath).st_mode
720
805
if new_executability:
721
806
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
808
to_mode = current_mode | (0o100 & ~umask)
724
809
# 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
810
if current_mode & 0o004:
811
to_mode |= 0o001 & ~umask
812
if current_mode & 0o040:
813
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
815
to_mode = current_mode & ~0o111
816
osutils.chmod_if_possible(abspath, to_mode)
733
818
def _new_entry(self, name, parent_id, file_id):
734
819
"""Helper function to create a new filesystem entry."""
780
865
self.create_symlink(target, trans_id)
868
def new_orphan(self, trans_id, parent_id):
869
"""Schedule an item to be orphaned.
871
When a directory is about to be removed, its children, if they are not
872
versioned are moved out of the way: they don't have a parent anymore.
874
:param trans_id: The trans_id of the existing item.
875
:param parent_id: The parent trans_id of the item.
877
raise NotImplementedError(self.new_orphan)
879
def _get_potential_orphans(self, dir_id):
880
"""Find the potential orphans in a directory.
882
A directory can't be safely deleted if there are versioned files in it.
883
If all the contained files are unversioned then they can be orphaned.
885
The 'None' return value means that the directory contains at least one
886
versioned file and should not be deleted.
888
:param dir_id: The directory trans id.
890
:return: A list of the orphan trans ids or None if at least one
891
versioned file is present.
894
# Find the potential orphans, stop if one item should be kept
895
for child_tid in self.by_parent()[dir_id]:
896
if child_tid in self._removed_contents:
897
# The child is removed as part of the transform. Since it was
898
# versioned before, it's not an orphan
900
elif self.final_file_id(child_tid) is None:
901
# The child is not versioned
902
orphans.append(child_tid)
904
# We have a versioned file here, searching for orphans is
783
910
def _affected_ids(self):
784
911
"""Return the set of transform ids affected by the transform"""
785
912
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
913
trans_ids.update(self._new_id)
787
914
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())
915
trans_ids.update(self._new_contents)
916
trans_ids.update(self._new_executability)
917
trans_ids.update(self._new_name)
918
trans_ids.update(self._new_parent)
794
921
def _get_file_id_maps(self):
903
1022
to_path = final_paths.get_path(to_trans_id)
1024
from_name, from_parent, from_kind, from_executable = \
1025
self._from_file_data(from_trans_id, from_versioned, from_path)
1027
to_name, to_parent, to_kind, to_executable = \
1028
self._to_file_data(to_trans_id, from_trans_id, from_executable)
904
1030
if from_kind != to_kind:
906
1032
elif to_kind in ('file', 'symlink') and (
907
to_trans_id != from_trans_id or
908
to_trans_id in self._new_contents):
1033
to_trans_id != from_trans_id
1034
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):
1036
if (not modified and from_versioned == to_versioned
1037
and from_parent == to_parent and from_name == to_name
1038
and from_executable == to_executable):
914
results.append((file_id, (from_path, to_path), modified,
915
(from_versioned, to_versioned),
916
(from_parent, to_parent),
917
(from_name, to_name),
918
(from_kind, to_kind),
919
(from_executable, to_executable)))
920
return iter(sorted(results, key=lambda x:x[1]))
1042
file_id, (from_path, to_path), modified,
1043
(from_versioned, to_versioned),
1044
(from_parent, to_parent),
1045
(from_name, to_name),
1046
(from_kind, to_kind),
1047
(from_executable, to_executable)))
1050
return (c.path[0] or '', c.path[1] or '')
1051
return iter(sorted(results, key=path_key))
922
1053
def get_preview_tree(self):
923
1054
"""Return a tree representing the result of the transform.
965
1117
return revision_id
967
1119
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1120
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1122
if path is None or self._tree.kind(path) != 'file':
972
1124
except errors.NoSuchFile:
976
1128
def _get_parents_texts(self, trans_id):
977
1129
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1130
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1133
return (self._tree.get_file_text(path),)
983
1135
def _get_parents_lines(self, trans_id):
984
1136
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1137
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1140
return (self._tree.get_file_lines(path),)
990
1142
def serialize(self, serializer):
991
1143
"""Serialize this TreeTransform.
993
1145
: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())
1147
new_name = {k.encode('utf-8'): v.encode('utf-8')
1148
for k, v in viewitems(self._new_name)}
1149
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1150
for k, v in viewitems(self._new_parent)}
1151
new_id = {k.encode('utf-8'): v
1152
for k, v in viewitems(self._new_id)}
1153
new_executability = {k.encode('utf-8'): int(v)
1154
for k, v in viewitems(self._new_executability)}
1155
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1156
for k, v in viewitems(self._tree_path_ids)}
1157
non_present_ids = {k: v.encode('utf-8')
1158
for k, v in viewitems(self._non_present_ids)}
1159
removed_contents = [trans_id.encode('utf-8')
1160
for trans_id in self._removed_contents]
1161
removed_id = [trans_id.encode('utf-8')
1162
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,
1164
b'_id_number': self._id_number,
1165
b'_new_name': new_name,
1166
b'_new_parent': new_parent,
1167
b'_new_executability': new_executability,
1169
b'_tree_path_ids': tree_path_ids,
1170
b'_removed_id': removed_id,
1171
b'_removed_contents': removed_contents,
1172
b'_non_present_ids': non_present_ids,
1012
1174
yield serializer.bytes_record(bencode.bencode(attribs),
1014
for trans_id, kind in self._new_contents.items():
1176
for trans_id, kind in sorted(viewitems(self._new_contents)):
1015
1177
if kind == 'file':
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1178
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1179
lines = cur_file.readlines()
1018
1180
parents = self._get_parents_lines(trans_id)
1019
1181
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
content = ''.join(mpdiff.to_patch())
1182
content = b''.join(mpdiff.to_patch())
1021
1183
if kind == 'directory':
1023
1185
if kind == 'symlink':
1024
1186
content = self._read_symlink_target(trans_id)
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
1187
if not isinstance(content, bytes):
1188
content = content.encode('utf-8')
1189
yield serializer.bytes_record(
1190
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1027
1192
def deserialize(self, records):
1028
1193
"""Deserialize a stored TreeTransform.
1030
1195
:param records: An iterable of (names, content) tuples, as per
1031
1196
pack.ContainerPushParser.
1033
names, content = records.next()
1198
names, content = next(records)
1034
1199
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())
1200
self._id_number = attribs[b'_id_number']
1201
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1202
for k, v in viewitems(attribs[b'_new_name'])}
1203
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1204
for k, v in viewitems(attribs[b'_new_parent'])}
1205
self._new_executability = {
1206
k.decode('utf-8'): bool(v)
1207
for k, v in viewitems(attribs[b'_new_executability'])}
1208
self._new_id = {k.decode('utf-8'): v
1209
for k, v in viewitems(attribs[b'_new_id'])}
1210
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1043
1211
self._tree_path_ids = {}
1044
1212
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1213
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1046
1214
path = bytepath.decode('utf-8')
1215
trans_id = trans_id.decode('utf-8')
1047
1216
self._tree_path_ids[path] = trans_id
1048
1217
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']
1218
self._removed_id = {trans_id.decode('utf-8')
1219
for trans_id in attribs[b'_removed_id']}
1220
self._removed_contents = set(
1221
trans_id.decode('utf-8')
1222
for trans_id in attribs[b'_removed_contents'])
1223
self._non_present_ids = {
1224
k: v.decode('utf-8')
1225
for k, v in viewitems(attribs[b'_non_present_ids'])}
1052
1226
for ((trans_id, kind),), content in records:
1227
trans_id = trans_id.decode('utf-8')
1228
kind = kind.decode('ascii')
1053
1229
if kind == 'file':
1054
1230
mpdiff = multiparent.MultiParent.from_patch(content)
1055
1231
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1059
1235
if kind == 'symlink':
1060
1236
self.create_symlink(content.decode('utf-8'), trans_id)
1238
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1239
"""Schedule creation of a new file.
1243
:param contents: an iterator of strings, all of which will be written
1244
to the target destination.
1245
:param trans_id: TreeTransform handle
1246
:param mode_id: If not None, force the mode of the target file to match
1247
the mode of the object referenced by mode_id.
1248
Otherwise, we will try to preserve mode bits of an existing file.
1249
:param sha1: If the sha1 of this content is already known, pass it in.
1250
We can use it to prevent future sha1 computations.
1252
raise NotImplementedError(self.create_file)
1254
def create_directory(self, trans_id):
1255
"""Schedule creation of a new directory.
1257
See also new_directory.
1259
raise NotImplementedError(self.create_directory)
1261
def create_symlink(self, target, trans_id):
1262
"""Schedule creation of a new symbolic link.
1264
target is a bytestring.
1265
See also new_symlink.
1267
raise NotImplementedError(self.create_symlink)
1269
def create_hardlink(self, path, trans_id):
1270
"""Schedule creation of a hard link"""
1271
raise NotImplementedError(self.create_hardlink)
1273
def cancel_creation(self, trans_id):
1274
"""Cancel the creation of new file contents."""
1275
raise NotImplementedError(self.cancel_creation)
1063
1278
class DiskTreeTransform(TreeTransformBase):
1064
1279
"""Tree transform storing its contents on disk."""
1066
def __init__(self, tree, limbodir, pb=None,
1067
case_sensitive=True):
1281
def __init__(self, tree, limbodir, pb=None, case_sensitive=True):
1068
1282
"""Constructor.
1069
1283
:param tree: The tree that will be transformed, but not necessarily
1070
1284
the output tree.
1173
1403
descendants.update(self._limbo_descendants(descendant))
1174
1404
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1406
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1407
"""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.
1411
:param contents: an iterator of strings, all of which will be written
1412
to the target destination.
1413
:param trans_id: TreeTransform handle
1414
:param mode_id: If not None, force the mode of the target file to match
1415
the mode of the object referenced by mode_id.
1416
Otherwise, we will try to preserve mode bits of an existing file.
1417
:param sha1: If the sha1 of this content is already known, pass it in.
1418
We can use it to prevent future sha1 computations.
1187
1420
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.
1421
with open(name, 'wb') as f:
1422
unique_add(self._new_contents, trans_id, 'file')
1199
1423
f.writelines(contents)
1202
1424
self._set_mtime(name)
1203
1425
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()
1426
# It is unfortunate we have to use lstat instead of fstat, but we just
1427
# used utime and chmod on the file, so we need the accurate final
1429
if sha1 is not None:
1430
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1212
1432
def _read_symlink_target(self, trans_id):
1213
1433
return os.readlink(self._limbo_name(trans_id))
1274
1500
del self._limbo_children_names[trans_id]
1275
1501
delete_any(self._limbo_name(trans_id))
1503
def new_orphan(self, trans_id, parent_id):
1504
conf = self._tree.get_config_stack()
1505
handle_orphan = conf.get('transform.orphan_policy')
1506
handle_orphan(self, trans_id, parent_id)
1509
class OrphaningError(errors.BzrError):
1511
# Only bugs could lead to such exception being seen by the user
1512
internal_error = True
1513
_fmt = "Error while orphaning %s in %s directory"
1515
def __init__(self, orphan, parent):
1516
errors.BzrError.__init__(self)
1517
self.orphan = orphan
1518
self.parent = parent
1521
class OrphaningForbidden(OrphaningError):
1523
_fmt = "Policy: %s doesn't allow creating orphans."
1525
def __init__(self, policy):
1526
errors.BzrError.__init__(self)
1527
self.policy = policy
1530
def move_orphan(tt, orphan_id, parent_id):
1531
"""See TreeTransformBase.new_orphan.
1533
This creates a new orphan in the `brz-orphans` dir at the root of the
1536
:param tt: The TreeTransform orphaning `trans_id`.
1538
:param orphan_id: The trans id that should be orphaned.
1540
:param parent_id: The orphan parent trans id.
1542
# Add the orphan dir if it doesn't exist
1543
orphan_dir_basename = 'brz-orphans'
1544
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1545
if tt.final_kind(od_id) is None:
1546
tt.create_directory(od_id)
1547
parent_path = tt._tree_id_paths[parent_id]
1548
# Find a name that doesn't exist yet in the orphan dir
1549
actual_name = tt.final_name(orphan_id)
1550
new_name = tt._available_backup_name(actual_name, od_id)
1551
tt.adjust_path(new_name, od_id, orphan_id)
1552
trace.warning('%s has been orphaned in %s'
1553
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1556
def refuse_orphan(tt, orphan_id, parent_id):
1557
"""See TreeTransformBase.new_orphan.
1559
This refuses to create orphan, letting the caller handle the conflict.
1561
raise OrphaningForbidden('never')
1564
orphaning_registry = registry.Registry()
1565
orphaning_registry.register(
1566
u'conflict', refuse_orphan,
1567
'Leave orphans in place and create a conflict on the directory.')
1568
orphaning_registry.register(
1569
u'move', move_orphan,
1570
'Move orphans into the brz-orphans directory.')
1571
orphaning_registry._set_default_key(u'conflict')
1574
opt_transform_orphan = _mod_config.RegistryOption(
1575
'transform.orphan_policy', orphaning_registry,
1576
help='Policy for orphaned files during transform operations.',
1278
1580
class TreeTransform(DiskTreeTransform):
1279
1581
"""Represent a tree transformation.
1656
1945
new_paths = self.new_paths(filesystem_only=True)
1657
1946
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()
1947
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1948
for num, (path, trans_id) in enumerate(new_paths):
1663
1949
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1950
child_pb.update(gettext('adding file'),
1951
num, len(new_paths))
1665
1952
full_path = self._tree.abspath(path)
1666
1953
if trans_id in self._needs_rename:
1668
1955
mover.rename(self._limbo_name(trans_id), full_path)
1956
except errors.TransformRenameFailed as e:
1670
1957
# We may be renaming a dangling inventory id
1671
1958
if e.errno != errno.ENOENT:
1674
1961
self.rename_count += 1
1675
if (trans_id in self._new_contents or
1676
self.path_changed(trans_id)):
1962
# TODO: if trans_id in self._observed_sha1s, we should
1963
# re-stat the final target, since ctime will be
1964
# updated by the change.
1965
if (trans_id in self._new_contents
1966
or self.path_changed(trans_id)):
1677
1967
if trans_id in self._new_contents:
1678
1968
modified_paths.append(full_path)
1679
1969
if trans_id in self._new_executability:
1680
1970
self._set_executability(path, trans_id)
1971
if trans_id in self._observed_sha1s:
1972
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1973
st = osutils.lstat(full_path)
1974
self._observed_sha1s[trans_id] = (o_sha1, st)
1975
for path, trans_id in new_paths:
1976
# new_paths includes stuff like workingtree conflicts. Only the
1977
# stuff in new_contents actually comes from limbo.
1978
if trans_id in self._limbo_files:
1979
del self._limbo_files[trans_id]
1683
1980
self._new_contents.clear()
1684
1981
return modified_paths
1983
def _apply_observed_sha1s(self):
1984
"""After we have finished renaming everything, update observed sha1s
1986
This has to be done after self._tree.apply_inventory_delta, otherwise
1987
it doesn't know anything about the files we are updating. Also, we want
1988
to do this as late as possible, so that most entries end up cached.
1990
# TODO: this doesn't update the stat information for directories. So
1991
# the first 'bzr status' will still need to rewrite
1992
# .bzr/checkout/dirstate. However, we at least don't need to
1993
# re-read all of the files.
1994
# TODO: If the operation took a while, we could do a time.sleep(3) here
1995
# to allow the clock to tick over and ensure we won't have any
1996
# problems. (we could observe start time, and finish time, and if
1997
# it is less than eg 10% overhead, add a sleep call.)
1998
paths = FinalPaths(self)
1999
for trans_id, observed in viewitems(self._observed_sha1s):
2000
path = paths.get_path(trans_id)
2001
self._tree._observed_sha1(path, observed)
1687
2004
class TransformPreview(DiskTreeTransform):
1688
2005
"""A TreeTransform for generating preview trees.
1795
2121
executable = False
1797
2123
file_id = self._transform.final_file_id(self._path2trans_id(path))
1798
executable = self.is_executable(file_id, path)
2124
executable = self.is_executable(path)
1799
2125
return kind, executable, None
2127
def is_locked(self):
1801
2130
def lock_read(self):
1802
2131
# Perhaps in theory, this should lock the TreeTransform?
2132
return lock.LogicalLockResult(self.unlock)
1805
2134
def unlock(self):
1809
def inventory(self):
2138
def root_inventory(self):
1810
2139
"""This Tree does not use inventory as its backing data."""
1811
raise NotImplementedError(_PreviewTree.inventory)
1813
def get_root_id(self):
1814
return self._transform.final_file_id(self._transform.root)
2140
raise NotImplementedError(_PreviewTree.root_inventory)
1816
2142
def all_file_ids(self):
1817
2143
tree_ids = set(self._transform._tree.all_file_ids())
1818
2144
tree_ids.difference_update(self._transform.tree_file_id(t)
1819
2145
for t in self._transform._removed_id)
1820
tree_ids.update(self._transform._new_id.values())
2146
tree_ids.update(viewvalues(self._transform._new_id))
1821
2147
return tree_ids
1824
return iter(self.all_file_ids())
1826
def _has_id(self, file_id, fallback_check):
1827
if file_id in self._transform._r_new_id:
1829
elif file_id in set([self._transform.tree_file_id(trans_id) for
1830
trans_id in self._transform._removed_id]):
1833
return fallback_check(file_id)
1835
def has_id(self, file_id):
1836
return self._has_id(file_id, self._transform._tree.has_id)
1838
def has_or_had_id(self, file_id):
1839
return self._has_id(file_id, self._transform._tree.has_or_had_id)
2149
def all_versioned_paths(self):
2150
tree_paths = set(self._transform._tree.all_versioned_paths())
2152
tree_paths.difference_update(
2153
self._transform.trans_id_tree_path(t)
2154
for t in self._transform._removed_id)
2157
self._final_paths._determine_path(t)
2158
for t in self._transform._new_id)
1841
2162
def _path2trans_id(self, path):
1842
2163
# We must not use None here, because that is a valid value to store.
1937
2269
ordered_ids = self._list_files_by_dir()
1938
2270
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
2272
yield self._final_paths.get_path(trans_id), entry
1942
2274
def _iter_entries_for_dir(self, dir_path):
1943
2275
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
1945
2276
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))
2277
dir_trans_id = self._path2trans_id(dir_path)
2278
dir_id = self._transform.final_file_id(dir_trans_id)
2279
for child_trans_id in self._all_children(dir_trans_id):
2280
ordered_ids.append((child_trans_id, dir_id))
1949
2282
for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2283
path_entries.append((self._final_paths.get_path(trans_id), entry))
1952
def list_files(self, include_root=False, from_dir=None, recursive=True):
2287
def list_files(self, include_root=False, from_dir=None, recursive=True,
2288
recurse_nested=False):
1953
2289
"""See WorkingTree.list_files."""
2291
raise NotImplementedError(
2292
'follow tree references not yet supported')
1954
2294
# XXX This should behave like WorkingTree.list_files, but is really
1955
2295
# more like RevisionTree.list_files.
1965
2307
if not path.startswith(prefix):
1967
2309
path = path[len(prefix):]
1968
yield path, 'V', entry.kind, entry.file_id, entry
2310
yield path, 'V', entry.kind, entry
1970
2312
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
2313
root_entry = inventory.make_entry(
2314
'directory', '', ROOT_PARENT, self.path2id(''))
2315
yield '', 'V', 'directory', root_entry
1974
2316
entries = self._iter_entries_for_dir(from_dir or '')
1975
2317
for path, entry in entries:
1976
yield path, 'V', entry.kind, entry.file_id, entry
2318
yield path, 'V', entry.kind, entry
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2320
def kind(self, path):
2321
trans_id = self._path2trans_id(path)
2322
if trans_id is None:
2323
raise errors.NoSuchFile(path)
1980
2324
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)
2326
def stored_kind(self, path):
2327
trans_id = self._path2trans_id(path)
2328
if trans_id is None:
2329
raise errors.NoSuchFile(path)
1985
2331
return self._transform._new_contents[trans_id]
1986
2332
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2333
return self._transform._tree.stored_kind(path)
1989
def get_file_mtime(self, file_id, path=None):
2335
def get_file_mtime(self, path):
1990
2336
"""See Tree.get_file_mtime"""
2337
file_id = self.path2id(path)
2339
raise errors.NoSuchFile(path)
1991
2340
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):
2341
return self._transform._tree.get_file_mtime(
2342
self._transform._tree.id2path(file_id))
2343
trans_id = self._path2trans_id(path)
2344
return self._stat_limbo_file(trans_id).st_mtime
2346
def get_file_size(self, path):
1999
2347
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2348
trans_id = self._path2trans_id(path)
2349
if trans_id is None:
2350
raise errors.NoSuchFile(path)
2351
kind = self._transform.final_kind(trans_id)
2354
if trans_id in self._transform._new_contents:
2355
return self._stat_limbo_file(trans_id).st_size
2356
if self.kind(path) == 'file':
2357
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)
2361
def get_file_verifier(self, path, stat_value=None):
2362
trans_id = self._path2trans_id(path)
2363
if trans_id is None:
2364
raise errors.NoSuchFile(path)
2365
kind = self._transform._new_contents.get(trans_id)
2367
return self._transform._tree.get_file_verifier(path)
2369
with self.get_file(path) as fileobj:
2370
return ("SHA1", sha_file(fileobj))
2372
def get_file_sha1(self, path, stat_value=None):
2373
trans_id = self._path2trans_id(path)
2374
if trans_id is None:
2375
raise errors.NoSuchFile(path)
2376
kind = self._transform._new_contents.get(trans_id)
2378
return self._transform._tree.get_file_sha1(path)
2380
with self.get_file(path) as fileobj:
2013
2381
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2383
def get_reference_revision(self, path):
2384
trans_id = self._path2trans_id(path)
2385
if trans_id is None:
2386
raise errors.NoSuchFile(path)
2387
reference_revision = self._transform._new_reference_revision.get(trans_id)
2388
if reference_revision is None:
2389
return self._transform._tree.get_reference_revision(path)
2390
return reference_revision
2392
def is_executable(self, path):
2393
trans_id = self._path2trans_id(path)
2394
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2397
return self._transform._new_executability[trans_id]
2023
2398
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2400
return self._transform._tree.is_executable(path)
2401
except OSError as e:
2027
2402
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2405
except errors.NoSuchFile:
2408
def has_filename(self, path):
2409
trans_id = self._path2trans_id(path)
2410
if trans_id in self._transform._new_contents:
2412
elif trans_id in self._transform._removed_contents:
2415
return self._transform._tree.has_filename(path)
2033
2417
def path_content_summary(self, path):
2034
2418
trans_id = self._path2trans_id(path)
2035
2419
tt = self._transform
2081
2467
raise ValueError('want_unversioned is not supported')
2082
2468
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2470
def get_file(self, path):
2085
2471
"""See Tree.get_file"""
2472
file_id = self.path2id(path)
2086
2473
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)
2474
return self._transform._tree.get_file(path)
2475
trans_id = self._path2trans_id(path)
2089
2476
name = self._transform._limbo_name(trans_id)
2090
2477
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2479
def get_file_with_stat(self, path):
2480
return self.get_file(path), None
2095
def annotate_iter(self, file_id,
2482
def annotate_iter(self, path,
2096
2483
default_revision=_mod_revision.CURRENT_REVISION):
2484
file_id = self.path2id(path)
2097
2485
changes = self._iter_changes_cache.get(file_id)
2098
2486
if changes is None:
2101
changed_content, versioned, kind = (changes[2], changes[3],
2489
changed_content, versioned, kind = (
2490
changes.changed_content, changes.versioned, changes.kind)
2103
2491
if kind[1] is None:
2105
2493
get_old = (kind[0] == 'file' and versioned[0])
2107
old_annotation = self._transform._tree.annotate_iter(file_id,
2108
default_revision=default_revision)
2495
old_annotation = self._transform._tree.annotate_iter(
2496
path, default_revision=default_revision)
2110
2498
old_annotation = []
2111
2499
if changes is None:
2243
2626
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2627
generate the inventory delta.
2246
wt.lock_tree_write()
2250
if accelerator_tree is not None:
2251
accelerator_tree.lock_read()
2253
return _build_tree(tree, wt, accelerator_tree, hardlink,
2256
if accelerator_tree is not None:
2257
accelerator_tree.unlock()
2629
with cleanup.ExitStack() as exit_stack:
2630
exit_stack.enter_context(wt.lock_tree_write())
2631
exit_stack.enter_context(tree.lock_read())
2632
if accelerator_tree is not None:
2633
exit_stack.enter_context(accelerator_tree.lock_read())
2634
return _build_tree(tree, wt, accelerator_tree, hardlink,
2264
2638
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2639
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2640
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2641
if num > 0: # more than just a root
2268
2642
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
2643
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2644
top_pb = ui.ui_factory.nested_progress_bar()
2274
2645
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2646
if tree.path2id('') is not None:
2276
2647
# This is kind of a hack: we should be altering the root
2277
2648
# as part of the regular tree shape diff logic.
2278
2649
# The conditional test here is to avoid doing an
2280
2651
# is set within the tree, nor setting the root and thus
2281
2652
# marking the tree as dirty, because we use two different
2282
2653
# idioms here: tree interfaces and inventory interfaces.
2283
if wt.get_root_id() != tree.get_root_id():
2284
wt.set_root_id(tree.get_root_id())
2654
if wt.path2id('') != tree.path2id(''):
2655
wt.set_root_id(tree.path2id(''))
2286
tt = TreeTransform(wt)
2657
tt = wt.get_transform()
2289
2660
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()
2661
file_trans_id[wt.path2id('')] = tt.trans_id_tree_path('')
2662
with ui.ui_factory.nested_progress_bar() as pb:
2294
2663
deferred_contents = []
2296
total = len(tree.inventory)
2665
total = len(tree.all_versioned_paths())
2297
2666
if delta_from_tree:
2298
2667
precomputed_delta = []
2300
2669
precomputed_delta = None
2670
# Check if tree inventory has content. If so, we populate
2671
# existing_files with the directory content. If there are no
2672
# entries we skip populating existing_files as its not used.
2673
# This improves performance and unncessary work on large
2674
# directory trees. (#501307)
2676
existing_files = set()
2677
for dir, files in wt.walkdirs():
2678
existing_files.update(f[0] for f in files)
2301
2679
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2680
enumerate(tree.iter_entries_by_dir()):
2681
pb.update(gettext("Building tree"), num
2682
- len(deferred_contents), total)
2304
2683
if entry.parent_id is None:
2306
2685
reparent = False
2376
2756
new_desired_files = desired_files
2378
2758
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2380
in iter if not (c or e[0] != e[1])]
2760
change.path for change in iter
2761
if not (change.changed_content or change.executable[0] != change.executable[1])]
2381
2762
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()]
2763
unchanged = [(tp, ap) for (tp, ap) in unchanged
2764
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2765
unchanged = dict(unchanged)
2385
2766
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2768
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2769
accelerator_path = unchanged.get(tree_path)
2389
2770
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2771
new_desired_files.append((tree_path,
2772
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2774
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2776
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
2779
with accelerator_tree.get_file(accelerator_path) as f:
2780
chunks = osutils.file_iterator(f)
2781
if wt.supports_content_filtering():
2782
filters = wt._content_filter_stack(tree_path)
2783
chunks = filtered_output_bytes(chunks, filters,
2784
ContentFilterContext(tree_path, tree))
2785
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2787
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2788
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2789
tree.iter_files_bytes(new_desired_files)):
2414
2790
if wt.supports_content_filtering():
2415
2791
filters = wt._content_filter_stack(tree_path)
2416
2792
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)
2793
ContentFilterContext(tree_path, tree))
2794
tt.create_file(contents, trans_id, sha1=text_sha1)
2795
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2798
def _reparent_children(tt, old_parent, new_parent):
2423
2799
for child in tt.iter_tree_children(old_parent):
2424
2800
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2803
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2804
by_parent = tt.by_parent()
2428
2805
for child in by_parent[old_parent]:
2429
2806
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2807
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2810
def _content_match(tree, entry, tree_path, kind, target_path):
2433
2811
if entry.kind != kind:
2435
2813
if entry.kind == "directory":
2437
2815
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2816
with open(target_path, 'rb') as f1, \
2817
tree.get_file(tree_path) as f2:
2818
if osutils.compare_files(f1, f2):
2440
2820
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2821
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2462
2842
final_parent = tt.final_parent(old_file)
2463
2843
if new_file in divert:
2464
new_name = tt.final_name(old_file)+'.diverted'
2844
new_name = tt.final_name(old_file) + '.diverted'
2465
2845
tt.adjust_path(new_name, final_parent, new_file)
2466
2846
new_conflicts.add((c_type, 'Diverted to',
2467
2847
new_file, old_file))
2469
new_name = tt.final_name(old_file)+'.moved'
2849
new_name = tt.final_name(old_file) + '.moved'
2470
2850
tt.adjust_path(new_name, final_parent, old_file)
2471
2851
new_conflicts.add((c_type, 'Moved existing file to',
2472
2852
old_file, new_file))
2473
2853
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2856
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2857
"""Create a new file according to its inventory entry"""
2478
2858
name = entry.name
2479
2859
kind = entry.kind
2480
2860
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,
2861
with tree.get_file(path) as f:
2862
executable = tree.is_executable(path)
2864
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2866
elif kind in ('directory', 'tree-reference'):
2486
2867
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2868
if kind == 'tree-reference':
2488
2869
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2870
return trans_id
2490
2871
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2872
target = tree.get_symlink_target(path)
2492
2873
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2875
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):
2878
def create_from_tree(tt, trans_id, tree, path, chunks=None,
2879
filter_tree_path=None):
2515
2880
"""Create new file contents according to tree contents.
2517
2882
:param filter_tree_path: the tree path to use to lookup
2518
2883
content filters to apply to the bytes output in the working tree.
2519
2884
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2886
kind = tree.kind(path)
2522
2887
if kind == 'directory':
2523
2888
tt.create_directory(trans_id)
2524
2889
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)
2891
f = tree.get_file(path)
2892
chunks = osutils.file_iterator(f)
2897
if wt.supports_content_filtering() and filter_tree_path is not None:
2898
filters = wt._content_filter_stack(filter_tree_path)
2899
chunks = filtered_output_bytes(
2901
ContentFilterContext(filter_tree_path, tree))
2902
tt.create_file(chunks, trans_id)
2537
2906
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2907
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2540
2909
raise AssertionError('Unknown kind %r' % kind)
2546
2915
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
2918
def revert(working_tree, target_tree, filenames, backups=False,
2593
2919
pb=None, change_reporter=None):
2594
2920
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2921
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)
2923
with target_tree.lock_read(), working_tree.get_transform(pb) as tt:
2924
pp = ProgressPhase("Revert phase", 3, pb)
2925
conflicts, merge_modified = _prepare_revert_transform(
2926
working_tree, target_tree, tt, filenames, backups, pp)
2928
change_reporter = delta._ChangeReporter(
2929
unversioned_filter=working_tree.is_ignored)
2930
delta.report_changes(tt.iter_changes(), change_reporter)
2931
for conflict in conflicts:
2932
trace.warning(text_type(conflict))
2935
if working_tree.supports_merge_modified():
2936
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2939
return conflicts
2641
2959
backups, merge_modified, basis_tree=None):
2642
2960
if basis_tree is not None:
2643
2961
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:
2962
# We ask the working_tree for its changes relative to the target, rather
2963
# than the target changes relative to the working tree. Because WT4 has an
2964
# optimizer to compare itself to a target, but no optimizer for the
2966
change_list = working_tree.iter_changes(
2967
target_tree, specific_files=specific_files, pb=pb)
2968
if not target_tree.is_versioned(u''):
2647
2969
skip_root = True
2649
2971
skip_root = False
2651
2973
deferred_files = []
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2974
for id_num, change in enumerate(change_list):
2975
file_id = change.file_id
2976
target_path, wt_path = change.path
2977
target_versioned, wt_versioned = change.versioned
2978
target_parent, wt_parent = change.parent_id
2979
target_name, wt_name = change.name
2980
target_kind, wt_kind = change.kind
2981
target_executable, wt_executable = change.executable
2982
if skip_root and wt_parent is None:
2656
2984
trans_id = tt.trans_id_file_id(file_id)
2986
if change.changed_content:
2659
2987
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
if merge_modified.get(file_id) != wt_sha1:
2988
if wt_kind == 'file' and (backups or target_kind is None):
2989
wt_sha1 = working_tree.get_file_sha1(wt_path)
2990
if merge_modified.get(wt_path) != wt_sha1:
2663
2991
# acquire the basis tree lazily to prevent the
2664
2992
# expense of accessing it when it's not needed ?
2665
2993
# (Guessing, RBC, 200702)
2666
2994
if basis_tree is None:
2667
2995
basis_tree = working_tree.basis_tree()
2668
2996
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:
2997
basis_inter = InterTree.get(basis_tree, working_tree)
2998
basis_path = basis_inter.find_source_path(wt_path)
2999
if basis_path is None:
3000
if target_kind is None and not target_versioned:
3003
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
3005
if wt_kind is not None:
2675
3006
if not keep_content:
2676
3007
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)
3008
elif target_kind is not None:
3009
parent_trans_id = tt.trans_id_file_id(wt_parent)
3010
backup_name = tt._available_backup_name(
3011
wt_name, parent_trans_id)
2682
3012
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):
3013
new_trans_id = tt.create_path(wt_name, parent_trans_id)
3014
if wt_versioned and target_versioned:
2685
3015
tt.unversion_file(trans_id)
2686
3016
tt.version_file(file_id, new_trans_id)
2687
3017
# New contents should have the same unix perms as old
2689
3019
mode_id = trans_id
2690
3020
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
3021
if target_kind in ('directory', 'tree-reference'):
2692
3022
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
3023
if target_kind == 'tree-reference':
3024
revision = target_tree.get_reference_revision(
2696
3026
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)))
3027
elif target_kind == 'symlink':
3028
tt.create_symlink(target_tree.get_symlink_target(
3029
target_path), trans_id)
3030
elif target_kind == 'file':
3031
deferred_files.append(
3032
(target_path, (trans_id, mode_id, file_id)))
2702
3033
if basis_tree is None:
2703
3034
basis_tree = working_tree.basis_tree()
2704
3035
basis_tree.lock_read()
2705
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2708
if file_id in merge_modified:
2709
del merge_modified[file_id]
3036
new_sha1 = target_tree.get_file_sha1(target_path)
3037
basis_inter = InterTree.get(basis_tree, target_tree)
3038
basis_path = basis_inter.find_source_path(target_path)
3039
if (basis_path is not None and
3040
new_sha1 == basis_tree.get_file_sha1(basis_path)):
3041
# If the new contents of the file match what is in basis,
3042
# then there is no need to store in merge_modified.
3043
if basis_path in merge_modified:
3044
del merge_modified[basis_path]
2711
merge_modified[file_id] = new_sha1
3046
merge_modified[target_path] = new_sha1
2713
3048
# 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):
3049
if keep_content and wt_executable == target_executable:
3050
tt.set_executability(target_executable, trans_id)
3051
elif target_kind is not None:
3052
raise AssertionError(target_kind)
3053
if not wt_versioned and target_versioned:
2719
3054
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
3055
if wt_versioned and not target_versioned:
2721
3056
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:
3057
if (target_name is not None
3058
and (wt_name != target_name or wt_parent != target_parent)):
3059
if target_name == '' and target_parent is None:
2725
3060
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)
3062
parent_trans = tt.trans_id_file_id(target_parent)
3063
if wt_parent is None and wt_versioned:
3064
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)
3066
tt.adjust_path(target_name, parent_trans, trans_id)
3067
if wt_executable != target_executable and target_kind == "file":
3068
tt.set_executability(target_executable, trans_id)
2734
3069
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]
3070
for (trans_id, mode_id, file_id), bytes in (
3071
target_tree.iter_files_bytes(deferred_files)):
2738
3072
# We're reverting a tree to the target tree so using the
2739
3073
# target tree to find the file path seems the best choice
2740
3074
# here IMO - Ian C 27/Oct/2009
2741
3075
filter_tree_path = target_tree.id2path(file_id)
2742
3076
filters = working_tree._content_filter_stack(filter_tree_path)
2743
bytes = filtered_output_bytes(bytes, filters,
3077
bytes = filtered_output_bytes(
2744
3079
ContentFilterContext(filter_tree_path, working_tree))
2745
3080
tt.create_file(bytes, trans_id, mode_id)
2747
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3082
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
2749
3084
tt.create_file(bytes, trans_id, mode_id)
2750
3085
tt.fixup_new_roots()
added
removed
breezy/transform.py
