395
536
def find_conflicts(self):
396
537
"""Find any violations of inventory or filesystem invariants"""
397
raise NotImplementedError(self.find_conflicts)
538
if self._done is True:
539
raise ReusingTransform()
541
# ensure all children of all existent parents are known
542
# all children of non-existent parents are known, by definition.
543
self._add_tree_children()
544
by_parent = self.by_parent()
545
conflicts.extend(self._unversioned_parents(by_parent))
546
conflicts.extend(self._parent_loops())
547
conflicts.extend(self._duplicate_entries(by_parent))
548
conflicts.extend(self._duplicate_ids())
549
conflicts.extend(self._parent_type_conflicts(by_parent))
550
conflicts.extend(self._improper_versioning())
551
conflicts.extend(self._executability_conflicts())
552
conflicts.extend(self._overwrite_conflicts())
555
def _check_malformed(self):
556
conflicts = self.find_conflicts()
557
if len(conflicts) != 0:
558
raise MalformedTransform(conflicts=conflicts)
560
def _add_tree_children(self):
561
"""Add all the children of all active parents to the known paths.
563
Active parents are those which gain children, and those which are
564
removed. This is a necessary first step in detecting conflicts.
566
parents = list(self.by_parent())
567
parents.extend([t for t in self._removed_contents if
568
self.tree_kind(t) == 'directory'])
569
for trans_id in self._removed_id:
570
file_id = self.tree_file_id(trans_id)
571
path = self._tree.id2path(file_id)
572
if file_id is not None:
573
if self._tree.stored_kind(path, file_id) == 'directory':
574
parents.append(trans_id)
575
elif self.tree_kind(trans_id) == 'directory':
576
parents.append(trans_id)
578
for parent_id in parents:
579
# ensure that all children are registered with the transaction
580
list(self.iter_tree_children(parent_id))
582
def _has_named_child(self, name, parent_id, known_children):
583
"""Does a parent already have a name child.
585
:param name: The searched for name.
587
:param parent_id: The parent for which the check is made.
589
:param known_children: The already known children. This should have
590
been recently obtained from `self.by_parent.get(parent_id)`
591
(or will be if None is passed).
593
if known_children is None:
594
known_children = self.by_parent().get(parent_id, [])
595
for child in known_children:
596
if self.final_name(child) == name:
598
parent_path = self._tree_id_paths.get(parent_id, None)
599
if parent_path is None:
600
# No parent... no children
602
child_path = joinpath(parent_path, name)
603
child_id = self._tree_path_ids.get(child_path, None)
605
# Not known by the tree transform yet, check the filesystem
606
return osutils.lexists(self._tree.abspath(child_path))
608
raise AssertionError('child_id is missing: %s, %s, %s'
609
% (name, parent_id, child_id))
611
def _available_backup_name(self, name, target_id):
612
"""Find an available backup name.
614
:param name: The basename of the file.
616
:param target_id: The directory trans_id where the backup should
619
known_children = self.by_parent().get(target_id, [])
620
return osutils.available_backup_name(
622
lambda base: self._has_named_child(
623
base, target_id, known_children))
625
def _parent_loops(self):
626
"""No entry should be its own ancestor"""
628
for trans_id in self._new_parent:
631
while parent_id != ROOT_PARENT:
634
parent_id = self.final_parent(parent_id)
637
if parent_id == trans_id:
638
conflicts.append(('parent loop', trans_id))
639
if parent_id in seen:
643
def _unversioned_parents(self, by_parent):
644
"""If parent directories are versioned, children must be versioned."""
646
for parent_id, children in viewitems(by_parent):
647
if parent_id == ROOT_PARENT:
649
if self.final_file_id(parent_id) is not None:
651
for child_id in children:
652
if self.final_file_id(child_id) is not None:
653
conflicts.append(('unversioned parent', parent_id))
657
def _improper_versioning(self):
658
"""Cannot version a file with no contents, or a bad type.
660
However, existing entries with no contents are okay.
663
for trans_id in self._new_id:
664
kind = self.final_kind(trans_id)
666
conflicts.append(('versioning no contents', trans_id))
668
if not inventory.InventoryEntry.versionable_kind(kind):
669
conflicts.append(('versioning bad kind', trans_id, kind))
672
def _executability_conflicts(self):
673
"""Check for bad executability changes.
675
Only versioned files may have their executability set, because
676
1. only versioned entries can have executability under windows
677
2. only files can be executable. (The execute bit on a directory
678
does not indicate searchability)
681
for trans_id in self._new_executability:
682
if self.final_file_id(trans_id) is None:
683
conflicts.append(('unversioned executability', trans_id))
685
if self.final_kind(trans_id) != "file":
686
conflicts.append(('non-file executability', trans_id))
689
def _overwrite_conflicts(self):
690
"""Check for overwrites (not permitted on Win32)"""
692
for trans_id in self._new_contents:
693
if self.tree_kind(trans_id) is None:
695
if trans_id not in self._removed_contents:
696
conflicts.append(('overwrite', trans_id,
697
self.final_name(trans_id)))
700
def _duplicate_entries(self, by_parent):
701
"""No directory may have two entries with the same name."""
703
if (self._new_name, self._new_parent) == ({}, {}):
705
for children in viewvalues(by_parent):
707
for child_tid in children:
708
name = self.final_name(child_tid)
710
# Keep children only if they still exist in the end
711
if not self._case_sensitive_target:
713
name_ids.append((name, child_tid))
717
for name, trans_id in name_ids:
718
kind = self.final_kind(trans_id)
719
file_id = self.final_file_id(trans_id)
720
if kind is None and file_id is None:
722
if name == last_name:
723
conflicts.append(('duplicate', last_trans_id, trans_id,
726
last_trans_id = trans_id
729
def _duplicate_ids(self):
730
"""Each inventory id may only be used once"""
732
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
734
all_ids = self._tree.all_file_ids()
735
active_tree_ids = all_ids.difference(removed_tree_ids)
736
for trans_id, file_id in viewitems(self._new_id):
737
if file_id in active_tree_ids:
738
old_trans_id = self.trans_id_tree_file_id(file_id)
739
conflicts.append(('duplicate id', old_trans_id, trans_id))
742
def _parent_type_conflicts(self, by_parent):
743
"""Children must have a directory parent"""
745
for parent_id, children in viewitems(by_parent):
746
if parent_id == ROOT_PARENT:
749
for child_id in children:
750
if self.final_kind(child_id) is not None:
755
# There is at least a child, so we need an existing directory to
757
kind = self.final_kind(parent_id)
759
# The directory will be deleted
760
conflicts.append(('missing parent', parent_id))
761
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
763
conflicts.append(('non-directory parent', parent_id))
766
def _set_executability(self, path, trans_id):
767
"""Set the executability of versioned files """
768
if self._tree._supports_executable():
769
new_executability = self._new_executability[trans_id]
770
abspath = self._tree.abspath(path)
771
current_mode = os.stat(abspath).st_mode
772
if new_executability:
775
to_mode = current_mode | (0o100 & ~umask)
776
# Enable x-bit for others only if they can read it.
777
if current_mode & 0o004:
778
to_mode |= 0o001 & ~umask
779
if current_mode & 0o040:
780
to_mode |= 0o010 & ~umask
782
to_mode = current_mode & ~0o111
783
osutils.chmod_if_possible(abspath, to_mode)
785
def _new_entry(self, name, parent_id, file_id):
786
"""Helper function to create a new filesystem entry."""
787
trans_id = self.create_path(name, parent_id)
788
if file_id is not None:
789
self.version_file(file_id, trans_id)
399
792
def new_file(self, name, parent_id, contents, file_id=None,
400
793
executable=None, sha1=None):
483
1041
may reduce performance for some non-native formats.)
484
1042
:return: The revision_id of the revision committed.
486
raise NotImplementedError(self.commit)
1044
self._check_malformed()
1046
unversioned = set(self._new_contents).difference(set(self._new_id))
1047
for trans_id in unversioned:
1048
if self.final_file_id(trans_id) is None:
1049
raise errors.StrictCommitFailed()
1051
revno, last_rev_id = branch.last_revision_info()
1052
if last_rev_id == _mod_revision.NULL_REVISION:
1053
if merge_parents is not None:
1054
raise ValueError('Cannot supply merge parents for first'
1058
parent_ids = [last_rev_id]
1059
if merge_parents is not None:
1060
parent_ids.extend(merge_parents)
1061
if self._tree.get_revision_id() != last_rev_id:
1062
raise ValueError('TreeTransform not based on branch basis: %s' %
1063
self._tree.get_revision_id())
1064
revprops = commit.Commit.update_revprops(revprops, branch, authors)
1065
builder = branch.get_commit_builder(parent_ids,
1066
timestamp=timestamp,
1068
committer=committer,
1070
revision_id=revision_id)
1071
preview = self.get_preview_tree()
1072
list(builder.record_iter_changes(preview, last_rev_id,
1073
self.iter_changes()))
1074
builder.finish_inventory()
1075
revision_id = builder.commit(message)
1076
branch.set_last_revision_info(revno + 1, revision_id)
1079
def _text_parent(self, trans_id):
1080
file_id = self.tree_file_id(trans_id)
1082
if (file_id is None or
1083
self._tree.kind(self._tree.id2path(file_id), file_id) != 'file'):
1085
except errors.NoSuchFile:
1089
def _get_parents_texts(self, trans_id):
1090
"""Get texts for compression parents of this file."""
1091
file_id = self._text_parent(trans_id)
1094
return (self._tree.get_file_text(self._tree.id2path(file_id), file_id),)
1096
def _get_parents_lines(self, trans_id):
1097
"""Get lines for compression parents of this file."""
1098
file_id = self._text_parent(trans_id)
1101
return (self._tree.get_file_lines(self._tree.id2path(file_id), file_id),)
1103
def serialize(self, serializer):
1104
"""Serialize this TreeTransform.
1106
:param serializer: A Serialiser like pack.ContainerSerializer.
1108
new_name = dict((k, v.encode('utf-8')) for k, v in
1109
viewitems(self._new_name))
1110
new_executability = dict((k, int(v)) for k, v in
1111
viewitems(self._new_executability))
1112
tree_path_ids = dict((k.encode('utf-8'), v)
1113
for k, v in viewitems(self._tree_path_ids))
1115
'_id_number': self._id_number,
1116
'_new_name': new_name,
1117
'_new_parent': self._new_parent,
1118
'_new_executability': new_executability,
1119
'_new_id': self._new_id,
1120
'_tree_path_ids': tree_path_ids,
1121
'_removed_id': list(self._removed_id),
1122
'_removed_contents': list(self._removed_contents),
1123
'_non_present_ids': self._non_present_ids,
1125
yield serializer.bytes_record(bencode.bencode(attribs),
1127
for trans_id, kind in viewitems(self._new_contents):
1129
lines = osutils.chunks_to_lines(
1130
self._read_file_chunks(trans_id))
1131
parents = self._get_parents_lines(trans_id)
1132
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1133
content = ''.join(mpdiff.to_patch())
1134
if kind == 'directory':
1136
if kind == 'symlink':
1137
content = self._read_symlink_target(trans_id)
1138
yield serializer.bytes_record(content, ((trans_id, kind),))
1140
def deserialize(self, records):
1141
"""Deserialize a stored TreeTransform.
1143
:param records: An iterable of (names, content) tuples, as per
1144
pack.ContainerPushParser.
1146
names, content = next(records)
1147
attribs = bencode.bdecode(content)
1148
self._id_number = attribs['_id_number']
1149
self._new_name = dict((k, v.decode('utf-8'))
1150
for k, v in viewitems(attribs['_new_name']))
1151
self._new_parent = attribs['_new_parent']
1152
self._new_executability = dict((k, bool(v))
1153
for k, v in viewitems(attribs['_new_executability']))
1154
self._new_id = attribs['_new_id']
1155
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1156
self._tree_path_ids = {}
1157
self._tree_id_paths = {}
1158
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1159
path = bytepath.decode('utf-8')
1160
self._tree_path_ids[path] = trans_id
1161
self._tree_id_paths[trans_id] = path
1162
self._removed_id = set(attribs['_removed_id'])
1163
self._removed_contents = set(attribs['_removed_contents'])
1164
self._non_present_ids = attribs['_non_present_ids']
1165
for ((trans_id, kind),), content in records:
1167
mpdiff = multiparent.MultiParent.from_patch(content)
1168
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1169
self.create_file(lines, trans_id)
1170
if kind == 'directory':
1171
self.create_directory(trans_id)
1172
if kind == 'symlink':
1173
self.create_symlink(content.decode('utf-8'), trans_id)
1176
class DiskTreeTransform(TreeTransformBase):
1177
"""Tree transform storing its contents on disk."""
1179
def __init__(self, tree, limbodir, pb=None,
1180
case_sensitive=True):
1182
:param tree: The tree that will be transformed, but not necessarily
1184
:param limbodir: A directory where new files can be stored until
1185
they are installed in their proper places
1187
:param case_sensitive: If True, the target of the transform is
1188
case sensitive, not just case preserving.
1190
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1191
self._limbodir = limbodir
1192
self._deletiondir = None
1193
# A mapping of transform ids to their limbo filename
1194
self._limbo_files = {}
1195
self._possibly_stale_limbo_files = set()
1196
# A mapping of transform ids to a set of the transform ids of children
1197
# that their limbo directory has
1198
self._limbo_children = {}
1199
# Map transform ids to maps of child filename to child transform id
1200
self._limbo_children_names = {}
1201
# List of transform ids that need to be renamed from limbo into place
1202
self._needs_rename = set()
1203
self._creation_mtime = None
1206
"""Release the working tree lock, if held, clean up limbo dir.
1208
This is required if apply has not been invoked, but can be invoked
1211
if self._tree is None:
1214
limbo_paths = list(viewvalues(self._limbo_files))
1215
limbo_paths.extend(self._possibly_stale_limbo_files)
1216
limbo_paths.sort(reverse=True)
1217
for path in limbo_paths:
1220
except OSError as e:
1221
if e.errno != errno.ENOENT:
1223
# XXX: warn? perhaps we just got interrupted at an
1224
# inconvenient moment, but perhaps files are disappearing
1227
delete_any(self._limbodir)
1229
# We don't especially care *why* the dir is immortal.
1230
raise ImmortalLimbo(self._limbodir)
1232
if self._deletiondir is not None:
1233
delete_any(self._deletiondir)
1235
raise errors.ImmortalPendingDeletion(self._deletiondir)
1237
TreeTransformBase.finalize(self)
1239
def _limbo_supports_executable(self):
1240
"""Check if the limbo path supports the executable bit."""
1241
# FIXME: Check actual file system capabilities of limbodir
1242
return osutils.supports_executable()
1244
def _limbo_name(self, trans_id):
1245
"""Generate the limbo name of a file"""
1246
limbo_name = self._limbo_files.get(trans_id)
1247
if limbo_name is None:
1248
limbo_name = self._generate_limbo_path(trans_id)
1249
self._limbo_files[trans_id] = limbo_name
1252
def _generate_limbo_path(self, trans_id):
1253
"""Generate a limbo path using the trans_id as the relative path.
1255
This is suitable as a fallback, and when the transform should not be
1256
sensitive to the path encoding of the limbo directory.
1258
self._needs_rename.add(trans_id)
1259
return pathjoin(self._limbodir, trans_id)
1261
def adjust_path(self, name, parent, trans_id):
1262
previous_parent = self._new_parent.get(trans_id)
1263
previous_name = self._new_name.get(trans_id)
1264
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1265
if (trans_id in self._limbo_files and
1266
trans_id not in self._needs_rename):
1267
self._rename_in_limbo([trans_id])
1268
if previous_parent != parent:
1269
self._limbo_children[previous_parent].remove(trans_id)
1270
if previous_parent != parent or previous_name != name:
1271
del self._limbo_children_names[previous_parent][previous_name]
1273
def _rename_in_limbo(self, trans_ids):
1274
"""Fix limbo names so that the right final path is produced.
1276
This means we outsmarted ourselves-- we tried to avoid renaming
1277
these files later by creating them with their final names in their
1278
final parents. But now the previous name or parent is no longer
1279
suitable, so we have to rename them.
1281
Even for trans_ids that have no new contents, we must remove their
1282
entries from _limbo_files, because they are now stale.
1284
for trans_id in trans_ids:
1285
old_path = self._limbo_files[trans_id]
1286
self._possibly_stale_limbo_files.add(old_path)
1287
del self._limbo_files[trans_id]
1288
if trans_id not in self._new_contents:
1290
new_path = self._limbo_name(trans_id)
1291
os.rename(old_path, new_path)
1292
self._possibly_stale_limbo_files.remove(old_path)
1293
for descendant in self._limbo_descendants(trans_id):
1294
desc_path = self._limbo_files[descendant]
1295
desc_path = new_path + desc_path[len(old_path):]
1296
self._limbo_files[descendant] = desc_path
1298
def _limbo_descendants(self, trans_id):
1299
"""Return the set of trans_ids whose limbo paths descend from this."""
1300
descendants = set(self._limbo_children.get(trans_id, []))
1301
for descendant in list(descendants):
1302
descendants.update(self._limbo_descendants(descendant))
488
1305
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
489
1306
"""Schedule creation of a new file.
583
1469
orphaning_registry = registry.Registry()
584
1470
orphaning_registry.register(
585
u'conflict', refuse_orphan,
1471
'conflict', refuse_orphan,
586
1472
'Leave orphans in place and create a conflict on the directory.')
587
1473
orphaning_registry.register(
588
u'move', move_orphan,
1474
'move', move_orphan,
589
1475
'Move orphans into the brz-orphans directory.')
590
orphaning_registry._set_default_key(u'conflict')
1476
orphaning_registry._set_default_key('conflict')
593
1479
opt_transform_orphan = _mod_config.RegistryOption(
594
'transform.orphan_policy', orphaning_registry,
1480
'bzr.transform.orphan_policy', orphaning_registry,
595
1481
help='Policy for orphaned files during transform operations.',
596
1482
invalid='warning')
1485
class TreeTransform(DiskTreeTransform):
1486
"""Represent a tree transformation.
1488
This object is designed to support incremental generation of the transform,
1491
However, it gives optimum performance when parent directories are created
1492
before their contents. The transform is then able to put child files
1493
directly in their parent directory, avoiding later renames.
1495
It is easy to produce malformed transforms, but they are generally
1496
harmless. Attempting to apply a malformed transform will cause an
1497
exception to be raised before any modifications are made to the tree.
1499
Many kinds of malformed transforms can be corrected with the
1500
resolve_conflicts function. The remaining ones indicate programming error,
1501
such as trying to create a file with no path.
1503
Two sets of file creation methods are supplied. Convenience methods are:
1508
These are composed of the low-level methods:
1510
* create_file or create_directory or create_symlink
1514
Transform/Transaction ids
1515
-------------------------
1516
trans_ids are temporary ids assigned to all files involved in a transform.
1517
It's possible, even common, that not all files in the Tree have trans_ids.
1519
trans_ids are used because filenames and file_ids are not good enough
1520
identifiers; filenames change, and not all files have file_ids. File-ids
1521
are also associated with trans-ids, so that moving a file moves its
1524
trans_ids are only valid for the TreeTransform that generated them.
1528
Limbo is a temporary directory use to hold new versions of files.
1529
Files are added to limbo by create_file, create_directory, create_symlink,
1530
and their convenience variants (new_*). Files may be removed from limbo
1531
using cancel_creation. Files are renamed from limbo into their final
1532
location as part of TreeTransform.apply
1534
Limbo must be cleaned up, by either calling TreeTransform.apply or
1535
calling TreeTransform.finalize.
1537
Files are placed into limbo inside their parent directories, where
1538
possible. This reduces subsequent renames, and makes operations involving
1539
lots of files faster. This optimization is only possible if the parent
1540
directory is created *before* creating any of its children, so avoid
1541
creating children before parents, where possible.
1545
This temporary directory is used by _FileMover for storing files that are
1546
about to be deleted. In case of rollback, the files will be restored.
1547
FileMover does not delete files until it is sure that a rollback will not
1550
def __init__(self, tree, pb=None):
1551
"""Note: a tree_write lock is taken on the tree.
1553
Use TreeTransform.finalize() to release the lock (can be omitted if
1554
TreeTransform.apply() called).
1556
tree.lock_tree_write()
1558
limbodir = urlutils.local_path_from_url(
1559
tree._transport.abspath('limbo'))
1560
osutils.ensure_empty_directory_exists(
1562
errors.ExistingLimbo)
1563
deletiondir = urlutils.local_path_from_url(
1564
tree._transport.abspath('pending-deletion'))
1565
osutils.ensure_empty_directory_exists(
1567
errors.ExistingPendingDeletion)
1572
# Cache of realpath results, to speed up canonical_path
1573
self._realpaths = {}
1574
# Cache of relpath results, to speed up canonical_path
1576
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1577
tree.case_sensitive)
1578
self._deletiondir = deletiondir
1580
def canonical_path(self, path):
1581
"""Get the canonical tree-relative path"""
1582
# don't follow final symlinks
1583
abs = self._tree.abspath(path)
1584
if abs in self._relpaths:
1585
return self._relpaths[abs]
1586
dirname, basename = os.path.split(abs)
1587
if dirname not in self._realpaths:
1588
self._realpaths[dirname] = os.path.realpath(dirname)
1589
dirname = self._realpaths[dirname]
1590
abs = pathjoin(dirname, basename)
1591
if dirname in self._relpaths:
1592
relpath = pathjoin(self._relpaths[dirname], basename)
1593
relpath = relpath.rstrip('/\\')
1595
relpath = self._tree.relpath(abs)
1596
self._relpaths[abs] = relpath
1599
def tree_kind(self, trans_id):
1600
"""Determine the file kind in the working tree.
1602
:returns: The file kind or None if the file does not exist
1604
path = self._tree_id_paths.get(trans_id)
1608
return file_kind(self._tree.abspath(path))
1609
except errors.NoSuchFile:
1612
def _set_mode(self, trans_id, mode_id, typefunc):
1613
"""Set the mode of new file contents.
1614
The mode_id is the existing file to get the mode from (often the same
1615
as trans_id). The operation is only performed if there's a mode match
1616
according to typefunc.
1621
old_path = self._tree_id_paths[mode_id]
1625
mode = os.stat(self._tree.abspath(old_path)).st_mode
1626
except OSError as e:
1627
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1628
# Either old_path doesn't exist, or the parent of the
1629
# target is not a directory (but will be one eventually)
1630
# Either way, we know it doesn't exist *right now*
1631
# See also bug #248448
1636
osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1638
def iter_tree_children(self, parent_id):
1639
"""Iterate through the entry's tree children, if any"""
1641
path = self._tree_id_paths[parent_id]
1645
children = os.listdir(self._tree.abspath(path))
1646
except OSError as e:
1647
if not (osutils._is_error_enotdir(e)
1648
or e.errno in (errno.ENOENT, errno.ESRCH)):
1652
for child in children:
1653
childpath = joinpath(path, child)
1654
if self._tree.is_control_filename(childpath):
1656
yield self.trans_id_tree_path(childpath)
1658
def _generate_limbo_path(self, trans_id):
1659
"""Generate a limbo path using the final path if possible.
1661
This optimizes the performance of applying the tree transform by
1662
avoiding renames. These renames can be avoided only when the parent
1663
directory is already scheduled for creation.
1665
If the final path cannot be used, falls back to using the trans_id as
1668
parent = self._new_parent.get(trans_id)
1669
# if the parent directory is already in limbo (e.g. when building a
1670
# tree), choose a limbo name inside the parent, to reduce further
1672
use_direct_path = False
1673
if self._new_contents.get(parent) == 'directory':
1674
filename = self._new_name.get(trans_id)
1675
if filename is not None:
1676
if parent not in self._limbo_children:
1677
self._limbo_children[parent] = set()
1678
self._limbo_children_names[parent] = {}
1679
use_direct_path = True
1680
# the direct path can only be used if no other file has
1681
# already taken this pathname, i.e. if the name is unused, or
1682
# if it is already associated with this trans_id.
1683
elif self._case_sensitive_target:
1684
if (self._limbo_children_names[parent].get(filename)
1685
in (trans_id, None)):
1686
use_direct_path = True
1688
for l_filename, l_trans_id in viewitems(
1689
self._limbo_children_names[parent]):
1690
if l_trans_id == trans_id:
1692
if l_filename.lower() == filename.lower():
1695
use_direct_path = True
1697
if not use_direct_path:
1698
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1700
limbo_name = pathjoin(self._limbo_files[parent], filename)
1701
self._limbo_children[parent].add(trans_id)
1702
self._limbo_children_names[parent][filename] = trans_id
1706
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1707
"""Apply all changes to the inventory and filesystem.
1709
If filesystem or inventory conflicts are present, MalformedTransform
1712
If apply succeeds, finalize is not necessary.
1714
:param no_conflicts: if True, the caller guarantees there are no
1715
conflicts, so no check is made.
1716
:param precomputed_delta: An inventory delta to use instead of
1718
:param _mover: Supply an alternate FileMover, for testing
1720
for hook in MutableTree.hooks['pre_transform']:
1721
hook(self._tree, self)
1722
if not no_conflicts:
1723
self._check_malformed()
1724
child_pb = ui.ui_factory.nested_progress_bar()
1726
if precomputed_delta is None:
1727
child_pb.update(gettext('Apply phase'), 0, 2)
1728
inventory_delta = self._generate_inventory_delta()
1731
inventory_delta = precomputed_delta
1734
mover = _FileMover()
1738
child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1739
self._apply_removals(mover)
1740
child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1741
modified_paths = self._apply_insertions(mover)
1746
mover.apply_deletions()
1749
if self.final_file_id(self.root) is None:
1750
inventory_delta = [e for e in inventory_delta if e[0] != '']
1751
self._tree.apply_inventory_delta(inventory_delta)
1752
self._apply_observed_sha1s()
1755
return _TransformResults(modified_paths, self.rename_count)
1757
def _generate_inventory_delta(self):
1758
"""Generate an inventory delta for the current transform."""
1759
inventory_delta = []
1760
child_pb = ui.ui_factory.nested_progress_bar()
1761
new_paths = self._inventory_altered()
1762
total_entries = len(new_paths) + len(self._removed_id)
1764
for num, trans_id in enumerate(self._removed_id):
1766
child_pb.update(gettext('removing file'), num, total_entries)
1767
if trans_id == self._new_root:
1768
file_id = self._tree.get_root_id()
1770
file_id = self.tree_file_id(trans_id)
1771
# File-id isn't really being deleted, just moved
1772
if file_id in self._r_new_id:
1774
path = self._tree_id_paths[trans_id]
1775
inventory_delta.append((path, None, file_id, None))
1776
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1778
entries = self._tree.iter_entries_by_dir(
1779
viewvalues(new_path_file_ids))
1780
old_paths = dict((e.file_id, p) for p, e in entries)
1782
for num, (path, trans_id) in enumerate(new_paths):
1784
child_pb.update(gettext('adding file'),
1785
num + len(self._removed_id), total_entries)
1786
file_id = new_path_file_ids[trans_id]
1790
kind = self.final_kind(trans_id)
1792
kind = self._tree.stored_kind(
1793
self._tree.id2path(file_id), file_id)
1794
parent_trans_id = self.final_parent(trans_id)
1795
parent_file_id = new_path_file_ids.get(parent_trans_id)
1796
if parent_file_id is None:
1797
parent_file_id = self.final_file_id(parent_trans_id)
1798
if trans_id in self._new_reference_revision:
1799
new_entry = inventory.TreeReference(
1801
self._new_name[trans_id],
1802
self.final_file_id(self._new_parent[trans_id]),
1803
None, self._new_reference_revision[trans_id])
1805
new_entry = inventory.make_entry(kind,
1806
self.final_name(trans_id),
1807
parent_file_id, file_id)
1808
old_path = old_paths.get(new_entry.file_id)
1809
new_executability = self._new_executability.get(trans_id)
1810
if new_executability is not None:
1811
new_entry.executable = new_executability
1812
inventory_delta.append(
1813
(old_path, path, new_entry.file_id, new_entry))
1816
return inventory_delta
1818
def _apply_removals(self, mover):
1819
"""Perform tree operations that remove directory/inventory names.
1821
That is, delete files that are to be deleted, and put any files that
1822
need renaming into limbo. This must be done in strict child-to-parent
1825
If inventory_delta is None, no inventory delta generation is performed.
1827
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1828
child_pb = ui.ui_factory.nested_progress_bar()
1830
for num, (path, trans_id) in enumerate(tree_paths):
1831
# do not attempt to move root into a subdirectory of itself.
1834
child_pb.update(gettext('removing file'), num, len(tree_paths))
1835
full_path = self._tree.abspath(path)
1836
if trans_id in self._removed_contents:
1837
delete_path = os.path.join(self._deletiondir, trans_id)
1838
mover.pre_delete(full_path, delete_path)
1839
elif (trans_id in self._new_name
1840
or trans_id in self._new_parent):
1842
mover.rename(full_path, self._limbo_name(trans_id))
1843
except errors.TransformRenameFailed as e:
1844
if e.errno != errno.ENOENT:
1847
self.rename_count += 1
1851
def _apply_insertions(self, mover):
1852
"""Perform tree operations that insert directory/inventory names.
1854
That is, create any files that need to be created, and restore from
1855
limbo any files that needed renaming. This must be done in strict
1856
parent-to-child order.
1858
If inventory_delta is None, no inventory delta is calculated, and
1859
no list of modified paths is returned.
1861
new_paths = self.new_paths(filesystem_only=True)
1863
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1865
child_pb = ui.ui_factory.nested_progress_bar()
1867
for num, (path, trans_id) in enumerate(new_paths):
1869
child_pb.update(gettext('adding file'), num, len(new_paths))
1870
full_path = self._tree.abspath(path)
1871
if trans_id in self._needs_rename:
1873
mover.rename(self._limbo_name(trans_id), full_path)
1874
except errors.TransformRenameFailed as e:
1875
# We may be renaming a dangling inventory id
1876
if e.errno != errno.ENOENT:
1879
self.rename_count += 1
1880
# TODO: if trans_id in self._observed_sha1s, we should
1881
# re-stat the final target, since ctime will be
1882
# updated by the change.
1883
if (trans_id in self._new_contents or
1884
self.path_changed(trans_id)):
1885
if trans_id in self._new_contents:
1886
modified_paths.append(full_path)
1887
if trans_id in self._new_executability:
1888
self._set_executability(path, trans_id)
1889
if trans_id in self._observed_sha1s:
1890
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1891
st = osutils.lstat(full_path)
1892
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
# We could get the file_id, but dirstate prefers to use the path
1922
# anyway, and it is 'cheaper' to determine.
1923
# file_id = self._new_id[trans_id]
1924
self._tree._observed_sha1(None, path, observed)
1927
class TransformPreview(DiskTreeTransform):
1928
"""A TreeTransform for generating preview trees.
1930
Unlike TreeTransform, this version works when the input tree is a
1931
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1932
unversioned files in the input tree.
1935
def __init__(self, tree, pb=None, case_sensitive=True):
1937
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1938
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1940
def canonical_path(self, path):
1943
def tree_kind(self, trans_id):
1944
path = self._tree_id_paths.get(trans_id)
1947
kind = self._tree.path_content_summary(path)[0]
1948
if kind == 'missing':
1952
def _set_mode(self, trans_id, mode_id, typefunc):
1953
"""Set the mode of new file contents.
1954
The mode_id is the existing file to get the mode from (often the same
1955
as trans_id). The operation is only performed if there's a mode match
1956
according to typefunc.
1958
# is it ok to ignore this? probably
1961
def iter_tree_children(self, parent_id):
1962
"""Iterate through the entry's tree children, if any"""
1964
path = self._tree_id_paths[parent_id]
1967
file_id = self.tree_file_id(parent_id)
1970
entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1971
children = getattr(entry, 'children', {})
1972
for child in children:
1973
childpath = joinpath(path, child)
1974
yield self.trans_id_tree_path(childpath)
1976
def new_orphan(self, trans_id, parent_id):
1977
raise NotImplementedError(self.new_orphan)
1980
class _PreviewTree(inventorytree.InventoryTree):
1981
"""Partial implementation of Tree to support show_diff_trees"""
1983
def __init__(self, transform):
1984
self._transform = transform
1985
self._final_paths = FinalPaths(transform)
1986
self.__by_parent = None
1987
self._parent_ids = []
1988
self._all_children_cache = {}
1989
self._path2trans_id_cache = {}
1990
self._final_name_cache = {}
1991
self._iter_changes_cache = dict((c[0], c) for c in
1992
self._transform.iter_changes())
1994
def _content_change(self, file_id):
1995
"""Return True if the content of this file changed"""
1996
changes = self._iter_changes_cache.get(file_id)
1997
# changes[2] is true if the file content changed. See
1998
# InterTree.iter_changes.
1999
return (changes is not None and changes[2])
2001
def _get_repository(self):
2002
repo = getattr(self._transform._tree, '_repository', None)
2004
repo = self._transform._tree.branch.repository
2007
def _iter_parent_trees(self):
2008
for revision_id in self.get_parent_ids():
2010
yield self.revision_tree(revision_id)
2011
except errors.NoSuchRevisionInTree:
2012
yield self._get_repository().revision_tree(revision_id)
2014
def _get_file_revision(self, path, file_id, vf, tree_revision):
2016
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
2017
for t in self._iter_parent_trees()]
2018
vf.add_lines((file_id, tree_revision), parent_keys,
2019
self.get_file_lines(path, file_id))
2020
repo = self._get_repository()
2021
base_vf = repo.texts
2022
if base_vf not in vf.fallback_versionedfiles:
2023
vf.fallback_versionedfiles.append(base_vf)
2024
return tree_revision
2026
def _stat_limbo_file(self, file_id=None, trans_id=None):
2027
if trans_id is None:
2028
trans_id = self._transform.trans_id_file_id(file_id)
2029
name = self._transform._limbo_name(trans_id)
2030
return os.lstat(name)
2033
def _by_parent(self):
2034
if self.__by_parent is None:
2035
self.__by_parent = self._transform.by_parent()
2036
return self.__by_parent
2038
def _comparison_data(self, entry, path):
2039
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
2040
if kind == 'missing':
2044
file_id = self._transform.final_file_id(self._path2trans_id(path))
2045
executable = self.is_executable(path, file_id)
2046
return kind, executable, None
2048
def is_locked(self):
2051
def lock_read(self):
2052
# Perhaps in theory, this should lock the TreeTransform?
2053
return lock.LogicalLockResult(self.unlock)
2059
def root_inventory(self):
2060
"""This Tree does not use inventory as its backing data."""
2061
raise NotImplementedError(_PreviewTree.root_inventory)
2063
def get_root_id(self):
2064
return self._transform.final_file_id(self._transform.root)
2066
def all_file_ids(self):
2067
tree_ids = set(self._transform._tree.all_file_ids())
2068
tree_ids.difference_update(self._transform.tree_file_id(t)
2069
for t in self._transform._removed_id)
2070
tree_ids.update(viewvalues(self._transform._new_id))
2073
def all_versioned_paths(self):
2074
return {self.id2path(fid) for fid in self.all_file_ids()}
2076
def _has_id(self, file_id, fallback_check):
2077
if file_id in self._transform._r_new_id:
2079
elif file_id in {self._transform.tree_file_id(trans_id) for
2080
trans_id in self._transform._removed_id}:
2083
return fallback_check(file_id)
2085
def has_id(self, file_id):
2086
return self._has_id(file_id, self._transform._tree.has_id)
2088
def has_or_had_id(self, file_id):
2089
return self._has_id(file_id, self._transform._tree.has_or_had_id)
2091
def _path2trans_id(self, path):
2092
# We must not use None here, because that is a valid value to store.
2093
trans_id = self._path2trans_id_cache.get(path, object)
2094
if trans_id is not object:
2096
segments = splitpath(path)
2097
cur_parent = self._transform.root
2098
for cur_segment in segments:
2099
for child in self._all_children(cur_parent):
2100
final_name = self._final_name_cache.get(child)
2101
if final_name is None:
2102
final_name = self._transform.final_name(child)
2103
self._final_name_cache[child] = final_name
2104
if final_name == cur_segment:
2108
self._path2trans_id_cache[path] = None
2110
self._path2trans_id_cache[path] = cur_parent
2113
def path2id(self, path):
2114
if isinstance(path, list):
2117
path = osutils.pathjoin(*path)
2118
return self._transform.final_file_id(self._path2trans_id(path))
2120
def id2path(self, file_id):
2121
trans_id = self._transform.trans_id_file_id(file_id)
2123
return self._final_paths._determine_path(trans_id)
2125
raise errors.NoSuchId(self, file_id)
2127
def _all_children(self, trans_id):
2128
children = self._all_children_cache.get(trans_id)
2129
if children is not None:
2131
children = set(self._transform.iter_tree_children(trans_id))
2132
# children in the _new_parent set are provided by _by_parent.
2133
children.difference_update(self._transform._new_parent)
2134
children.update(self._by_parent.get(trans_id, []))
2135
self._all_children_cache[trans_id] = children
2138
def iter_children(self, file_id):
2139
trans_id = self._transform.trans_id_file_id(file_id)
2140
for child_trans_id in self._all_children(trans_id):
2141
yield self._transform.final_file_id(child_trans_id)
2144
possible_extras = set(self._transform.trans_id_tree_path(p) for p
2145
in self._transform._tree.extras())
2146
possible_extras.update(self._transform._new_contents)
2147
possible_extras.update(self._transform._removed_id)
2148
for trans_id in possible_extras:
2149
if self._transform.final_file_id(trans_id) is None:
2150
yield self._final_paths._determine_path(trans_id)
2152
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
2153
yield_parents=False):
2154
for trans_id, parent_file_id in ordered_entries:
2155
file_id = self._transform.final_file_id(trans_id)
2158
if (specific_file_ids is not None
2159
and file_id not in specific_file_ids):
2161
kind = self._transform.final_kind(trans_id)
2163
kind = self._transform._tree.stored_kind(
2164
self._transform._tree.id2path(file_id),
2166
new_entry = inventory.make_entry(
2168
self._transform.final_name(trans_id),
2169
parent_file_id, file_id)
2170
yield new_entry, trans_id
2172
def _list_files_by_dir(self):
2173
todo = [ROOT_PARENT]
2175
while len(todo) > 0:
2177
parent_file_id = self._transform.final_file_id(parent)
2178
children = list(self._all_children(parent))
2179
paths = dict(zip(children, self._final_paths.get_paths(children)))
2180
children.sort(key=paths.get)
2181
todo.extend(reversed(children))
2182
for trans_id in children:
2183
ordered_ids.append((trans_id, parent_file_id))
2186
def iter_child_entries(self, path, file_id=None):
2188
file_id = self.path2id(path)
2190
raise errors.NoSuchFile(path)
2191
trans_id = self._transform.trans_id_file_id(file_id)
2192
todo = [(child_trans_id, trans_id) for child_trans_id in
2193
self._all_children(trans_id)]
2194
for entry, trans_id in self._make_inv_entries(todo):
2197
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
2198
# This may not be a maximally efficient implementation, but it is
2199
# reasonably straightforward. An implementation that grafts the
2200
# TreeTransform changes onto the tree's iter_entries_by_dir results
2201
# might be more efficient, but requires tricky inferences about stack
2203
ordered_ids = self._list_files_by_dir()
2204
for entry, trans_id in self._make_inv_entries(ordered_ids,
2205
specific_file_ids, yield_parents=yield_parents):
2206
yield unicode(self._final_paths.get_path(trans_id)), entry
2208
def _iter_entries_for_dir(self, dir_path):
2209
"""Return path, entry for items in a directory without recursing down."""
2210
dir_file_id = self.path2id(dir_path)
2212
for file_id in self.iter_children(dir_file_id):
2213
trans_id = self._transform.trans_id_file_id(file_id)
2214
ordered_ids.append((trans_id, file_id))
2215
for entry, trans_id in self._make_inv_entries(ordered_ids):
2216
yield unicode(self._final_paths.get_path(trans_id)), entry
2218
def list_files(self, include_root=False, from_dir=None, recursive=True):
2219
"""See WorkingTree.list_files."""
2220
# XXX This should behave like WorkingTree.list_files, but is really
2221
# more like RevisionTree.list_files.
2225
prefix = from_dir + '/'
2226
entries = self.iter_entries_by_dir()
2227
for path, entry in entries:
2228
if entry.name == '' and not include_root:
2231
if not path.startswith(prefix):
2233
path = path[len(prefix):]
2234
yield path, 'V', entry.kind, entry.file_id, entry
2236
if from_dir is None and include_root is True:
2237
root_entry = inventory.make_entry('directory', '',
2238
ROOT_PARENT, self.get_root_id())
2239
yield '', 'V', 'directory', root_entry.file_id, root_entry
2240
entries = self._iter_entries_for_dir(from_dir or '')
2241
for path, entry in entries:
2242
yield path, 'V', entry.kind, entry.file_id, entry
2244
def kind(self, path, file_id=None):
2246
file_id = self.path2id(path)
2247
trans_id = self._transform.trans_id_file_id(file_id)
2248
return self._transform.final_kind(trans_id)
2250
def stored_kind(self, path, file_id=None):
2252
file_id = self.path2id(path)
2253
trans_id = self._transform.trans_id_file_id(file_id)
2255
return self._transform._new_contents[trans_id]
2257
return self._transform._tree.stored_kind(path, file_id)
2259
def get_file_mtime(self, path, file_id=None):
2260
"""See Tree.get_file_mtime"""
2262
file_id = self.path2id(path)
2264
raise errors.NoSuchFile(path)
2265
if not self._content_change(file_id):
2266
return self._transform._tree.get_file_mtime(
2267
self._transform._tree.id2path(file_id), file_id)
2268
return self._stat_limbo_file(file_id).st_mtime
2270
def _file_size(self, entry, stat_value):
2271
path = self.id2path(entry.file_id)
2272
return self.get_file_size(path, entry.file_id)
2274
def get_file_size(self, path, file_id=None):
2275
"""See Tree.get_file_size"""
2277
file_id = self.path2id(path)
2278
trans_id = self._transform.trans_id_file_id(file_id)
2279
kind = self._transform.final_kind(trans_id)
2282
if trans_id in self._transform._new_contents:
2283
return self._stat_limbo_file(trans_id=trans_id).st_size
2284
if self.kind(path, file_id) == 'file':
2285
return self._transform._tree.get_file_size(path, file_id)
2289
def get_file_verifier(self, path, file_id=None, stat_value=None):
2291
file_id = self.path2id(path)
2292
trans_id = self._transform.trans_id_file_id(file_id)
2293
kind = self._transform._new_contents.get(trans_id)
2295
return self._transform._tree.get_file_verifier(path, file_id)
2297
fileobj = self.get_file(path, file_id)
2299
return ("SHA1", sha_file(fileobj))
2303
def get_file_sha1(self, path, file_id=None, stat_value=None):
2305
file_id = self.path2id(path)
2306
trans_id = self._transform.trans_id_file_id(file_id)
2307
kind = self._transform._new_contents.get(trans_id)
2309
return self._transform._tree.get_file_sha1(path, file_id)
2311
fileobj = self.get_file(path, file_id)
2313
return sha_file(fileobj)
2317
def is_executable(self, path, file_id=None):
2319
file_id = self.path2id(path)
2322
trans_id = self._transform.trans_id_file_id(file_id)
2324
return self._transform._new_executability[trans_id]
2327
return self._transform._tree.is_executable(path, file_id)
2328
except OSError as e:
2329
if e.errno == errno.ENOENT:
2332
except errors.NoSuchId:
2335
def has_filename(self, path):
2336
trans_id = self._path2trans_id(path)
2337
if trans_id in self._transform._new_contents:
2339
elif trans_id in self._transform._removed_contents:
2342
return self._transform._tree.has_filename(path)
2344
def path_content_summary(self, path):
2345
trans_id = self._path2trans_id(path)
2346
tt = self._transform
2347
tree_path = tt._tree_id_paths.get(trans_id)
2348
kind = tt._new_contents.get(trans_id)
2350
if tree_path is None or trans_id in tt._removed_contents:
2351
return 'missing', None, None, None
2352
summary = tt._tree.path_content_summary(tree_path)
2353
kind, size, executable, link_or_sha1 = summary
2356
limbo_name = tt._limbo_name(trans_id)
2357
if trans_id in tt._new_reference_revision:
2358
kind = 'tree-reference'
2360
statval = os.lstat(limbo_name)
2361
size = statval.st_size
2362
if not tt._limbo_supports_executable():
2365
executable = statval.st_mode & S_IEXEC
2369
if kind == 'symlink':
2370
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2371
executable = tt._new_executability.get(trans_id, executable)
2372
return kind, size, executable, link_or_sha1
2374
def iter_changes(self, from_tree, include_unchanged=False,
2375
specific_files=None, pb=None, extra_trees=None,
2376
require_versioned=True, want_unversioned=False):
2377
"""See InterTree.iter_changes.
2379
This has a fast path that is only used when the from_tree matches
2380
the transform tree, and no fancy options are supplied.
2382
if (from_tree is not self._transform._tree or include_unchanged or
2383
specific_files or want_unversioned):
2384
return tree.InterTree(from_tree, self).iter_changes(
2385
include_unchanged=include_unchanged,
2386
specific_files=specific_files,
2388
extra_trees=extra_trees,
2389
require_versioned=require_versioned,
2390
want_unversioned=want_unversioned)
2391
if want_unversioned:
2392
raise ValueError('want_unversioned is not supported')
2393
return self._transform.iter_changes()
2395
def get_file(self, path, file_id=None):
2396
"""See Tree.get_file"""
2398
file_id = self.path2id(path)
2399
if not self._content_change(file_id):
2400
return self._transform._tree.get_file(path, file_id)
2401
trans_id = self._transform.trans_id_file_id(file_id)
2402
name = self._transform._limbo_name(trans_id)
2403
return open(name, 'rb')
2405
def get_file_with_stat(self, path, file_id=None):
2406
return self.get_file(path, file_id), None
2408
def annotate_iter(self, path, file_id=None,
2409
default_revision=_mod_revision.CURRENT_REVISION):
2411
file_id = self.path2id(path)
2412
changes = self._iter_changes_cache.get(file_id)
2416
changed_content, versioned, kind = (changes[2], changes[3],
2420
get_old = (kind[0] == 'file' and versioned[0])
2422
old_annotation = self._transform._tree.annotate_iter(
2423
path, file_id=file_id, default_revision=default_revision)
2427
return old_annotation
2428
if not changed_content:
2429
return old_annotation
2430
# TODO: This is doing something similar to what WT.annotate_iter is
2431
# doing, however it fails slightly because it doesn't know what
2432
# the *other* revision_id is, so it doesn't know how to give the
2433
# other as the origin for some lines, they all get
2434
# 'default_revision'
2435
# It would be nice to be able to use the new Annotator based
2436
# approach, as well.
2437
return annotate.reannotate([old_annotation],
2438
self.get_file(path, file_id).readlines(),
2441
def get_symlink_target(self, path, file_id=None):
2442
"""See Tree.get_symlink_target"""
2444
file_id = self.path2id(path)
2445
if not self._content_change(file_id):
2446
return self._transform._tree.get_symlink_target(path)
2447
trans_id = self._transform.trans_id_file_id(file_id)
2448
name = self._transform._limbo_name(trans_id)
2449
return osutils.readlink(name)
2451
def walkdirs(self, prefix=''):
2452
pending = [self._transform.root]
2453
while len(pending) > 0:
2454
parent_id = pending.pop()
2457
prefix = prefix.rstrip('/')
2458
parent_path = self._final_paths.get_path(parent_id)
2459
parent_file_id = self._transform.final_file_id(parent_id)
2460
for child_id in self._all_children(parent_id):
2461
path_from_root = self._final_paths.get_path(child_id)
2462
basename = self._transform.final_name(child_id)
2463
file_id = self._transform.final_file_id(child_id)
2464
kind = self._transform.final_kind(child_id)
2465
if kind is not None:
2466
versioned_kind = kind
2469
versioned_kind = self._transform._tree.stored_kind(
2470
self._transform._tree.id2path(file_id),
2472
if versioned_kind == 'directory':
2473
subdirs.append(child_id)
2474
children.append((path_from_root, basename, kind, None,
2475
file_id, versioned_kind))
2477
if parent_path.startswith(prefix):
2478
yield (parent_path, parent_file_id), children
2479
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2482
def get_parent_ids(self):
2483
return self._parent_ids
2485
def set_parent_ids(self, parent_ids):
2486
self._parent_ids = parent_ids
2488
def get_revision_tree(self, revision_id):
2489
return self._transform._tree.get_revision_tree(revision_id)
599
2492
def joinpath(parent, child):
600
2493
"""Join tree-relative paths, handling the tree root specially"""
601
2494
if parent is None or parent == "":
added
removed
breezy/transform.py
