390
525
def new_contents(self, trans_id):
391
526
return (trans_id in self._new_contents)
393
def find_raw_conflicts(self):
528
def find_conflicts(self):
394
529
"""Find any violations of inventory or filesystem invariants"""
395
raise NotImplementedError(self.find_raw_conflicts)
530
if self._done is True:
531
raise ReusingTransform()
533
# ensure all children of all existent parents are known
534
# all children of non-existent parents are known, by definition.
535
self._add_tree_children()
536
by_parent = self.by_parent()
537
conflicts.extend(self._unversioned_parents(by_parent))
538
conflicts.extend(self._parent_loops())
539
conflicts.extend(self._duplicate_entries(by_parent))
540
conflicts.extend(self._duplicate_ids())
541
conflicts.extend(self._parent_type_conflicts(by_parent))
542
conflicts.extend(self._improper_versioning())
543
conflicts.extend(self._executability_conflicts())
544
conflicts.extend(self._overwrite_conflicts())
547
def _check_malformed(self):
548
conflicts = self.find_conflicts()
549
if len(conflicts) != 0:
550
raise MalformedTransform(conflicts=conflicts)
552
def _add_tree_children(self):
553
"""Add all the children of all active parents to the known paths.
555
Active parents are those which gain children, and those which are
556
removed. This is a necessary first step in detecting conflicts.
558
parents = list(self.by_parent())
559
parents.extend([t for t in self._removed_contents if
560
self.tree_kind(t) == 'directory'])
561
for trans_id in self._removed_id:
562
path = self.tree_path(trans_id)
564
if self._tree.stored_kind(path) == 'directory':
565
parents.append(trans_id)
566
elif self.tree_kind(trans_id) == 'directory':
567
parents.append(trans_id)
569
for parent_id in parents:
570
# ensure that all children are registered with the transaction
571
list(self.iter_tree_children(parent_id))
573
def _has_named_child(self, name, parent_id, known_children):
574
"""Does a parent already have a name child.
576
:param name: The searched for name.
578
:param parent_id: The parent for which the check is made.
580
:param known_children: The already known children. This should have
581
been recently obtained from `self.by_parent.get(parent_id)`
582
(or will be if None is passed).
584
if known_children is None:
585
known_children = self.by_parent().get(parent_id, [])
586
for child in known_children:
587
if self.final_name(child) == name:
589
parent_path = self._tree_id_paths.get(parent_id, None)
590
if parent_path is None:
591
# No parent... no children
593
child_path = joinpath(parent_path, name)
594
child_id = self._tree_path_ids.get(child_path, None)
596
# Not known by the tree transform yet, check the filesystem
597
return osutils.lexists(self._tree.abspath(child_path))
599
raise AssertionError('child_id is missing: %s, %s, %s'
600
% (name, parent_id, child_id))
602
def _available_backup_name(self, name, target_id):
603
"""Find an available backup name.
605
:param name: The basename of the file.
607
:param target_id: The directory trans_id where the backup should
610
known_children = self.by_parent().get(target_id, [])
611
return osutils.available_backup_name(
613
lambda base: self._has_named_child(
614
base, target_id, known_children))
616
def _parent_loops(self):
617
"""No entry should be its own ancestor"""
619
for trans_id in self._new_parent:
622
while parent_id != ROOT_PARENT:
625
parent_id = self.final_parent(parent_id)
628
if parent_id == trans_id:
629
conflicts.append(('parent loop', trans_id))
630
if parent_id in seen:
634
def _unversioned_parents(self, by_parent):
635
"""If parent directories are versioned, children must be versioned."""
637
for parent_id, children in viewitems(by_parent):
638
if parent_id == ROOT_PARENT:
640
if self.final_file_id(parent_id) is not None:
642
for child_id in children:
643
if self.final_file_id(child_id) is not None:
644
conflicts.append(('unversioned parent', parent_id))
648
def _improper_versioning(self):
649
"""Cannot version a file with no contents, or a bad type.
651
However, existing entries with no contents are okay.
654
for trans_id in self._new_id:
655
kind = self.final_kind(trans_id)
657
conflicts.append(('versioning no contents', trans_id))
659
if not self._tree.versionable_kind(kind):
660
conflicts.append(('versioning bad kind', trans_id, kind))
663
def _executability_conflicts(self):
664
"""Check for bad executability changes.
666
Only versioned files may have their executability set, because
667
1. only versioned entries can have executability under windows
668
2. only files can be executable. (The execute bit on a directory
669
does not indicate searchability)
672
for trans_id in self._new_executability:
673
if self.final_file_id(trans_id) is None:
674
conflicts.append(('unversioned executability', trans_id))
676
if self.final_kind(trans_id) != "file":
677
conflicts.append(('non-file executability', trans_id))
680
def _overwrite_conflicts(self):
681
"""Check for overwrites (not permitted on Win32)"""
683
for trans_id in self._new_contents:
684
if self.tree_kind(trans_id) is None:
686
if trans_id not in self._removed_contents:
687
conflicts.append(('overwrite', trans_id,
688
self.final_name(trans_id)))
691
def _duplicate_entries(self, by_parent):
692
"""No directory may have two entries with the same name."""
694
if (self._new_name, self._new_parent) == ({}, {}):
696
for children in viewvalues(by_parent):
698
for child_tid in children:
699
name = self.final_name(child_tid)
701
# Keep children only if they still exist in the end
702
if not self._case_sensitive_target:
704
name_ids.append((name, child_tid))
708
for name, trans_id in name_ids:
709
kind = self.final_kind(trans_id)
710
file_id = self.final_file_id(trans_id)
711
if kind is None and file_id is None:
713
if name == last_name:
714
conflicts.append(('duplicate', last_trans_id, trans_id,
717
last_trans_id = trans_id
720
def _duplicate_ids(self):
721
"""Each inventory id may only be used once"""
724
all_ids = self._tree.all_file_ids()
725
except errors.UnsupportedOperation:
726
# it's okay for non-file-id trees to raise UnsupportedOperation.
728
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
730
active_tree_ids = all_ids.difference(removed_tree_ids)
731
for trans_id, file_id in viewitems(self._new_id):
732
if file_id in active_tree_ids:
733
path = self._tree.id2path(file_id)
734
old_trans_id = self.trans_id_tree_path(path)
735
conflicts.append(('duplicate id', old_trans_id, trans_id))
738
def _parent_type_conflicts(self, by_parent):
739
"""Children must have a directory parent"""
741
for parent_id, children in viewitems(by_parent):
742
if parent_id == ROOT_PARENT:
745
for child_id in children:
746
if self.final_kind(child_id) is not None:
751
# There is at least a child, so we need an existing directory to
753
kind = self.final_kind(parent_id)
755
# The directory will be deleted
756
conflicts.append(('missing parent', parent_id))
757
elif kind != "directory":
758
# Meh, we need a *directory* to put something in it
759
conflicts.append(('non-directory parent', parent_id))
762
def _set_executability(self, path, trans_id):
763
"""Set the executability of versioned files """
764
if self._tree._supports_executable():
765
new_executability = self._new_executability[trans_id]
766
abspath = self._tree.abspath(path)
767
current_mode = os.stat(abspath).st_mode
768
if new_executability:
771
to_mode = current_mode | (0o100 & ~umask)
772
# Enable x-bit for others only if they can read it.
773
if current_mode & 0o004:
774
to_mode |= 0o001 & ~umask
775
if current_mode & 0o040:
776
to_mode |= 0o010 & ~umask
778
to_mode = current_mode & ~0o111
779
osutils.chmod_if_possible(abspath, to_mode)
781
def _new_entry(self, name, parent_id, file_id):
782
"""Helper function to create a new filesystem entry."""
783
trans_id = self.create_path(name, parent_id)
784
if file_id is not None:
785
self.version_file(file_id, trans_id)
397
788
def new_file(self, name, parent_id, contents, file_id=None,
398
789
executable=None, sha1=None):
481
1043
may reduce performance for some non-native formats.)
482
1044
:return: The revision_id of the revision committed.
484
raise NotImplementedError(self.commit)
1046
self._check_malformed()
1048
unversioned = set(self._new_contents).difference(set(self._new_id))
1049
for trans_id in unversioned:
1050
if self.final_file_id(trans_id) is None:
1051
raise errors.StrictCommitFailed()
1053
revno, last_rev_id = branch.last_revision_info()
1054
if last_rev_id == _mod_revision.NULL_REVISION:
1055
if merge_parents is not None:
1056
raise ValueError('Cannot supply merge parents for first'
1060
parent_ids = [last_rev_id]
1061
if merge_parents is not None:
1062
parent_ids.extend(merge_parents)
1063
if self._tree.get_revision_id() != last_rev_id:
1064
raise ValueError('TreeTransform not based on branch basis: %s' %
1065
self._tree.get_revision_id().decode('utf-8'))
1066
revprops = commit.Commit.update_revprops(revprops, branch, authors)
1067
builder = branch.get_commit_builder(parent_ids,
1068
timestamp=timestamp,
1070
committer=committer,
1072
revision_id=revision_id)
1073
preview = self.get_preview_tree()
1074
list(builder.record_iter_changes(preview, last_rev_id,
1075
self.iter_changes()))
1076
builder.finish_inventory()
1077
revision_id = builder.commit(message)
1078
branch.set_last_revision_info(revno + 1, revision_id)
1081
def _text_parent(self, trans_id):
1082
path = self.tree_path(trans_id)
1084
if path is None or self._tree.kind(path) != 'file':
1086
except errors.NoSuchFile:
1090
def _get_parents_texts(self, trans_id):
1091
"""Get texts for compression parents of this file."""
1092
path = self._text_parent(trans_id)
1095
return (self._tree.get_file_text(path),)
1097
def _get_parents_lines(self, trans_id):
1098
"""Get lines for compression parents of this file."""
1099
path = self._text_parent(trans_id)
1102
return (self._tree.get_file_lines(path),)
1104
def serialize(self, serializer):
1105
"""Serialize this TreeTransform.
1107
:param serializer: A Serialiser like pack.ContainerSerializer.
1109
new_name = {k.encode('utf-8'): v.encode('utf-8')
1110
for k, v in viewitems(self._new_name)}
1111
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1112
for k, v in viewitems(self._new_parent)}
1113
new_id = {k.encode('utf-8'): v
1114
for k, v in viewitems(self._new_id)}
1115
new_executability = {k.encode('utf-8'): int(v)
1116
for k, v in viewitems(self._new_executability)}
1117
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1118
for k, v in viewitems(self._tree_path_ids)}
1119
non_present_ids = {k: v.encode('utf-8')
1120
for k, v in viewitems(self._non_present_ids)}
1121
removed_contents = [trans_id.encode('utf-8')
1122
for trans_id in self._removed_contents]
1123
removed_id = [trans_id.encode('utf-8')
1124
for trans_id in self._removed_id]
1126
b'_id_number': self._id_number,
1127
b'_new_name': new_name,
1128
b'_new_parent': new_parent,
1129
b'_new_executability': new_executability,
1131
b'_tree_path_ids': tree_path_ids,
1132
b'_removed_id': removed_id,
1133
b'_removed_contents': removed_contents,
1134
b'_non_present_ids': non_present_ids,
1136
yield serializer.bytes_record(bencode.bencode(attribs),
1138
for trans_id, kind in sorted(viewitems(self._new_contents)):
1140
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1141
lines = cur_file.readlines()
1142
parents = self._get_parents_lines(trans_id)
1143
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1144
content = b''.join(mpdiff.to_patch())
1145
if kind == 'directory':
1147
if kind == 'symlink':
1148
content = self._read_symlink_target(trans_id)
1149
if not isinstance(content, bytes):
1150
content = content.encode('utf-8')
1151
yield serializer.bytes_record(
1152
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1154
def deserialize(self, records):
1155
"""Deserialize a stored TreeTransform.
1157
:param records: An iterable of (names, content) tuples, as per
1158
pack.ContainerPushParser.
1160
names, content = next(records)
1161
attribs = bencode.bdecode(content)
1162
self._id_number = attribs[b'_id_number']
1163
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1164
for k, v in viewitems(attribs[b'_new_name'])}
1165
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1166
for k, v in viewitems(attribs[b'_new_parent'])}
1167
self._new_executability = {
1168
k.decode('utf-8'): bool(v)
1169
for k, v in viewitems(attribs[b'_new_executability'])}
1170
self._new_id = {k.decode('utf-8'): v
1171
for k, v in viewitems(attribs[b'_new_id'])}
1172
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1173
self._tree_path_ids = {}
1174
self._tree_id_paths = {}
1175
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1176
path = bytepath.decode('utf-8')
1177
trans_id = trans_id.decode('utf-8')
1178
self._tree_path_ids[path] = trans_id
1179
self._tree_id_paths[trans_id] = path
1180
self._removed_id = {trans_id.decode('utf-8')
1181
for trans_id in attribs[b'_removed_id']}
1182
self._removed_contents = set(
1183
trans_id.decode('utf-8')
1184
for trans_id in attribs[b'_removed_contents'])
1185
self._non_present_ids = {
1186
k: v.decode('utf-8')
1187
for k, v in viewitems(attribs[b'_non_present_ids'])}
1188
for ((trans_id, kind),), content in records:
1189
trans_id = trans_id.decode('utf-8')
1190
kind = kind.decode('ascii')
1192
mpdiff = multiparent.MultiParent.from_patch(content)
1193
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1194
self.create_file(lines, trans_id)
1195
if kind == 'directory':
1196
self.create_directory(trans_id)
1197
if kind == 'symlink':
1198
self.create_symlink(content.decode('utf-8'), trans_id)
1201
class DiskTreeTransform(TreeTransformBase):
1202
"""Tree transform storing its contents on disk."""
1204
def __init__(self, tree, limbodir, pb=None,
1205
case_sensitive=True):
1207
:param tree: The tree that will be transformed, but not necessarily
1209
:param limbodir: A directory where new files can be stored until
1210
they are installed in their proper places
1212
:param case_sensitive: If True, the target of the transform is
1213
case sensitive, not just case preserving.
1215
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1216
self._limbodir = limbodir
1217
self._deletiondir = None
1218
# A mapping of transform ids to their limbo filename
1219
self._limbo_files = {}
1220
self._possibly_stale_limbo_files = set()
1221
# A mapping of transform ids to a set of the transform ids of children
1222
# that their limbo directory has
1223
self._limbo_children = {}
1224
# Map transform ids to maps of child filename to child transform id
1225
self._limbo_children_names = {}
1226
# List of transform ids that need to be renamed from limbo into place
1227
self._needs_rename = set()
1228
self._creation_mtime = None
1231
"""Release the working tree lock, if held, clean up limbo dir.
1233
This is required if apply has not been invoked, but can be invoked
1236
if self._tree is None:
1239
limbo_paths = list(viewvalues(self._limbo_files))
1240
limbo_paths.extend(self._possibly_stale_limbo_files)
1241
limbo_paths.sort(reverse=True)
1242
for path in limbo_paths:
1245
except OSError as e:
1246
if e.errno != errno.ENOENT:
1248
# XXX: warn? perhaps we just got interrupted at an
1249
# inconvenient moment, but perhaps files are disappearing
1252
delete_any(self._limbodir)
1254
# We don't especially care *why* the dir is immortal.
1255
raise ImmortalLimbo(self._limbodir)
1257
if self._deletiondir is not None:
1258
delete_any(self._deletiondir)
1260
raise errors.ImmortalPendingDeletion(self._deletiondir)
1262
TreeTransformBase.finalize(self)
1264
def _limbo_supports_executable(self):
1265
"""Check if the limbo path supports the executable bit."""
1266
# FIXME: Check actual file system capabilities of limbodir
1267
return osutils.supports_executable()
1269
def _limbo_name(self, trans_id):
1270
"""Generate the limbo name of a file"""
1271
limbo_name = self._limbo_files.get(trans_id)
1272
if limbo_name is None:
1273
limbo_name = self._generate_limbo_path(trans_id)
1274
self._limbo_files[trans_id] = limbo_name
1277
def _generate_limbo_path(self, trans_id):
1278
"""Generate a limbo path using the trans_id as the relative path.
1280
This is suitable as a fallback, and when the transform should not be
1281
sensitive to the path encoding of the limbo directory.
1283
self._needs_rename.add(trans_id)
1284
return pathjoin(self._limbodir, trans_id)
1286
def adjust_path(self, name, parent, trans_id):
1287
previous_parent = self._new_parent.get(trans_id)
1288
previous_name = self._new_name.get(trans_id)
1289
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1290
if (trans_id in self._limbo_files
1291
and trans_id not in self._needs_rename):
1292
self._rename_in_limbo([trans_id])
1293
if previous_parent != parent:
1294
self._limbo_children[previous_parent].remove(trans_id)
1295
if previous_parent != parent or previous_name != name:
1296
del self._limbo_children_names[previous_parent][previous_name]
1298
def _rename_in_limbo(self, trans_ids):
1299
"""Fix limbo names so that the right final path is produced.
1301
This means we outsmarted ourselves-- we tried to avoid renaming
1302
these files later by creating them with their final names in their
1303
final parents. But now the previous name or parent is no longer
1304
suitable, so we have to rename them.
1306
Even for trans_ids that have no new contents, we must remove their
1307
entries from _limbo_files, because they are now stale.
1309
for trans_id in trans_ids:
1310
old_path = self._limbo_files[trans_id]
1311
self._possibly_stale_limbo_files.add(old_path)
1312
del self._limbo_files[trans_id]
1313
if trans_id not in self._new_contents:
1315
new_path = self._limbo_name(trans_id)
1316
os.rename(old_path, new_path)
1317
self._possibly_stale_limbo_files.remove(old_path)
1318
for descendant in self._limbo_descendants(trans_id):
1319
desc_path = self._limbo_files[descendant]
1320
desc_path = new_path + desc_path[len(old_path):]
1321
self._limbo_files[descendant] = desc_path
1323
def _limbo_descendants(self, trans_id):
1324
"""Return the set of trans_ids whose limbo paths descend from this."""
1325
descendants = set(self._limbo_children.get(trans_id, []))
1326
for descendant in list(descendants):
1327
descendants.update(self._limbo_descendants(descendant))
486
1330
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
487
1331
"""Schedule creation of a new file.
599
1497
invalid='warning')
1500
class TreeTransform(DiskTreeTransform):
1501
"""Represent a tree transformation.
1503
This object is designed to support incremental generation of the transform,
1506
However, it gives optimum performance when parent directories are created
1507
before their contents. The transform is then able to put child files
1508
directly in their parent directory, avoiding later renames.
1510
It is easy to produce malformed transforms, but they are generally
1511
harmless. Attempting to apply a malformed transform will cause an
1512
exception to be raised before any modifications are made to the tree.
1514
Many kinds of malformed transforms can be corrected with the
1515
resolve_conflicts function. The remaining ones indicate programming error,
1516
such as trying to create a file with no path.
1518
Two sets of file creation methods are supplied. Convenience methods are:
1523
These are composed of the low-level methods:
1525
* create_file or create_directory or create_symlink
1529
Transform/Transaction ids
1530
-------------------------
1531
trans_ids are temporary ids assigned to all files involved in a transform.
1532
It's possible, even common, that not all files in the Tree have trans_ids.
1534
trans_ids are used because filenames and file_ids are not good enough
1535
identifiers; filenames change, and not all files have file_ids. File-ids
1536
are also associated with trans-ids, so that moving a file moves its
1539
trans_ids are only valid for the TreeTransform that generated them.
1543
Limbo is a temporary directory use to hold new versions of files.
1544
Files are added to limbo by create_file, create_directory, create_symlink,
1545
and their convenience variants (new_*). Files may be removed from limbo
1546
using cancel_creation. Files are renamed from limbo into their final
1547
location as part of TreeTransform.apply
1549
Limbo must be cleaned up, by either calling TreeTransform.apply or
1550
calling TreeTransform.finalize.
1552
Files are placed into limbo inside their parent directories, where
1553
possible. This reduces subsequent renames, and makes operations involving
1554
lots of files faster. This optimization is only possible if the parent
1555
directory is created *before* creating any of its children, so avoid
1556
creating children before parents, where possible.
1560
This temporary directory is used by _FileMover for storing files that are
1561
about to be deleted. In case of rollback, the files will be restored.
1562
FileMover does not delete files until it is sure that a rollback will not
1566
def __init__(self, tree, pb=None):
1567
"""Note: a tree_write lock is taken on the tree.
1569
Use TreeTransform.finalize() to release the lock (can be omitted if
1570
TreeTransform.apply() called).
1572
tree.lock_tree_write()
1574
limbodir = urlutils.local_path_from_url(
1575
tree._transport.abspath('limbo'))
1576
osutils.ensure_empty_directory_exists(
1578
errors.ExistingLimbo)
1579
deletiondir = urlutils.local_path_from_url(
1580
tree._transport.abspath('pending-deletion'))
1581
osutils.ensure_empty_directory_exists(
1583
errors.ExistingPendingDeletion)
1584
except BaseException:
1588
# Cache of realpath results, to speed up canonical_path
1589
self._realpaths = {}
1590
# Cache of relpath results, to speed up canonical_path
1592
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1593
tree.case_sensitive)
1594
self._deletiondir = deletiondir
1596
def canonical_path(self, path):
1597
"""Get the canonical tree-relative path"""
1598
# don't follow final symlinks
1599
abs = self._tree.abspath(path)
1600
if abs in self._relpaths:
1601
return self._relpaths[abs]
1602
dirname, basename = os.path.split(abs)
1603
if dirname not in self._realpaths:
1604
self._realpaths[dirname] = os.path.realpath(dirname)
1605
dirname = self._realpaths[dirname]
1606
abs = pathjoin(dirname, basename)
1607
if dirname in self._relpaths:
1608
relpath = pathjoin(self._relpaths[dirname], basename)
1609
relpath = relpath.rstrip('/\\')
1611
relpath = self._tree.relpath(abs)
1612
self._relpaths[abs] = relpath
1615
def tree_kind(self, trans_id):
1616
"""Determine the file kind in the working tree.
1618
:returns: The file kind or None if the file does not exist
1620
path = self._tree_id_paths.get(trans_id)
1624
return file_kind(self._tree.abspath(path))
1625
except errors.NoSuchFile:
1628
def _set_mode(self, trans_id, mode_id, typefunc):
1629
"""Set the mode of new file contents.
1630
The mode_id is the existing file to get the mode from (often the same
1631
as trans_id). The operation is only performed if there's a mode match
1632
according to typefunc.
1637
old_path = self._tree_id_paths[mode_id]
1641
mode = os.stat(self._tree.abspath(old_path)).st_mode
1642
except OSError as e:
1643
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1644
# Either old_path doesn't exist, or the parent of the
1645
# target is not a directory (but will be one eventually)
1646
# Either way, we know it doesn't exist *right now*
1647
# See also bug #248448
1652
osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1654
def iter_tree_children(self, parent_id):
1655
"""Iterate through the entry's tree children, if any"""
1657
path = self._tree_id_paths[parent_id]
1661
children = os.listdir(self._tree.abspath(path))
1662
except OSError as e:
1663
if not (osutils._is_error_enotdir(e) or
1664
e.errno in (errno.ENOENT, errno.ESRCH)):
1668
for child in children:
1669
childpath = joinpath(path, child)
1670
if self._tree.is_control_filename(childpath):
1672
yield self.trans_id_tree_path(childpath)
1674
def _generate_limbo_path(self, trans_id):
1675
"""Generate a limbo path using the final path if possible.
1677
This optimizes the performance of applying the tree transform by
1678
avoiding renames. These renames can be avoided only when the parent
1679
directory is already scheduled for creation.
1681
If the final path cannot be used, falls back to using the trans_id as
1684
parent = self._new_parent.get(trans_id)
1685
# if the parent directory is already in limbo (e.g. when building a
1686
# tree), choose a limbo name inside the parent, to reduce further
1688
use_direct_path = False
1689
if self._new_contents.get(parent) == 'directory':
1690
filename = self._new_name.get(trans_id)
1691
if filename is not None:
1692
if parent not in self._limbo_children:
1693
self._limbo_children[parent] = set()
1694
self._limbo_children_names[parent] = {}
1695
use_direct_path = True
1696
# the direct path can only be used if no other file has
1697
# already taken this pathname, i.e. if the name is unused, or
1698
# if it is already associated with this trans_id.
1699
elif self._case_sensitive_target:
1700
if (self._limbo_children_names[parent].get(filename)
1701
in (trans_id, None)):
1702
use_direct_path = True
1704
for l_filename, l_trans_id in viewitems(
1705
self._limbo_children_names[parent]):
1706
if l_trans_id == trans_id:
1708
if l_filename.lower() == filename.lower():
1711
use_direct_path = True
1713
if not use_direct_path:
1714
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1716
limbo_name = pathjoin(self._limbo_files[parent], filename)
1717
self._limbo_children[parent].add(trans_id)
1718
self._limbo_children_names[parent][filename] = trans_id
1721
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1722
"""Apply all changes to the inventory and filesystem.
1724
If filesystem or inventory conflicts are present, MalformedTransform
1727
If apply succeeds, finalize is not necessary.
1729
:param no_conflicts: if True, the caller guarantees there are no
1730
conflicts, so no check is made.
1731
:param precomputed_delta: An inventory delta to use instead of
1733
:param _mover: Supply an alternate FileMover, for testing
1735
for hook in MutableTree.hooks['pre_transform']:
1736
hook(self._tree, self)
1737
if not no_conflicts:
1738
self._check_malformed()
1739
with ui.ui_factory.nested_progress_bar() as child_pb:
1740
if precomputed_delta is None:
1741
child_pb.update(gettext('Apply phase'), 0, 2)
1742
inventory_delta = self._generate_inventory_delta()
1745
inventory_delta = precomputed_delta
1748
mover = _FileMover()
1752
child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1753
self._apply_removals(mover)
1754
child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1755
modified_paths = self._apply_insertions(mover)
1756
except BaseException:
1760
mover.apply_deletions()
1761
if self.final_file_id(self.root) is None:
1762
inventory_delta = [e for e in inventory_delta if e[0] != '']
1763
self._tree.apply_inventory_delta(inventory_delta)
1764
self._apply_observed_sha1s()
1767
return _TransformResults(modified_paths, self.rename_count)
1769
def _generate_inventory_delta(self):
1770
"""Generate an inventory delta for the current transform."""
1771
inventory_delta = []
1772
new_paths = self._inventory_altered()
1773
total_entries = len(new_paths) + len(self._removed_id)
1774
with ui.ui_factory.nested_progress_bar() as child_pb:
1775
for num, trans_id in enumerate(self._removed_id):
1777
child_pb.update(gettext('removing file'),
1779
if trans_id == self._new_root:
1780
file_id = self._tree.get_root_id()
1782
file_id = self.tree_file_id(trans_id)
1783
# File-id isn't really being deleted, just moved
1784
if file_id in self._r_new_id:
1786
path = self._tree_id_paths[trans_id]
1787
inventory_delta.append((path, None, file_id, None))
1788
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1790
for num, (path, trans_id) in enumerate(new_paths):
1792
child_pb.update(gettext('adding file'),
1793
num + len(self._removed_id), total_entries)
1794
file_id = new_path_file_ids[trans_id]
1797
kind = self.final_kind(trans_id)
1799
kind = self._tree.stored_kind(self._tree.id2path(file_id))
1800
parent_trans_id = self.final_parent(trans_id)
1801
parent_file_id = new_path_file_ids.get(parent_trans_id)
1802
if parent_file_id is None:
1803
parent_file_id = self.final_file_id(parent_trans_id)
1804
if trans_id in self._new_reference_revision:
1805
new_entry = inventory.TreeReference(
1807
self._new_name[trans_id],
1808
self.final_file_id(self._new_parent[trans_id]),
1809
None, self._new_reference_revision[trans_id])
1811
new_entry = inventory.make_entry(kind,
1812
self.final_name(trans_id),
1813
parent_file_id, file_id)
1815
old_path = self._tree.id2path(new_entry.file_id)
1816
except errors.NoSuchId:
1818
new_executability = self._new_executability.get(trans_id)
1819
if new_executability is not None:
1820
new_entry.executable = new_executability
1821
inventory_delta.append(
1822
(old_path, path, new_entry.file_id, new_entry))
1823
return inventory_delta
1825
def _apply_removals(self, mover):
1826
"""Perform tree operations that remove directory/inventory names.
1828
That is, delete files that are to be deleted, and put any files that
1829
need renaming into limbo. This must be done in strict child-to-parent
1832
If inventory_delta is None, no inventory delta generation is performed.
1834
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1835
with ui.ui_factory.nested_progress_bar() as child_pb:
1836
for num, (path, trans_id) in enumerate(tree_paths):
1837
# do not attempt to move root into a subdirectory of itself.
1840
child_pb.update(gettext('removing file'), num, len(tree_paths))
1841
full_path = self._tree.abspath(path)
1842
if trans_id in self._removed_contents:
1843
delete_path = os.path.join(self._deletiondir, trans_id)
1844
mover.pre_delete(full_path, delete_path)
1845
elif (trans_id in self._new_name or
1846
trans_id in self._new_parent):
1848
mover.rename(full_path, self._limbo_name(trans_id))
1849
except errors.TransformRenameFailed as e:
1850
if e.errno != errno.ENOENT:
1853
self.rename_count += 1
1855
def _apply_insertions(self, mover):
1856
"""Perform tree operations that insert directory/inventory names.
1858
That is, create any files that need to be created, and restore from
1859
limbo any files that needed renaming. This must be done in strict
1860
parent-to-child order.
1862
If inventory_delta is None, no inventory delta is calculated, and
1863
no list of modified paths is returned.
1865
new_paths = self.new_paths(filesystem_only=True)
1867
with ui.ui_factory.nested_progress_bar() as child_pb:
1868
for num, (path, trans_id) in enumerate(new_paths):
1870
child_pb.update(gettext('adding file'),
1871
num, len(new_paths))
1872
full_path = self._tree.abspath(path)
1873
if trans_id in self._needs_rename:
1875
mover.rename(self._limbo_name(trans_id), full_path)
1876
except errors.TransformRenameFailed as e:
1877
# We may be renaming a dangling inventory id
1878
if e.errno != errno.ENOENT:
1881
self.rename_count += 1
1882
# TODO: if trans_id in self._observed_sha1s, we should
1883
# re-stat the final target, since ctime will be
1884
# updated by the change.
1885
if (trans_id in self._new_contents
1886
or self.path_changed(trans_id)):
1887
if trans_id in self._new_contents:
1888
modified_paths.append(full_path)
1889
if trans_id in self._new_executability:
1890
self._set_executability(path, trans_id)
1891
if trans_id in self._observed_sha1s:
1892
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1893
st = osutils.lstat(full_path)
1894
self._observed_sha1s[trans_id] = (o_sha1, st)
1895
for path, trans_id in new_paths:
1896
# new_paths includes stuff like workingtree conflicts. Only the
1897
# stuff in new_contents actually comes from limbo.
1898
if trans_id in self._limbo_files:
1899
del self._limbo_files[trans_id]
1900
self._new_contents.clear()
1901
return modified_paths
1903
def _apply_observed_sha1s(self):
1904
"""After we have finished renaming everything, update observed sha1s
1906
This has to be done after self._tree.apply_inventory_delta, otherwise
1907
it doesn't know anything about the files we are updating. Also, we want
1908
to do this as late as possible, so that most entries end up cached.
1910
# TODO: this doesn't update the stat information for directories. So
1911
# the first 'bzr status' will still need to rewrite
1912
# .bzr/checkout/dirstate. However, we at least don't need to
1913
# re-read all of the files.
1914
# TODO: If the operation took a while, we could do a time.sleep(3) here
1915
# to allow the clock to tick over and ensure we won't have any
1916
# problems. (we could observe start time, and finish time, and if
1917
# it is less than eg 10% overhead, add a sleep call.)
1918
paths = FinalPaths(self)
1919
for trans_id, observed in viewitems(self._observed_sha1s):
1920
path = paths.get_path(trans_id)
1921
self._tree._observed_sha1(path, observed)
1924
class TransformPreview(DiskTreeTransform):
1925
"""A TreeTransform for generating preview trees.
1927
Unlike TreeTransform, this version works when the input tree is a
1928
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1929
unversioned files in the input tree.
1932
def __init__(self, tree, pb=None, case_sensitive=True):
1934
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1935
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1937
def canonical_path(self, path):
1940
def tree_kind(self, trans_id):
1941
path = self._tree_id_paths.get(trans_id)
1944
kind = self._tree.path_content_summary(path)[0]
1945
if kind == 'missing':
1949
def _set_mode(self, trans_id, mode_id, typefunc):
1950
"""Set the mode of new file contents.
1951
The mode_id is the existing file to get the mode from (often the same
1952
as trans_id). The operation is only performed if there's a mode match
1953
according to typefunc.
1955
# is it ok to ignore this? probably
1958
def iter_tree_children(self, parent_id):
1959
"""Iterate through the entry's tree children, if any"""
1961
path = self._tree_id_paths[parent_id]
1965
entry = next(self._tree.iter_entries_by_dir(
1966
specific_files=[path]))[1]
1967
except StopIteration:
1969
children = getattr(entry, 'children', {})
1970
for child in children:
1971
childpath = joinpath(path, child)
1972
yield self.trans_id_tree_path(childpath)
1974
def new_orphan(self, trans_id, parent_id):
1975
raise NotImplementedError(self.new_orphan)
1978
class _PreviewTree(inventorytree.InventoryTree):
1979
"""Partial implementation of Tree to support show_diff_trees"""
1981
def __init__(self, transform):
1982
self._transform = transform
1983
self._final_paths = FinalPaths(transform)
1984
self.__by_parent = None
1985
self._parent_ids = []
1986
self._all_children_cache = {}
1987
self._path2trans_id_cache = {}
1988
self._final_name_cache = {}
1989
self._iter_changes_cache = dict((c[0], c) for c in
1990
self._transform.iter_changes())
1992
def _content_change(self, file_id):
1993
"""Return True if the content of this file changed"""
1994
changes = self._iter_changes_cache.get(file_id)
1995
# changes[2] is true if the file content changed. See
1996
# InterTree.iter_changes.
1997
return (changes is not None and changes[2])
1999
def _get_repository(self):
2000
repo = getattr(self._transform._tree, '_repository', None)
2002
repo = self._transform._tree.branch.repository
2005
def _iter_parent_trees(self):
2006
for revision_id in self.get_parent_ids():
2008
yield self.revision_tree(revision_id)
2009
except errors.NoSuchRevisionInTree:
2010
yield self._get_repository().revision_tree(revision_id)
2012
def _get_file_revision(self, path, file_id, vf, tree_revision):
2014
(file_id, t.get_file_revision(t.id2path(file_id)))
2015
for t in self._iter_parent_trees()]
2016
vf.add_lines((file_id, tree_revision), parent_keys,
2017
self.get_file_lines(path))
2018
repo = self._get_repository()
2019
base_vf = repo.texts
2020
if base_vf not in vf.fallback_versionedfiles:
2021
vf.fallback_versionedfiles.append(base_vf)
2022
return tree_revision
2024
def _stat_limbo_file(self, trans_id):
2025
name = self._transform._limbo_name(trans_id)
2026
return os.lstat(name)
2029
def _by_parent(self):
2030
if self.__by_parent is None:
2031
self.__by_parent = self._transform.by_parent()
2032
return self.__by_parent
2034
def _comparison_data(self, entry, path):
2035
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
2036
if kind == 'missing':
2040
file_id = self._transform.final_file_id(self._path2trans_id(path))
2041
executable = self.is_executable(path)
2042
return kind, executable, None
2044
def is_locked(self):
2047
def lock_read(self):
2048
# Perhaps in theory, this should lock the TreeTransform?
2049
return lock.LogicalLockResult(self.unlock)
2055
def root_inventory(self):
2056
"""This Tree does not use inventory as its backing data."""
2057
raise NotImplementedError(_PreviewTree.root_inventory)
2059
def get_root_id(self):
2060
return self._transform.final_file_id(self._transform.root)
2062
def all_file_ids(self):
2063
tree_ids = set(self._transform._tree.all_file_ids())
2064
tree_ids.difference_update(self._transform.tree_file_id(t)
2065
for t in self._transform._removed_id)
2066
tree_ids.update(viewvalues(self._transform._new_id))
2069
def all_versioned_paths(self):
2070
tree_paths = set(self._transform._tree.all_versioned_paths())
2072
tree_paths.difference_update(
2073
self._transform.trans_id_tree_path(t)
2074
for t in self._transform._removed_id)
2077
self._final_paths._determine_path(t)
2078
for t in self._transform._new_id)
2082
def _has_id(self, file_id, fallback_check):
2083
if file_id in self._transform._r_new_id:
2085
elif file_id in {self._transform.tree_file_id(trans_id) for
2086
trans_id in self._transform._removed_id}:
2089
return fallback_check(file_id)
2091
def has_id(self, file_id):
2092
return self._has_id(file_id, self._transform._tree.has_id)
2094
def has_or_had_id(self, file_id):
2095
return self._has_id(file_id, self._transform._tree.has_or_had_id)
2097
def _path2trans_id(self, path):
2098
# We must not use None here, because that is a valid value to store.
2099
trans_id = self._path2trans_id_cache.get(path, object)
2100
if trans_id is not object:
2102
segments = splitpath(path)
2103
cur_parent = self._transform.root
2104
for cur_segment in segments:
2105
for child in self._all_children(cur_parent):
2106
final_name = self._final_name_cache.get(child)
2107
if final_name is None:
2108
final_name = self._transform.final_name(child)
2109
self._final_name_cache[child] = final_name
2110
if final_name == cur_segment:
2114
self._path2trans_id_cache[path] = None
2116
self._path2trans_id_cache[path] = cur_parent
2119
def path2id(self, path):
2120
if isinstance(path, list):
2123
path = osutils.pathjoin(*path)
2124
return self._transform.final_file_id(self._path2trans_id(path))
2126
def id2path(self, file_id):
2127
trans_id = self._transform.trans_id_file_id(file_id)
2129
return self._final_paths._determine_path(trans_id)
2131
raise errors.NoSuchId(self, file_id)
2133
def _all_children(self, trans_id):
2134
children = self._all_children_cache.get(trans_id)
2135
if children is not None:
2137
children = set(self._transform.iter_tree_children(trans_id))
2138
# children in the _new_parent set are provided by _by_parent.
2139
children.difference_update(self._transform._new_parent)
2140
children.update(self._by_parent.get(trans_id, []))
2141
self._all_children_cache[trans_id] = children
2144
def _iter_children(self, file_id):
2145
trans_id = self._transform.trans_id_file_id(file_id)
2146
for child_trans_id in self._all_children(trans_id):
2147
yield self._transform.final_file_id(child_trans_id)
2150
possible_extras = set(self._transform.trans_id_tree_path(p) for p
2151
in self._transform._tree.extras())
2152
possible_extras.update(self._transform._new_contents)
2153
possible_extras.update(self._transform._removed_id)
2154
for trans_id in possible_extras:
2155
if self._transform.final_file_id(trans_id) is None:
2156
yield self._final_paths._determine_path(trans_id)
2158
def _make_inv_entries(self, ordered_entries, specific_files=None):
2159
for trans_id, parent_file_id in ordered_entries:
2160
file_id = self._transform.final_file_id(trans_id)
2163
if (specific_files is not None
2164
and self._final_paths.get_path(trans_id) not in specific_files):
2166
kind = self._transform.final_kind(trans_id)
2168
kind = self._transform._tree.stored_kind(
2169
self._transform._tree.id2path(file_id))
2170
new_entry = inventory.make_entry(
2172
self._transform.final_name(trans_id),
2173
parent_file_id, file_id)
2174
yield new_entry, trans_id
2176
def _list_files_by_dir(self):
2177
todo = [ROOT_PARENT]
2179
while len(todo) > 0:
2181
parent_file_id = self._transform.final_file_id(parent)
2182
children = list(self._all_children(parent))
2183
paths = dict(zip(children, self._final_paths.get_paths(children)))
2184
children.sort(key=paths.get)
2185
todo.extend(reversed(children))
2186
for trans_id in children:
2187
ordered_ids.append((trans_id, parent_file_id))
2190
def iter_child_entries(self, path):
2191
trans_id = self._path2trans_id(path)
2192
if trans_id is None:
2193
raise errors.NoSuchFile(path)
2194
todo = [(child_trans_id, trans_id) for child_trans_id in
2195
self._all_children(trans_id)]
2196
for entry, trans_id in self._make_inv_entries(todo):
2199
def iter_entries_by_dir(self, specific_files=None):
2200
# This may not be a maximally efficient implementation, but it is
2201
# reasonably straightforward. An implementation that grafts the
2202
# TreeTransform changes onto the tree's iter_entries_by_dir results
2203
# might be more efficient, but requires tricky inferences about stack
2205
ordered_ids = self._list_files_by_dir()
2206
for entry, trans_id in self._make_inv_entries(ordered_ids,
2208
yield self._final_paths.get_path(trans_id), entry
2210
def _iter_entries_for_dir(self, dir_path):
2211
"""Return path, entry for items in a directory without recursing down."""
2213
dir_trans_id = self._path2trans_id(dir_path)
2214
dir_id = self._transform.final_file_id(dir_trans_id)
2215
for child_trans_id in self._all_children(dir_trans_id):
2216
ordered_ids.append((child_trans_id, dir_id))
2218
for entry, trans_id in self._make_inv_entries(ordered_ids):
2219
path_entries.append((self._final_paths.get_path(trans_id), entry))
2223
def list_files(self, include_root=False, from_dir=None, recursive=True):
2224
"""See WorkingTree.list_files."""
2225
# XXX This should behave like WorkingTree.list_files, but is really
2226
# more like RevisionTree.list_files.
2232
prefix = from_dir + '/'
2233
entries = self.iter_entries_by_dir()
2234
for path, entry in entries:
2235
if entry.name == '' and not include_root:
2238
if not path.startswith(prefix):
2240
path = path[len(prefix):]
2241
yield path, 'V', entry.kind, entry
2243
if from_dir is None and include_root is True:
2244
root_entry = inventory.make_entry(
2245
'directory', '', ROOT_PARENT, self.get_root_id())
2246
yield '', 'V', 'directory', root_entry
2247
entries = self._iter_entries_for_dir(from_dir or '')
2248
for path, entry in entries:
2249
yield path, 'V', entry.kind, entry
2251
def kind(self, path):
2252
trans_id = self._path2trans_id(path)
2253
if trans_id is None:
2254
raise errors.NoSuchFile(path)
2255
return self._transform.final_kind(trans_id)
2257
def stored_kind(self, path):
2258
trans_id = self._path2trans_id(path)
2259
if trans_id is None:
2260
raise errors.NoSuchFile(path)
2262
return self._transform._new_contents[trans_id]
2264
return self._transform._tree.stored_kind(path)
2266
def get_file_mtime(self, path):
2267
"""See Tree.get_file_mtime"""
2268
file_id = self.path2id(path)
2270
raise errors.NoSuchFile(path)
2271
if not self._content_change(file_id):
2272
return self._transform._tree.get_file_mtime(
2273
self._transform._tree.id2path(file_id))
2274
trans_id = self._path2trans_id(path)
2275
return self._stat_limbo_file(trans_id).st_mtime
2277
def get_file_size(self, path):
2278
"""See Tree.get_file_size"""
2279
trans_id = self._path2trans_id(path)
2280
if trans_id is None:
2281
raise errors.NoSuchFile(path)
2282
kind = self._transform.final_kind(trans_id)
2285
if trans_id in self._transform._new_contents:
2286
return self._stat_limbo_file(trans_id).st_size
2287
if self.kind(path) == 'file':
2288
return self._transform._tree.get_file_size(path)
2292
def get_file_verifier(self, path, stat_value=None):
2293
trans_id = self._path2trans_id(path)
2294
if trans_id is None:
2295
raise errors.NoSuchFile(path)
2296
kind = self._transform._new_contents.get(trans_id)
2298
return self._transform._tree.get_file_verifier(path)
2300
with self.get_file(path) as fileobj:
2301
return ("SHA1", sha_file(fileobj))
2303
def get_file_sha1(self, path, stat_value=None):
2304
trans_id = self._path2trans_id(path)
2305
if trans_id is None:
2306
raise errors.NoSuchFile(path)
2307
kind = self._transform._new_contents.get(trans_id)
2309
return self._transform._tree.get_file_sha1(path)
2311
with self.get_file(path) as fileobj:
2312
return sha_file(fileobj)
2314
def is_executable(self, path):
2315
trans_id = self._path2trans_id(path)
2316
if trans_id is None:
2319
return self._transform._new_executability[trans_id]
2322
return self._transform._tree.is_executable(path)
2323
except OSError as e:
2324
if e.errno == errno.ENOENT:
2327
except errors.NoSuchFile:
2330
def has_filename(self, path):
2331
trans_id = self._path2trans_id(path)
2332
if trans_id in self._transform._new_contents:
2334
elif trans_id in self._transform._removed_contents:
2337
return self._transform._tree.has_filename(path)
2339
def path_content_summary(self, path):
2340
trans_id = self._path2trans_id(path)
2341
tt = self._transform
2342
tree_path = tt._tree_id_paths.get(trans_id)
2343
kind = tt._new_contents.get(trans_id)
2345
if tree_path is None or trans_id in tt._removed_contents:
2346
return 'missing', None, None, None
2347
summary = tt._tree.path_content_summary(tree_path)
2348
kind, size, executable, link_or_sha1 = summary
2351
limbo_name = tt._limbo_name(trans_id)
2352
if trans_id in tt._new_reference_revision:
2353
kind = 'tree-reference'
2355
statval = os.lstat(limbo_name)
2356
size = statval.st_size
2357
if not tt._limbo_supports_executable():
2360
executable = statval.st_mode & S_IEXEC
2364
if kind == 'symlink':
2365
link_or_sha1 = os.readlink(limbo_name)
2366
if not isinstance(link_or_sha1, text_type):
2367
link_or_sha1 = link_or_sha1.decode(osutils._fs_enc)
2368
executable = tt._new_executability.get(trans_id, executable)
2369
return kind, size, executable, link_or_sha1
2371
def iter_changes(self, from_tree, include_unchanged=False,
2372
specific_files=None, pb=None, extra_trees=None,
2373
require_versioned=True, want_unversioned=False):
2374
"""See InterTree.iter_changes.
2376
This has a fast path that is only used when the from_tree matches
2377
the transform tree, and no fancy options are supplied.
2379
if (from_tree is not self._transform._tree or include_unchanged
2380
or specific_files or want_unversioned):
2381
return tree.InterTree(from_tree, self).iter_changes(
2382
include_unchanged=include_unchanged,
2383
specific_files=specific_files,
2385
extra_trees=extra_trees,
2386
require_versioned=require_versioned,
2387
want_unversioned=want_unversioned)
2388
if want_unversioned:
2389
raise ValueError('want_unversioned is not supported')
2390
return self._transform.iter_changes()
2392
def get_file(self, path):
2393
"""See Tree.get_file"""
2394
file_id = self.path2id(path)
2395
if not self._content_change(file_id):
2396
return self._transform._tree.get_file(path)
2397
trans_id = self._path2trans_id(path)
2398
name = self._transform._limbo_name(trans_id)
2399
return open(name, 'rb')
2401
def get_file_with_stat(self, path):
2402
return self.get_file(path), None
2404
def annotate_iter(self, path,
2405
default_revision=_mod_revision.CURRENT_REVISION):
2406
file_id = self.path2id(path)
2407
changes = self._iter_changes_cache.get(file_id)
2411
changed_content, versioned, kind = (changes[2], changes[3],
2415
get_old = (kind[0] == 'file' and versioned[0])
2417
old_annotation = self._transform._tree.annotate_iter(
2418
path, default_revision=default_revision)
2422
return old_annotation
2423
if not changed_content:
2424
return old_annotation
2425
# TODO: This is doing something similar to what WT.annotate_iter is
2426
# doing, however it fails slightly because it doesn't know what
2427
# the *other* revision_id is, so it doesn't know how to give the
2428
# other as the origin for some lines, they all get
2429
# 'default_revision'
2430
# It would be nice to be able to use the new Annotator based
2431
# approach, as well.
2432
return annotate.reannotate([old_annotation],
2433
self.get_file(path).readlines(),
2436
def get_symlink_target(self, path):
2437
"""See Tree.get_symlink_target"""
2438
file_id = self.path2id(path)
2439
if not self._content_change(file_id):
2440
return self._transform._tree.get_symlink_target(path)
2441
trans_id = self._path2trans_id(path)
2442
name = self._transform._limbo_name(trans_id)
2443
return osutils.readlink(name)
2445
def walkdirs(self, prefix=''):
2446
pending = [self._transform.root]
2447
while len(pending) > 0:
2448
parent_id = pending.pop()
2451
prefix = prefix.rstrip('/')
2452
parent_path = self._final_paths.get_path(parent_id)
2453
parent_file_id = self._transform.final_file_id(parent_id)
2454
for child_id in self._all_children(parent_id):
2455
path_from_root = self._final_paths.get_path(child_id)
2456
basename = self._transform.final_name(child_id)
2457
file_id = self._transform.final_file_id(child_id)
2458
kind = self._transform.final_kind(child_id)
2459
if kind is not None:
2460
versioned_kind = kind
2463
versioned_kind = self._transform._tree.stored_kind(
2464
self._transform._tree.id2path(file_id))
2465
if versioned_kind == 'directory':
2466
subdirs.append(child_id)
2467
children.append((path_from_root, basename, kind, None,
2468
file_id, versioned_kind))
2470
if parent_path.startswith(prefix):
2471
yield (parent_path, parent_file_id), children
2472
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2475
def get_parent_ids(self):
2476
return self._parent_ids
2478
def set_parent_ids(self, parent_ids):
2479
self._parent_ids = parent_ids
2481
def get_revision_tree(self, revision_id):
2482
return self._transform._tree.get_revision_tree(revision_id)
602
2485
def joinpath(parent, child):
603
2486
"""Join tree-relative paths, handling the tree root specially"""
604
2487
if parent is None or parent == "":
added
removed
breezy/transform.py
