832
861
self.create_symlink(target, trans_id)
835
def new_orphan(self, trans_id, parent_id):
836
"""Schedule an item to be orphaned.
838
When a directory is about to be removed, its children, if they are not
839
versioned are moved out of the way: they don't have a parent anymore.
841
:param trans_id: The trans_id of the existing item.
842
:param parent_id: The parent trans_id of the item.
844
raise NotImplementedError(self.new_orphan)
846
def _get_potential_orphans(self, dir_id):
847
"""Find the potential orphans in a directory.
849
A directory can't be safely deleted if there are versioned files in it.
850
If all the contained files are unversioned then they can be orphaned.
852
The 'None' return value means that the directory contains at least one
853
versioned file and should not be deleted.
855
:param dir_id: The directory trans id.
857
:return: A list of the orphan trans ids or None if at least one
858
versioned file is present.
861
# Find the potential orphans, stop if one item should be kept
862
for child_tid in self.by_parent()[dir_id]:
863
if child_tid in self._removed_contents:
864
# The child is removed as part of the transform. Since it was
865
# versioned before, it's not an orphan
867
elif self.final_file_id(child_tid) is None:
868
# The child is not versioned
869
orphans.append(child_tid)
871
# We have a versioned file here, searching for orphans is
877
def _affected_ids(self):
878
"""Return the set of transform ids affected by the transform"""
879
trans_ids = set(self._removed_id)
880
trans_ids.update(self._new_id)
881
trans_ids.update(self._removed_contents)
882
trans_ids.update(self._new_contents)
883
trans_ids.update(self._new_executability)
884
trans_ids.update(self._new_name)
885
trans_ids.update(self._new_parent)
888
def _get_file_id_maps(self):
889
"""Return mapping of file_ids to trans_ids in the to and from states"""
890
trans_ids = self._affected_ids()
893
# Build up two dicts: trans_ids associated with file ids in the
894
# FROM state, vs the TO state.
895
for trans_id in trans_ids:
896
from_file_id = self.tree_file_id(trans_id)
897
if from_file_id is not None:
898
from_trans_ids[from_file_id] = trans_id
899
to_file_id = self.final_file_id(trans_id)
900
if to_file_id is not None:
901
to_trans_ids[to_file_id] = trans_id
902
return from_trans_ids, to_trans_ids
904
def _from_file_data(self, from_trans_id, from_versioned, from_path):
905
"""Get data about a file in the from (tree) state
907
Return a (name, parent, kind, executable) tuple
909
from_path = self._tree_id_paths.get(from_trans_id)
911
# get data from working tree if versioned
912
from_entry = next(self._tree.iter_entries_by_dir(
913
specific_files=[from_path]))[1]
914
from_name = from_entry.name
915
from_parent = from_entry.parent_id
918
if from_path is None:
919
# File does not exist in FROM state
923
# File exists, but is not versioned. Have to use path-
925
from_name = os.path.basename(from_path)
926
tree_parent = self.get_tree_parent(from_trans_id)
927
from_parent = self.tree_file_id(tree_parent)
928
if from_path is not None:
929
from_kind, from_executable, from_stats = \
930
self._tree._comparison_data(from_entry, from_path)
933
from_executable = False
934
return from_name, from_parent, from_kind, from_executable
936
def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
937
"""Get data about a file in the to (target) state
939
Return a (name, parent, kind, executable) tuple
941
to_name = self.final_name(to_trans_id)
942
to_kind = self.final_kind(to_trans_id)
943
to_parent = self.final_file_id(self.final_parent(to_trans_id))
944
if to_trans_id in self._new_executability:
945
to_executable = self._new_executability[to_trans_id]
946
elif to_trans_id == from_trans_id:
947
to_executable = from_executable
949
to_executable = False
950
return to_name, to_parent, to_kind, to_executable
952
def iter_changes(self):
953
"""Produce output in the same format as Tree.iter_changes.
955
Will produce nonsensical results if invoked while inventory/filesystem
956
conflicts (as reported by TreeTransform.find_conflicts()) are present.
958
This reads the Transform, but only reproduces changes involving a
959
file_id. Files that are not versioned in either of the FROM or TO
960
states are not reflected.
962
final_paths = FinalPaths(self)
963
from_trans_ids, to_trans_ids = self._get_file_id_maps()
965
# Now iterate through all active file_ids
966
for file_id in set(from_trans_ids).union(to_trans_ids):
968
from_trans_id = from_trans_ids.get(file_id)
969
# find file ids, and determine versioning state
970
if from_trans_id is None:
971
from_versioned = False
972
from_trans_id = to_trans_ids[file_id]
974
from_versioned = True
975
to_trans_id = to_trans_ids.get(file_id)
976
if to_trans_id is None:
978
to_trans_id = from_trans_id
982
if not from_versioned:
985
from_path = self._tree_id_paths.get(from_trans_id)
989
to_path = final_paths.get_path(to_trans_id)
991
from_name, from_parent, from_kind, from_executable = \
992
self._from_file_data(from_trans_id, from_versioned, from_path)
994
to_name, to_parent, to_kind, to_executable = \
995
self._to_file_data(to_trans_id, from_trans_id, from_executable)
997
if from_kind != to_kind:
999
elif to_kind in ('file', 'symlink') and (
1000
to_trans_id != from_trans_id
1001
or to_trans_id in self._new_contents):
1003
if (not modified and from_versioned == to_versioned
1004
and from_parent == to_parent and from_name == to_name
1005
and from_executable == to_executable):
1009
file_id, (from_path, to_path), modified,
1010
(from_versioned, to_versioned),
1011
(from_parent, to_parent),
1012
(from_name, to_name),
1013
(from_kind, to_kind),
1014
(from_executable, to_executable)))
1017
return (c.path[0] or '', c.path[1] or '')
1018
return iter(sorted(results, key=path_key))
1020
def get_preview_tree(self):
1021
"""Return a tree representing the result of the transform.
1023
The tree is a snapshot, and altering the TreeTransform will invalidate
1026
return _PreviewTree(self)
1028
def commit(self, branch, message, merge_parents=None, strict=False,
1029
timestamp=None, timezone=None, committer=None, authors=None,
1030
revprops=None, revision_id=None):
1031
"""Commit the result of this TreeTransform to a branch.
1033
:param branch: The branch to commit to.
1034
:param message: The message to attach to the commit.
1035
:param merge_parents: Additional parent revision-ids specified by
1037
:param strict: If True, abort the commit if there are unversioned
1039
:param timestamp: if not None, seconds-since-epoch for the time and
1040
date. (May be a float.)
1041
:param timezone: Optional timezone for timestamp, as an offset in
1043
:param committer: Optional committer in email-id format.
1044
(e.g. "J Random Hacker <jrandom@example.com>")
1045
:param authors: Optional list of authors in email-id format.
1046
:param revprops: Optional dictionary of revision properties.
1047
:param revision_id: Optional revision id. (Specifying a revision-id
1048
may reduce performance for some non-native formats.)
1049
:return: The revision_id of the revision committed.
1051
self._check_malformed()
1053
unversioned = set(self._new_contents).difference(set(self._new_id))
1054
for trans_id in unversioned:
1055
if self.final_file_id(trans_id) is None:
1056
raise errors.StrictCommitFailed()
1058
revno, last_rev_id = branch.last_revision_info()
1059
if last_rev_id == _mod_revision.NULL_REVISION:
1060
if merge_parents is not None:
1061
raise ValueError('Cannot supply merge parents for first'
1065
parent_ids = [last_rev_id]
1066
if merge_parents is not None:
1067
parent_ids.extend(merge_parents)
1068
if self._tree.get_revision_id() != last_rev_id:
1069
raise ValueError('TreeTransform not based on branch basis: %s' %
1070
self._tree.get_revision_id().decode('utf-8'))
1071
revprops = commit.Commit.update_revprops(revprops, branch, authors)
1072
builder = branch.get_commit_builder(parent_ids,
1073
timestamp=timestamp,
1075
committer=committer,
1077
revision_id=revision_id)
1078
preview = self.get_preview_tree()
1079
list(builder.record_iter_changes(preview, last_rev_id,
1080
self.iter_changes()))
1081
builder.finish_inventory()
1082
revision_id = builder.commit(message)
1083
branch.set_last_revision_info(revno + 1, revision_id)
1086
def _text_parent(self, trans_id):
1087
path = self.tree_path(trans_id)
1089
if path is None or self._tree.kind(path) != 'file':
1091
except errors.NoSuchFile:
1095
def _get_parents_texts(self, trans_id):
1096
"""Get texts for compression parents of this file."""
1097
path = self._text_parent(trans_id)
1100
return (self._tree.get_file_text(path),)
1102
def _get_parents_lines(self, trans_id):
1103
"""Get lines for compression parents of this file."""
1104
path = self._text_parent(trans_id)
1107
return (self._tree.get_file_lines(path),)
1109
def serialize(self, serializer):
1110
"""Serialize this TreeTransform.
1112
:param serializer: A Serialiser like pack.ContainerSerializer.
1114
new_name = {k.encode('utf-8'): v.encode('utf-8')
1115
for k, v in viewitems(self._new_name)}
1116
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1117
for k, v in viewitems(self._new_parent)}
1118
new_id = {k.encode('utf-8'): v
1119
for k, v in viewitems(self._new_id)}
1120
new_executability = {k.encode('utf-8'): int(v)
1121
for k, v in viewitems(self._new_executability)}
1122
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1123
for k, v in viewitems(self._tree_path_ids)}
1124
non_present_ids = {k: v.encode('utf-8')
1125
for k, v in viewitems(self._non_present_ids)}
1126
removed_contents = [trans_id.encode('utf-8')
1127
for trans_id in self._removed_contents]
1128
removed_id = [trans_id.encode('utf-8')
1129
for trans_id in self._removed_id]
1131
b'_id_number': self._id_number,
1132
b'_new_name': new_name,
1133
b'_new_parent': new_parent,
1134
b'_new_executability': new_executability,
1136
b'_tree_path_ids': tree_path_ids,
1137
b'_removed_id': removed_id,
1138
b'_removed_contents': removed_contents,
1139
b'_non_present_ids': non_present_ids,
1141
yield serializer.bytes_record(bencode.bencode(attribs),
1143
for trans_id, kind in sorted(viewitems(self._new_contents)):
1145
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1146
lines = cur_file.readlines()
1147
parents = self._get_parents_lines(trans_id)
1148
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1149
content = b''.join(mpdiff.to_patch())
1150
if kind == 'directory':
1152
if kind == 'symlink':
1153
content = self._read_symlink_target(trans_id)
1154
if not isinstance(content, bytes):
1155
content = content.encode('utf-8')
1156
yield serializer.bytes_record(
1157
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1159
def deserialize(self, records):
1160
"""Deserialize a stored TreeTransform.
1162
:param records: An iterable of (names, content) tuples, as per
1163
pack.ContainerPushParser.
1165
names, content = next(records)
1166
attribs = bencode.bdecode(content)
1167
self._id_number = attribs[b'_id_number']
1168
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1169
for k, v in viewitems(attribs[b'_new_name'])}
1170
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1171
for k, v in viewitems(attribs[b'_new_parent'])}
1172
self._new_executability = {
1173
k.decode('utf-8'): bool(v)
1174
for k, v in viewitems(attribs[b'_new_executability'])}
1175
self._new_id = {k.decode('utf-8'): v
1176
for k, v in viewitems(attribs[b'_new_id'])}
1177
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1178
self._tree_path_ids = {}
1179
self._tree_id_paths = {}
1180
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1181
path = bytepath.decode('utf-8')
1182
trans_id = trans_id.decode('utf-8')
1183
self._tree_path_ids[path] = trans_id
1184
self._tree_id_paths[trans_id] = path
1185
self._removed_id = {trans_id.decode('utf-8')
1186
for trans_id in attribs[b'_removed_id']}
1187
self._removed_contents = set(
1188
trans_id.decode('utf-8')
1189
for trans_id in attribs[b'_removed_contents'])
1190
self._non_present_ids = {
1191
k: v.decode('utf-8')
1192
for k, v in viewitems(attribs[b'_non_present_ids'])}
1193
for ((trans_id, kind),), content in records:
1194
trans_id = trans_id.decode('utf-8')
1195
kind = kind.decode('ascii')
1197
mpdiff = multiparent.MultiParent.from_patch(content)
1198
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1199
self.create_file(lines, trans_id)
1200
if kind == 'directory':
1201
self.create_directory(trans_id)
1202
if kind == 'symlink':
1203
self.create_symlink(content.decode('utf-8'), trans_id)
1205
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1206
"""Schedule creation of a new file.
1210
:param contents: an iterator of strings, all of which will be written
1211
to the target destination.
1212
:param trans_id: TreeTransform handle
1213
:param mode_id: If not None, force the mode of the target file to match
1214
the mode of the object referenced by mode_id.
1215
Otherwise, we will try to preserve mode bits of an existing file.
1216
:param sha1: If the sha1 of this content is already known, pass it in.
1217
We can use it to prevent future sha1 computations.
1219
raise NotImplementedError(self.create_file)
1221
def create_directory(self, trans_id):
1222
"""Schedule creation of a new directory.
1224
See also new_directory.
1226
raise NotImplementedError(self.create_directory)
1228
def create_symlink(self, target, trans_id):
1229
"""Schedule creation of a new symbolic link.
1231
target is a bytestring.
1232
See also new_symlink.
1234
raise NotImplementedError(self.create_symlink)
1236
def create_hardlink(self, path, trans_id):
1237
"""Schedule creation of a hard link"""
1238
raise NotImplementedError(self.create_hardlink)
1240
def cancel_creation(self, trans_id):
1241
"""Cancel the creation of new file contents."""
1242
raise NotImplementedError(self.cancel_creation)
1245
class DiskTreeTransform(TreeTransformBase):
1246
"""Tree transform storing its contents on disk."""
1248
def __init__(self, tree, limbodir, pb=None, case_sensitive=True):
1250
:param tree: The tree that will be transformed, but not necessarily
1252
:param limbodir: A directory where new files can be stored until
1253
they are installed in their proper places
1255
:param case_sensitive: If True, the target of the transform is
1256
case sensitive, not just case preserving.
1258
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1259
self._limbodir = limbodir
1260
self._deletiondir = None
1261
# A mapping of transform ids to their limbo filename
1262
self._limbo_files = {}
1263
self._possibly_stale_limbo_files = set()
1264
# A mapping of transform ids to a set of the transform ids of children
1265
# that their limbo directory has
1266
self._limbo_children = {}
1267
# Map transform ids to maps of child filename to child transform id
1268
self._limbo_children_names = {}
1269
# List of transform ids that need to be renamed from limbo into place
1270
self._needs_rename = set()
1271
self._creation_mtime = None
1272
self._create_symlinks = osutils.supports_symlinks(self._limbodir)
1275
"""Release the working tree lock, if held, clean up limbo dir.
1277
This is required if apply has not been invoked, but can be invoked
1280
if self._tree is None:
1283
limbo_paths = list(viewvalues(self._limbo_files))
1284
limbo_paths.extend(self._possibly_stale_limbo_files)
1285
limbo_paths.sort(reverse=True)
1286
for path in limbo_paths:
1289
except OSError as e:
1290
if e.errno != errno.ENOENT:
1292
# XXX: warn? perhaps we just got interrupted at an
1293
# inconvenient moment, but perhaps files are disappearing
1296
delete_any(self._limbodir)
1298
# We don't especially care *why* the dir is immortal.
1299
raise ImmortalLimbo(self._limbodir)
1301
if self._deletiondir is not None:
1302
delete_any(self._deletiondir)
1304
raise errors.ImmortalPendingDeletion(self._deletiondir)
1306
TreeTransformBase.finalize(self)
1308
def _limbo_supports_executable(self):
1309
"""Check if the limbo path supports the executable bit."""
1310
return osutils.supports_executable(self._limbodir)
1312
def _limbo_name(self, trans_id):
1313
"""Generate the limbo name of a file"""
1314
limbo_name = self._limbo_files.get(trans_id)
1315
if limbo_name is None:
1316
limbo_name = self._generate_limbo_path(trans_id)
1317
self._limbo_files[trans_id] = limbo_name
1320
def _generate_limbo_path(self, trans_id):
1321
"""Generate a limbo path using the trans_id as the relative path.
1323
This is suitable as a fallback, and when the transform should not be
1324
sensitive to the path encoding of the limbo directory.
1326
self._needs_rename.add(trans_id)
1327
return pathjoin(self._limbodir, trans_id)
1329
def adjust_path(self, name, parent, trans_id):
1330
previous_parent = self._new_parent.get(trans_id)
1331
previous_name = self._new_name.get(trans_id)
1332
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1333
if (trans_id in self._limbo_files
1334
and trans_id not in self._needs_rename):
1335
self._rename_in_limbo([trans_id])
1336
if previous_parent != parent:
1337
self._limbo_children[previous_parent].remove(trans_id)
1338
if previous_parent != parent or previous_name != name:
1339
del self._limbo_children_names[previous_parent][previous_name]
1341
def _rename_in_limbo(self, trans_ids):
1342
"""Fix limbo names so that the right final path is produced.
1344
This means we outsmarted ourselves-- we tried to avoid renaming
1345
these files later by creating them with their final names in their
1346
final parents. But now the previous name or parent is no longer
1347
suitable, so we have to rename them.
1349
Even for trans_ids that have no new contents, we must remove their
1350
entries from _limbo_files, because they are now stale.
1352
for trans_id in trans_ids:
1353
old_path = self._limbo_files[trans_id]
1354
self._possibly_stale_limbo_files.add(old_path)
1355
del self._limbo_files[trans_id]
1356
if trans_id not in self._new_contents:
1358
new_path = self._limbo_name(trans_id)
1359
os.rename(old_path, new_path)
1360
self._possibly_stale_limbo_files.remove(old_path)
1361
for descendant in self._limbo_descendants(trans_id):
1362
desc_path = self._limbo_files[descendant]
1363
desc_path = new_path + desc_path[len(old_path):]
1364
self._limbo_files[descendant] = desc_path
1366
def _limbo_descendants(self, trans_id):
1367
"""Return the set of trans_ids whose limbo paths descend from this."""
1368
descendants = set(self._limbo_children.get(trans_id, []))
1369
for descendant in list(descendants):
1370
descendants.update(self._limbo_descendants(descendant))
1373
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1374
"""Schedule creation of a new file.
1378
:param contents: an iterator of strings, all of which will be written
1379
to the target destination.
1380
:param trans_id: TreeTransform handle
1381
:param mode_id: If not None, force the mode of the target file to match
1382
the mode of the object referenced by mode_id.
1383
Otherwise, we will try to preserve mode bits of an existing file.
1384
:param sha1: If the sha1 of this content is already known, pass it in.
1385
We can use it to prevent future sha1 computations.
1387
name = self._limbo_name(trans_id)
1388
with open(name, 'wb') as f:
1389
unique_add(self._new_contents, trans_id, 'file')
1390
f.writelines(contents)
1391
self._set_mtime(name)
1392
self._set_mode(trans_id, mode_id, S_ISREG)
1393
# It is unfortunate we have to use lstat instead of fstat, but we just
1394
# used utime and chmod on the file, so we need the accurate final
1396
if sha1 is not None:
1397
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1399
def _read_symlink_target(self, trans_id):
1400
return os.readlink(self._limbo_name(trans_id))
1402
def _set_mtime(self, path):
1403
"""All files that are created get the same mtime.
1405
This time is set by the first object to be created.
1407
if self._creation_mtime is None:
1408
self._creation_mtime = time.time()
1409
os.utime(path, (self._creation_mtime, self._creation_mtime))
1411
def create_hardlink(self, path, trans_id):
1412
"""Schedule creation of a hard link"""
1413
name = self._limbo_name(trans_id)
1416
except OSError as e:
1417
if e.errno != errno.EPERM:
1419
raise errors.HardLinkNotSupported(path)
1421
unique_add(self._new_contents, trans_id, 'file')
1422
except BaseException:
1423
# Clean up the file, it never got registered so
1424
# TreeTransform.finalize() won't clean it up.
1428
def create_directory(self, trans_id):
1429
"""Schedule creation of a new directory.
1431
See also new_directory.
1433
os.mkdir(self._limbo_name(trans_id))
1434
unique_add(self._new_contents, trans_id, 'directory')
1436
def create_symlink(self, target, trans_id):
1437
"""Schedule creation of a new symbolic link.
1439
target is a bytestring.
1440
See also new_symlink.
1442
if self._create_symlinks:
1443
os.symlink(target, self._limbo_name(trans_id))
1446
path = FinalPaths(self).get_path(trans_id)
1450
'Unable to create symlink "%s" on this filesystem.' % (path,))
1451
# We add symlink to _new_contents even if they are unsupported
1452
# and not created. These entries are subsequently used to avoid
1453
# conflicts on platforms that don't support symlink
1454
unique_add(self._new_contents, trans_id, 'symlink')
1456
def cancel_creation(self, trans_id):
1457
"""Cancel the creation of new file contents."""
1458
del self._new_contents[trans_id]
1459
if trans_id in self._observed_sha1s:
1460
del self._observed_sha1s[trans_id]
1461
children = self._limbo_children.get(trans_id)
1462
# if this is a limbo directory with children, move them before removing
1464
if children is not None:
1465
self._rename_in_limbo(children)
1466
del self._limbo_children[trans_id]
1467
del self._limbo_children_names[trans_id]
1468
delete_any(self._limbo_name(trans_id))
1470
def new_orphan(self, trans_id, parent_id):
1471
conf = self._tree.get_config_stack()
1472
handle_orphan = conf.get('transform.orphan_policy')
1473
handle_orphan(self, trans_id, parent_id)
1476
class OrphaningError(errors.BzrError):
1478
# Only bugs could lead to such exception being seen by the user
1479
internal_error = True
1480
_fmt = "Error while orphaning %s in %s directory"
1482
def __init__(self, orphan, parent):
1483
errors.BzrError.__init__(self)
1484
self.orphan = orphan
1485
self.parent = parent
1488
class OrphaningForbidden(OrphaningError):
1490
_fmt = "Policy: %s doesn't allow creating orphans."
1492
def __init__(self, policy):
1493
errors.BzrError.__init__(self)
1494
self.policy = policy
1497
def move_orphan(tt, orphan_id, parent_id):
1498
"""See TreeTransformBase.new_orphan.
1500
This creates a new orphan in the `brz-orphans` dir at the root of the
1503
:param tt: The TreeTransform orphaning `trans_id`.
1505
:param orphan_id: The trans id that should be orphaned.
1507
:param parent_id: The orphan parent trans id.
1509
# Add the orphan dir if it doesn't exist
1510
orphan_dir_basename = 'brz-orphans'
1511
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1512
if tt.final_kind(od_id) is None:
1513
tt.create_directory(od_id)
1514
parent_path = tt._tree_id_paths[parent_id]
1515
# Find a name that doesn't exist yet in the orphan dir
1516
actual_name = tt.final_name(orphan_id)
1517
new_name = tt._available_backup_name(actual_name, od_id)
1518
tt.adjust_path(new_name, od_id, orphan_id)
1519
trace.warning('%s has been orphaned in %s'
1520
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1523
def refuse_orphan(tt, orphan_id, parent_id):
1524
"""See TreeTransformBase.new_orphan.
1526
This refuses to create orphan, letting the caller handle the conflict.
1528
raise OrphaningForbidden('never')
1531
orphaning_registry = registry.Registry()
1532
orphaning_registry.register(
1533
u'conflict', refuse_orphan,
1534
'Leave orphans in place and create a conflict on the directory.')
1535
orphaning_registry.register(
1536
u'move', move_orphan,
1537
'Move orphans into the brz-orphans directory.')
1538
orphaning_registry._set_default_key(u'conflict')
1541
opt_transform_orphan = _mod_config.RegistryOption(
1542
'transform.orphan_policy', orphaning_registry,
1543
help='Policy for orphaned files during transform operations.',
1547
class TreeTransform(DiskTreeTransform):
1548
"""Represent a tree transformation.
1550
This object is designed to support incremental generation of the transform,
1553
However, it gives optimum performance when parent directories are created
1554
before their contents. The transform is then able to put child files
1555
directly in their parent directory, avoiding later renames.
1557
It is easy to produce malformed transforms, but they are generally
1558
harmless. Attempting to apply a malformed transform will cause an
1559
exception to be raised before any modifications are made to the tree.
1561
Many kinds of malformed transforms can be corrected with the
1562
resolve_conflicts function. The remaining ones indicate programming error,
1563
such as trying to create a file with no path.
1565
Two sets of file creation methods are supplied. Convenience methods are:
1570
These are composed of the low-level methods:
1572
* create_file or create_directory or create_symlink
1576
Transform/Transaction ids
1577
-------------------------
1578
trans_ids are temporary ids assigned to all files involved in a transform.
1579
It's possible, even common, that not all files in the Tree have trans_ids.
1581
trans_ids are used because filenames and file_ids are not good enough
1582
identifiers; filenames change, and not all files have file_ids. File-ids
1583
are also associated with trans-ids, so that moving a file moves its
1586
trans_ids are only valid for the TreeTransform that generated them.
1590
Limbo is a temporary directory use to hold new versions of files.
1591
Files are added to limbo by create_file, create_directory, create_symlink,
1592
and their convenience variants (new_*). Files may be removed from limbo
1593
using cancel_creation. Files are renamed from limbo into their final
1594
location as part of TreeTransform.apply
1596
Limbo must be cleaned up, by either calling TreeTransform.apply or
1597
calling TreeTransform.finalize.
1599
Files are placed into limbo inside their parent directories, where
1600
possible. This reduces subsequent renames, and makes operations involving
1601
lots of files faster. This optimization is only possible if the parent
1602
directory is created *before* creating any of its children, so avoid
1603
creating children before parents, where possible.
1607
This temporary directory is used by _FileMover for storing files that are
1608
about to be deleted. In case of rollback, the files will be restored.
1609
FileMover does not delete files until it is sure that a rollback will not
1613
def __init__(self, tree, pb=None):
1614
"""Note: a tree_write lock is taken on the tree.
1616
Use TreeTransform.finalize() to release the lock (can be omitted if
1617
TreeTransform.apply() called).
1619
tree.lock_tree_write()
1621
limbodir = urlutils.local_path_from_url(
1622
tree._transport.abspath('limbo'))
1623
osutils.ensure_empty_directory_exists(
1625
errors.ExistingLimbo)
1626
deletiondir = urlutils.local_path_from_url(
1627
tree._transport.abspath('pending-deletion'))
1628
osutils.ensure_empty_directory_exists(
1630
errors.ExistingPendingDeletion)
1631
except BaseException:
1635
# Cache of realpath results, to speed up canonical_path
1636
self._realpaths = {}
1637
# Cache of relpath results, to speed up canonical_path
1639
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1640
tree.case_sensitive)
1641
self._deletiondir = deletiondir
1643
def canonical_path(self, path):
1644
"""Get the canonical tree-relative path"""
1645
# don't follow final symlinks
1646
abs = self._tree.abspath(path)
1647
if abs in self._relpaths:
1648
return self._relpaths[abs]
1649
dirname, basename = os.path.split(abs)
1650
if dirname not in self._realpaths:
1651
self._realpaths[dirname] = os.path.realpath(dirname)
1652
dirname = self._realpaths[dirname]
1653
abs = pathjoin(dirname, basename)
1654
if dirname in self._relpaths:
1655
relpath = pathjoin(self._relpaths[dirname], basename)
1656
relpath = relpath.rstrip('/\\')
1658
relpath = self._tree.relpath(abs)
1659
self._relpaths[abs] = relpath
1662
def tree_kind(self, trans_id):
1663
"""Determine the file kind in the working tree.
1665
:returns: The file kind or None if the file does not exist
1667
path = self._tree_id_paths.get(trans_id)
1671
return file_kind(self._tree.abspath(path))
1672
except errors.NoSuchFile:
1675
def _set_mode(self, trans_id, mode_id, typefunc):
1676
"""Set the mode of new file contents.
1677
The mode_id is the existing file to get the mode from (often the same
1678
as trans_id). The operation is only performed if there's a mode match
1679
according to typefunc.
1684
old_path = self._tree_id_paths[mode_id]
1688
mode = os.stat(self._tree.abspath(old_path)).st_mode
1689
except OSError as e:
1690
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1691
# Either old_path doesn't exist, or the parent of the
1692
# target is not a directory (but will be one eventually)
1693
# Either way, we know it doesn't exist *right now*
1694
# See also bug #248448
1699
osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1701
def iter_tree_children(self, parent_id):
1702
"""Iterate through the entry's tree children, if any"""
1704
path = self._tree_id_paths[parent_id]
1708
children = os.listdir(self._tree.abspath(path))
1709
except OSError as e:
1710
if not (osutils._is_error_enotdir(e) or
1711
e.errno in (errno.ENOENT, errno.ESRCH)):
1715
for child in children:
1716
childpath = joinpath(path, child)
1717
if self._tree.is_control_filename(childpath):
1719
yield self.trans_id_tree_path(childpath)
1721
def _generate_limbo_path(self, trans_id):
1722
"""Generate a limbo path using the final path if possible.
1724
This optimizes the performance of applying the tree transform by
1725
avoiding renames. These renames can be avoided only when the parent
1726
directory is already scheduled for creation.
1728
If the final path cannot be used, falls back to using the trans_id as
1731
parent = self._new_parent.get(trans_id)
1732
# if the parent directory is already in limbo (e.g. when building a
1733
# tree), choose a limbo name inside the parent, to reduce further
1735
use_direct_path = False
1736
if self._new_contents.get(parent) == 'directory':
1737
filename = self._new_name.get(trans_id)
1738
if filename is not None:
1739
if parent not in self._limbo_children:
1740
self._limbo_children[parent] = set()
1741
self._limbo_children_names[parent] = {}
1742
use_direct_path = True
1743
# the direct path can only be used if no other file has
1744
# already taken this pathname, i.e. if the name is unused, or
1745
# if it is already associated with this trans_id.
1746
elif self._case_sensitive_target:
1747
if (self._limbo_children_names[parent].get(filename)
1748
in (trans_id, None)):
1749
use_direct_path = True
1751
for l_filename, l_trans_id in viewitems(
1752
self._limbo_children_names[parent]):
1753
if l_trans_id == trans_id:
1755
if l_filename.lower() == filename.lower():
1758
use_direct_path = True
1760
if not use_direct_path:
1761
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1763
limbo_name = pathjoin(self._limbo_files[parent], filename)
1764
self._limbo_children[parent].add(trans_id)
1765
self._limbo_children_names[parent][filename] = trans_id
1768
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1769
"""Apply all changes to the inventory and filesystem.
1771
If filesystem or inventory conflicts are present, MalformedTransform
1774
If apply succeeds, finalize is not necessary.
1776
:param no_conflicts: if True, the caller guarantees there are no
1777
conflicts, so no check is made.
1778
:param precomputed_delta: An inventory delta to use instead of
1780
:param _mover: Supply an alternate FileMover, for testing
1782
for hook in MutableTree.hooks['pre_transform']:
1783
hook(self._tree, self)
1784
if not no_conflicts:
1785
self._check_malformed()
1786
with ui.ui_factory.nested_progress_bar() as child_pb:
1787
if precomputed_delta is None:
1788
child_pb.update(gettext('Apply phase'), 0, 2)
1789
inventory_delta = self._generate_inventory_delta()
1792
inventory_delta = precomputed_delta
1795
mover = _FileMover()
1799
child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1800
self._apply_removals(mover)
1801
child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1802
modified_paths = self._apply_insertions(mover)
1803
except BaseException:
1807
mover.apply_deletions()
1808
if self.final_file_id(self.root) is None:
1809
inventory_delta = [e for e in inventory_delta if e[0] != '']
1810
self._tree.apply_inventory_delta(inventory_delta)
1811
self._apply_observed_sha1s()
1814
return _TransformResults(modified_paths, self.rename_count)
1816
def _generate_inventory_delta(self):
1817
"""Generate an inventory delta for the current transform."""
1818
inventory_delta = []
1819
new_paths = self._inventory_altered()
1820
total_entries = len(new_paths) + len(self._removed_id)
1821
with ui.ui_factory.nested_progress_bar() as child_pb:
1822
for num, trans_id in enumerate(self._removed_id):
1824
child_pb.update(gettext('removing file'),
1826
if trans_id == self._new_root:
1827
file_id = self._tree.path2id('')
1829
file_id = self.tree_file_id(trans_id)
1830
# File-id isn't really being deleted, just moved
1831
if file_id in self._r_new_id:
1833
path = self._tree_id_paths[trans_id]
1834
inventory_delta.append((path, None, file_id, None))
1835
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1837
for num, (path, trans_id) in enumerate(new_paths):
1839
child_pb.update(gettext('adding file'),
1840
num + len(self._removed_id), total_entries)
1841
file_id = new_path_file_ids[trans_id]
1844
kind = self.final_kind(trans_id)
1846
kind = self._tree.stored_kind(self._tree.id2path(file_id))
1847
parent_trans_id = self.final_parent(trans_id)
1848
parent_file_id = new_path_file_ids.get(parent_trans_id)
1849
if parent_file_id is None:
1850
parent_file_id = self.final_file_id(parent_trans_id)
1851
if trans_id in self._new_reference_revision:
1852
new_entry = inventory.TreeReference(
1854
self._new_name[trans_id],
1855
self.final_file_id(self._new_parent[trans_id]),
1856
None, self._new_reference_revision[trans_id])
1858
new_entry = inventory.make_entry(kind,
1859
self.final_name(trans_id),
1860
parent_file_id, file_id)
1862
old_path = self._tree.id2path(new_entry.file_id)
1863
except errors.NoSuchId:
1865
new_executability = self._new_executability.get(trans_id)
1866
if new_executability is not None:
1867
new_entry.executable = new_executability
1868
inventory_delta.append(
1869
(old_path, path, new_entry.file_id, new_entry))
1870
return inventory_delta
1872
def _apply_removals(self, mover):
1873
"""Perform tree operations that remove directory/inventory names.
1875
That is, delete files that are to be deleted, and put any files that
1876
need renaming into limbo. This must be done in strict child-to-parent
1879
If inventory_delta is None, no inventory delta generation is performed.
1881
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1882
with ui.ui_factory.nested_progress_bar() as child_pb:
1883
for num, (path, trans_id) in enumerate(tree_paths):
1884
# do not attempt to move root into a subdirectory of itself.
1887
child_pb.update(gettext('removing file'), num, len(tree_paths))
1888
full_path = self._tree.abspath(path)
1889
if trans_id in self._removed_contents:
1890
delete_path = os.path.join(self._deletiondir, trans_id)
1891
mover.pre_delete(full_path, delete_path)
1892
elif (trans_id in self._new_name or
1893
trans_id in self._new_parent):
1895
mover.rename(full_path, self._limbo_name(trans_id))
1896
except errors.TransformRenameFailed as e:
1897
if e.errno != errno.ENOENT:
1900
self.rename_count += 1
1902
def _apply_insertions(self, mover):
1903
"""Perform tree operations that insert directory/inventory names.
1905
That is, create any files that need to be created, and restore from
1906
limbo any files that needed renaming. This must be done in strict
1907
parent-to-child order.
1909
If inventory_delta is None, no inventory delta is calculated, and
1910
no list of modified paths is returned.
1912
new_paths = self.new_paths(filesystem_only=True)
1914
with ui.ui_factory.nested_progress_bar() as child_pb:
1915
for num, (path, trans_id) in enumerate(new_paths):
1917
child_pb.update(gettext('adding file'),
1918
num, len(new_paths))
1919
full_path = self._tree.abspath(path)
1920
if trans_id in self._needs_rename:
1922
mover.rename(self._limbo_name(trans_id), full_path)
1923
except errors.TransformRenameFailed as e:
1924
# We may be renaming a dangling inventory id
1925
if e.errno != errno.ENOENT:
1928
self.rename_count += 1
1929
# TODO: if trans_id in self._observed_sha1s, we should
1930
# re-stat the final target, since ctime will be
1931
# updated by the change.
1932
if (trans_id in self._new_contents
1933
or self.path_changed(trans_id)):
1934
if trans_id in self._new_contents:
1935
modified_paths.append(full_path)
1936
if trans_id in self._new_executability:
1937
self._set_executability(path, trans_id)
1938
if trans_id in self._observed_sha1s:
1939
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1940
st = osutils.lstat(full_path)
1941
self._observed_sha1s[trans_id] = (o_sha1, st)
1942
for path, trans_id in new_paths:
1943
# new_paths includes stuff like workingtree conflicts. Only the
1944
# stuff in new_contents actually comes from limbo.
1945
if trans_id in self._limbo_files:
1946
del self._limbo_files[trans_id]
1947
self._new_contents.clear()
1948
return modified_paths
1950
def _apply_observed_sha1s(self):
1951
"""After we have finished renaming everything, update observed sha1s
1953
This has to be done after self._tree.apply_inventory_delta, otherwise
1954
it doesn't know anything about the files we are updating. Also, we want
1955
to do this as late as possible, so that most entries end up cached.
1957
# TODO: this doesn't update the stat information for directories. So
1958
# the first 'bzr status' will still need to rewrite
1959
# .bzr/checkout/dirstate. However, we at least don't need to
1960
# re-read all of the files.
1961
# TODO: If the operation took a while, we could do a time.sleep(3) here
1962
# to allow the clock to tick over and ensure we won't have any
1963
# problems. (we could observe start time, and finish time, and if
1964
# it is less than eg 10% overhead, add a sleep call.)
1965
paths = FinalPaths(self)
1966
for trans_id, observed in viewitems(self._observed_sha1s):
1967
path = paths.get_path(trans_id)
1968
self._tree._observed_sha1(path, observed)
1971
class TransformPreview(DiskTreeTransform):
1972
"""A TreeTransform for generating preview trees.
1974
Unlike TreeTransform, this version works when the input tree is a
1975
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1976
unversioned files in the input tree.
1979
def __init__(self, tree, pb=None, case_sensitive=True):
1981
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1982
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1984
def canonical_path(self, path):
1987
def tree_kind(self, trans_id):
1988
path = self._tree_id_paths.get(trans_id)
1991
kind = self._tree.path_content_summary(path)[0]
1992
if kind == 'missing':
1996
def _set_mode(self, trans_id, mode_id, typefunc):
1997
"""Set the mode of new file contents.
1998
The mode_id is the existing file to get the mode from (often the same
1999
as trans_id). The operation is only performed if there's a mode match
2000
according to typefunc.
2002
# is it ok to ignore this? probably
2005
def iter_tree_children(self, parent_id):
2006
"""Iterate through the entry's tree children, if any"""
2008
path = self._tree_id_paths[parent_id]
2012
entry = next(self._tree.iter_entries_by_dir(
2013
specific_files=[path]))[1]
2014
except StopIteration:
2016
children = getattr(entry, 'children', {})
2017
for child in children:
2018
childpath = joinpath(path, child)
2019
yield self.trans_id_tree_path(childpath)
2021
def new_orphan(self, trans_id, parent_id):
2022
raise NotImplementedError(self.new_orphan)
2025
class _PreviewTree(inventorytree.InventoryTree):
2026
"""Partial implementation of Tree to support show_diff_trees"""
2028
def __init__(self, transform):
2029
self._transform = transform
2030
self._final_paths = FinalPaths(transform)
2031
self.__by_parent = None
2032
self._parent_ids = []
2033
self._all_children_cache = {}
2034
self._path2trans_id_cache = {}
2035
self._final_name_cache = {}
2036
self._iter_changes_cache = dict((c.file_id, c) for c in
2037
self._transform.iter_changes())
2039
def supports_tree_reference(self):
2040
# TODO(jelmer): Support tree references in _PreviewTree.
2041
# return self._transform._tree.supports_tree_reference()
2044
def _content_change(self, file_id):
2045
"""Return True if the content of this file changed"""
2046
changes = self._iter_changes_cache.get(file_id)
2047
return (changes is not None and changes.changed_content)
2049
def _get_repository(self):
2050
repo = getattr(self._transform._tree, '_repository', None)
2052
repo = self._transform._tree.branch.repository
2055
def _iter_parent_trees(self):
2056
for revision_id in self.get_parent_ids():
2058
yield self.revision_tree(revision_id)
2059
except errors.NoSuchRevisionInTree:
2060
yield self._get_repository().revision_tree(revision_id)
2062
def _get_file_revision(self, path, file_id, vf, tree_revision):
2064
(file_id, t.get_file_revision(t.id2path(file_id)))
2065
for t in self._iter_parent_trees()]
2066
vf.add_lines((file_id, tree_revision), parent_keys,
2067
self.get_file_lines(path))
2068
repo = self._get_repository()
2069
base_vf = repo.texts
2070
if base_vf not in vf.fallback_versionedfiles:
2071
vf.fallback_versionedfiles.append(base_vf)
2072
return tree_revision
2074
def _stat_limbo_file(self, trans_id):
2075
name = self._transform._limbo_name(trans_id)
2076
return os.lstat(name)
2079
def _by_parent(self):
2080
if self.__by_parent is None:
2081
self.__by_parent = self._transform.by_parent()
2082
return self.__by_parent
2084
def _comparison_data(self, entry, path):
2085
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
2086
if kind == 'missing':
2090
file_id = self._transform.final_file_id(self._path2trans_id(path))
2091
executable = self.is_executable(path)
2092
return kind, executable, None
2094
def is_locked(self):
2097
def lock_read(self):
2098
# Perhaps in theory, this should lock the TreeTransform?
2099
return lock.LogicalLockResult(self.unlock)
2105
def root_inventory(self):
2106
"""This Tree does not use inventory as its backing data."""
2107
raise NotImplementedError(_PreviewTree.root_inventory)
2109
def all_file_ids(self):
2110
tree_ids = set(self._transform._tree.all_file_ids())
2111
tree_ids.difference_update(self._transform.tree_file_id(t)
2112
for t in self._transform._removed_id)
2113
tree_ids.update(viewvalues(self._transform._new_id))
2116
def all_versioned_paths(self):
2117
tree_paths = set(self._transform._tree.all_versioned_paths())
2119
tree_paths.difference_update(
2120
self._transform.trans_id_tree_path(t)
2121
for t in self._transform._removed_id)
2124
self._final_paths._determine_path(t)
2125
for t in self._transform._new_id)
2129
def _path2trans_id(self, path):
2130
# We must not use None here, because that is a valid value to store.
2131
trans_id = self._path2trans_id_cache.get(path, object)
2132
if trans_id is not object:
2134
segments = splitpath(path)
2135
cur_parent = self._transform.root
2136
for cur_segment in segments:
2137
for child in self._all_children(cur_parent):
2138
final_name = self._final_name_cache.get(child)
2139
if final_name is None:
2140
final_name = self._transform.final_name(child)
2141
self._final_name_cache[child] = final_name
2142
if final_name == cur_segment:
2146
self._path2trans_id_cache[path] = None
2148
self._path2trans_id_cache[path] = cur_parent
2151
def path2id(self, path):
2152
if isinstance(path, list):
2155
path = osutils.pathjoin(*path)
2156
return self._transform.final_file_id(self._path2trans_id(path))
2158
def id2path(self, file_id, recurse='down'):
2159
trans_id = self._transform.trans_id_file_id(file_id)
2161
return self._final_paths._determine_path(trans_id)
2163
raise errors.NoSuchId(self, file_id)
2165
def _all_children(self, trans_id):
2166
children = self._all_children_cache.get(trans_id)
2167
if children is not None:
2169
children = set(self._transform.iter_tree_children(trans_id))
2170
# children in the _new_parent set are provided by _by_parent.
2171
children.difference_update(self._transform._new_parent)
2172
children.update(self._by_parent.get(trans_id, []))
2173
self._all_children_cache[trans_id] = children
2177
possible_extras = set(self._transform.trans_id_tree_path(p) for p
2178
in self._transform._tree.extras())
2179
possible_extras.update(self._transform._new_contents)
2180
possible_extras.update(self._transform._removed_id)
2181
for trans_id in possible_extras:
2182
if self._transform.final_file_id(trans_id) is None:
2183
yield self._final_paths._determine_path(trans_id)
2185
def _make_inv_entries(self, ordered_entries, specific_files=None):
2186
for trans_id, parent_file_id in ordered_entries:
2187
file_id = self._transform.final_file_id(trans_id)
2190
if (specific_files is not None
2191
and self._final_paths.get_path(trans_id) not in specific_files):
2193
kind = self._transform.final_kind(trans_id)
2195
kind = self._transform._tree.stored_kind(
2196
self._transform._tree.id2path(file_id))
2197
new_entry = inventory.make_entry(
2199
self._transform.final_name(trans_id),
2200
parent_file_id, file_id)
2201
yield new_entry, trans_id
2203
def _list_files_by_dir(self):
2204
todo = [ROOT_PARENT]
2206
while len(todo) > 0:
2208
parent_file_id = self._transform.final_file_id(parent)
2209
children = list(self._all_children(parent))
2210
paths = dict(zip(children, self._final_paths.get_paths(children)))
2211
children.sort(key=paths.get)
2212
todo.extend(reversed(children))
2213
for trans_id in children:
2214
ordered_ids.append((trans_id, parent_file_id))
2217
def iter_child_entries(self, path):
2218
trans_id = self._path2trans_id(path)
2219
if trans_id is None:
2220
raise errors.NoSuchFile(path)
2221
todo = [(child_trans_id, trans_id) for child_trans_id in
2222
self._all_children(trans_id)]
2223
for entry, trans_id in self._make_inv_entries(todo):
2226
def iter_entries_by_dir(self, specific_files=None, recurse_nested=False):
2228
raise NotImplementedError(
2229
'follow tree references not yet supported')
2231
# This may not be a maximally efficient implementation, but it is
2232
# reasonably straightforward. An implementation that grafts the
2233
# TreeTransform changes onto the tree's iter_entries_by_dir results
2234
# might be more efficient, but requires tricky inferences about stack
2236
ordered_ids = self._list_files_by_dir()
2237
for entry, trans_id in self._make_inv_entries(ordered_ids,
2239
yield self._final_paths.get_path(trans_id), entry
2241
def _iter_entries_for_dir(self, dir_path):
2242
"""Return path, entry for items in a directory without recursing down."""
2244
dir_trans_id = self._path2trans_id(dir_path)
2245
dir_id = self._transform.final_file_id(dir_trans_id)
2246
for child_trans_id in self._all_children(dir_trans_id):
2247
ordered_ids.append((child_trans_id, dir_id))
2249
for entry, trans_id in self._make_inv_entries(ordered_ids):
2250
path_entries.append((self._final_paths.get_path(trans_id), entry))
2254
def list_files(self, include_root=False, from_dir=None, recursive=True,
2255
recurse_nested=False):
2256
"""See WorkingTree.list_files."""
2258
raise NotImplementedError(
2259
'follow tree references not yet supported')
2261
# XXX This should behave like WorkingTree.list_files, but is really
2262
# more like RevisionTree.list_files.
2268
prefix = from_dir + '/'
2269
entries = self.iter_entries_by_dir()
2270
for path, entry in entries:
2271
if entry.name == '' and not include_root:
2274
if not path.startswith(prefix):
2276
path = path[len(prefix):]
2277
yield path, 'V', entry.kind, entry
2279
if from_dir is None and include_root is True:
2280
root_entry = inventory.make_entry(
2281
'directory', '', ROOT_PARENT, self.path2id(''))
2282
yield '', 'V', 'directory', root_entry
2283
entries = self._iter_entries_for_dir(from_dir or '')
2284
for path, entry in entries:
2285
yield path, 'V', entry.kind, entry
2287
def kind(self, path):
2288
trans_id = self._path2trans_id(path)
2289
if trans_id is None:
2290
raise errors.NoSuchFile(path)
2291
return self._transform.final_kind(trans_id)
2293
def stored_kind(self, path):
2294
trans_id = self._path2trans_id(path)
2295
if trans_id is None:
2296
raise errors.NoSuchFile(path)
2298
return self._transform._new_contents[trans_id]
2300
return self._transform._tree.stored_kind(path)
2302
def get_file_mtime(self, path):
2303
"""See Tree.get_file_mtime"""
2304
file_id = self.path2id(path)
2306
raise errors.NoSuchFile(path)
2307
if not self._content_change(file_id):
2308
return self._transform._tree.get_file_mtime(
2309
self._transform._tree.id2path(file_id))
2310
trans_id = self._path2trans_id(path)
2311
return self._stat_limbo_file(trans_id).st_mtime
2313
def get_file_size(self, path):
2314
"""See Tree.get_file_size"""
2315
trans_id = self._path2trans_id(path)
2316
if trans_id is None:
2317
raise errors.NoSuchFile(path)
2318
kind = self._transform.final_kind(trans_id)
2321
if trans_id in self._transform._new_contents:
2322
return self._stat_limbo_file(trans_id).st_size
2323
if self.kind(path) == 'file':
2324
return self._transform._tree.get_file_size(path)
2328
def get_file_verifier(self, path, stat_value=None):
2329
trans_id = self._path2trans_id(path)
2330
if trans_id is None:
2331
raise errors.NoSuchFile(path)
2332
kind = self._transform._new_contents.get(trans_id)
2334
return self._transform._tree.get_file_verifier(path)
2336
with self.get_file(path) as fileobj:
2337
return ("SHA1", sha_file(fileobj))
2339
def get_file_sha1(self, path, stat_value=None):
2340
trans_id = self._path2trans_id(path)
2341
if trans_id is None:
2342
raise errors.NoSuchFile(path)
2343
kind = self._transform._new_contents.get(trans_id)
2345
return self._transform._tree.get_file_sha1(path)
2347
with self.get_file(path) as fileobj:
2348
return sha_file(fileobj)
2350
def get_reference_revision(self, path):
2351
trans_id = self._path2trans_id(path)
2352
if trans_id is None:
2353
raise errors.NoSuchFile(path)
2354
reference_revision = self._transform._new_reference_revision.get(trans_id)
2355
if reference_revision is None:
2356
return self._transform._tree.get_reference_revision(path)
2357
return reference_revision
2359
def is_executable(self, path):
2360
trans_id = self._path2trans_id(path)
2361
if trans_id is None:
2364
return self._transform._new_executability[trans_id]
2367
return self._transform._tree.is_executable(path)
2368
except OSError as e:
2369
if e.errno == errno.ENOENT:
2372
except errors.NoSuchFile:
2375
def has_filename(self, path):
2376
trans_id = self._path2trans_id(path)
2377
if trans_id in self._transform._new_contents:
2379
elif trans_id in self._transform._removed_contents:
2382
return self._transform._tree.has_filename(path)
2384
def path_content_summary(self, path):
2385
trans_id = self._path2trans_id(path)
2386
tt = self._transform
2387
tree_path = tt._tree_id_paths.get(trans_id)
2388
kind = tt._new_contents.get(trans_id)
2390
if tree_path is None or trans_id in tt._removed_contents:
2391
return 'missing', None, None, None
2392
summary = tt._tree.path_content_summary(tree_path)
2393
kind, size, executable, link_or_sha1 = summary
2396
limbo_name = tt._limbo_name(trans_id)
2397
if trans_id in tt._new_reference_revision:
2398
kind = 'tree-reference'
2400
statval = os.lstat(limbo_name)
2401
size = statval.st_size
2402
if not tt._limbo_supports_executable():
2405
executable = statval.st_mode & S_IEXEC
2409
if kind == 'symlink':
2410
link_or_sha1 = os.readlink(limbo_name)
2411
if not isinstance(link_or_sha1, text_type):
2412
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2413
executable = tt._new_executability.get(trans_id, executable)
2414
return kind, size, executable, link_or_sha1
2416
def iter_changes(self, from_tree, include_unchanged=False,
2417
specific_files=None, pb=None, extra_trees=None,
2418
require_versioned=True, want_unversioned=False):
2419
"""See InterTree.iter_changes.
2421
This has a fast path that is only used when the from_tree matches
2422
the transform tree, and no fancy options are supplied.
2424
if (from_tree is not self._transform._tree or include_unchanged
2425
or specific_files or want_unversioned):
2426
return tree.InterTree(from_tree, self).iter_changes(
2427
include_unchanged=include_unchanged,
2428
specific_files=specific_files,
2430
extra_trees=extra_trees,
2431
require_versioned=require_versioned,
2432
want_unversioned=want_unversioned)
2433
if want_unversioned:
2434
raise ValueError('want_unversioned is not supported')
2435
return self._transform.iter_changes()
2437
def get_file(self, path):
2438
"""See Tree.get_file"""
2439
file_id = self.path2id(path)
2440
if not self._content_change(file_id):
2441
return self._transform._tree.get_file(path)
2442
trans_id = self._path2trans_id(path)
2443
name = self._transform._limbo_name(trans_id)
2444
return open(name, 'rb')
2446
def get_file_with_stat(self, path):
2447
return self.get_file(path), None
2449
def annotate_iter(self, path,
2450
default_revision=_mod_revision.CURRENT_REVISION):
2451
file_id = self.path2id(path)
2452
changes = self._iter_changes_cache.get(file_id)
2456
changed_content, versioned, kind = (
2457
changes.changed_content, changes.versioned, changes.kind)
2460
get_old = (kind[0] == 'file' and versioned[0])
2462
old_annotation = self._transform._tree.annotate_iter(
2463
path, default_revision=default_revision)
2467
return old_annotation
2468
if not changed_content:
2469
return old_annotation
2470
# TODO: This is doing something similar to what WT.annotate_iter is
2471
# doing, however it fails slightly because it doesn't know what
2472
# the *other* revision_id is, so it doesn't know how to give the
2473
# other as the origin for some lines, they all get
2474
# 'default_revision'
2475
# It would be nice to be able to use the new Annotator based
2476
# approach, as well.
2477
return annotate.reannotate([old_annotation],
2478
self.get_file(path).readlines(),
2481
def get_symlink_target(self, path):
2482
"""See Tree.get_symlink_target"""
2483
file_id = self.path2id(path)
2484
if not self._content_change(file_id):
2485
return self._transform._tree.get_symlink_target(path)
2486
trans_id = self._path2trans_id(path)
2487
name = self._transform._limbo_name(trans_id)
2488
return osutils.readlink(name)
2490
def walkdirs(self, prefix=''):
2491
pending = [self._transform.root]
2492
while len(pending) > 0:
2493
parent_id = pending.pop()
2496
prefix = prefix.rstrip('/')
2497
parent_path = self._final_paths.get_path(parent_id)
2498
parent_file_id = self._transform.final_file_id(parent_id)
2499
for child_id in self._all_children(parent_id):
2500
path_from_root = self._final_paths.get_path(child_id)
2501
basename = self._transform.final_name(child_id)
2502
file_id = self._transform.final_file_id(child_id)
2503
kind = self._transform.final_kind(child_id)
2504
if kind is not None:
2505
versioned_kind = kind
2508
versioned_kind = self._transform._tree.stored_kind(
2509
self._transform._tree.id2path(file_id))
2510
if versioned_kind == 'directory':
2511
subdirs.append(child_id)
2512
children.append((path_from_root, basename, kind, None,
2513
file_id, versioned_kind))
2515
if parent_path.startswith(prefix):
2516
yield (parent_path, parent_file_id), children
2517
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2520
def get_parent_ids(self):
2521
return self._parent_ids
2523
def set_parent_ids(self, parent_ids):
2524
self._parent_ids = parent_ids
2526
def get_revision_tree(self, revision_id):
2527
return self._transform._tree.get_revision_tree(revision_id)
2530
864
def joinpath(parent, child):
2531
865
"""Join tree-relative paths, handling the tree root specially"""
2532
866
if parent is None or parent == "":
2563
896
self._known_paths[trans_id] = self._determine_path(trans_id)
2564
897
return self._known_paths[trans_id]
2566
def get_paths(self, trans_ids):
2567
return [(self.get_path(t), t) for t in trans_ids]
2570
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2571
delta_from_tree=False):
2572
"""Create working tree for a branch, using a TreeTransform.
2574
This function should be used on empty trees, having a tree root at most.
2575
(see merge and revert functionality for working with existing trees)
2577
Existing files are handled like so:
2579
- Existing bzrdirs take precedence over creating new items. They are
2580
created as '%s.diverted' % name.
2581
- Otherwise, if the content on disk matches the content we are building,
2582
it is silently replaced.
2583
- Otherwise, conflict resolution will move the old file to 'oldname.moved'.
2585
:param tree: The tree to convert wt into a copy of
2586
:param wt: The working tree that files will be placed into
2587
:param accelerator_tree: A tree which can be used for retrieving file
2588
contents more quickly than tree itself, i.e. a workingtree. tree
2589
will be used for cases where accelerator_tree's content is different.
2590
:param hardlink: If true, hard-link files to accelerator_tree, where
2591
possible. accelerator_tree must implement abspath, i.e. be a
2593
:param delta_from_tree: If true, build_tree may use the input Tree to
2594
generate the inventory delta.
2596
with cleanup.ExitStack() as exit_stack:
2597
exit_stack.enter_context(wt.lock_tree_write())
2598
exit_stack.enter_context(tree.lock_read())
2599
if accelerator_tree is not None:
2600
exit_stack.enter_context(accelerator_tree.lock_read())
2601
return _build_tree(tree, wt, accelerator_tree, hardlink,
2605
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2606
"""See build_tree."""
2607
for num, _unused in enumerate(wt.all_versioned_paths()):
2608
if num > 0: # more than just a root
2609
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
899
def topology_sorted_ids(tree):
900
"""Determine the topological order of the ids in a tree"""
901
file_ids = list(tree)
902
file_ids.sort(key=tree.id2path)
905
def build_tree(tree, wt):
906
"""Create working tree for a branch, using a Transaction."""
2610
907
file_trans_id = {}
2611
top_pb = ui.ui_factory.nested_progress_bar()
908
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2612
909
pp = ProgressPhase("Build phase", 2, top_pb)
2613
if tree.path2id('') is not None:
2614
# This is kind of a hack: we should be altering the root
2615
# as part of the regular tree shape diff logic.
2616
# The conditional test here is to avoid doing an
2617
# expensive operation (flush) every time the root id
2618
# is set within the tree, nor setting the root and thus
2619
# marking the tree as dirty, because we use two different
2620
# idioms here: tree interfaces and inventory interfaces.
2621
if wt.path2id('') != tree.path2id(''):
2622
wt.set_root_id(tree.path2id(''))
2624
tt = wt.get_transform()
910
tt = TreeTransform(wt)
2628
file_trans_id[wt.path2id('')] = tt.trans_id_tree_path('')
2629
with ui.ui_factory.nested_progress_bar() as pb:
2630
deferred_contents = []
2632
total = len(tree.all_versioned_paths())
2634
precomputed_delta = []
2636
precomputed_delta = None
2637
# Check if tree inventory has content. If so, we populate
2638
# existing_files with the directory content. If there are no
2639
# entries we skip populating existing_files as its not used.
2640
# This improves performance and unncessary work on large
2641
# directory trees. (#501307)
2643
existing_files = set()
2644
for dir, files in wt.walkdirs():
2645
existing_files.update(f[0] for f in files)
2646
for num, (tree_path, entry) in \
2647
enumerate(tree.iter_entries_by_dir()):
2648
pb.update(gettext("Building tree"), num
2649
- len(deferred_contents), total)
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)
915
pb = bzrlib.ui.ui_factory.nested_progress_bar()
917
for num, file_id in enumerate(file_ids):
918
pb.update("Building tree", num, len(file_ids))
919
entry = tree.inventory[file_id]
2650
920
if entry.parent_id is None:
2653
file_id = entry.file_id
2655
precomputed_delta.append((None, tree_path, file_id, entry))
2656
if tree_path in existing_files:
2657
target_path = wt.abspath(tree_path)
2658
kind = file_kind(target_path)
2659
if kind == "directory":
2661
controldir.ControlDir.open(target_path)
2662
except errors.NotBranchError:
2666
if (file_id not in divert
2668
tree, entry, tree_path, kind, target_path)):
2669
tt.delete_contents(tt.trans_id_tree_path(tree_path))
2670
if kind == 'directory':
922
if entry.parent_id not in file_trans_id:
923
raise repr(entry.parent_id)
2672
924
parent_id = file_trans_id[entry.parent_id]
2673
if entry.kind == 'file':
2674
# We *almost* replicate new_by_entry, so that we can defer
2675
# getting the file text, and get them all at once.
2676
trans_id = tt.create_path(entry.name, parent_id)
2677
file_trans_id[file_id] = trans_id
2678
tt.version_file(file_id, trans_id)
2679
executable = tree.is_executable(tree_path)
2681
tt.set_executability(executable, trans_id)
2682
trans_data = (trans_id, file_id,
2683
tree_path, entry.text_sha1)
2684
deferred_contents.append((tree_path, trans_data))
2686
file_trans_id[file_id] = new_by_entry(
2687
tree_path, tt, entry, parent_id, tree)
2689
new_trans_id = file_trans_id[file_id]
2690
old_parent = tt.trans_id_tree_path(tree_path)
2691
_reparent_children(tt, old_parent, new_trans_id)
2692
offset = num + 1 - len(deferred_contents)
2693
_create_files(tt, tree, deferred_contents, pb, offset,
2694
accelerator_tree, hardlink)
925
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2696
divert_trans = set(file_trans_id[f] for f in divert)
2699
return resolve_checkout(t, c, divert_trans)
2700
raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
2701
if len(raw_conflicts) > 0:
2702
precomputed_delta = None
2703
conflicts = cook_conflicts(raw_conflicts, tt)
2704
for conflict in conflicts:
2705
trace.warning(text_type(conflict))
2707
wt.add_conflicts(conflicts)
2708
except errors.UnsupportedOperation:
2710
result = tt.apply(no_conflicts=True,
2711
precomputed_delta=precomputed_delta)
2714
933
top_pb.finished()
2718
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2720
total = len(desired_files) + offset
2722
if accelerator_tree is None:
2723
new_desired_files = desired_files
2725
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2727
change.path for change in iter
2728
if not (change.changed_content or change.executable[0] != change.executable[1])]
2729
if accelerator_tree.supports_content_filtering():
2730
unchanged = [(tp, ap) for (tp, ap) in unchanged
2731
if not next(accelerator_tree.iter_search_rules([ap]))]
2732
unchanged = dict(unchanged)
2733
new_desired_files = []
2735
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2736
accelerator_path = unchanged.get(tree_path)
2737
if accelerator_path is None:
2738
new_desired_files.append((tree_path,
2739
(trans_id, file_id, tree_path, text_sha1)))
2741
pb.update(gettext('Adding file contents'), count + offset, total)
2743
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2746
with accelerator_tree.get_file(accelerator_path) as f:
2747
chunks = osutils.file_iterator(f)
2748
if wt.supports_content_filtering():
2749
filters = wt._content_filter_stack(tree_path)
2750
chunks = filtered_output_bytes(chunks, filters,
2751
ContentFilterContext(tree_path, tree))
2752
tt.create_file(chunks, trans_id, sha1=text_sha1)
2755
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2756
tree.iter_files_bytes(new_desired_files)):
2757
if wt.supports_content_filtering():
2758
filters = wt._content_filter_stack(tree_path)
2759
contents = filtered_output_bytes(contents, filters,
2760
ContentFilterContext(tree_path, tree))
2761
tt.create_file(contents, trans_id, sha1=text_sha1)
2762
pb.update(gettext('Adding file contents'), count + offset, total)
2765
def _reparent_children(tt, old_parent, new_parent):
2766
for child in tt.iter_tree_children(old_parent):
2767
tt.adjust_path(tt.final_name(child), new_parent, child)
2770
def _reparent_transform_children(tt, old_parent, new_parent):
2771
by_parent = tt.by_parent()
2772
for child in by_parent[old_parent]:
2773
tt.adjust_path(tt.final_name(child), new_parent, child)
2774
return by_parent[old_parent]
2777
def _content_match(tree, entry, tree_path, kind, target_path):
2778
if entry.kind != kind:
2780
if entry.kind == "directory":
2782
if entry.kind == "file":
2783
with open(target_path, 'rb') as f1, \
2784
tree.get_file(tree_path) as f2:
2785
if osutils.compare_files(f1, f2):
2787
elif entry.kind == "symlink":
2788
if tree.get_symlink_target(tree_path) == os.readlink(target_path):
2793
def resolve_checkout(tt, conflicts, divert):
2794
new_conflicts = set()
2795
for c_type, conflict in ((c[0], c) for c in conflicts):
2796
# Anything but a 'duplicate' would indicate programmer error
2797
if c_type != 'duplicate':
2798
raise AssertionError(c_type)
2799
# Now figure out which is new and which is old
2800
if tt.new_contents(conflict[1]):
2801
new_file = conflict[1]
2802
old_file = conflict[2]
2804
new_file = conflict[2]
2805
old_file = conflict[1]
2807
# We should only get here if the conflict wasn't completely
2809
final_parent = tt.final_parent(old_file)
2810
if new_file in divert:
2811
new_name = tt.final_name(old_file) + '.diverted'
2812
tt.adjust_path(new_name, final_parent, new_file)
2813
new_conflicts.add((c_type, 'Diverted to',
2814
new_file, old_file))
2816
new_name = tt.final_name(old_file) + '.moved'
2817
tt.adjust_path(new_name, final_parent, old_file)
2818
new_conflicts.add((c_type, 'Moved existing file to',
2819
old_file, new_file))
2820
return new_conflicts
2823
def new_by_entry(path, tt, entry, parent_id, tree):
935
def new_by_entry(tt, entry, parent_id, tree):
2824
936
"""Create a new file according to its inventory entry"""
2825
937
name = entry.name
2826
938
kind = entry.kind
2827
939
if kind == 'file':
2828
with tree.get_file(path) as f:
2829
executable = tree.is_executable(path)
2831
name, parent_id, osutils.file_iterator(f), entry.file_id,
2833
elif kind in ('directory', 'tree-reference'):
2834
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2835
if kind == 'tree-reference':
2836
tt.set_tree_reference(entry.reference_revision, trans_id)
940
contents = tree.get_file(entry.file_id).readlines()
941
executable = tree.is_executable(entry.file_id)
942
return tt.new_file(name, parent_id, contents, entry.file_id,
944
elif kind == 'directory':
945
return tt.new_directory(name, parent_id, entry.file_id)
2838
946
elif kind == 'symlink':
2839
target = tree.get_symlink_target(path)
947
target = tree.get_symlink_target(entry.file_id)
2840
948
return tt.new_symlink(name, parent_id, target, entry.file_id)
2842
raise errors.BadFileKindError(name, kind)
2845
def create_from_tree(tt, trans_id, tree, path, chunks=None,
2846
filter_tree_path=None):
2847
"""Create new file contents according to tree contents.
2849
:param filter_tree_path: the tree path to use to lookup
2850
content filters to apply to the bytes output in the working tree.
2851
This only applies if the working tree supports content filtering.
2853
kind = tree.kind(path)
2854
if kind == 'directory':
950
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
951
"""Create new file contents according to an inventory entry."""
952
if entry.kind == "file":
954
lines = tree.get_file(entry.file_id).readlines()
955
tt.create_file(lines, trans_id, mode_id=mode_id)
956
elif entry.kind == "symlink":
957
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
958
elif entry.kind == "directory":
2855
959
tt.create_directory(trans_id)
2856
elif kind == "file":
2858
f = tree.get_file(path)
2859
chunks = osutils.file_iterator(f)
2864
if wt.supports_content_filtering() and filter_tree_path is not None:
2865
filters = wt._content_filter_stack(filter_tree_path)
2866
chunks = filtered_output_bytes(
2868
ContentFilterContext(filter_tree_path, tree))
2869
tt.create_file(chunks, trans_id)
2873
elif kind == "symlink":
2874
tt.create_symlink(tree.get_symlink_target(path), trans_id)
2876
raise AssertionError('Unknown kind %r' % kind)
2879
961
def create_entry_executability(tt, entry, trans_id):
2880
962
"""Set the executability of a trans_id according to an inventory entry"""
2882
964
tt.set_executability(entry.executable, trans_id)
2885
def revert(working_tree, target_tree, filenames, backups=False,
2886
pb=None, change_reporter=None):
967
def find_interesting(working_tree, target_tree, filenames):
968
"""Find the ids corresponding to specified filenames."""
970
interesting_ids = None
972
interesting_ids = set()
973
for tree_path in filenames:
975
for tree in (working_tree, target_tree):
976
file_id = tree.inventory.path2id(tree_path)
977
if file_id is not None:
978
interesting_ids.add(file_id)
981
raise NotVersionedError(path=tree_path)
982
return interesting_ids
985
def change_entry(tt, file_id, working_tree, target_tree,
986
trans_id_file_id, backups, trans_id, by_parent):
987
"""Replace a file_id's contents with those from a target tree."""
988
e_trans_id = trans_id_file_id(file_id)
989
entry = target_tree.inventory[file_id]
990
has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry,
996
tt.delete_contents(e_trans_id)
998
parent_trans_id = trans_id_file_id(entry.parent_id)
999
backup_name = get_backup_name(entry, by_parent,
1000
parent_trans_id, tt)
1001
tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1002
tt.unversion_file(e_trans_id)
1003
e_trans_id = tt.create_path(entry.name, parent_trans_id)
1004
tt.version_file(file_id, e_trans_id)
1005
trans_id[file_id] = e_trans_id
1006
create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1007
create_entry_executability(tt, entry, e_trans_id)
1010
tt.set_executability(entry.executable, e_trans_id)
1011
if tt.final_name(e_trans_id) != entry.name:
1014
parent_id = tt.final_parent(e_trans_id)
1015
parent_file_id = tt.final_file_id(parent_id)
1016
if parent_file_id != entry.parent_id:
1021
parent_trans_id = trans_id_file_id(entry.parent_id)
1022
tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1025
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1026
"""Produce a backup-style name that appears to be available"""
1030
yield "%s.~%d~" % (entry.name, counter)
1032
for name in name_gen():
1033
if not tt.has_named_child(by_parent, parent_trans_id, name):
1036
def _entry_changes(file_id, entry, working_tree):
1037
"""Determine in which ways the inventory entry has changed.
1039
Returns booleans: has_contents, content_mod, meta_mod
1040
has_contents means there are currently contents, but they differ
1041
contents_mod means contents need to be modified
1042
meta_mod means the metadata needs to be modified
1044
cur_entry = working_tree.inventory[file_id]
1046
working_kind = working_tree.kind(file_id)
1049
if e.errno != errno.ENOENT:
1051
has_contents = False
1054
if has_contents is True:
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:
1059
contents_mod, meta_mod = True, False
1061
cur_entry._read_tree_state(working_tree.id2path(file_id),
1063
contents_mod, meta_mod = entry.detect_changes(cur_entry)
1064
cur_entry._forget_tree_state()
1065
return has_contents, contents_mod, meta_mod
1068
def revert(working_tree, target_tree, filenames, backups=False,
1069
pb=DummyProgress()):
2887
1070
"""Revert a working tree's contents to those of a target tree."""
2888
pb = ui.ui_factory.nested_progress_bar()
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
1075
tt = TreeTransform(working_tree, pb)
2890
with target_tree.lock_read(), working_tree.get_transform(pb) as tt:
2891
pp = ProgressPhase("Revert phase", 3, pb)
2892
conflicts, merge_modified = _prepare_revert_transform(
2893
working_tree, target_tree, tt, filenames, backups, pp)
2895
change_reporter = delta._ChangeReporter(
2896
unversioned_filter=working_tree.is_ignored)
2897
delta.report_changes(tt.iter_changes(), change_reporter)
2898
for conflict in conflicts:
2899
trace.warning(text_type(conflict))
2902
if working_tree.supports_merge_modified():
2903
working_tree.set_merge_modified(merge_modified)
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)
1132
for conflict in conflicts:
1136
working_tree.set_merge_modified({})
2906
1140
return conflicts
2909
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2910
backups, pp, basis_tree=None,
2911
merge_modified=None):
2912
with ui.ui_factory.nested_progress_bar() as child_pb:
2913
if merge_modified is None:
2914
merge_modified = working_tree.merge_modified()
2915
merge_modified = _alter_files(working_tree, target_tree, tt,
2916
child_pb, filenames, backups,
2917
merge_modified, basis_tree)
2918
with ui.ui_factory.nested_progress_bar() as child_pb:
2919
raw_conflicts = resolve_conflicts(
2920
tt, child_pb, lambda t, c: conflict_pass(t, c, target_tree))
2921
conflicts = cook_conflicts(raw_conflicts, tt)
2922
return conflicts, merge_modified
2925
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2926
backups, merge_modified, basis_tree=None):
2927
if basis_tree is not None:
2928
basis_tree.lock_read()
2929
# We ask the working_tree for its changes relative to the target, rather
2930
# than the target changes relative to the working tree. Because WT4 has an
2931
# optimizer to compare itself to a target, but no optimizer for the
2933
change_list = working_tree.iter_changes(
2934
target_tree, specific_files=specific_files, pb=pb)
2935
if not target_tree.is_versioned(u''):
2941
for id_num, change in enumerate(change_list):
2942
file_id = change.file_id
2943
target_path, wt_path = change.path
2944
target_versioned, wt_versioned = change.versioned
2945
target_parent, wt_parent = change.parent_id
2946
target_name, wt_name = change.name
2947
target_kind, wt_kind = change.kind
2948
target_executable, wt_executable = change.executable
2949
if skip_root and wt_parent is None:
2951
trans_id = tt.trans_id_file_id(file_id)
2953
if change.changed_content:
2954
keep_content = False
2955
if wt_kind == 'file' and (backups or target_kind is None):
2956
wt_sha1 = working_tree.get_file_sha1(wt_path)
2957
if merge_modified.get(wt_path) != wt_sha1:
2958
# acquire the basis tree lazily to prevent the
2959
# expense of accessing it when it's not needed ?
2960
# (Guessing, RBC, 200702)
2961
if basis_tree is None:
2962
basis_tree = working_tree.basis_tree()
2963
basis_tree.lock_read()
2964
basis_inter = InterTree.get(basis_tree, working_tree)
2965
basis_path = basis_inter.find_source_path(wt_path)
2966
if basis_path is None:
2967
if target_kind is None and not target_versioned:
2970
if wt_sha1 != basis_tree.get_file_sha1(basis_path):
2972
if wt_kind is not None:
2973
if not keep_content:
2974
tt.delete_contents(trans_id)
2975
elif target_kind is not None:
2976
parent_trans_id = tt.trans_id_file_id(wt_parent)
2977
backup_name = tt._available_backup_name(
2978
wt_name, parent_trans_id)
2979
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2980
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2981
if wt_versioned and target_versioned:
2982
tt.unversion_file(trans_id)
2983
tt.version_file(file_id, new_trans_id)
2984
# New contents should have the same unix perms as old
2987
trans_id = new_trans_id
2988
if target_kind in ('directory', 'tree-reference'):
2989
tt.create_directory(trans_id)
2990
if target_kind == 'tree-reference':
2991
revision = target_tree.get_reference_revision(
2993
tt.set_tree_reference(revision, trans_id)
2994
elif target_kind == 'symlink':
2995
tt.create_symlink(target_tree.get_symlink_target(
2996
target_path), trans_id)
2997
elif target_kind == 'file':
2998
deferred_files.append(
2999
(target_path, (trans_id, mode_id, file_id)))
3000
if basis_tree is None:
3001
basis_tree = working_tree.basis_tree()
3002
basis_tree.lock_read()
3003
new_sha1 = target_tree.get_file_sha1(target_path)
3004
basis_inter = InterTree.get(basis_tree, target_tree)
3005
basis_path = basis_inter.find_source_path(target_path)
3006
if (basis_path is not None and
3007
new_sha1 == basis_tree.get_file_sha1(basis_path)):
3008
# If the new contents of the file match what is in basis,
3009
# then there is no need to store in merge_modified.
3010
if basis_path in merge_modified:
3011
del merge_modified[basis_path]
3013
merge_modified[target_path] = new_sha1
3015
# preserve the execute bit when backing up
3016
if keep_content and wt_executable == target_executable:
3017
tt.set_executability(target_executable, trans_id)
3018
elif target_kind is not None:
3019
raise AssertionError(target_kind)
3020
if not wt_versioned and target_versioned:
3021
tt.version_file(file_id, trans_id)
3022
if wt_versioned and not target_versioned:
3023
tt.unversion_file(trans_id)
3024
if (target_name is not None
3025
and (wt_name != target_name or wt_parent != target_parent)):
3026
if target_name == '' and target_parent is None:
3027
parent_trans = ROOT_PARENT
3029
parent_trans = tt.trans_id_file_id(target_parent)
3030
if wt_parent is None and wt_versioned:
3031
tt.adjust_root_path(target_name, parent_trans)
3033
tt.adjust_path(target_name, parent_trans, trans_id)
3034
if wt_executable != target_executable and target_kind == "file":
3035
tt.set_executability(target_executable, trans_id)
3036
if working_tree.supports_content_filtering():
3037
for (trans_id, mode_id, file_id), bytes in (
3038
target_tree.iter_files_bytes(deferred_files)):
3039
# We're reverting a tree to the target tree so using the
3040
# target tree to find the file path seems the best choice
3041
# here IMO - Ian C 27/Oct/2009
3042
filter_tree_path = target_tree.id2path(file_id)
3043
filters = working_tree._content_filter_stack(filter_tree_path)
3044
bytes = filtered_output_bytes(
3046
ContentFilterContext(filter_tree_path, working_tree))
3047
tt.create_file(bytes, trans_id, mode_id)
3049
for (trans_id, mode_id, file_id), bytes in target_tree.iter_files_bytes(
3051
tt.create_file(bytes, trans_id, mode_id)
3052
tt.fixup_new_roots()
3054
if basis_tree is not None:
3056
return merge_modified
3059
def resolve_conflicts(tt, pb=None, pass_func=None):
1143
def resolve_conflicts(tt, pb=DummyProgress()):
3060
1144
"""Make many conflict-resolution attempts, but die if they fail"""
3061
if pass_func is None:
3062
pass_func = conflict_pass
3063
1145
new_conflicts = set()
3064
with ui.ui_factory.nested_progress_bar() as pb:
3065
1147
for n in range(10):
3066
pb.update(gettext('Resolution pass'), n + 1, 10)
1148
pb.update('Resolution pass', n+1, 10)
3067
1149
conflicts = tt.find_conflicts()
3068
1150
if len(conflicts) == 0:
3069
1151
return new_conflicts
3070
new_conflicts.update(pass_func(tt, conflicts))
1152
new_conflicts.update(conflict_pass(tt, conflicts))
3071
1153
raise MalformedTransform(conflicts=conflicts)
3074
def conflict_pass(tt, conflicts, path_tree=None):
3075
"""Resolve some classes of conflicts.
3077
:param tt: The transform to resolve conflicts in
3078
:param conflicts: The conflicts to resolve
3079
:param path_tree: A Tree to get supplemental paths from
1158
def conflict_pass(tt, conflicts):
1159
"""Resolve some classes of conflicts."""
3081
1160
new_conflicts = set()
3082
1161
for c_type, conflict in ((c[0], c) for c in conflicts):
3083
1162
if c_type == 'duplicate id':
added
removed
bzrlib/transform.py
