395
533
def find_conflicts(self):
396
534
"""Find any violations of inventory or filesystem invariants"""
397
raise NotImplementedError(self.find_conflicts)
535
if self._done is True:
536
raise ReusingTransform()
538
# ensure all children of all existent parents are known
539
# all children of non-existent parents are known, by definition.
540
self._add_tree_children()
541
by_parent = self.by_parent()
542
conflicts.extend(self._unversioned_parents(by_parent))
543
conflicts.extend(self._parent_loops())
544
conflicts.extend(self._duplicate_entries(by_parent))
545
conflicts.extend(self._duplicate_ids())
546
conflicts.extend(self._parent_type_conflicts(by_parent))
547
conflicts.extend(self._improper_versioning())
548
conflicts.extend(self._executability_conflicts())
549
conflicts.extend(self._overwrite_conflicts())
552
def _check_malformed(self):
553
conflicts = self.find_conflicts()
554
if len(conflicts) != 0:
555
raise MalformedTransform(conflicts=conflicts)
557
def _add_tree_children(self):
558
"""Add all the children of all active parents to the known paths.
560
Active parents are those which gain children, and those which are
561
removed. This is a necessary first step in detecting conflicts.
563
parents = self.by_parent().keys()
564
parents.extend([t for t in self._removed_contents if
565
self.tree_kind(t) == 'directory'])
566
for trans_id in self._removed_id:
567
file_id = self.tree_file_id(trans_id)
568
if file_id is not None:
569
if self._tree.stored_kind(file_id) == 'directory':
570
parents.append(trans_id)
571
elif self.tree_kind(trans_id) == 'directory':
572
parents.append(trans_id)
574
for parent_id in parents:
575
# ensure that all children are registered with the transaction
576
list(self.iter_tree_children(parent_id))
578
def _has_named_child(self, name, parent_id, known_children):
579
"""Does a parent already have a name child.
581
:param name: The searched for name.
583
:param parent_id: The parent for which the check is made.
585
:param known_children: The already known children. This should have
586
been recently obtained from `self.by_parent.get(parent_id)`
587
(or will be if None is passed).
589
if known_children is None:
590
known_children = self.by_parent().get(parent_id, [])
591
for child in known_children:
592
if self.final_name(child) == name:
594
parent_path = self._tree_id_paths.get(parent_id, None)
595
if parent_path is None:
596
# No parent... no children
598
child_path = joinpath(parent_path, name)
599
child_id = self._tree_path_ids.get(child_path, None)
601
# Not known by the tree transform yet, check the filesystem
602
return osutils.lexists(self._tree.abspath(child_path))
604
raise AssertionError('child_id is missing: %s, %s, %s'
605
% (name, parent_id, child_id))
607
def _available_backup_name(self, name, target_id):
608
"""Find an available backup name.
610
:param name: The basename of the file.
612
:param target_id: The directory trans_id where the backup should
615
known_children = self.by_parent().get(target_id, [])
616
return osutils.available_backup_name(
618
lambda base: self._has_named_child(
619
base, target_id, known_children))
621
def _parent_loops(self):
622
"""No entry should be its own ancestor"""
624
for trans_id in self._new_parent:
627
while parent_id != ROOT_PARENT:
630
parent_id = self.final_parent(parent_id)
633
if parent_id == trans_id:
634
conflicts.append(('parent loop', trans_id))
635
if parent_id in seen:
639
def _unversioned_parents(self, by_parent):
640
"""If parent directories are versioned, children must be versioned."""
642
for parent_id, children in by_parent.iteritems():
643
if parent_id == ROOT_PARENT:
645
if self.final_file_id(parent_id) is not None:
647
for child_id in children:
648
if self.final_file_id(child_id) is not None:
649
conflicts.append(('unversioned parent', parent_id))
653
def _improper_versioning(self):
654
"""Cannot version a file with no contents, or a bad type.
656
However, existing entries with no contents are okay.
659
for trans_id in self._new_id.iterkeys():
660
kind = self.final_kind(trans_id)
662
conflicts.append(('versioning no contents', trans_id))
664
if not inventory.InventoryEntry.versionable_kind(kind):
665
conflicts.append(('versioning bad kind', trans_id, kind))
668
def _executability_conflicts(self):
669
"""Check for bad executability changes.
671
Only versioned files may have their executability set, because
672
1. only versioned entries can have executability under windows
673
2. only files can be executable. (The execute bit on a directory
674
does not indicate searchability)
677
for trans_id in self._new_executability:
678
if self.final_file_id(trans_id) is None:
679
conflicts.append(('unversioned executability', trans_id))
681
if self.final_kind(trans_id) != "file":
682
conflicts.append(('non-file executability', trans_id))
685
def _overwrite_conflicts(self):
686
"""Check for overwrites (not permitted on Win32)"""
688
for trans_id in self._new_contents:
689
if self.tree_kind(trans_id) is None:
691
if trans_id not in self._removed_contents:
692
conflicts.append(('overwrite', trans_id,
693
self.final_name(trans_id)))
696
def _duplicate_entries(self, by_parent):
697
"""No directory may have two entries with the same name."""
699
if (self._new_name, self._new_parent) == ({}, {}):
701
for children in by_parent.itervalues():
703
for child_tid in children:
704
name = self.final_name(child_tid)
706
# Keep children only if they still exist in the end
707
if not self._case_sensitive_target:
709
name_ids.append((name, child_tid))
713
for name, trans_id in name_ids:
714
kind = self.final_kind(trans_id)
715
file_id = self.final_file_id(trans_id)
716
if kind is None and file_id is None:
718
if name == last_name:
719
conflicts.append(('duplicate', last_trans_id, trans_id,
722
last_trans_id = trans_id
725
def _duplicate_ids(self):
726
"""Each inventory id may only be used once"""
728
removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
730
all_ids = self._tree.all_file_ids()
731
active_tree_ids = all_ids.difference(removed_tree_ids)
732
for trans_id, file_id in self._new_id.iteritems():
733
if file_id in active_tree_ids:
734
old_trans_id = self.trans_id_tree_file_id(file_id)
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 by_parent.iteritems():
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 | (0100 & ~umask)
772
# Enable x-bit for others only if they can read it.
773
if current_mode & 0004:
774
to_mode |= 0001 & ~umask
775
if current_mode & 0040:
776
to_mode |= 0010 & ~umask
778
to_mode = current_mode & ~0111
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)
399
788
def new_file(self, name, parent_id, contents, file_id=None,
400
789
executable=None, sha1=None):
483
1037
may reduce performance for some non-native formats.)
484
1038
:return: The revision_id of the revision committed.
486
raise NotImplementedError(self.commit)
1040
self._check_malformed()
1042
unversioned = set(self._new_contents).difference(set(self._new_id))
1043
for trans_id in unversioned:
1044
if self.final_file_id(trans_id) is None:
1045
raise errors.StrictCommitFailed()
1047
revno, last_rev_id = branch.last_revision_info()
1048
if last_rev_id == _mod_revision.NULL_REVISION:
1049
if merge_parents is not None:
1050
raise ValueError('Cannot supply merge parents for first'
1054
parent_ids = [last_rev_id]
1055
if merge_parents is not None:
1056
parent_ids.extend(merge_parents)
1057
if self._tree.get_revision_id() != last_rev_id:
1058
raise ValueError('TreeTransform not based on branch basis: %s' %
1059
self._tree.get_revision_id())
1060
revprops = commit.Commit.update_revprops(revprops, branch, authors)
1061
builder = branch.get_commit_builder(parent_ids,
1062
timestamp=timestamp,
1064
committer=committer,
1066
revision_id=revision_id)
1067
preview = self.get_preview_tree()
1068
list(builder.record_iter_changes(preview, last_rev_id,
1069
self.iter_changes()))
1070
builder.finish_inventory()
1071
revision_id = builder.commit(message)
1072
branch.set_last_revision_info(revno + 1, revision_id)
1075
def _text_parent(self, trans_id):
1076
file_id = self.tree_file_id(trans_id)
1078
if file_id is None or self._tree.kind(file_id) != 'file':
1080
except errors.NoSuchFile:
1084
def _get_parents_texts(self, trans_id):
1085
"""Get texts for compression parents of this file."""
1086
file_id = self._text_parent(trans_id)
1089
return (self._tree.get_file_text(file_id),)
1091
def _get_parents_lines(self, trans_id):
1092
"""Get lines for compression parents of this file."""
1093
file_id = self._text_parent(trans_id)
1096
return (self._tree.get_file_lines(file_id),)
1098
def serialize(self, serializer):
1099
"""Serialize this TreeTransform.
1101
:param serializer: A Serialiser like pack.ContainerSerializer.
1103
new_name = dict((k, v.encode('utf-8')) for k, v in
1104
self._new_name.items())
1105
new_executability = dict((k, int(v)) for k, v in
1106
self._new_executability.items())
1107
tree_path_ids = dict((k.encode('utf-8'), v)
1108
for k, v in self._tree_path_ids.items())
1110
'_id_number': self._id_number,
1111
'_new_name': new_name,
1112
'_new_parent': self._new_parent,
1113
'_new_executability': new_executability,
1114
'_new_id': self._new_id,
1115
'_tree_path_ids': tree_path_ids,
1116
'_removed_id': list(self._removed_id),
1117
'_removed_contents': list(self._removed_contents),
1118
'_non_present_ids': self._non_present_ids,
1120
yield serializer.bytes_record(bencode.bencode(attribs),
1122
for trans_id, kind in self._new_contents.items():
1124
lines = osutils.chunks_to_lines(
1125
self._read_file_chunks(trans_id))
1126
parents = self._get_parents_lines(trans_id)
1127
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1128
content = ''.join(mpdiff.to_patch())
1129
if kind == 'directory':
1131
if kind == 'symlink':
1132
content = self._read_symlink_target(trans_id)
1133
yield serializer.bytes_record(content, ((trans_id, kind),))
1135
def deserialize(self, records):
1136
"""Deserialize a stored TreeTransform.
1138
:param records: An iterable of (names, content) tuples, as per
1139
pack.ContainerPushParser.
1141
names, content = records.next()
1142
attribs = bencode.bdecode(content)
1143
self._id_number = attribs['_id_number']
1144
self._new_name = dict((k, v.decode('utf-8'))
1145
for k, v in attribs['_new_name'].items())
1146
self._new_parent = attribs['_new_parent']
1147
self._new_executability = dict((k, bool(v)) for k, v in
1148
attribs['_new_executability'].items())
1149
self._new_id = attribs['_new_id']
1150
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1151
self._tree_path_ids = {}
1152
self._tree_id_paths = {}
1153
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1154
path = bytepath.decode('utf-8')
1155
self._tree_path_ids[path] = trans_id
1156
self._tree_id_paths[trans_id] = path
1157
self._removed_id = set(attribs['_removed_id'])
1158
self._removed_contents = set(attribs['_removed_contents'])
1159
self._non_present_ids = attribs['_non_present_ids']
1160
for ((trans_id, kind),), content in records:
1162
mpdiff = multiparent.MultiParent.from_patch(content)
1163
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1164
self.create_file(lines, trans_id)
1165
if kind == 'directory':
1166
self.create_directory(trans_id)
1167
if kind == 'symlink':
1168
self.create_symlink(content.decode('utf-8'), trans_id)
1171
class DiskTreeTransform(TreeTransformBase):
1172
"""Tree transform storing its contents on disk."""
1174
def __init__(self, tree, limbodir, pb=None,
1175
case_sensitive=True):
1177
:param tree: The tree that will be transformed, but not necessarily
1179
:param limbodir: A directory where new files can be stored until
1180
they are installed in their proper places
1182
:param case_sensitive: If True, the target of the transform is
1183
case sensitive, not just case preserving.
1185
TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1186
self._limbodir = limbodir
1187
self._deletiondir = None
1188
# A mapping of transform ids to their limbo filename
1189
self._limbo_files = {}
1190
self._possibly_stale_limbo_files = set()
1191
# A mapping of transform ids to a set of the transform ids of children
1192
# that their limbo directory has
1193
self._limbo_children = {}
1194
# Map transform ids to maps of child filename to child transform id
1195
self._limbo_children_names = {}
1196
# List of transform ids that need to be renamed from limbo into place
1197
self._needs_rename = set()
1198
self._creation_mtime = None
1201
"""Release the working tree lock, if held, clean up limbo dir.
1203
This is required if apply has not been invoked, but can be invoked
1206
if self._tree is None:
1209
limbo_paths = self._limbo_files.values() + list(
1210
self._possibly_stale_limbo_files)
1211
limbo_paths = sorted(limbo_paths, reverse=True)
1212
for path in limbo_paths:
1216
if e.errno != errno.ENOENT:
1218
# XXX: warn? perhaps we just got interrupted at an
1219
# inconvenient moment, but perhaps files are disappearing
1222
delete_any(self._limbodir)
1224
# We don't especially care *why* the dir is immortal.
1225
raise ImmortalLimbo(self._limbodir)
1227
if self._deletiondir is not None:
1228
delete_any(self._deletiondir)
1230
raise errors.ImmortalPendingDeletion(self._deletiondir)
1232
TreeTransformBase.finalize(self)
1234
def _limbo_supports_executable(self):
1235
"""Check if the limbo path supports the executable bit."""
1236
# FIXME: Check actual file system capabilities of limbodir
1237
return osutils.supports_executable()
1239
def _limbo_name(self, trans_id):
1240
"""Generate the limbo name of a file"""
1241
limbo_name = self._limbo_files.get(trans_id)
1242
if limbo_name is None:
1243
limbo_name = self._generate_limbo_path(trans_id)
1244
self._limbo_files[trans_id] = limbo_name
1247
def _generate_limbo_path(self, trans_id):
1248
"""Generate a limbo path using the trans_id as the relative path.
1250
This is suitable as a fallback, and when the transform should not be
1251
sensitive to the path encoding of the limbo directory.
1253
self._needs_rename.add(trans_id)
1254
return pathjoin(self._limbodir, trans_id)
1256
def adjust_path(self, name, parent, trans_id):
1257
previous_parent = self._new_parent.get(trans_id)
1258
previous_name = self._new_name.get(trans_id)
1259
TreeTransformBase.adjust_path(self, name, parent, trans_id)
1260
if (trans_id in self._limbo_files and
1261
trans_id not in self._needs_rename):
1262
self._rename_in_limbo([trans_id])
1263
if previous_parent != parent:
1264
self._limbo_children[previous_parent].remove(trans_id)
1265
if previous_parent != parent or previous_name != name:
1266
del self._limbo_children_names[previous_parent][previous_name]
1268
def _rename_in_limbo(self, trans_ids):
1269
"""Fix limbo names so that the right final path is produced.
1271
This means we outsmarted ourselves-- we tried to avoid renaming
1272
these files later by creating them with their final names in their
1273
final parents. But now the previous name or parent is no longer
1274
suitable, so we have to rename them.
1276
Even for trans_ids that have no new contents, we must remove their
1277
entries from _limbo_files, because they are now stale.
1279
for trans_id in trans_ids:
1280
old_path = self._limbo_files[trans_id]
1281
self._possibly_stale_limbo_files.add(old_path)
1282
del self._limbo_files[trans_id]
1283
if trans_id not in self._new_contents:
1285
new_path = self._limbo_name(trans_id)
1286
os.rename(old_path, new_path)
1287
self._possibly_stale_limbo_files.remove(old_path)
1288
for descendant in self._limbo_descendants(trans_id):
1289
desc_path = self._limbo_files[descendant]
1290
desc_path = new_path + desc_path[len(old_path):]
1291
self._limbo_files[descendant] = desc_path
1293
def _limbo_descendants(self, trans_id):
1294
"""Return the set of trans_ids whose limbo paths descend from this."""
1295
descendants = set(self._limbo_children.get(trans_id, []))
1296
for descendant in list(descendants):
1297
descendants.update(self._limbo_descendants(descendant))
488
1300
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
489
1301
"""Schedule creation of a new file.
583
1464
orphaning_registry = registry.Registry()
584
1465
orphaning_registry.register(
585
u'conflict', refuse_orphan,
1466
'conflict', refuse_orphan,
586
1467
'Leave orphans in place and create a conflict on the directory.')
587
1468
orphaning_registry.register(
588
u'move', move_orphan,
589
'Move orphans into the brz-orphans directory.')
590
orphaning_registry._set_default_key(u'conflict')
1469
'move', move_orphan,
1470
'Move orphans into the bzr-orphans directory.')
1471
orphaning_registry._set_default_key('conflict')
593
1474
opt_transform_orphan = _mod_config.RegistryOption(
594
'transform.orphan_policy', orphaning_registry,
1475
'bzr.transform.orphan_policy', orphaning_registry,
595
1476
help='Policy for orphaned files during transform operations.',
596
1477
invalid='warning')
1480
class TreeTransform(DiskTreeTransform):
1481
"""Represent a tree transformation.
1483
This object is designed to support incremental generation of the transform,
1486
However, it gives optimum performance when parent directories are created
1487
before their contents. The transform is then able to put child files
1488
directly in their parent directory, avoiding later renames.
1490
It is easy to produce malformed transforms, but they are generally
1491
harmless. Attempting to apply a malformed transform will cause an
1492
exception to be raised before any modifications are made to the tree.
1494
Many kinds of malformed transforms can be corrected with the
1495
resolve_conflicts function. The remaining ones indicate programming error,
1496
such as trying to create a file with no path.
1498
Two sets of file creation methods are supplied. Convenience methods are:
1503
These are composed of the low-level methods:
1505
* create_file or create_directory or create_symlink
1509
Transform/Transaction ids
1510
-------------------------
1511
trans_ids are temporary ids assigned to all files involved in a transform.
1512
It's possible, even common, that not all files in the Tree have trans_ids.
1514
trans_ids are used because filenames and file_ids are not good enough
1515
identifiers; filenames change, and not all files have file_ids. File-ids
1516
are also associated with trans-ids, so that moving a file moves its
1519
trans_ids are only valid for the TreeTransform that generated them.
1523
Limbo is a temporary directory use to hold new versions of files.
1524
Files are added to limbo by create_file, create_directory, create_symlink,
1525
and their convenience variants (new_*). Files may be removed from limbo
1526
using cancel_creation. Files are renamed from limbo into their final
1527
location as part of TreeTransform.apply
1529
Limbo must be cleaned up, by either calling TreeTransform.apply or
1530
calling TreeTransform.finalize.
1532
Files are placed into limbo inside their parent directories, where
1533
possible. This reduces subsequent renames, and makes operations involving
1534
lots of files faster. This optimization is only possible if the parent
1535
directory is created *before* creating any of its children, so avoid
1536
creating children before parents, where possible.
1540
This temporary directory is used by _FileMover for storing files that are
1541
about to be deleted. In case of rollback, the files will be restored.
1542
FileMover does not delete files until it is sure that a rollback will not
1545
def __init__(self, tree, pb=None):
1546
"""Note: a tree_write lock is taken on the tree.
1548
Use TreeTransform.finalize() to release the lock (can be omitted if
1549
TreeTransform.apply() called).
1551
tree.lock_tree_write()
1554
limbodir = urlutils.local_path_from_url(
1555
tree._transport.abspath('limbo'))
1556
osutils.ensure_empty_directory_exists(
1558
errors.ExistingLimbo)
1559
deletiondir = urlutils.local_path_from_url(
1560
tree._transport.abspath('pending-deletion'))
1561
osutils.ensure_empty_directory_exists(
1563
errors.ExistingPendingDeletion)
1568
# Cache of realpath results, to speed up canonical_path
1569
self._realpaths = {}
1570
# Cache of relpath results, to speed up canonical_path
1572
DiskTreeTransform.__init__(self, tree, limbodir, pb,
1573
tree.case_sensitive)
1574
self._deletiondir = deletiondir
1576
def canonical_path(self, path):
1577
"""Get the canonical tree-relative path"""
1578
# don't follow final symlinks
1579
abs = self._tree.abspath(path)
1580
if abs in self._relpaths:
1581
return self._relpaths[abs]
1582
dirname, basename = os.path.split(abs)
1583
if dirname not in self._realpaths:
1584
self._realpaths[dirname] = os.path.realpath(dirname)
1585
dirname = self._realpaths[dirname]
1586
abs = pathjoin(dirname, basename)
1587
if dirname in self._relpaths:
1588
relpath = pathjoin(self._relpaths[dirname], basename)
1589
relpath = relpath.rstrip('/\\')
1591
relpath = self._tree.relpath(abs)
1592
self._relpaths[abs] = relpath
1595
def tree_kind(self, trans_id):
1596
"""Determine the file kind in the working tree.
1598
:returns: The file kind or None if the file does not exist
1600
path = self._tree_id_paths.get(trans_id)
1604
return file_kind(self._tree.abspath(path))
1605
except errors.NoSuchFile:
1608
def _set_mode(self, trans_id, mode_id, typefunc):
1609
"""Set the mode of new file contents.
1610
The mode_id is the existing file to get the mode from (often the same
1611
as trans_id). The operation is only performed if there's a mode match
1612
according to typefunc.
1617
old_path = self._tree_id_paths[mode_id]
1621
mode = os.stat(self._tree.abspath(old_path)).st_mode
1623
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1624
# Either old_path doesn't exist, or the parent of the
1625
# target is not a directory (but will be one eventually)
1626
# Either way, we know it doesn't exist *right now*
1627
# See also bug #248448
1632
osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1634
def iter_tree_children(self, parent_id):
1635
"""Iterate through the entry's tree children, if any"""
1637
path = self._tree_id_paths[parent_id]
1641
children = os.listdir(self._tree.abspath(path))
1643
if not (osutils._is_error_enotdir(e)
1644
or e.errno in (errno.ENOENT, errno.ESRCH)):
1648
for child in children:
1649
childpath = joinpath(path, child)
1650
if self._tree.is_control_filename(childpath):
1652
yield self.trans_id_tree_path(childpath)
1654
def _generate_limbo_path(self, trans_id):
1655
"""Generate a limbo path using the final path if possible.
1657
This optimizes the performance of applying the tree transform by
1658
avoiding renames. These renames can be avoided only when the parent
1659
directory is already scheduled for creation.
1661
If the final path cannot be used, falls back to using the trans_id as
1664
parent = self._new_parent.get(trans_id)
1665
# if the parent directory is already in limbo (e.g. when building a
1666
# tree), choose a limbo name inside the parent, to reduce further
1668
use_direct_path = False
1669
if self._new_contents.get(parent) == 'directory':
1670
filename = self._new_name.get(trans_id)
1671
if filename is not None:
1672
if parent not in self._limbo_children:
1673
self._limbo_children[parent] = set()
1674
self._limbo_children_names[parent] = {}
1675
use_direct_path = True
1676
# the direct path can only be used if no other file has
1677
# already taken this pathname, i.e. if the name is unused, or
1678
# if it is already associated with this trans_id.
1679
elif self._case_sensitive_target:
1680
if (self._limbo_children_names[parent].get(filename)
1681
in (trans_id, None)):
1682
use_direct_path = True
1684
for l_filename, l_trans_id in\
1685
self._limbo_children_names[parent].iteritems():
1686
if l_trans_id == trans_id:
1688
if l_filename.lower() == filename.lower():
1691
use_direct_path = True
1693
if not use_direct_path:
1694
return DiskTreeTransform._generate_limbo_path(self, trans_id)
1696
limbo_name = pathjoin(self._limbo_files[parent], filename)
1697
self._limbo_children[parent].add(trans_id)
1698
self._limbo_children_names[parent][filename] = trans_id
1702
def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1703
"""Apply all changes to the inventory and filesystem.
1705
If filesystem or inventory conflicts are present, MalformedTransform
1708
If apply succeeds, finalize is not necessary.
1710
:param no_conflicts: if True, the caller guarantees there are no
1711
conflicts, so no check is made.
1712
:param precomputed_delta: An inventory delta to use instead of
1714
:param _mover: Supply an alternate FileMover, for testing
1716
for hook in MutableTree.hooks['pre_transform']:
1717
hook(self._tree, self)
1718
if not no_conflicts:
1719
self._check_malformed()
1720
child_pb = ui.ui_factory.nested_progress_bar()
1722
if precomputed_delta is None:
1723
child_pb.update(gettext('Apply phase'), 0, 2)
1724
inventory_delta = self._generate_inventory_delta()
1727
inventory_delta = precomputed_delta
1730
mover = _FileMover()
1734
child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1735
self._apply_removals(mover)
1736
child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1737
modified_paths = self._apply_insertions(mover)
1742
mover.apply_deletions()
1745
if self.final_file_id(self.root) is None:
1746
inventory_delta = [e for e in inventory_delta if e[0] != '']
1747
self._tree.apply_inventory_delta(inventory_delta)
1748
self._apply_observed_sha1s()
1751
return _TransformResults(modified_paths, self.rename_count)
1753
def _generate_inventory_delta(self):
1754
"""Generate an inventory delta for the current transform."""
1755
inventory_delta = []
1756
child_pb = ui.ui_factory.nested_progress_bar()
1757
new_paths = self._inventory_altered()
1758
total_entries = len(new_paths) + len(self._removed_id)
1760
for num, trans_id in enumerate(self._removed_id):
1762
child_pb.update(gettext('removing file'), num, total_entries)
1763
if trans_id == self._new_root:
1764
file_id = self._tree.get_root_id()
1766
file_id = self.tree_file_id(trans_id)
1767
# File-id isn't really being deleted, just moved
1768
if file_id in self._r_new_id:
1770
path = self._tree_id_paths[trans_id]
1771
inventory_delta.append((path, None, file_id, None))
1772
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1774
entries = self._tree.iter_entries_by_dir(
1775
new_path_file_ids.values())
1776
old_paths = dict((e.file_id, p) for p, e in entries)
1778
for num, (path, trans_id) in enumerate(new_paths):
1780
child_pb.update(gettext('adding file'),
1781
num + len(self._removed_id), total_entries)
1782
file_id = new_path_file_ids[trans_id]
1786
kind = self.final_kind(trans_id)
1788
kind = self._tree.stored_kind(file_id)
1789
parent_trans_id = self.final_parent(trans_id)
1790
parent_file_id = new_path_file_ids.get(parent_trans_id)
1791
if parent_file_id is None:
1792
parent_file_id = self.final_file_id(parent_trans_id)
1793
if trans_id in self._new_reference_revision:
1794
new_entry = inventory.TreeReference(
1796
self._new_name[trans_id],
1797
self.final_file_id(self._new_parent[trans_id]),
1798
None, self._new_reference_revision[trans_id])
1800
new_entry = inventory.make_entry(kind,
1801
self.final_name(trans_id),
1802
parent_file_id, file_id)
1803
old_path = old_paths.get(new_entry.file_id)
1804
new_executability = self._new_executability.get(trans_id)
1805
if new_executability is not None:
1806
new_entry.executable = new_executability
1807
inventory_delta.append(
1808
(old_path, path, new_entry.file_id, new_entry))
1811
return inventory_delta
1813
def _apply_removals(self, mover):
1814
"""Perform tree operations that remove directory/inventory names.
1816
That is, delete files that are to be deleted, and put any files that
1817
need renaming into limbo. This must be done in strict child-to-parent
1820
If inventory_delta is None, no inventory delta generation is performed.
1822
tree_paths = list(self._tree_path_ids.iteritems())
1823
tree_paths.sort(reverse=True)
1824
child_pb = ui.ui_factory.nested_progress_bar()
1826
for num, (path, trans_id) in enumerate(tree_paths):
1827
# do not attempt to move root into a subdirectory of itself.
1830
child_pb.update(gettext('removing file'), num, len(tree_paths))
1831
full_path = self._tree.abspath(path)
1832
if trans_id in self._removed_contents:
1833
delete_path = os.path.join(self._deletiondir, trans_id)
1834
mover.pre_delete(full_path, delete_path)
1835
elif (trans_id in self._new_name
1836
or trans_id in self._new_parent):
1838
mover.rename(full_path, self._limbo_name(trans_id))
1839
except errors.TransformRenameFailed, e:
1840
if e.errno != errno.ENOENT:
1843
self.rename_count += 1
1847
def _apply_insertions(self, mover):
1848
"""Perform tree operations that insert directory/inventory names.
1850
That is, create any files that need to be created, and restore from
1851
limbo any files that needed renaming. This must be done in strict
1852
parent-to-child order.
1854
If inventory_delta is None, no inventory delta is calculated, and
1855
no list of modified paths is returned.
1857
new_paths = self.new_paths(filesystem_only=True)
1859
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1861
child_pb = ui.ui_factory.nested_progress_bar()
1863
for num, (path, trans_id) in enumerate(new_paths):
1865
child_pb.update(gettext('adding file'), num, len(new_paths))
1866
full_path = self._tree.abspath(path)
1867
if trans_id in self._needs_rename:
1869
mover.rename(self._limbo_name(trans_id), full_path)
1870
except errors.TransformRenameFailed, e:
1871
# We may be renaming a dangling inventory id
1872
if e.errno != errno.ENOENT:
1875
self.rename_count += 1
1876
# TODO: if trans_id in self._observed_sha1s, we should
1877
# re-stat the final target, since ctime will be
1878
# updated by the change.
1879
if (trans_id in self._new_contents or
1880
self.path_changed(trans_id)):
1881
if trans_id in self._new_contents:
1882
modified_paths.append(full_path)
1883
if trans_id in self._new_executability:
1884
self._set_executability(path, trans_id)
1885
if trans_id in self._observed_sha1s:
1886
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1887
st = osutils.lstat(full_path)
1888
self._observed_sha1s[trans_id] = (o_sha1, st)
1891
for path, trans_id in new_paths:
1892
# new_paths includes stuff like workingtree conflicts. Only the
1893
# stuff in new_contents actually comes from limbo.
1894
if trans_id in self._limbo_files:
1895
del self._limbo_files[trans_id]
1896
self._new_contents.clear()
1897
return modified_paths
1899
def _apply_observed_sha1s(self):
1900
"""After we have finished renaming everything, update observed sha1s
1902
This has to be done after self._tree.apply_inventory_delta, otherwise
1903
it doesn't know anything about the files we are updating. Also, we want
1904
to do this as late as possible, so that most entries end up cached.
1906
# TODO: this doesn't update the stat information for directories. So
1907
# the first 'bzr status' will still need to rewrite
1908
# .bzr/checkout/dirstate. However, we at least don't need to
1909
# re-read all of the files.
1910
# TODO: If the operation took a while, we could do a time.sleep(3) here
1911
# to allow the clock to tick over and ensure we won't have any
1912
# problems. (we could observe start time, and finish time, and if
1913
# it is less than eg 10% overhead, add a sleep call.)
1914
paths = FinalPaths(self)
1915
for trans_id, observed in self._observed_sha1s.iteritems():
1916
path = paths.get_path(trans_id)
1917
# We could get the file_id, but dirstate prefers to use the path
1918
# anyway, and it is 'cheaper' to determine.
1919
# file_id = self._new_id[trans_id]
1920
self._tree._observed_sha1(None, path, observed)
1923
class TransformPreview(DiskTreeTransform):
1924
"""A TreeTransform for generating preview trees.
1926
Unlike TreeTransform, this version works when the input tree is a
1927
RevisionTree, rather than a WorkingTree. As a result, it tends to ignore
1928
unversioned files in the input tree.
1931
def __init__(self, tree, pb=None, case_sensitive=True):
1933
limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1934
DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1936
def canonical_path(self, path):
1939
def tree_kind(self, trans_id):
1940
path = self._tree_id_paths.get(trans_id)
1943
kind = self._tree.path_content_summary(path)[0]
1944
if kind == 'missing':
1948
def _set_mode(self, trans_id, mode_id, typefunc):
1949
"""Set the mode of new file contents.
1950
The mode_id is the existing file to get the mode from (often the same
1951
as trans_id). The operation is only performed if there's a mode match
1952
according to typefunc.
1954
# is it ok to ignore this? probably
1957
def iter_tree_children(self, parent_id):
1958
"""Iterate through the entry's tree children, if any"""
1960
path = self._tree_id_paths[parent_id]
1963
file_id = self.tree_file_id(parent_id)
1966
entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1967
children = getattr(entry, 'children', {})
1968
for child in children:
1969
childpath = joinpath(path, child)
1970
yield self.trans_id_tree_path(childpath)
1972
def new_orphan(self, trans_id, parent_id):
1973
raise NotImplementedError(self.new_orphan)
1976
class _PreviewTree(tree.InventoryTree):
1977
"""Partial implementation of Tree to support show_diff_trees"""
1979
def __init__(self, transform):
1980
self._transform = transform
1981
self._final_paths = FinalPaths(transform)
1982
self.__by_parent = None
1983
self._parent_ids = []
1984
self._all_children_cache = {}
1985
self._path2trans_id_cache = {}
1986
self._final_name_cache = {}
1987
self._iter_changes_cache = dict((c[0], c) for c in
1988
self._transform.iter_changes())
1990
def _content_change(self, file_id):
1991
"""Return True if the content of this file changed"""
1992
changes = self._iter_changes_cache.get(file_id)
1993
# changes[2] is true if the file content changed. See
1994
# InterTree.iter_changes.
1995
return (changes is not None and changes[2])
1997
def _get_repository(self):
1998
repo = getattr(self._transform._tree, '_repository', None)
2000
repo = self._transform._tree.branch.repository
2003
def _iter_parent_trees(self):
2004
for revision_id in self.get_parent_ids():
2006
yield self.revision_tree(revision_id)
2007
except errors.NoSuchRevisionInTree:
2008
yield self._get_repository().revision_tree(revision_id)
2010
def _get_file_revision(self, file_id, vf, tree_revision):
2011
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
2012
self._iter_parent_trees()]
2013
vf.add_lines((file_id, tree_revision), parent_keys,
2014
self.get_file_lines(file_id))
2015
repo = self._get_repository()
2016
base_vf = repo.texts
2017
if base_vf not in vf.fallback_versionedfiles:
2018
vf.fallback_versionedfiles.append(base_vf)
2019
return tree_revision
2021
def _stat_limbo_file(self, file_id=None, trans_id=None):
2022
if trans_id is None:
2023
trans_id = self._transform.trans_id_file_id(file_id)
2024
name = self._transform._limbo_name(trans_id)
2025
return os.lstat(name)
2028
def _by_parent(self):
2029
if self.__by_parent is None:
2030
self.__by_parent = self._transform.by_parent()
2031
return self.__by_parent
2033
def _comparison_data(self, entry, path):
2034
kind, size, executable, link_or_sha1 = self.path_content_summary(path)
2035
if kind == 'missing':
2039
file_id = self._transform.final_file_id(self._path2trans_id(path))
2040
executable = self.is_executable(file_id, path)
2041
return kind, executable, None
2043
def is_locked(self):
2046
def lock_read(self):
2047
# Perhaps in theory, this should lock the TreeTransform?
2054
@deprecated_method(deprecated_in((2, 5, 0)))
2055
def inventory(self):
2056
"""This Tree does not use inventory as its backing data."""
2057
raise NotImplementedError(_PreviewTree.inventory)
2060
def root_inventory(self):
2061
"""This Tree does not use inventory as its backing data."""
2062
raise NotImplementedError(_PreviewTree.root_inventory)
2064
def get_root_id(self):
2065
return self._transform.final_file_id(self._transform.root)
2067
def all_file_ids(self):
2068
tree_ids = set(self._transform._tree.all_file_ids())
2069
tree_ids.difference_update(self._transform.tree_file_id(t)
2070
for t in self._transform._removed_id)
2071
tree_ids.update(self._transform._new_id.values())
2075
return iter(self.all_file_ids())
2077
def _has_id(self, file_id, fallback_check):
2078
if file_id in self._transform._r_new_id:
2080
elif file_id in set([self._transform.tree_file_id(trans_id) for
2081
trans_id in self._transform._removed_id]):
2084
return fallback_check(file_id)
2086
def has_id(self, file_id):
2087
return self._has_id(file_id, self._transform._tree.has_id)
2089
def has_or_had_id(self, file_id):
2090
return self._has_id(file_id, self._transform._tree.has_or_had_id)
2092
def _path2trans_id(self, path):
2093
# We must not use None here, because that is a valid value to store.
2094
trans_id = self._path2trans_id_cache.get(path, object)
2095
if trans_id is not object:
2097
segments = splitpath(path)
2098
cur_parent = self._transform.root
2099
for cur_segment in segments:
2100
for child in self._all_children(cur_parent):
2101
final_name = self._final_name_cache.get(child)
2102
if final_name is None:
2103
final_name = self._transform.final_name(child)
2104
self._final_name_cache[child] = final_name
2105
if final_name == cur_segment:
2109
self._path2trans_id_cache[path] = None
2111
self._path2trans_id_cache[path] = cur_parent
2114
def path2id(self, path):
2115
if isinstance(path, list):
2118
path = osutils.pathjoin(*path)
2119
return self._transform.final_file_id(self._path2trans_id(path))
2121
def id2path(self, file_id):
2122
trans_id = self._transform.trans_id_file_id(file_id)
2124
return self._final_paths._determine_path(trans_id)
2126
raise errors.NoSuchId(self, file_id)
2128
def _all_children(self, trans_id):
2129
children = self._all_children_cache.get(trans_id)
2130
if children is not None:
2132
children = set(self._transform.iter_tree_children(trans_id))
2133
# children in the _new_parent set are provided by _by_parent.
2134
children.difference_update(self._transform._new_parent.keys())
2135
children.update(self._by_parent.get(trans_id, []))
2136
self._all_children_cache[trans_id] = children
2139
def iter_children(self, file_id):
2140
trans_id = self._transform.trans_id_file_id(file_id)
2141
for child_trans_id in self._all_children(trans_id):
2142
yield self._transform.final_file_id(child_trans_id)
2145
possible_extras = set(self._transform.trans_id_tree_path(p) for p
2146
in self._transform._tree.extras())
2147
possible_extras.update(self._transform._new_contents)
2148
possible_extras.update(self._transform._removed_id)
2149
for trans_id in possible_extras:
2150
if self._transform.final_file_id(trans_id) is None:
2151
yield self._final_paths._determine_path(trans_id)
2153
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
2154
yield_parents=False):
2155
for trans_id, parent_file_id in ordered_entries:
2156
file_id = self._transform.final_file_id(trans_id)
2159
if (specific_file_ids is not None
2160
and file_id not in specific_file_ids):
2162
kind = self._transform.final_kind(trans_id)
2164
kind = self._transform._tree.stored_kind(file_id)
2165
new_entry = inventory.make_entry(
2167
self._transform.final_name(trans_id),
2168
parent_file_id, file_id)
2169
yield new_entry, trans_id
2171
def _list_files_by_dir(self):
2172
todo = [ROOT_PARENT]
2174
while len(todo) > 0:
2176
parent_file_id = self._transform.final_file_id(parent)
2177
children = list(self._all_children(parent))
2178
paths = dict(zip(children, self._final_paths.get_paths(children)))
2179
children.sort(key=paths.get)
2180
todo.extend(reversed(children))
2181
for trans_id in children:
2182
ordered_ids.append((trans_id, parent_file_id))
2185
def iter_child_entries(self, file_id, path=None):
2186
self.id2path(file_id)
2187
trans_id = self._transform.trans_id_file_id(file_id)
2188
todo = [(child_trans_id, trans_id) for child_trans_id in
2189
self._all_children(trans_id)]
2190
for entry, trans_id in self._make_inv_entries(todo):
2193
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
2194
# This may not be a maximally efficient implementation, but it is
2195
# reasonably straightforward. An implementation that grafts the
2196
# TreeTransform changes onto the tree's iter_entries_by_dir results
2197
# might be more efficient, but requires tricky inferences about stack
2199
ordered_ids = self._list_files_by_dir()
2200
for entry, trans_id in self._make_inv_entries(ordered_ids,
2201
specific_file_ids, yield_parents=yield_parents):
2202
yield unicode(self._final_paths.get_path(trans_id)), entry
2204
def _iter_entries_for_dir(self, dir_path):
2205
"""Return path, entry for items in a directory without recursing down."""
2206
dir_file_id = self.path2id(dir_path)
2208
for file_id in self.iter_children(dir_file_id):
2209
trans_id = self._transform.trans_id_file_id(file_id)
2210
ordered_ids.append((trans_id, file_id))
2211
for entry, trans_id in self._make_inv_entries(ordered_ids):
2212
yield unicode(self._final_paths.get_path(trans_id)), entry
2214
def list_files(self, include_root=False, from_dir=None, recursive=True):
2215
"""See WorkingTree.list_files."""
2216
# XXX This should behave like WorkingTree.list_files, but is really
2217
# more like RevisionTree.list_files.
2221
prefix = from_dir + '/'
2222
entries = self.iter_entries_by_dir()
2223
for path, entry in entries:
2224
if entry.name == '' and not include_root:
2227
if not path.startswith(prefix):
2229
path = path[len(prefix):]
2230
yield path, 'V', entry.kind, entry.file_id, entry
2232
if from_dir is None and include_root is True:
2233
root_entry = inventory.make_entry('directory', '',
2234
ROOT_PARENT, self.get_root_id())
2235
yield '', 'V', 'directory', root_entry.file_id, root_entry
2236
entries = self._iter_entries_for_dir(from_dir or '')
2237
for path, entry in entries:
2238
yield path, 'V', entry.kind, entry.file_id, entry
2240
def kind(self, file_id):
2241
trans_id = self._transform.trans_id_file_id(file_id)
2242
return self._transform.final_kind(trans_id)
2244
def stored_kind(self, file_id):
2245
trans_id = self._transform.trans_id_file_id(file_id)
2247
return self._transform._new_contents[trans_id]
2249
return self._transform._tree.stored_kind(file_id)
2251
def get_file_mtime(self, file_id, path=None):
2252
"""See Tree.get_file_mtime"""
2253
if not self._content_change(file_id):
2254
return self._transform._tree.get_file_mtime(file_id)
2255
return self._stat_limbo_file(file_id).st_mtime
2257
def _file_size(self, entry, stat_value):
2258
return self.get_file_size(entry.file_id)
2260
def get_file_size(self, file_id):
2261
"""See Tree.get_file_size"""
2262
trans_id = self._transform.trans_id_file_id(file_id)
2263
kind = self._transform.final_kind(trans_id)
2266
if trans_id in self._transform._new_contents:
2267
return self._stat_limbo_file(trans_id=trans_id).st_size
2268
if self.kind(file_id) == 'file':
2269
return self._transform._tree.get_file_size(file_id)
2273
def get_file_verifier(self, file_id, path=None, stat_value=None):
2274
trans_id = self._transform.trans_id_file_id(file_id)
2275
kind = self._transform._new_contents.get(trans_id)
2277
return self._transform._tree.get_file_verifier(file_id)
2279
fileobj = self.get_file(file_id)
2281
return ("SHA1", sha_file(fileobj))
2285
def get_file_sha1(self, file_id, path=None, stat_value=None):
2286
trans_id = self._transform.trans_id_file_id(file_id)
2287
kind = self._transform._new_contents.get(trans_id)
2289
return self._transform._tree.get_file_sha1(file_id)
2291
fileobj = self.get_file(file_id)
2293
return sha_file(fileobj)
2297
def is_executable(self, file_id, path=None):
2300
trans_id = self._transform.trans_id_file_id(file_id)
2302
return self._transform._new_executability[trans_id]
2305
return self._transform._tree.is_executable(file_id, path)
2307
if e.errno == errno.ENOENT:
2310
except errors.NoSuchId:
2313
def has_filename(self, path):
2314
trans_id = self._path2trans_id(path)
2315
if trans_id in self._transform._new_contents:
2317
elif trans_id in self._transform._removed_contents:
2320
return self._transform._tree.has_filename(path)
2322
def path_content_summary(self, path):
2323
trans_id = self._path2trans_id(path)
2324
tt = self._transform
2325
tree_path = tt._tree_id_paths.get(trans_id)
2326
kind = tt._new_contents.get(trans_id)
2328
if tree_path is None or trans_id in tt._removed_contents:
2329
return 'missing', None, None, None
2330
summary = tt._tree.path_content_summary(tree_path)
2331
kind, size, executable, link_or_sha1 = summary
2334
limbo_name = tt._limbo_name(trans_id)
2335
if trans_id in tt._new_reference_revision:
2336
kind = 'tree-reference'
2338
statval = os.lstat(limbo_name)
2339
size = statval.st_size
2340
if not tt._limbo_supports_executable():
2343
executable = statval.st_mode & S_IEXEC
2347
if kind == 'symlink':
2348
link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2349
executable = tt._new_executability.get(trans_id, executable)
2350
return kind, size, executable, link_or_sha1
2352
def iter_changes(self, from_tree, include_unchanged=False,
2353
specific_files=None, pb=None, extra_trees=None,
2354
require_versioned=True, want_unversioned=False):
2355
"""See InterTree.iter_changes.
2357
This has a fast path that is only used when the from_tree matches
2358
the transform tree, and no fancy options are supplied.
2360
if (from_tree is not self._transform._tree or include_unchanged or
2361
specific_files or want_unversioned):
2362
return tree.InterTree(from_tree, self).iter_changes(
2363
include_unchanged=include_unchanged,
2364
specific_files=specific_files,
2366
extra_trees=extra_trees,
2367
require_versioned=require_versioned,
2368
want_unversioned=want_unversioned)
2369
if want_unversioned:
2370
raise ValueError('want_unversioned is not supported')
2371
return self._transform.iter_changes()
2373
def get_file(self, file_id, path=None):
2374
"""See Tree.get_file"""
2375
if not self._content_change(file_id):
2376
return self._transform._tree.get_file(file_id, path)
2377
trans_id = self._transform.trans_id_file_id(file_id)
2378
name = self._transform._limbo_name(trans_id)
2379
return open(name, 'rb')
2381
def get_file_with_stat(self, file_id, path=None):
2382
return self.get_file(file_id, path), None
2384
def annotate_iter(self, file_id,
2385
default_revision=_mod_revision.CURRENT_REVISION):
2386
changes = self._iter_changes_cache.get(file_id)
2390
changed_content, versioned, kind = (changes[2], changes[3],
2394
get_old = (kind[0] == 'file' and versioned[0])
2396
old_annotation = self._transform._tree.annotate_iter(file_id,
2397
default_revision=default_revision)
2401
return old_annotation
2402
if not changed_content:
2403
return old_annotation
2404
# TODO: This is doing something similar to what WT.annotate_iter is
2405
# doing, however it fails slightly because it doesn't know what
2406
# the *other* revision_id is, so it doesn't know how to give the
2407
# other as the origin for some lines, they all get
2408
# 'default_revision'
2409
# It would be nice to be able to use the new Annotator based
2410
# approach, as well.
2411
return annotate.reannotate([old_annotation],
2412
self.get_file(file_id).readlines(),
2415
def get_symlink_target(self, file_id, path=None):
2416
"""See Tree.get_symlink_target"""
2417
if not self._content_change(file_id):
2418
return self._transform._tree.get_symlink_target(file_id)
2419
trans_id = self._transform.trans_id_file_id(file_id)
2420
name = self._transform._limbo_name(trans_id)
2421
return osutils.readlink(name)
2423
def walkdirs(self, prefix=''):
2424
pending = [self._transform.root]
2425
while len(pending) > 0:
2426
parent_id = pending.pop()
2429
prefix = prefix.rstrip('/')
2430
parent_path = self._final_paths.get_path(parent_id)
2431
parent_file_id = self._transform.final_file_id(parent_id)
2432
for child_id in self._all_children(parent_id):
2433
path_from_root = self._final_paths.get_path(child_id)
2434
basename = self._transform.final_name(child_id)
2435
file_id = self._transform.final_file_id(child_id)
2436
kind = self._transform.final_kind(child_id)
2437
if kind is not None:
2438
versioned_kind = kind
2441
versioned_kind = self._transform._tree.stored_kind(file_id)
2442
if versioned_kind == 'directory':
2443
subdirs.append(child_id)
2444
children.append((path_from_root, basename, kind, None,
2445
file_id, versioned_kind))
2447
if parent_path.startswith(prefix):
2448
yield (parent_path, parent_file_id), children
2449
pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2452
def get_parent_ids(self):
2453
return self._parent_ids
2455
def set_parent_ids(self, parent_ids):
2456
self._parent_ids = parent_ids
2458
def get_revision_tree(self, revision_id):
2459
return self._transform._tree.get_revision_tree(revision_id)
599
2462
def joinpath(parent, child):
600
2463
"""Join tree-relative paths, handling the tree root specially"""
601
2464
if parent is None or parent == "":
added
removed
bzrlib/transform.py
