717
861
self.create_symlink(target, trans_id)
720
def _affected_ids(self):
721
"""Return the set of transform ids affected by the transform"""
722
trans_ids = set(self._removed_id)
723
trans_ids.update(self._new_id.keys())
724
trans_ids.update(self._removed_contents)
725
trans_ids.update(self._new_contents.keys())
726
trans_ids.update(self._new_executability.keys())
727
trans_ids.update(self._new_name.keys())
728
trans_ids.update(self._new_parent.keys())
731
def _get_file_id_maps(self):
732
"""Return mapping of file_ids to trans_ids in the to and from states"""
733
trans_ids = self._affected_ids()
736
# Build up two dicts: trans_ids associated with file ids in the
737
# FROM state, vs the TO state.
738
for trans_id in trans_ids:
739
from_file_id = self.tree_file_id(trans_id)
740
if from_file_id is not None:
741
from_trans_ids[from_file_id] = trans_id
742
to_file_id = self.final_file_id(trans_id)
743
if to_file_id is not None:
744
to_trans_ids[to_file_id] = trans_id
745
return from_trans_ids, to_trans_ids
747
def _from_file_data(self, from_trans_id, from_versioned, file_id):
748
"""Get data about a file in the from (tree) state
750
Return a (name, parent, kind, executable) tuple
752
from_path = self._tree_id_paths.get(from_trans_id)
754
# get data from working tree if versioned
755
from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
756
from_name = from_entry.name
757
from_parent = from_entry.parent_id
760
if from_path is None:
761
# File does not exist in FROM state
765
# File exists, but is not versioned. Have to use path-
767
from_name = os.path.basename(from_path)
768
tree_parent = self.get_tree_parent(from_trans_id)
769
from_parent = self.tree_file_id(tree_parent)
770
if from_path is not None:
771
from_kind, from_executable, from_stats = \
772
self._tree._comparison_data(from_entry, from_path)
775
from_executable = False
776
return from_name, from_parent, from_kind, from_executable
778
def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
779
"""Get data about a file in the to (target) state
781
Return a (name, parent, kind, executable) tuple
783
to_name = self.final_name(to_trans_id)
785
to_kind = self.final_kind(to_trans_id)
788
to_parent = self.final_file_id(self.final_parent(to_trans_id))
789
if to_trans_id in self._new_executability:
790
to_executable = self._new_executability[to_trans_id]
791
elif to_trans_id == from_trans_id:
792
to_executable = from_executable
794
to_executable = False
795
return to_name, to_parent, to_kind, to_executable
797
def iter_changes(self):
798
"""Produce output in the same format as Tree.iter_changes.
800
Will produce nonsensical results if invoked while inventory/filesystem
801
conflicts (as reported by TreeTransform.find_conflicts()) are present.
803
This reads the Transform, but only reproduces changes involving a
804
file_id. Files that are not versioned in either of the FROM or TO
805
states are not reflected.
807
final_paths = FinalPaths(self)
808
from_trans_ids, to_trans_ids = self._get_file_id_maps()
810
# Now iterate through all active file_ids
811
for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()):
813
from_trans_id = from_trans_ids.get(file_id)
814
# find file ids, and determine versioning state
815
if from_trans_id is None:
816
from_versioned = False
817
from_trans_id = to_trans_ids[file_id]
819
from_versioned = True
820
to_trans_id = to_trans_ids.get(file_id)
821
if to_trans_id is None:
823
to_trans_id = from_trans_id
827
from_name, from_parent, from_kind, from_executable = \
828
self._from_file_data(from_trans_id, from_versioned, file_id)
830
to_name, to_parent, to_kind, to_executable = \
831
self._to_file_data(to_trans_id, from_trans_id, from_executable)
833
if not from_versioned:
836
from_path = self._tree_id_paths.get(from_trans_id)
840
to_path = final_paths.get_path(to_trans_id)
841
if from_kind != to_kind:
843
elif to_kind in ('file', 'symlink') and (
844
to_trans_id != from_trans_id or
845
to_trans_id in self._new_contents):
847
if (not modified and from_versioned == to_versioned and
848
from_parent==to_parent and from_name == to_name and
849
from_executable == to_executable):
851
results.append((file_id, (from_path, to_path), modified,
852
(from_versioned, to_versioned),
853
(from_parent, to_parent),
854
(from_name, to_name),
855
(from_kind, to_kind),
856
(from_executable, to_executable)))
857
return iter(sorted(results, key=lambda x:x[1]))
859
def get_preview_tree(self):
860
"""Return a tree representing the result of the transform.
862
The tree is a snapshot, and altering the TreeTransform will invalidate
865
return _PreviewTree(self)
867
def commit(self, branch, message, merge_parents=None, strict=False):
868
"""Commit the result of this TreeTransform to a branch.
870
:param branch: The branch to commit to.
871
:param message: The message to attach to the commit.
872
:param merge_parents: Additional parents specified by pending merges.
873
:return: The revision_id of the revision committed.
875
self._check_malformed()
877
unversioned = set(self._new_contents).difference(set(self._new_id))
878
for trans_id in unversioned:
879
if self.final_file_id(trans_id) is None:
880
raise errors.StrictCommitFailed()
882
revno, last_rev_id = branch.last_revision_info()
883
if last_rev_id == _mod_revision.NULL_REVISION:
884
if merge_parents is not None:
885
raise ValueError('Cannot supply merge parents for first'
889
parent_ids = [last_rev_id]
890
if merge_parents is not None:
891
parent_ids.extend(merge_parents)
892
if self._tree.get_revision_id() != last_rev_id:
893
raise ValueError('TreeTransform not based on branch basis: %s' %
894
self._tree.get_revision_id())
895
builder = branch.get_commit_builder(parent_ids)
896
preview = self.get_preview_tree()
897
list(builder.record_iter_changes(preview, last_rev_id,
898
self.iter_changes()))
899
builder.finish_inventory()
900
revision_id = builder.commit(message)
901
branch.set_last_revision_info(revno + 1, revision_id)
904
def _text_parent(self, trans_id):
905
file_id = self.tree_file_id(trans_id)
907
if file_id is None or self._tree.kind(file_id) != 'file':
909
except errors.NoSuchFile:
913
def _get_parents_texts(self, trans_id):
914
"""Get texts for compression parents of this file."""
915
file_id = self._text_parent(trans_id)
918
return (self._tree.get_file_text(file_id),)
920
def _get_parents_lines(self, trans_id):
921
"""Get lines for compression parents of this file."""
922
file_id = self._text_parent(trans_id)
925
return (self._tree.get_file_lines(file_id),)
927
def serialize(self, serializer):
928
"""Serialize this TreeTransform.
930
:param serializer: A Serialiser like pack.ContainerSerializer.
932
new_name = dict((k, v.encode('utf-8')) for k, v in
933
self._new_name.items())
934
new_executability = dict((k, int(v)) for k, v in
935
self._new_executability.items())
936
tree_path_ids = dict((k.encode('utf-8'), v)
937
for k, v in self._tree_path_ids.items())
939
'_id_number': self._id_number,
940
'_new_name': new_name,
941
'_new_parent': self._new_parent,
942
'_new_executability': new_executability,
943
'_new_id': self._new_id,
944
'_tree_path_ids': tree_path_ids,
945
'_removed_id': list(self._removed_id),
946
'_removed_contents': list(self._removed_contents),
947
'_non_present_ids': self._non_present_ids,
949
yield serializer.bytes_record(bencode.bencode(attribs),
951
for trans_id, kind in self._new_contents.items():
953
lines = osutils.chunks_to_lines(
954
self._read_file_chunks(trans_id))
955
parents = self._get_parents_lines(trans_id)
956
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
957
content = ''.join(mpdiff.to_patch())
958
if kind == 'directory':
960
if kind == 'symlink':
961
content = self._read_symlink_target(trans_id)
962
yield serializer.bytes_record(content, ((trans_id, kind),))
964
def deserialize(self, records):
965
"""Deserialize a stored TreeTransform.
967
:param records: An iterable of (names, content) tuples, as per
968
pack.ContainerPushParser.
970
names, content = records.next()
971
attribs = bencode.bdecode(content)
972
self._id_number = attribs['_id_number']
973
self._new_name = dict((k, v.decode('utf-8'))
974
for k, v in attribs['_new_name'].items())
975
self._new_parent = attribs['_new_parent']
976
self._new_executability = dict((k, bool(v)) for k, v in
977
attribs['_new_executability'].items())
978
self._new_id = attribs['_new_id']
979
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
980
self._tree_path_ids = {}
981
self._tree_id_paths = {}
982
for bytepath, trans_id in attribs['_tree_path_ids'].items():
983
path = bytepath.decode('utf-8')
984
self._tree_path_ids[path] = trans_id
985
self._tree_id_paths[trans_id] = path
986
self._removed_id = set(attribs['_removed_id'])
987
self._removed_contents = set(attribs['_removed_contents'])
988
self._non_present_ids = attribs['_non_present_ids']
989
for ((trans_id, kind),), content in records:
991
mpdiff = multiparent.MultiParent.from_patch(content)
992
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
993
self.create_file(lines, trans_id)
994
if kind == 'directory':
995
self.create_directory(trans_id)
996
if kind == 'symlink':
997
self.create_symlink(content.decode('utf-8'), trans_id)
1000
class DiskTreeTransform(TreeTransformBase):
1001
"""Tree transform storing its contents on disk."""
1003
def __init__(self, tree, limbodir, pb=DummyProgress(),
1004
case_sensitive=True):
1006
:param tree: The tree that will be transformed, but not necessarily
1008
:param limbodir: A directory where new files can be stored until
1009
they are installed in their proper places
1010
:param pb: A ProgressBar indicating how much progress is being made
1011
:param case_sensitive: If True, the target of the transform is
1012
case sensitive, not just case preserving.
1014
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1015
self._limbodir = limbodir
1016
self._deletiondir = None
1017
# A mapping of transform ids to their limbo filename
1018
self._limbo_files = {}
1019
# A mapping of transform ids to a set of the transform ids of children
1020
# that their limbo directory has
1021
self._limbo_children = {}
1022
# Map transform ids to maps of child filename to child transform id
1023
self._limbo_children_names = {}
1024
# List of transform ids that need to be renamed from limbo into place
1025
self._needs_rename = set()
1028
"""Release the working tree lock, if held, clean up limbo dir.
1030
This is required if apply has not been invoked, but can be invoked
1033
if self._tree is None:
1036
entries = [(self._limbo_name(t), t, k) for t, k in
1037
self._new_contents.iteritems()]
1038
entries.sort(reverse=True)
1039
for path, trans_id, kind in entries:
1042
delete_any(self._limbodir)
1044
# We don't especially care *why* the dir is immortal.
1045
raise ImmortalLimbo(self._limbodir)
1047
if self._deletiondir is not None:
1048
delete_any(self._deletiondir)
1050
raise errors.ImmortalPendingDeletion(self._deletiondir)
1052
TreeTransformBase.finalize(self)
1054
def _limbo_name(self, trans_id):
1055
"""Generate the limbo name of a file"""
1056
limbo_name = self._limbo_files.get(trans_id)
1057
if limbo_name is None:
1058
limbo_name = self._generate_limbo_path(trans_id)
1059
self._limbo_files[trans_id] = limbo_name
1062
def _generate_limbo_path(self, trans_id):
1063
"""Generate a limbo path using the trans_id as the relative path.
1065
This is suitable as a fallback, and when the transform should not be
1066
sensitive to the path encoding of the limbo directory.
1068
self._needs_rename.add(trans_id)
1069
return pathjoin(self._limbodir, trans_id)
1071
def adjust_path(self, name, parent, trans_id):
1072
previous_parent = self._new_parent.get(trans_id)
1073
previous_name = self._new_name.get(trans_id)
1074
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1075
if (trans_id in self._limbo_files and
1076
trans_id not in self._needs_rename):
1077
self._rename_in_limbo([trans_id])
1078
self._limbo_children[previous_parent].remove(trans_id)
1079
del self._limbo_children_names[previous_parent][previous_name]
1081
def _rename_in_limbo(self, trans_ids):
1082
"""Fix limbo names so that the right final path is produced.
1084
This means we outsmarted ourselves-- we tried to avoid renaming
1085
these files later by creating them with their final names in their
1086
final parents. But now the previous name or parent is no longer
1087
suitable, so we have to rename them.
1089
Even for trans_ids that have no new contents, we must remove their
1090
entries from _limbo_files, because they are now stale.
1092
for trans_id in trans_ids:
1093
old_path = self._limbo_files.pop(trans_id)
1094
if trans_id not in self._new_contents:
1096
new_path = self._limbo_name(trans_id)
1097
os.rename(old_path, new_path)
1098
for descendant in self._limbo_descendants(trans_id):
1099
desc_path = self._limbo_files[descendant]
1100
desc_path = new_path + desc_path[len(old_path):]
1101
self._limbo_files[descendant] = desc_path
1103
def _limbo_descendants(self, trans_id):
1104
"""Return the set of trans_ids whose limbo paths descend from this."""
1105
descendants = set(self._limbo_children.get(trans_id, []))
1106
for descendant in list(descendants):
1107
descendants.update(self._limbo_descendants(descendant))
1110
def create_file(self, contents, trans_id, mode_id=None):
1111
"""Schedule creation of a new file.
1115
Contents is an iterator of strings, all of which will be written
1116
to the target destination.
1118
New file takes the permissions of any existing file with that id,
1119
unless mode_id is specified.
1121
name = self._limbo_name(trans_id)
1122
f = open(name, 'wb')
1125
unique_add(self._new_contents, trans_id, 'file')
1127
# Clean up the file, it never got registered so
1128
# TreeTransform.finalize() won't clean it up.
1133
f.writelines(contents)
1136
self._set_mode(trans_id, mode_id, S_ISREG)
1138
def _read_file_chunks(self, trans_id):
1139
cur_file = open(self._limbo_name(trans_id), 'rb')
1141
return cur_file.readlines()
1145
def _read_symlink_target(self, trans_id):
1146
return os.readlink(self._limbo_name(trans_id))
1148
def create_hardlink(self, path, trans_id):
1149
"""Schedule creation of a hard link"""
1150
name = self._limbo_name(trans_id)
1154
if e.errno != errno.EPERM:
1156
raise errors.HardLinkNotSupported(path)
1158
unique_add(self._new_contents, trans_id, 'file')
1160
# Clean up the file, it never got registered so
1161
# TreeTransform.finalize() won't clean it up.
1165
def create_directory(self, trans_id):
1166
"""Schedule creation of a new directory.
1168
See also new_directory.
1170
os.mkdir(self._limbo_name(trans_id))
1171
unique_add(self._new_contents, trans_id, 'directory')
1173
def create_symlink(self, target, trans_id):
1174
"""Schedule creation of a new symbolic link.
1176
target is a bytestring.
1177
See also new_symlink.
1180
os.symlink(target, self._limbo_name(trans_id))
1181
unique_add(self._new_contents, trans_id, 'symlink')
1184
path = FinalPaths(self).get_path(trans_id)
1187
raise UnableCreateSymlink(path=path)
1189
def cancel_creation(self, trans_id):
1190
"""Cancel the creation of new file contents."""
1191
del self._new_contents[trans_id]
1192
children = self._limbo_children.get(trans_id)
1193
# if this is a limbo directory with children, move them before removing
1195
if children is not None:
1196
self._rename_in_limbo(children)
1197
del self._limbo_children[trans_id]
1198
del self._limbo_children_names[trans_id]
1199
delete_any(self._limbo_name(trans_id))
1202
class TreeTransform(DiskTreeTransform):
1203
"""Represent a tree transformation.
1205
This object is designed to support incremental generation of the transform,
1208
However, it gives optimum performance when parent directories are created
1209
before their contents. The transform is then able to put child files
1210
directly in their parent directory, avoiding later renames.
1212
It is easy to produce malformed transforms, but they are generally
1213
harmless. Attempting to apply a malformed transform will cause an
1214
exception to be raised before any modifications are made to the tree.
1216
Many kinds of malformed transforms can be corrected with the
1217
resolve_conflicts function. The remaining ones indicate programming error,
1218
such as trying to create a file with no path.
1220
Two sets of file creation methods are supplied. Convenience methods are:
1225
These are composed of the low-level methods:
1227
* create_file or create_directory or create_symlink
1231
Transform/Transaction ids
1232
-------------------------
1233
trans_ids are temporary ids assigned to all files involved in a transform.
1234
It's possible, even common, that not all files in the Tree have trans_ids.
1236
trans_ids are used because filenames and file_ids are not good enough
1237
identifiers; filenames change, and not all files have file_ids. File-ids
1238
are also associated with trans-ids, so that moving a file moves its
1241
trans_ids are only valid for the TreeTransform that generated them.
1245
Limbo is a temporary directory use to hold new versions of files.
1246
Files are added to limbo by create_file, create_directory, create_symlink,
1247
and their convenience variants (new_*). Files may be removed from limbo
1248
using cancel_creation. Files are renamed from limbo into their final
1249
location as part of TreeTransform.apply
1251
Limbo must be cleaned up, by either calling TreeTransform.apply or
1252
calling TreeTransform.finalize.
1254
Files are placed into limbo inside their parent directories, where
1255
possible. This reduces subsequent renames, and makes operations involving
1256
lots of files faster. This optimization is only possible if the parent
1257
directory is created *before* creating any of its children, so avoid
1258
creating children before parents, where possible.
1262
This temporary directory is used by _FileMover for storing files that are
1263
about to be deleted. In case of rollback, the files will be restored.
1264
FileMover does not delete files until it is sure that a rollback will not
1267
def __init__(self, tree, pb=DummyProgress()):
1268
"""Note: a tree_write lock is taken on the tree.
1270
Use TreeTransform.finalize() to release the lock (can be omitted if
1271
TreeTransform.apply() called).
1273
tree.lock_tree_write()
1276
limbodir = urlutils.local_path_from_url(
1277
tree._transport.abspath('limbo'))
1281
if e.errno == errno.EEXIST:
1282
raise ExistingLimbo(limbodir)
1283
deletiondir = urlutils.local_path_from_url(
1284
tree._transport.abspath('pending-deletion'))
1286
os.mkdir(deletiondir)
1288
if e.errno == errno.EEXIST:
1289
raise errors.ExistingPendingDeletion(deletiondir)
1294
# Cache of realpath results, to speed up canonical_path
1295
self._realpaths = {}
1296
# Cache of relpath results, to speed up canonical_path
1298
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1299
tree.case_sensitive)
1300
self._deletiondir = deletiondir
1302
def canonical_path(self, path):
1303
"""Get the canonical tree-relative path"""
1304
# don't follow final symlinks
1305
abs = self._tree.abspath(path)
1306
if abs in self._relpaths:
1307
return self._relpaths[abs]
1308
dirname, basename = os.path.split(abs)
1309
if dirname not in self._realpaths:
1310
self._realpaths[dirname] = os.path.realpath(dirname)
1311
dirname = self._realpaths[dirname]
1312
abs = pathjoin(dirname, basename)
1313
if dirname in self._relpaths:
1314
relpath = pathjoin(self._relpaths[dirname], basename)
1315
relpath = relpath.rstrip('/\\')
1317
relpath = self._tree.relpath(abs)
1318
self._relpaths[abs] = relpath
1321
def tree_kind(self, trans_id):
1322
"""Determine the file kind in the working tree.
1324
Raises NoSuchFile if the file does not exist
1326
path = self._tree_id_paths.get(trans_id)
1328
raise NoSuchFile(None)
1330
return file_kind(self._tree.abspath(path))
1332
if e.errno != errno.ENOENT:
1335
raise NoSuchFile(path)
1337
def _set_mode(self, trans_id, mode_id, typefunc):
1338
"""Set the mode of new file contents.
1339
The mode_id is the existing file to get the mode from (often the same
1340
as trans_id). The operation is only performed if there's a mode match
1341
according to typefunc.
1346
old_path = self._tree_id_paths[mode_id]
1350
mode = os.stat(self._tree.abspath(old_path)).st_mode
1352
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1353
# Either old_path doesn't exist, or the parent of the
1354
# target is not a directory (but will be one eventually)
1355
# Either way, we know it doesn't exist *right now*
1356
# See also bug #248448
1361
os.chmod(self._limbo_name(trans_id), mode)
1363
def iter_tree_children(self, parent_id):
1364
"""Iterate through the entry's tree children, if any"""
1366
path = self._tree_id_paths[parent_id]
1370
children = os.listdir(self._tree.abspath(path))
1372
if not (osutils._is_error_enotdir(e)
1373
or e.errno in (errno.ENOENT, errno.ESRCH)):
1377
for child in children:
1378
childpath = joinpath(path, child)
1379
if self._tree.is_control_filename(childpath):
1381
yield self.trans_id_tree_path(childpath)
1383
def _generate_limbo_path(self, trans_id):
1384
"""Generate a limbo path using the final path if possible.
1386
This optimizes the performance of applying the tree transform by
1387
avoiding renames. These renames can be avoided only when the parent
1388
directory is already scheduled for creation.
1390
If the final path cannot be used, falls back to using the trans_id as
1393
parent = self._new_parent.get(trans_id)
1394
# if the parent directory is already in limbo (e.g. when building a
1395
# tree), choose a limbo name inside the parent, to reduce further
1397
use_direct_path = False
1398
if self._new_contents.get(parent) == 'directory':
1399
filename = self._new_name.get(trans_id)
1400
if filename is not None:
1401
if parent not in self._limbo_children:
1402
self._limbo_children[parent] = set()
1403
self._limbo_children_names[parent] = {}
1404
use_direct_path = True
1405
# the direct path can only be used if no other file has
1406
# already taken this pathname, i.e. if the name is unused, or
1407
# if it is already associated with this trans_id.
1408
elif self._case_sensitive_target:
1409
if (self._limbo_children_names[parent].get(filename)
1410
in (trans_id, None)):
1411
use_direct_path = True
1413
for l_filename, l_trans_id in\
1414
self._limbo_children_names[parent].iteritems():
1415
if l_trans_id == trans_id:
1417
if l_filename.lower() == filename.lower():
1420
use_direct_path = True
1422
if not use_direct_path:
1423
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1425
limbo_name = pathjoin(self._limbo_files[parent], filename)
1426
self._limbo_children[parent].add(trans_id)
1427
self._limbo_children_names[parent][filename] = trans_id
1431
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1432
"""Apply all changes to the inventory and filesystem.
1434
If filesystem or inventory conflicts are present, MalformedTransform
1437
If apply succeeds, finalize is not necessary.
1439
:param no_conflicts: if True, the caller guarantees there are no
1440
conflicts, so no check is made.
1441
:param precomputed_delta: An inventory delta to use instead of
1443
:param _mover: Supply an alternate FileMover, for testing
1445
if not no_conflicts:
1446
self._check_malformed()
1447
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1449
if precomputed_delta is None:
1450
child_pb.update('Apply phase', 0, 2)
1451
inventory_delta = self._generate_inventory_delta()
1454
inventory_delta = precomputed_delta
1457
mover = _FileMover()
1461
child_pb.update('Apply phase', 0 + offset, 2 + offset)
1462
self._apply_removals(mover)
1463
child_pb.update('Apply phase', 1 + offset, 2 + offset)
1464
modified_paths = self._apply_insertions(mover)
1469
mover.apply_deletions()
1472
self._tree.apply_inventory_delta(inventory_delta)
1475
return _TransformResults(modified_paths, self.rename_count)
1477
def _generate_inventory_delta(self):
1478
"""Generate an inventory delta for the current transform."""
1479
inventory_delta = []
1480
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1481
new_paths = self._inventory_altered()
1482
total_entries = len(new_paths) + len(self._removed_id)
1484
for num, trans_id in enumerate(self._removed_id):
1486
child_pb.update('removing file', num, total_entries)
1487
if trans_id == self._new_root:
1488
file_id = self._tree.get_root_id()
1490
file_id = self.tree_file_id(trans_id)
1491
# File-id isn't really being deleted, just moved
1492
if file_id in self._r_new_id:
1494
path = self._tree_id_paths[trans_id]
1495
inventory_delta.append((path, None, file_id, None))
1496
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1498
entries = self._tree.iter_entries_by_dir(
1499
new_path_file_ids.values())
1500
old_paths = dict((e.file_id, p) for p, e in entries)
1502
for num, (path, trans_id) in enumerate(new_paths):
1504
child_pb.update('adding file',
1505
num + len(self._removed_id), total_entries)
1506
file_id = new_path_file_ids[trans_id]
1511
kind = self.final_kind(trans_id)
1513
kind = self._tree.stored_kind(file_id)
1514
parent_trans_id = self.final_parent(trans_id)
1515
parent_file_id = new_path_file_ids.get(parent_trans_id)
1516
if parent_file_id is None:
1517
parent_file_id = self.final_file_id(parent_trans_id)
1518
if trans_id in self._new_reference_revision:
1519
new_entry = inventory.TreeReference(
1521
self._new_name[trans_id],
1522
self.final_file_id(self._new_parent[trans_id]),
1523
None, self._new_reference_revision[trans_id])
1525
new_entry = inventory.make_entry(kind,
1526
self.final_name(trans_id),
1527
parent_file_id, file_id)
1528
old_path = old_paths.get(new_entry.file_id)
1529
new_executability = self._new_executability.get(trans_id)
1530
if new_executability is not None:
1531
new_entry.executable = new_executability
1532
inventory_delta.append(
1533
(old_path, path, new_entry.file_id, new_entry))
1536
return inventory_delta
1538
def _apply_removals(self, mover):
1539
"""Perform tree operations that remove directory/inventory names.
1541
That is, delete files that are to be deleted, and put any files that
1542
need renaming into limbo. This must be done in strict child-to-parent
1545
If inventory_delta is None, no inventory delta generation is performed.
1547
tree_paths = list(self._tree_path_ids.iteritems())
1548
tree_paths.sort(reverse=True)
1549
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551
for num, data in enumerate(tree_paths):
1552
path, trans_id = data
1553
child_pb.update('removing file', num, len(tree_paths))
1554
full_path = self._tree.abspath(path)
1555
if trans_id in self._removed_contents:
1556
mover.pre_delete(full_path, os.path.join(self._deletiondir,
1558
elif trans_id in self._new_name or trans_id in \
1561
mover.rename(full_path, self._limbo_name(trans_id))
1563
if e.errno != errno.ENOENT:
1566
self.rename_count += 1
1570
def _apply_insertions(self, mover):
1571
"""Perform tree operations that insert directory/inventory names.
1573
That is, create any files that need to be created, and restore from
1574
limbo any files that needed renaming. This must be done in strict
1575
parent-to-child order.
1577
If inventory_delta is None, no inventory delta is calculated, and
1578
no list of modified paths is returned.
1580
new_paths = self.new_paths(filesystem_only=True)
1582
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1584
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1586
for num, (path, trans_id) in enumerate(new_paths):
1588
child_pb.update('adding file', num, len(new_paths))
1589
full_path = self._tree.abspath(path)
1590
if trans_id in self._needs_rename:
1592
mover.rename(self._limbo_name(trans_id), full_path)
1594
# We may be renaming a dangling inventory id
1595
if e.errno != errno.ENOENT:
1598
self.rename_count += 1
1599
if (trans_id in self._new_contents or
1600
self.path_changed(trans_id)):
1601
if trans_id in self._new_contents:
1602
modified_paths.append(full_path)
1603
if trans_id in self._new_executability:
1604
self._set_executability(path, trans_id)
1607
self._new_contents.clear()
1608
return modified_paths
1611
class TransformPreview(DiskTreeTransform):
1612
"""A TreeTransform for generating preview trees.
1614
Unlike TreeTransform, this version works when the input tree is a
1615
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1616
unversioned files in the input tree.
1619
def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1621
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1622
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1624
def canonical_path(self, path):
1627
def tree_kind(self, trans_id):
1628
path = self._tree_id_paths.get(trans_id)
1630
raise NoSuchFile(None)
1631
file_id = self._tree.path2id(path)
1632
return self._tree.kind(file_id)
1634
def _set_mode(self, trans_id, mode_id, typefunc):
1635
"""Set the mode of new file contents.
1636
The mode_id is the existing file to get the mode from (often the same
1637
as trans_id). The operation is only performed if there's a mode match
1638
according to typefunc.
1640
# is it ok to ignore this? probably
1643
def iter_tree_children(self, parent_id):
1644
"""Iterate through the entry's tree children, if any"""
1646
path = self._tree_id_paths[parent_id]
1649
file_id = self.tree_file_id(parent_id)
1652
entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1653
children = getattr(entry, 'children', {})
1654
for child in children:
1655
childpath = joinpath(path, child)
1656
yield self.trans_id_tree_path(childpath)
1659
class _PreviewTree(tree.Tree):
1660
"""Partial implementation of Tree to support show_diff_trees"""
1662
def __init__(self, transform):
1663
self._transform = transform
1664
self._final_paths = FinalPaths(transform)
1665
self.__by_parent = None
1666
self._parent_ids = []
1667
self._all_children_cache = {}
1668
self._path2trans_id_cache = {}
1669
self._final_name_cache = {}
1670
self._iter_changes_cache = dict((c[0], c) for c in
1671
self._transform.iter_changes())
1673
def _content_change(self, file_id):
1674
"""Return True if the content of this file changed"""
1675
changes = self._iter_changes_cache.get(file_id)
1676
# changes[2] is true if the file content changed. See
1677
# InterTree.iter_changes.
1678
return (changes is not None and changes[2])
1680
def _get_repository(self):
1681
repo = getattr(self._transform._tree, '_repository', None)
1683
repo = self._transform._tree.branch.repository
1686
def _iter_parent_trees(self):
1687
for revision_id in self.get_parent_ids():
1689
yield self.revision_tree(revision_id)
1690
except errors.NoSuchRevisionInTree:
1691
yield self._get_repository().revision_tree(revision_id)
1693
def _get_file_revision(self, file_id, vf, tree_revision):
1694
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1695
self._iter_parent_trees()]
1696
vf.add_lines((file_id, tree_revision), parent_keys,
1697
self.get_file(file_id).readlines())
1698
repo = self._get_repository()
1699
base_vf = repo.texts
1700
if base_vf not in vf.fallback_versionedfiles:
1701
vf.fallback_versionedfiles.append(base_vf)
1702
return tree_revision
1704
def _stat_limbo_file(self, file_id):
1705
trans_id = self._transform.trans_id_file_id(file_id)
1706
name = self._transform._limbo_name(trans_id)
1707
return os.lstat(name)
1710
def _by_parent(self):
1711
if self.__by_parent is None:
1712
self.__by_parent = self._transform.by_parent()
1713
return self.__by_parent
1715
def _comparison_data(self, entry, path):
1716
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
1717
if kind == 'missing':
1721
file_id = self._transform.final_file_id(self._path2trans_id(path))
1722
executable = self.is_executable(file_id, path)
1723
return kind, executable, None
1725
def lock_read(self):
1726
# Perhaps in theory, this should lock the TreeTransform?
1733
def inventory(self):
1734
"""This Tree does not use inventory as its backing data."""
1735
raise NotImplementedError(_PreviewTree.inventory)
1737
def get_root_id(self):
1738
return self._transform.final_file_id(self._transform.root)
1740
def all_file_ids(self):
1741
tree_ids = set(self._transform._tree.all_file_ids())
1742
tree_ids.difference_update(self._transform.tree_file_id(t)
1743
for t in self._transform._removed_id)
1744
tree_ids.update(self._transform._new_id.values())
1748
return iter(self.all_file_ids())
1750
def _has_id(self, file_id, fallback_check):
1751
if file_id in self._transform._r_new_id:
1753
elif file_id in set([self._transform.tree_file_id(trans_id) for
1754
trans_id in self._transform._removed_id]):
1757
return fallback_check(file_id)
1759
def has_id(self, file_id):
1760
return self._has_id(file_id, self._transform._tree.has_id)
1762
def has_or_had_id(self, file_id):
1763
return self._has_id(file_id, self._transform._tree.has_or_had_id)
1765
def _path2trans_id(self, path):
1766
# We must not use None here, because that is a valid value to store.
1767
trans_id = self._path2trans_id_cache.get(path, object)
1768
if trans_id is not object:
1770
segments = splitpath(path)
1771
cur_parent = self._transform.root
1772
for cur_segment in segments:
1773
for child in self._all_children(cur_parent):
1774
final_name = self._final_name_cache.get(child)
1775
if final_name is None:
1776
final_name = self._transform.final_name(child)
1777
self._final_name_cache[child] = final_name
1778
if final_name == cur_segment:
1782
self._path2trans_id_cache[path] = None
1784
self._path2trans_id_cache[path] = cur_parent
1787
def path2id(self, path):
1788
return self._transform.final_file_id(self._path2trans_id(path))
1790
def id2path(self, file_id):
1791
trans_id = self._transform.trans_id_file_id(file_id)
1793
return self._final_paths._determine_path(trans_id)
1795
raise errors.NoSuchId(self, file_id)
1797
def _all_children(self, trans_id):
1798
children = self._all_children_cache.get(trans_id)
1799
if children is not None:
1801
children = set(self._transform.iter_tree_children(trans_id))
1802
# children in the _new_parent set are provided by _by_parent.
1803
children.difference_update(self._transform._new_parent.keys())
1804
children.update(self._by_parent.get(trans_id, []))
1805
self._all_children_cache[trans_id] = children
1808
def iter_children(self, file_id):
1809
trans_id = self._transform.trans_id_file_id(file_id)
1810
for child_trans_id in self._all_children(trans_id):
1811
yield self._transform.final_file_id(child_trans_id)
1814
possible_extras = set(self._transform.trans_id_tree_path(p) for p
1815
in self._transform._tree.extras())
1816
possible_extras.update(self._transform._new_contents)
1817
possible_extras.update(self._transform._removed_id)
1818
for trans_id in possible_extras:
1819
if self._transform.final_file_id(trans_id) is None:
1820
yield self._final_paths._determine_path(trans_id)
1822
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1823
yield_parents=False):
1824
for trans_id, parent_file_id in ordered_entries:
1825
file_id = self._transform.final_file_id(trans_id)
1828
if (specific_file_ids is not None
1829
and file_id not in specific_file_ids):
1832
kind = self._transform.final_kind(trans_id)
1834
kind = self._transform._tree.stored_kind(file_id)
1835
new_entry = inventory.make_entry(
1837
self._transform.final_name(trans_id),
1838
parent_file_id, file_id)
1839
yield new_entry, trans_id
1841
def _list_files_by_dir(self):
1842
todo = [ROOT_PARENT]
1844
while len(todo) > 0:
1846
parent_file_id = self._transform.final_file_id(parent)
1847
children = list(self._all_children(parent))
1848
paths = dict(zip(children, self._final_paths.get_paths(children)))
1849
children.sort(key=paths.get)
1850
todo.extend(reversed(children))
1851
for trans_id in children:
1852
ordered_ids.append((trans_id, parent_file_id))
1855
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
1856
# This may not be a maximally efficient implementation, but it is
1857
# reasonably straightforward. An implementation that grafts the
1858
# TreeTransform changes onto the tree's iter_entries_by_dir results
1859
# might be more efficient, but requires tricky inferences about stack
1861
ordered_ids = self._list_files_by_dir()
1862
for entry, trans_id in self._make_inv_entries(ordered_ids,
1863
specific_file_ids, yield_parents=yield_parents):
1864
yield unicode(self._final_paths.get_path(trans_id)), entry
1866
def _iter_entries_for_dir(self, dir_path):
1867
"""Return path, entry for items in a directory without recursing down."""
1868
dir_file_id = self.path2id(dir_path)
1870
for file_id in self.iter_children(dir_file_id):
1871
trans_id = self._transform.trans_id_file_id(file_id)
1872
ordered_ids.append((trans_id, file_id))
1873
for entry, trans_id in self._make_inv_entries(ordered_ids):
1874
yield unicode(self._final_paths.get_path(trans_id)), entry
1876
def list_files(self, include_root=False, from_dir=None, recursive=True):
1877
"""See WorkingTree.list_files."""
1878
# XXX This should behave like WorkingTree.list_files, but is really
1879
# more like RevisionTree.list_files.
1883
prefix = from_dir + '/'
1884
entries = self.iter_entries_by_dir()
1885
for path, entry in entries:
1886
if entry.name == '' and not include_root:
1889
if not path.startswith(prefix):
1891
path = path[len(prefix):]
1892
yield path, 'V', entry.kind, entry.file_id, entry
1894
if from_dir is None and include_root is True:
1895
root_entry = inventory.make_entry('directory', '',
1896
ROOT_PARENT, self.get_root_id())
1897
yield '', 'V', 'directory', root_entry.file_id, root_entry
1898
entries = self._iter_entries_for_dir(from_dir or '')
1899
for path, entry in entries:
1900
yield path, 'V', entry.kind, entry.file_id, entry
1902
def kind(self, file_id):
1903
trans_id = self._transform.trans_id_file_id(file_id)
1904
return self._transform.final_kind(trans_id)
1906
def stored_kind(self, file_id):
1907
trans_id = self._transform.trans_id_file_id(file_id)
1909
return self._transform._new_contents[trans_id]
1911
return self._transform._tree.stored_kind(file_id)
1913
def get_file_mtime(self, file_id, path=None):
1914
"""See Tree.get_file_mtime"""
1915
if not self._content_change(file_id):
1916
return self._transform._tree.get_file_mtime(file_id)
1917
return self._stat_limbo_file(file_id).st_mtime
1919
def _file_size(self, entry, stat_value):
1920
return self.get_file_size(entry.file_id)
1922
def get_file_size(self, file_id):
1923
"""See Tree.get_file_size"""
1924
if self.kind(file_id) == 'file':
1925
return self._transform._tree.get_file_size(file_id)
1929
def get_file_sha1(self, file_id, path=None, stat_value=None):
1930
trans_id = self._transform.trans_id_file_id(file_id)
1931
kind = self._transform._new_contents.get(trans_id)
1933
return self._transform._tree.get_file_sha1(file_id)
1935
fileobj = self.get_file(file_id)
1937
return sha_file(fileobj)
1941
def is_executable(self, file_id, path=None):
1944
trans_id = self._transform.trans_id_file_id(file_id)
1946
return self._transform._new_executability[trans_id]
1949
return self._transform._tree.is_executable(file_id, path)
1951
if e.errno == errno.ENOENT:
1954
except errors.NoSuchId:
1957
def path_content_summary(self, path):
1958
trans_id = self._path2trans_id(path)
1959
tt = self._transform
1960
tree_path = tt._tree_id_paths.get(trans_id)
1961
kind = tt._new_contents.get(trans_id)
1963
if tree_path is None or trans_id in tt._removed_contents:
1964
return 'missing', None, None, None
1965
summary = tt._tree.path_content_summary(tree_path)
1966
kind, size, executable, link_or_sha1 = summary
1969
limbo_name = tt._limbo_name(trans_id)
1970
if trans_id in tt._new_reference_revision:
1971
kind = 'tree-reference'
1973
statval = os.lstat(limbo_name)
1974
size = statval.st_size
1975
if not supports_executable():
1978
executable = statval.st_mode & S_IEXEC
1982
if kind == 'symlink':
1983
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
1984
if supports_executable():
1985
executable = tt._new_executability.get(trans_id, executable)
1986
return kind, size, executable, link_or_sha1
1988
def iter_changes(self, from_tree, include_unchanged=False,
1989
specific_files=None, pb=None, extra_trees=None,
1990
require_versioned=True, want_unversioned=False):
1991
"""See InterTree.iter_changes.
1993
This has a fast path that is only used when the from_tree matches
1994
the transform tree, and no fancy options are supplied.
1996
if (from_tree is not self._transform._tree or include_unchanged or
1997
specific_files or want_unversioned):
1998
return tree.InterTree(from_tree, self).iter_changes(
1999
include_unchanged=include_unchanged,
2000
specific_files=specific_files,
2002
extra_trees=extra_trees,
2003
require_versioned=require_versioned,
2004
want_unversioned=want_unversioned)
2005
if want_unversioned:
2006
raise ValueError('want_unversioned is not supported')
2007
return self._transform.iter_changes()
2009
def get_file(self, file_id, path=None):
2010
"""See Tree.get_file"""
2011
if not self._content_change(file_id):
2012
return self._transform._tree.get_file(file_id, path)
2013
trans_id = self._transform.trans_id_file_id(file_id)
2014
name = self._transform._limbo_name(trans_id)
2015
return open(name, 'rb')
2017
def get_file_with_stat(self, file_id, path=None):
2018
return self.get_file(file_id, path), None
2020
def annotate_iter(self, file_id,
2021
default_revision=_mod_revision.CURRENT_REVISION):
2022
changes = self._iter_changes_cache.get(file_id)
2026
changed_content, versioned, kind = (changes[2], changes[3],
2030
get_old = (kind[0] == 'file' and versioned[0])
2032
old_annotation = self._transform._tree.annotate_iter(file_id,
2033
default_revision=default_revision)
2037
return old_annotation
2038
if not changed_content:
2039
return old_annotation
2040
# TODO: This is doing something similar to what WT.annotate_iter is
2041
# doing, however it fails slightly because it doesn't know what
2042
# the *other* revision_id is, so it doesn't know how to give the
2043
# other as the origin for some lines, they all get
2044
# 'default_revision'
2045
# It would be nice to be able to use the new Annotator based
2046
# approach, as well.
2047
return annotate.reannotate([old_annotation],
2048
self.get_file(file_id).readlines(),
2051
def get_symlink_target(self, file_id):
2052
"""See Tree.get_symlink_target"""
2053
if not self._content_change(file_id):
2054
return self._transform._tree.get_symlink_target(file_id)
2055
trans_id = self._transform.trans_id_file_id(file_id)
2056
name = self._transform._limbo_name(trans_id)
2057
return osutils.readlink(name)
2059
def walkdirs(self, prefix=''):
2060
pending = [self._transform.root]
2061
while len(pending) > 0:
2062
parent_id = pending.pop()
2065
prefix = prefix.rstrip('/')
2066
parent_path = self._final_paths.get_path(parent_id)
2067
parent_file_id = self._transform.final_file_id(parent_id)
2068
for child_id in self._all_children(parent_id):
2069
path_from_root = self._final_paths.get_path(child_id)
2070
basename = self._transform.final_name(child_id)
2071
file_id = self._transform.final_file_id(child_id)
2073
kind = self._transform.final_kind(child_id)
2074
versioned_kind = kind
2077
versioned_kind = self._transform._tree.stored_kind(file_id)
2078
if versioned_kind == 'directory':
2079
subdirs.append(child_id)
2080
children.append((path_from_root, basename, kind, None,
2081
file_id, versioned_kind))
2083
if parent_path.startswith(prefix):
2084
yield (parent_path, parent_file_id), children
2085
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2088
def get_parent_ids(self):
2089
return self._parent_ids
2091
def set_parent_ids(self, parent_ids):
2092
self._parent_ids = parent_ids
2094
def get_revision_tree(self, revision_id):
2095
return self._transform._tree.get_revision_tree(revision_id)
2098
864
def joinpath(parent, child):
2099
865
"""Join tree-relative paths, handling the tree root specially"""
2100
866
if parent is None or parent == "":
2130
896
self._known_paths[trans_id] = self._determine_path(trans_id)
2131
897
return self._known_paths[trans_id]
2133
def get_paths(self, trans_ids):
2134
return [(self.get_path(t), t) for t in trans_ids]
2138
899
def topology_sorted_ids(tree):
2139
900
"""Determine the topological order of the ids in a tree"""
2140
901
file_ids = list(tree)
2141
902
file_ids.sort(key=tree.id2path)
2145
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2146
delta_from_tree=False):
2147
"""Create working tree for a branch, using a TreeTransform.
2149
This function should be used on empty trees, having a tree root at most.
2150
(see merge and revert functionality for working with existing trees)
2152
Existing files are handled like so:
2154
- Existing bzrdirs take precedence over creating new items. They are
2155
created as '%s.diverted' % name.
2156
- Otherwise, if the content on disk matches the content we are building,
2157
it is silently replaced.
2158
- Otherwise, conflict resolution will move the old file to 'oldname.moved'.
2160
:param tree: The tree to convert wt into a copy of
2161
:param wt: The working tree that files will be placed into
2162
:param accelerator_tree: A tree which can be used for retrieving file
2163
contents more quickly than tree itself, i.e. a workingtree. tree
2164
will be used for cases where accelerator_tree's content is different.
2165
:param hardlink: If true, hard-link files to accelerator_tree, where
2166
possible. accelerator_tree must implement abspath, i.e. be a
2168
:param delta_from_tree: If true, build_tree may use the input Tree to
2169
generate the inventory delta.
2171
wt.lock_tree_write()
2175
if accelerator_tree is not None:
2176
accelerator_tree.lock_read()
2178
return _build_tree(tree, wt, accelerator_tree, hardlink,
2181
if accelerator_tree is not None:
2182
accelerator_tree.unlock()
2189
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2190
"""See build_tree."""
2191
for num, _unused in enumerate(wt.all_file_ids()):
2192
if num > 0: # more than just a root
2193
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2194
existing_files = set()
2195
for dir, files in wt.walkdirs():
2196
existing_files.update(f[0] for f in files)
905
def build_tree(tree, wt):
906
"""Create working tree for a branch, using a Transaction."""
2197
907
file_trans_id = {}
2198
908
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2199
909
pp = ProgressPhase("Build phase", 2, top_pb)
2200
if tree.inventory.root is not None:
2201
# This is kind of a hack: we should be altering the root
2202
# as part of the regular tree shape diff logic.
2203
# The conditional test here is to avoid doing an
2204
# expensive operation (flush) every time the root id
2205
# is set within the tree, nor setting the root and thus
2206
# marking the tree as dirty, because we use two different
2207
# idioms here: tree interfaces and inventory interfaces.
2208
if wt.get_root_id() != tree.get_root_id():
2209
wt.set_root_id(tree.get_root_id())
2211
910
tt = TreeTransform(wt)
2215
file_trans_id[wt.get_root_id()] = \
2216
tt.trans_id_tree_file_id(wt.get_root_id())
913
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_file_id(wt.get_root_id())
914
file_ids = topology_sorted_ids(tree)
2217
915
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2219
deferred_contents = []
2221
total = len(tree.inventory)
2223
precomputed_delta = []
2225
precomputed_delta = None
2226
for num, (tree_path, entry) in \
2227
enumerate(tree.inventory.iter_entries_by_dir()):
2228
pb.update("Building tree", num - len(deferred_contents), total)
917
for num, file_id in enumerate(file_ids):
918
pb.update("Building tree", num, len(file_ids))
919
entry = tree.inventory[file_id]
2229
920
if entry.parent_id is None:
2232
file_id = entry.file_id
2234
precomputed_delta.append((None, tree_path, file_id, entry))
2235
if tree_path in existing_files:
2236
target_path = wt.abspath(tree_path)
2237
kind = file_kind(target_path)
2238
if kind == "directory":
2240
bzrdir.BzrDir.open(target_path)
2241
except errors.NotBranchError:
2245
if (file_id not in divert and
2246
_content_match(tree, entry, file_id, kind,
2248
tt.delete_contents(tt.trans_id_tree_path(tree_path))
2249
if kind == 'directory':
922
if entry.parent_id not in file_trans_id:
923
raise repr(entry.parent_id)
2251
924
parent_id = file_trans_id[entry.parent_id]
2252
if entry.kind == 'file':
2253
# We *almost* replicate new_by_entry, so that we can defer
2254
# getting the file text, and get them all at once.
2255
trans_id = tt.create_path(entry.name, parent_id)
2256
file_trans_id[file_id] = trans_id
2257
tt.version_file(file_id, trans_id)
2258
executable = tree.is_executable(file_id, tree_path)
2260
tt.set_executability(executable, trans_id)
2261
trans_data = (trans_id, tree_path)
2262
deferred_contents.append((file_id, trans_data))
2264
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2267
new_trans_id = file_trans_id[file_id]
2268
old_parent = tt.trans_id_tree_path(tree_path)
2269
_reparent_children(tt, old_parent, new_trans_id)
2270
offset = num + 1 - len(deferred_contents)
2271
_create_files(tt, tree, deferred_contents, pb, offset,
2272
accelerator_tree, hardlink)
925
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2276
divert_trans = set(file_trans_id[f] for f in divert)
2277
resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
2278
raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
2279
if len(raw_conflicts) > 0:
2280
precomputed_delta = None
2281
conflicts = cook_conflicts(raw_conflicts, tt)
2282
for conflict in conflicts:
2285
wt.add_conflicts(conflicts)
2286
except errors.UnsupportedOperation:
2288
result = tt.apply(no_conflicts=True,
2289
precomputed_delta=precomputed_delta)
2292
933
top_pb.finished()
2296
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2298
total = len(desired_files) + offset
2300
if accelerator_tree is None:
2301
new_desired_files = desired_files
2303
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2304
unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2305
in iter if not (c or e[0] != e[1]))
2306
new_desired_files = []
2308
for file_id, (trans_id, tree_path) in desired_files:
2309
accelerator_path = unchanged.get(file_id)
2310
if accelerator_path is None:
2311
new_desired_files.append((file_id, (trans_id, tree_path)))
2313
pb.update('Adding file contents', count + offset, total)
2315
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2318
contents = accelerator_tree.get_file(file_id, accelerator_path)
2319
if wt.supports_content_filtering():
2320
filters = wt._content_filter_stack(tree_path)
2321
contents = filtered_output_bytes(contents, filters,
2322
ContentFilterContext(tree_path, tree))
2324
tt.create_file(contents, trans_id)
2328
except AttributeError:
2329
# after filtering, contents may no longer be file-like
2333
for count, ((trans_id, tree_path), contents) in enumerate(
2334
tree.iter_files_bytes(new_desired_files)):
2335
if wt.supports_content_filtering():
2336
filters = wt._content_filter_stack(tree_path)
2337
contents = filtered_output_bytes(contents, filters,
2338
ContentFilterContext(tree_path, tree))
2339
tt.create_file(contents, trans_id)
2340
pb.update('Adding file contents', count + offset, total)
2343
def _reparent_children(tt, old_parent, new_parent):
2344
for child in tt.iter_tree_children(old_parent):
2345
tt.adjust_path(tt.final_name(child), new_parent, child)
2347
def _reparent_transform_children(tt, old_parent, new_parent):
2348
by_parent = tt.by_parent()
2349
for child in by_parent[old_parent]:
2350
tt.adjust_path(tt.final_name(child), new_parent, child)
2351
return by_parent[old_parent]
2353
def _content_match(tree, entry, file_id, kind, target_path):
2354
if entry.kind != kind:
2356
if entry.kind == "directory":
2358
if entry.kind == "file":
2359
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2361
elif entry.kind == "symlink":
2362
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2367
def resolve_checkout(tt, conflicts, divert):
2368
new_conflicts = set()
2369
for c_type, conflict in ((c[0], c) for c in conflicts):
2370
# Anything but a 'duplicate' would indicate programmer error
2371
if c_type != 'duplicate':
2372
raise AssertionError(c_type)
2373
# Now figure out which is new and which is old
2374
if tt.new_contents(conflict[1]):
2375
new_file = conflict[1]
2376
old_file = conflict[2]
2378
new_file = conflict[2]
2379
old_file = conflict[1]
2381
# We should only get here if the conflict wasn't completely
2383
final_parent = tt.final_parent(old_file)
2384
if new_file in divert:
2385
new_name = tt.final_name(old_file)+'.diverted'
2386
tt.adjust_path(new_name, final_parent, new_file)
2387
new_conflicts.add((c_type, 'Diverted to',
2388
new_file, old_file))
2390
new_name = tt.final_name(old_file)+'.moved'
2391
tt.adjust_path(new_name, final_parent, old_file)
2392
new_conflicts.add((c_type, 'Moved existing file to',
2393
old_file, new_file))
2394
return new_conflicts
2397
935
def new_by_entry(tt, entry, parent_id, tree):
2398
936
"""Create a new file according to its inventory entry"""
2485
1046
working_kind = working_tree.kind(file_id)
2486
1047
has_contents = True
1049
if e.errno != errno.ENOENT:
2488
1051
has_contents = False
2489
1052
contents_mod = True
2490
1053
meta_mod = False
2491
1054
if has_contents is True:
2492
if entry.kind != working_kind:
1055
real_e_kind = entry.kind
1056
if real_e_kind == 'root_directory':
1057
real_e_kind = 'directory'
1058
if real_e_kind != working_kind:
2493
1059
contents_mod, meta_mod = True, False
2495
cur_entry._read_tree_state(working_tree.id2path(file_id),
1061
cur_entry._read_tree_state(working_tree.id2path(file_id),
2497
1063
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2498
1064
cur_entry._forget_tree_state()
2499
1065
return has_contents, contents_mod, meta_mod
2502
def revert(working_tree, target_tree, filenames, backups=False,
2503
pb=DummyProgress(), change_reporter=None):
1068
def revert(working_tree, target_tree, filenames, backups=False,
1069
pb=DummyProgress()):
2504
1070
"""Revert a working tree's contents to those of a target tree."""
2505
target_tree.lock_read()
1071
interesting_ids = find_interesting(working_tree, target_tree, filenames)
1072
def interesting(file_id):
1073
return interesting_ids is None or file_id in interesting_ids
2506
1075
tt = TreeTransform(working_tree, pb)
2508
pp = ProgressPhase("Revert phase", 3, pb)
2509
conflicts, merge_modified = _prepare_revert_transform(
2510
working_tree, target_tree, tt, filenames, backups, pp)
2512
change_reporter = delta._ChangeReporter(
2513
unversioned_filter=working_tree.is_ignored)
2514
delta.report_changes(tt.iter_changes(), change_reporter)
1077
merge_modified = working_tree.merge_modified()
1079
def trans_id_file_id(file_id):
1081
return trans_id[file_id]
1083
return tt.trans_id_tree_file_id(file_id)
1085
pp = ProgressPhase("Revert phase", 4, pb)
1087
sorted_interesting = [i for i in topology_sorted_ids(target_tree) if
1089
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1091
by_parent = tt.by_parent()
1092
for id_num, file_id in enumerate(sorted_interesting):
1093
child_pb.update("Reverting file", id_num+1,
1094
len(sorted_interesting))
1095
if file_id not in working_tree.inventory:
1096
entry = target_tree.inventory[file_id]
1097
parent_id = trans_id_file_id(entry.parent_id)
1098
e_trans_id = new_by_entry(tt, entry, parent_id, target_tree)
1099
trans_id[file_id] = e_trans_id
1101
backup_this = backups
1102
if file_id in merge_modified:
1104
del merge_modified[file_id]
1105
change_entry(tt, file_id, working_tree, target_tree,
1106
trans_id_file_id, backup_this, trans_id,
1111
wt_interesting = [i for i in working_tree.inventory if interesting(i)]
1112
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1114
for id_num, file_id in enumerate(wt_interesting):
1115
child_pb.update("New file check", id_num+1,
1116
len(sorted_interesting))
1117
if file_id not in target_tree:
1118
trans_id = tt.trans_id_tree_file_id(file_id)
1119
tt.unversion_file(trans_id)
1120
if file_id in merge_modified:
1121
tt.delete_contents(trans_id)
1122
del merge_modified[file_id]
1126
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1128
raw_conflicts = resolve_conflicts(tt, child_pb)
1131
conflicts = cook_conflicts(raw_conflicts, tt)
2515
1132
for conflict in conflicts:
2516
1133
warning(conflict)
2517
1134
pp.next_phase()
2519
working_tree.set_merge_modified(merge_modified)
1136
working_tree.set_merge_modified({})
2521
target_tree.unlock()
2524
1140
return conflicts
2527
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2528
backups, pp, basis_tree=None,
2529
merge_modified=None):
2531
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2533
if merge_modified is None:
2534
merge_modified = working_tree.merge_modified()
2535
merge_modified = _alter_files(working_tree, target_tree, tt,
2536
child_pb, filenames, backups,
2537
merge_modified, basis_tree)
2541
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2543
raw_conflicts = resolve_conflicts(tt, child_pb,
2544
lambda t, c: conflict_pass(t, c, target_tree))
2547
conflicts = cook_conflicts(raw_conflicts, tt)
2548
return conflicts, merge_modified
2551
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2552
backups, merge_modified, basis_tree=None):
2553
if basis_tree is not None:
2554
basis_tree.lock_read()
2555
change_list = target_tree.iter_changes(working_tree,
2556
specific_files=specific_files, pb=pb)
2557
if target_tree.get_root_id() is None:
2563
for id_num, (file_id, path, changed_content, versioned, parent, name,
2564
kind, executable) in enumerate(change_list):
2565
if skip_root and file_id[0] is not None and parent[0] is None:
2567
trans_id = tt.trans_id_file_id(file_id)
2570
keep_content = False
2571
if kind[0] == 'file' and (backups or kind[1] is None):
2572
wt_sha1 = working_tree.get_file_sha1(file_id)
2573
if merge_modified.get(file_id) != wt_sha1:
2574
# acquire the basis tree lazily to prevent the
2575
# expense of accessing it when it's not needed ?
2576
# (Guessing, RBC, 200702)
2577
if basis_tree is None:
2578
basis_tree = working_tree.basis_tree()
2579
basis_tree.lock_read()
2580
if file_id in basis_tree:
2581
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2583
elif kind[1] is None and not versioned[1]:
2585
if kind[0] is not None:
2586
if not keep_content:
2587
tt.delete_contents(trans_id)
2588
elif kind[1] is not None:
2589
parent_trans_id = tt.trans_id_file_id(parent[0])
2590
by_parent = tt.by_parent()
2591
backup_name = _get_backup_name(name[0], by_parent,
2592
parent_trans_id, tt)
2593
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2594
new_trans_id = tt.create_path(name[0], parent_trans_id)
2595
if versioned == (True, True):
2596
tt.unversion_file(trans_id)
2597
tt.version_file(file_id, new_trans_id)
2598
# New contents should have the same unix perms as old
2601
trans_id = new_trans_id
2602
if kind[1] in ('directory', 'tree-reference'):
2603
tt.create_directory(trans_id)
2604
if kind[1] == 'tree-reference':
2605
revision = target_tree.get_reference_revision(file_id,
2607
tt.set_tree_reference(revision, trans_id)
2608
elif kind[1] == 'symlink':
2609
tt.create_symlink(target_tree.get_symlink_target(file_id),
2611
elif kind[1] == 'file':
2612
deferred_files.append((file_id, (trans_id, mode_id)))
2613
if basis_tree is None:
2614
basis_tree = working_tree.basis_tree()
2615
basis_tree.lock_read()
2616
new_sha1 = target_tree.get_file_sha1(file_id)
2617
if (file_id in basis_tree and new_sha1 ==
2618
basis_tree.get_file_sha1(file_id)):
2619
if file_id in merge_modified:
2620
del merge_modified[file_id]
2622
merge_modified[file_id] = new_sha1
2624
# preserve the execute bit when backing up
2625
if keep_content and executable[0] == executable[1]:
2626
tt.set_executability(executable[1], trans_id)
2627
elif kind[1] is not None:
2628
raise AssertionError(kind[1])
2629
if versioned == (False, True):
2630
tt.version_file(file_id, trans_id)
2631
if versioned == (True, False):
2632
tt.unversion_file(trans_id)
2633
if (name[1] is not None and
2634
(name[0] != name[1] or parent[0] != parent[1])):
2635
if name[1] == '' and parent[1] is None:
2636
parent_trans = ROOT_PARENT
2638
parent_trans = tt.trans_id_file_id(parent[1])
2639
tt.adjust_path(name[1], parent_trans, trans_id)
2640
if executable[0] != executable[1] and kind[1] == "file":
2641
tt.set_executability(executable[1], trans_id)
2642
if working_tree.supports_content_filtering():
2643
for index, ((trans_id, mode_id), bytes) in enumerate(
2644
target_tree.iter_files_bytes(deferred_files)):
2645
file_id = deferred_files[index][0]
2646
# We're reverting a tree to the target tree so using the
2647
# target tree to find the file path seems the best choice
2648
# here IMO - Ian C 27/Oct/2009
2649
filter_tree_path = target_tree.id2path(file_id)
2650
filters = working_tree._content_filter_stack(filter_tree_path)
2651
bytes = filtered_output_bytes(bytes, filters,
2652
ContentFilterContext(filter_tree_path, working_tree))
2653
tt.create_file(bytes, trans_id, mode_id)
2655
for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2657
tt.create_file(bytes, trans_id, mode_id)
2659
if basis_tree is not None:
2661
return merge_modified
2664
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1143
def resolve_conflicts(tt, pb=DummyProgress()):
2665
1144
"""Make many conflict-resolution attempts, but die if they fail"""
2666
if pass_func is None:
2667
pass_func = conflict_pass
2668
1145
new_conflicts = set()
2670
1147
for n in range(10):
added
removed
bzrlib/transform.py
