14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from stat import S_ISREG, S_IEXEC
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
33
43
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
from bzrlib.osutils import (
53
from .errors import (DuplicateKey, MalformedTransform,
54
ReusingTransform, CantMoveRoot,
55
ImmortalLimbo, NoFinalPath,
57
from .filters import filtered_output_bytes, ContentFilterContext
58
from .mutabletree import MutableTree
59
from .osutils import (
53
from bzrlib.progress import ProgressPhase
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
67
from .progress import ProgressPhase
64
78
ROOT_PARENT = "root-parent"
67
80
def unique_add(map, key, value):
69
82
raise DuplicateKey(key=key)
73
87
class _TransformResults(object):
74
88
def __init__(self, modified_paths, rename_count):
75
89
object.__init__(self)
380
392
return sorted(FinalPaths(self).get_paths(new_ids))
382
394
def _inventory_altered(self):
383
"""Get the trans_ids and paths of files needing new inv entries."""
385
for id_set in [self._new_name, self._new_parent, self._new_id,
395
"""Determine which trans_ids need new Inventory entries.
397
An new entry is needed when anything that would be reflected by an
398
inventory entry changes, including file name, file_id, parent file_id,
399
file kind, and the execute bit.
401
Some care is taken to return entries with real changes, not cases
402
where the value is deleted and then restored to its original value,
403
but some actually unchanged values may be returned.
405
:returns: A list of (path, trans_id) for all items requiring an
406
inventory change. Ordered by path.
409
# Find entries whose file_ids are new (or changed).
410
new_file_id = set(t for t in self._new_id
411
if self._new_id[t] != self.tree_file_id(t))
412
for id_set in [self._new_name, self._new_parent, new_file_id,
386
413
self._new_executability]:
387
new_ids.update(id_set)
414
changed_ids.update(id_set)
415
# removing implies a kind change
388
416
changed_kind = set(self._removed_contents)
389
418
changed_kind.intersection_update(self._new_contents)
390
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
393
new_ids.update(changed_kind)
394
return sorted(FinalPaths(self).get_paths(new_ids))
419
# Ignore entries that are already known to have changed.
420
changed_kind.difference_update(changed_ids)
421
# to keep only the truly changed ones
422
changed_kind = (t for t in changed_kind
423
if self.tree_kind(t) != self.final_kind(t))
424
# all kind changes will alter the inventory
425
changed_ids.update(changed_kind)
426
# To find entries with changed parent_ids, find parents which existed,
427
# but changed file_id.
428
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
429
# Now add all their children to the set.
430
for parent_trans_id in new_file_id:
431
changed_ids.update(self.iter_tree_children(parent_trans_id))
432
return sorted(FinalPaths(self).get_paths(changed_ids))
396
434
def final_kind(self, trans_id):
397
435
"""Determine the final file kind, after any changes applied.
399
Raises NoSuchFile if the file does not exist/has no contents.
400
(It is conceivable that a path would be created without the
401
corresponding contents insertion command)
437
:return: None if the file does not exist/has no contents. (It is
438
conceivable that a path would be created without the corresponding
439
contents insertion command)
403
441
if trans_id in self._new_contents:
404
442
return self._new_contents[trans_id]
405
443
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
446
return self.tree_kind(trans_id)
448
def tree_path(self, trans_id):
449
"""Determine the tree path associated with the trans_id."""
450
return self._tree_id_paths.get(trans_id)
410
452
def tree_file_id(self, trans_id):
411
453
"""Determine the file id associated with the trans_id in the tree"""
413
path = self._tree_id_paths[trans_id]
415
# the file is a new, unversioned file, or invalid trans_id
454
path = self.tree_path(trans_id)
417
457
# the file is old; the old id is still valid
418
458
if self._new_root == trans_id:
531
571
# ensure that all children are registered with the transaction
532
572
list(self.iter_tree_children(parent_id))
534
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
574
def _has_named_child(self, name, parent_id, known_children):
575
"""Does a parent already have a name child.
577
:param name: The searched for name.
579
:param parent_id: The parent for which the check is made.
581
:param known_children: The already known children. This should have
582
been recently obtained from `self.by_parent.get(parent_id)`
583
(or will be if None is passed).
585
if known_children is None:
586
known_children = self.by_parent().get(parent_id, [])
587
for child in known_children:
540
588
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
590
parent_path = self._tree_id_paths.get(parent_id, None)
591
if parent_path is None:
592
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
594
child_path = joinpath(parent_path, name)
595
child_id = self._tree_path_ids.get(child_path, None)
548
596
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
597
# Not known by the tree transform yet, check the filesystem
598
return osutils.lexists(self._tree.abspath(child_path))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
600
raise AssertionError('child_id is missing: %s, %s, %s'
601
% (name, parent_id, child_id))
603
def _available_backup_name(self, name, target_id):
604
"""Find an available backup name.
606
:param name: The basename of the file.
608
:param target_id: The directory trans_id where the backup should
611
known_children = self.by_parent().get(target_id, [])
612
return osutils.available_backup_name(
614
lambda base: self._has_named_child(
615
base, target_id, known_children))
559
617
def _parent_loops(self):
560
618
"""No entry should be its own ancestor"""
672
725
self._removed_id))
673
726
all_ids = self._tree.all_file_ids()
674
727
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
728
for trans_id, file_id in viewitems(self._new_id):
676
729
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
730
path = self._tree.id2path(file_id)
731
old_trans_id = self.trans_id_tree_path(path)
678
732
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
735
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
736
"""Children must have a directory parent"""
684
for parent_id, children in by_parent.iteritems():
685
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
738
for parent_id, children in viewitems(by_parent):
739
if parent_id == ROOT_PARENT:
742
for child_id in children:
743
if self.final_kind(child_id) is not None:
748
# There is at least a child, so we need an existing directory to
750
kind = self.final_kind(parent_id)
752
# The directory will be deleted
699
753
conflicts.append(('missing parent', parent_id))
700
754
elif kind != "directory":
755
# Meh, we need a *directory* to put something in it
701
756
conflicts.append(('non-directory parent', parent_id))
704
def _any_contents(self, trans_ids):
705
"""Return true if any of the trans_ids, will have contents."""
706
for trans_id in trans_ids:
708
kind = self.final_kind(trans_id)
714
759
def _set_executability(self, path, trans_id):
715
760
"""Set the executability of versioned files """
716
if supports_executable():
761
if self._tree._supports_executable():
717
762
new_executability = self._new_executability[trans_id]
718
763
abspath = self._tree.abspath(path)
719
764
current_mode = os.stat(abspath).st_mode
720
765
if new_executability:
721
766
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
768
to_mode = current_mode | (0o100 & ~umask)
724
769
# Enable x-bit for others only if they can read it.
725
if current_mode & 0004:
726
to_mode |= 0001 & ~umask
727
if current_mode & 0040:
728
to_mode |= 0010 & ~umask
770
if current_mode & 0o004:
771
to_mode |= 0o001 & ~umask
772
if current_mode & 0o040:
773
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
775
to_mode = current_mode & ~0o111
776
osutils.chmod_if_possible(abspath, to_mode)
733
778
def _new_entry(self, name, parent_id, file_id):
734
779
"""Helper function to create a new filesystem entry."""
780
825
self.create_symlink(target, trans_id)
828
def new_orphan(self, trans_id, parent_id):
829
"""Schedule an item to be orphaned.
831
When a directory is about to be removed, its children, if they are not
832
versioned are moved out of the way: they don't have a parent anymore.
834
:param trans_id: The trans_id of the existing item.
835
:param parent_id: The parent trans_id of the item.
837
raise NotImplementedError(self.new_orphan)
839
def _get_potential_orphans(self, dir_id):
840
"""Find the potential orphans in a directory.
842
A directory can't be safely deleted if there are versioned files in it.
843
If all the contained files are unversioned then they can be orphaned.
845
The 'None' return value means that the directory contains at least one
846
versioned file and should not be deleted.
848
:param dir_id: The directory trans id.
850
:return: A list of the orphan trans ids or None if at least one
851
versioned file is present.
854
# Find the potential orphans, stop if one item should be kept
855
for child_tid in self.by_parent()[dir_id]:
856
if child_tid in self._removed_contents:
857
# The child is removed as part of the transform. Since it was
858
# versioned before, it's not an orphan
860
elif self.final_file_id(child_tid) is None:
861
# The child is not versioned
862
orphans.append(child_tid)
864
# We have a versioned file here, searching for orphans is
783
870
def _affected_ids(self):
784
871
"""Return the set of transform ids affected by the transform"""
785
872
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
873
trans_ids.update(self._new_id)
787
874
trans_ids.update(self._removed_contents)
788
trans_ids.update(self._new_contents.keys())
789
trans_ids.update(self._new_executability.keys())
790
trans_ids.update(self._new_name.keys())
791
trans_ids.update(self._new_parent.keys())
875
trans_ids.update(self._new_contents)
876
trans_ids.update(self._new_executability)
877
trans_ids.update(self._new_name)
878
trans_ids.update(self._new_parent)
794
881
def _get_file_id_maps(self):
928
1018
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1020
def commit(self, branch, message, merge_parents=None, strict=False,
1021
timestamp=None, timezone=None, committer=None, authors=None,
1022
revprops=None, revision_id=None):
931
1023
"""Commit the result of this TreeTransform to a branch.
933
1025
:param branch: The branch to commit to.
934
1026
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1027
:param merge_parents: Additional parent revision-ids specified by
1029
:param strict: If True, abort the commit if there are unversioned
1031
:param timestamp: if not None, seconds-since-epoch for the time and
1032
date. (May be a float.)
1033
:param timezone: Optional timezone for timestamp, as an offset in
1035
:param committer: Optional committer in email-id format.
1036
(e.g. "J Random Hacker <jrandom@example.com>")
1037
:param authors: Optional list of authors in email-id format.
1038
:param revprops: Optional dictionary of revision properties.
1039
:param revision_id: Optional revision id. (Specifying a revision-id
1040
may reduce performance for some non-native formats.)
936
1041
:return: The revision_id of the revision committed.
938
1043
self._check_malformed()
965
1076
return revision_id
967
1078
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1079
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1081
if path is None or self._tree.kind(path) != 'file':
972
1083
except errors.NoSuchFile:
976
1087
def _get_parents_texts(self, trans_id):
977
1088
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1089
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1092
return (self._tree.get_file_text(path),)
983
1094
def _get_parents_lines(self, trans_id):
984
1095
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1096
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1099
return (self._tree.get_file_lines(path),)
990
1101
def serialize(self, serializer):
991
1102
"""Serialize this TreeTransform.
993
1104
:param serializer: A Serialiser like pack.ContainerSerializer.
995
new_name = dict((k, v.encode('utf-8')) for k, v in
996
self._new_name.items())
997
new_executability = dict((k, int(v)) for k, v in
998
self._new_executability.items())
999
tree_path_ids = dict((k.encode('utf-8'), v)
1000
for k, v in self._tree_path_ids.items())
1106
new_name = {k.encode('utf-8'): v.encode('utf-8')
1107
for k, v in viewitems(self._new_name)}
1108
new_parent = {k.encode('utf-8'): v.encode('utf-8')
1109
for k, v in viewitems(self._new_parent)}
1110
new_id = {k.encode('utf-8'): v
1111
for k, v in viewitems(self._new_id)}
1112
new_executability = {k.encode('utf-8'): int(v)
1113
for k, v in viewitems(self._new_executability)}
1114
tree_path_ids = {k.encode('utf-8'): v.encode('utf-8')
1115
for k, v in viewitems(self._tree_path_ids)}
1116
non_present_ids = {k: v.encode('utf-8')
1117
for k, v in viewitems(self._non_present_ids)}
1118
removed_contents = [trans_id.encode('utf-8')
1119
for trans_id in self._removed_contents]
1120
removed_id = [trans_id.encode('utf-8')
1121
for trans_id in self._removed_id]
1002
'_id_number': self._id_number,
1003
'_new_name': new_name,
1004
'_new_parent': self._new_parent,
1005
'_new_executability': new_executability,
1006
'_new_id': self._new_id,
1007
'_tree_path_ids': tree_path_ids,
1008
'_removed_id': list(self._removed_id),
1009
'_removed_contents': list(self._removed_contents),
1010
'_non_present_ids': self._non_present_ids,
1123
b'_id_number': self._id_number,
1124
b'_new_name': new_name,
1125
b'_new_parent': new_parent,
1126
b'_new_executability': new_executability,
1128
b'_tree_path_ids': tree_path_ids,
1129
b'_removed_id': removed_id,
1130
b'_removed_contents': removed_contents,
1131
b'_non_present_ids': non_present_ids,
1012
1133
yield serializer.bytes_record(bencode.bencode(attribs),
1014
for trans_id, kind in self._new_contents.items():
1135
for trans_id, kind in sorted(viewitems(self._new_contents)):
1015
1136
if kind == 'file':
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1137
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1138
lines = cur_file.readlines()
1018
1139
parents = self._get_parents_lines(trans_id)
1019
1140
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
content = ''.join(mpdiff.to_patch())
1141
content = b''.join(mpdiff.to_patch())
1021
1142
if kind == 'directory':
1023
1144
if kind == 'symlink':
1024
1145
content = self._read_symlink_target(trans_id)
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
1146
if not isinstance(content, bytes):
1147
content = content.encode('utf-8')
1148
yield serializer.bytes_record(
1149
content, ((trans_id.encode('utf-8'), kind.encode('ascii')),))
1027
1151
def deserialize(self, records):
1028
1152
"""Deserialize a stored TreeTransform.
1030
1154
:param records: An iterable of (names, content) tuples, as per
1031
1155
pack.ContainerPushParser.
1033
names, content = records.next()
1157
names, content = next(records)
1034
1158
attribs = bencode.bdecode(content)
1035
self._id_number = attribs['_id_number']
1036
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1038
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1041
self._new_id = attribs['_new_id']
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1159
self._id_number = attribs[b'_id_number']
1160
self._new_name = {k.decode('utf-8'): v.decode('utf-8')
1161
for k, v in viewitems(attribs[b'_new_name'])}
1162
self._new_parent = {k.decode('utf-8'): v.decode('utf-8')
1163
for k, v in viewitems(attribs[b'_new_parent'])}
1164
self._new_executability = {k.decode('utf-8'): bool(v)
1165
for k, v in viewitems(attribs[b'_new_executability'])}
1166
self._new_id = {k.decode('utf-8'): v
1167
for k, v in viewitems(attribs[b'_new_id'])}
1168
self._r_new_id = {v: k for k, v in viewitems(self._new_id)}
1043
1169
self._tree_path_ids = {}
1044
1170
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1171
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1046
1172
path = bytepath.decode('utf-8')
1173
trans_id = trans_id.decode('utf-8')
1047
1174
self._tree_path_ids[path] = trans_id
1048
1175
self._tree_id_paths[trans_id] = path
1049
self._removed_id = set(attribs['_removed_id'])
1050
self._removed_contents = set(attribs['_removed_contents'])
1051
self._non_present_ids = attribs['_non_present_ids']
1176
self._removed_id = {trans_id.decode('utf-8')
1177
for trans_id in attribs[b'_removed_id']}
1178
self._removed_contents = set(trans_id.decode('utf-8')
1179
for trans_id in attribs[b'_removed_contents'])
1180
self._non_present_ids = {k: v.decode('utf-8')
1181
for k, v in viewitems(attribs[b'_non_present_ids'])}
1052
1182
for ((trans_id, kind),), content in records:
1183
trans_id = trans_id.decode('utf-8')
1184
kind = kind.decode('ascii')
1053
1185
if kind == 'file':
1054
1186
mpdiff = multiparent.MultiParent.from_patch(content)
1055
1187
lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1173
1321
descendants.update(self._limbo_descendants(descendant))
1174
1322
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1324
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1325
"""Schedule creation of a new file.
1181
Contents is an iterator of strings, all of which will be written
1182
to the target destination.
1184
New file takes the permissions of any existing file with that id,
1185
unless mode_id is specified.
1329
:param contents: an iterator of strings, all of which will be written
1330
to the target destination.
1331
:param trans_id: TreeTransform handle
1332
:param mode_id: If not None, force the mode of the target file to match
1333
the mode of the object referenced by mode_id.
1334
Otherwise, we will try to preserve mode bits of an existing file.
1335
:param sha1: If the sha1 of this content is already known, pass it in.
1336
We can use it to prevent future sha1 computations.
1187
1338
name = self._limbo_name(trans_id)
1188
f = open(name, 'wb')
1191
unique_add(self._new_contents, trans_id, 'file')
1193
# Clean up the file, it never got registered so
1194
# TreeTransform.finalize() won't clean it up.
1339
with open(name, 'wb') as f:
1340
unique_add(self._new_contents, trans_id, 'file')
1199
1341
f.writelines(contents)
1202
1342
self._set_mtime(name)
1203
1343
self._set_mode(trans_id, mode_id, S_ISREG)
1205
def _read_file_chunks(self, trans_id):
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1208
return cur_file.readlines()
1344
# It is unfortunate we have to use lstat instead of fstat, but we just
1345
# used utime and chmod on the file, so we need the accurate final
1347
if sha1 is not None:
1348
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1212
1350
def _read_symlink_target(self, trans_id):
1213
1351
return os.readlink(self._limbo_name(trans_id))
1274
1414
del self._limbo_children_names[trans_id]
1275
1415
delete_any(self._limbo_name(trans_id))
1417
def new_orphan(self, trans_id, parent_id):
1418
conf = self._tree.get_config_stack()
1419
handle_orphan = conf.get('transform.orphan_policy')
1420
handle_orphan(self, trans_id, parent_id)
1423
class OrphaningError(errors.BzrError):
1425
# Only bugs could lead to such exception being seen by the user
1426
internal_error = True
1427
_fmt = "Error while orphaning %s in %s directory"
1429
def __init__(self, orphan, parent):
1430
errors.BzrError.__init__(self)
1431
self.orphan = orphan
1432
self.parent = parent
1435
class OrphaningForbidden(OrphaningError):
1437
_fmt = "Policy: %s doesn't allow creating orphans."
1439
def __init__(self, policy):
1440
errors.BzrError.__init__(self)
1441
self.policy = policy
1444
def move_orphan(tt, orphan_id, parent_id):
1445
"""See TreeTransformBase.new_orphan.
1447
This creates a new orphan in the `brz-orphans` dir at the root of the
1450
:param tt: The TreeTransform orphaning `trans_id`.
1452
:param orphan_id: The trans id that should be orphaned.
1454
:param parent_id: The orphan parent trans id.
1456
# Add the orphan dir if it doesn't exist
1457
orphan_dir_basename = 'brz-orphans'
1458
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1459
if tt.final_kind(od_id) is None:
1460
tt.create_directory(od_id)
1461
parent_path = tt._tree_id_paths[parent_id]
1462
# Find a name that doesn't exist yet in the orphan dir
1463
actual_name = tt.final_name(orphan_id)
1464
new_name = tt._available_backup_name(actual_name, od_id)
1465
tt.adjust_path(new_name, od_id, orphan_id)
1466
trace.warning('%s has been orphaned in %s'
1467
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1470
def refuse_orphan(tt, orphan_id, parent_id):
1471
"""See TreeTransformBase.new_orphan.
1473
This refuses to create orphan, letting the caller handle the conflict.
1475
raise OrphaningForbidden('never')
1478
orphaning_registry = registry.Registry()
1479
orphaning_registry.register(
1480
u'conflict', refuse_orphan,
1481
'Leave orphans in place and create a conflict on the directory.')
1482
orphaning_registry.register(
1483
u'move', move_orphan,
1484
'Move orphans into the brz-orphans directory.')
1485
orphaning_registry._set_default_key(u'conflict')
1488
opt_transform_orphan = _mod_config.RegistryOption(
1489
'transform.orphan_policy', orphaning_registry,
1490
help='Policy for orphaned files during transform operations.',
1278
1494
class TreeTransform(DiskTreeTransform):
1279
1495
"""Represent a tree transformation.
1571
1779
inventory_delta.append((path, None, file_id, None))
1572
1780
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1574
entries = self._tree.iter_entries_by_dir(
1575
new_path_file_ids.values())
1576
old_paths = dict((e.file_id, p) for p, e in entries)
1577
1782
final_kinds = {}
1578
1783
for num, (path, trans_id) in enumerate(new_paths):
1579
1784
if (num % 10) == 0:
1580
child_pb.update('adding file',
1785
child_pb.update(gettext('adding file'),
1581
1786
num + len(self._removed_id), total_entries)
1582
1787
file_id = new_path_file_ids[trans_id]
1583
1788
if file_id is None:
1585
1790
needs_entry = False
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1791
kind = self.final_kind(trans_id)
1793
kind = self._tree.stored_kind(
1794
self._tree.id2path(file_id), file_id)
1590
1795
parent_trans_id = self.final_parent(trans_id)
1591
1796
parent_file_id = new_path_file_ids.get(parent_trans_id)
1592
1797
if parent_file_id is None:
1657
1861
modified_paths = []
1658
1862
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1660
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1864
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1865
for num, (path, trans_id) in enumerate(new_paths):
1663
1866
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1867
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1868
full_path = self._tree.abspath(path)
1666
1869
if trans_id in self._needs_rename:
1668
1871
mover.rename(self._limbo_name(trans_id), full_path)
1872
except errors.TransformRenameFailed as e:
1670
1873
# We may be renaming a dangling inventory id
1671
1874
if e.errno != errno.ENOENT:
1674
1877
self.rename_count += 1
1878
# TODO: if trans_id in self._observed_sha1s, we should
1879
# re-stat the final target, since ctime will be
1880
# updated by the change.
1675
1881
if (trans_id in self._new_contents or
1676
1882
self.path_changed(trans_id)):
1677
1883
if trans_id in self._new_contents:
1678
1884
modified_paths.append(full_path)
1679
1885
if trans_id in self._new_executability:
1680
1886
self._set_executability(path, trans_id)
1887
if trans_id in self._observed_sha1s:
1888
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1889
st = osutils.lstat(full_path)
1890
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]
1683
1896
self._new_contents.clear()
1684
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 viewitems(self._observed_sha1s):
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)
1687
1923
class TransformPreview(DiskTreeTransform):
1688
1924
"""A TreeTransform for generating preview trees.
1766
2008
except errors.NoSuchRevisionInTree:
1767
2009
yield self._get_repository().revision_tree(revision_id)
1769
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1771
self._iter_parent_trees()]
2011
def _get_file_revision(self, path, file_id, vf, tree_revision):
2013
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
2014
for t in self._iter_parent_trees()]
1772
2015
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2016
self.get_file_lines(path, file_id))
1774
2017
repo = self._get_repository()
1775
2018
base_vf = repo.texts
1776
2019
if base_vf not in vf.fallback_versionedfiles:
1777
2020
vf.fallback_versionedfiles.append(base_vf)
1778
2021
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2023
def _stat_limbo_file(self, trans_id):
1782
2024
name = self._transform._limbo_name(trans_id)
1783
2025
return os.lstat(name)
1895
2144
if self._transform.final_file_id(trans_id) is None:
1896
2145
yield self._final_paths._determine_path(trans_id)
1898
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1899
yield_parents=False):
2147
def _make_inv_entries(self, ordered_entries, specific_files=None):
1900
2148
for trans_id, parent_file_id in ordered_entries:
1901
2149
file_id = self._transform.final_file_id(trans_id)
1902
2150
if file_id is None:
1904
if (specific_file_ids is not None
1905
and file_id not in specific_file_ids):
2152
if (specific_files is not None and
2153
self._final_paths.get_path(trans_id) not in specific_files):
1908
kind = self._transform.final_kind(trans_id)
1910
kind = self._transform._tree.stored_kind(file_id)
2155
kind = self._transform.final_kind(trans_id)
2157
kind = self._transform._tree.stored_kind(
2158
self._transform._tree.id2path(file_id),
1911
2160
new_entry = inventory.make_entry(
1913
2162
self._transform.final_name(trans_id),
1937
2195
ordered_ids = self._list_files_by_dir()
1938
2196
for entry, trans_id in self._make_inv_entries(ordered_ids,
1939
specific_file_ids, yield_parents=yield_parents):
1940
yield unicode(self._final_paths.get_path(trans_id)), entry
2198
yield self._final_paths.get_path(trans_id), entry
1942
2200
def _iter_entries_for_dir(self, dir_path):
1943
2201
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
1945
2202
ordered_ids = []
1946
for file_id in self.iter_children(dir_file_id):
1947
trans_id = self._transform.trans_id_file_id(file_id)
1948
ordered_ids.append((trans_id, file_id))
2203
dir_trans_id = self._path2trans_id(dir_path)
2204
dir_id = self._transform.final_file_id(dir_trans_id)
2205
for child_trans_id in self._all_children(dir_trans_id):
2206
ordered_ids.append((child_trans_id, dir_id))
1949
2208
for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2209
path_entries.append((self._final_paths.get_path(trans_id), entry))
1952
2213
def list_files(self, include_root=False, from_dir=None, recursive=True):
1953
2214
"""See WorkingTree.list_files."""
1975
2236
for path, entry in entries:
1976
2237
yield path, 'V', entry.kind, entry.file_id, entry
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2239
def kind(self, path, file_id=None):
2240
trans_id = self._path2trans_id(path)
2241
if trans_id is None:
2242
raise errors.NoSuchFile(path)
1980
2243
return self._transform.final_kind(trans_id)
1982
def stored_kind(self, file_id):
1983
trans_id = self._transform.trans_id_file_id(file_id)
2245
def stored_kind(self, path, file_id=None):
2246
trans_id = self._path2trans_id(path)
2247
if trans_id is None:
2248
raise errors.NoSuchFile(path)
1985
2250
return self._transform._new_contents[trans_id]
1986
2251
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2252
return self._transform._tree.stored_kind(path, file_id)
1989
def get_file_mtime(self, file_id, path=None):
2254
def get_file_mtime(self, path, file_id=None):
1990
2255
"""See Tree.get_file_mtime"""
2257
file_id = self.path2id(path)
2259
raise errors.NoSuchFile(path)
1991
2260
if not self._content_change(file_id):
1992
return self._transform._tree.get_file_mtime(file_id)
1993
return self._stat_limbo_file(file_id).st_mtime
1995
def _file_size(self, entry, stat_value):
1996
return self.get_file_size(entry.file_id)
1998
def get_file_size(self, file_id):
2261
return self._transform._tree.get_file_mtime(
2262
self._transform._tree.id2path(file_id), file_id)
2263
trans_id = self._path2trans_id(path)
2264
return self._stat_limbo_file(trans_id).st_mtime
2266
def get_file_size(self, path, file_id=None):
1999
2267
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2268
trans_id = self._path2trans_id(path)
2269
if trans_id is None:
2270
raise errors.NoSuchFile(path)
2271
kind = self._transform.final_kind(trans_id)
2274
if trans_id in self._transform._new_contents:
2275
return self._stat_limbo_file(trans_id).st_size
2276
if self.kind(path, file_id) == 'file':
2277
return self._transform._tree.get_file_size(path, file_id)
2005
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
trans_id = self._transform.trans_id_file_id(file_id)
2007
kind = self._transform._new_contents.get(trans_id)
2009
return self._transform._tree.get_file_sha1(file_id)
2011
fileobj = self.get_file(file_id)
2281
def get_file_verifier(self, path, file_id=None, stat_value=None):
2282
trans_id = self._path2trans_id(path)
2283
if trans_id is None:
2284
raise errors.NoSuchFile(path)
2285
kind = self._transform._new_contents.get(trans_id)
2287
return self._transform._tree.get_file_verifier(path, file_id)
2289
with self.get_file(path, file_id) as fileobj:
2290
return ("SHA1", sha_file(fileobj))
2292
def get_file_sha1(self, path, file_id=None, stat_value=None):
2293
trans_id = self._path2trans_id(path)
2294
if trans_id is None:
2295
raise errors.NoSuchFile(path)
2296
kind = self._transform._new_contents.get(trans_id)
2298
return self._transform._tree.get_file_sha1(path, file_id)
2300
with self.get_file(path, file_id) as fileobj:
2013
2301
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2303
def is_executable(self, path, file_id=None):
2304
trans_id = self._path2trans_id(path)
2305
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2308
return self._transform._new_executability[trans_id]
2023
2309
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2311
return self._transform._tree.is_executable(path, file_id)
2312
except OSError as e:
2027
2313
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2316
except errors.NoSuchFile:
2319
def has_filename(self, path):
2320
trans_id = self._path2trans_id(path)
2321
if trans_id in self._transform._new_contents:
2323
elif trans_id in self._transform._removed_contents:
2326
return self._transform._tree.has_filename(path)
2033
2328
def path_content_summary(self, path):
2034
2329
trans_id = self._path2trans_id(path)
2035
2330
tt = self._transform
2081
2378
raise ValueError('want_unversioned is not supported')
2082
2379
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2381
def get_file(self, path, file_id=None):
2085
2382
"""See Tree.get_file"""
2384
file_id = self.path2id(path)
2086
2385
if not self._content_change(file_id):
2087
return self._transform._tree.get_file(file_id, path)
2088
trans_id = self._transform.trans_id_file_id(file_id)
2386
return self._transform._tree.get_file(path, file_id)
2387
trans_id = self._path2trans_id(path)
2089
2388
name = self._transform._limbo_name(trans_id)
2090
2389
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2391
def get_file_with_stat(self, path, file_id=None):
2392
return self.get_file(path, file_id), None
2095
def annotate_iter(self, file_id,
2394
def annotate_iter(self, path, file_id=None,
2096
2395
default_revision=_mod_revision.CURRENT_REVISION):
2397
file_id = self.path2id(path)
2097
2398
changes = self._iter_changes_cache.get(file_id)
2098
2399
if changes is None:
2243
2548
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2549
generate the inventory delta.
2246
wt.lock_tree_write()
2551
with wt.lock_tree_write(), tree.lock_read():
2552
if accelerator_tree is not None:
2553
accelerator_tree.lock_read()
2555
return _build_tree(tree, wt, accelerator_tree, hardlink,
2250
2558
if accelerator_tree is not None:
2251
accelerator_tree.lock_read()
2253
return _build_tree(tree, wt, accelerator_tree, hardlink,
2256
if accelerator_tree is not None:
2257
accelerator_tree.unlock()
2559
accelerator_tree.unlock()
2264
2562
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2563
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2564
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2565
if num > 0: # more than just a root
2268
2566
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
existing_files = set()
2270
for dir, files in wt.walkdirs():
2271
existing_files.update(f[0] for f in files)
2272
2567
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2568
top_pb = ui.ui_factory.nested_progress_bar()
2274
2569
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2570
if tree.get_root_id() is not None:
2276
2571
# This is kind of a hack: we should be altering the root
2277
2572
# as part of the regular tree shape diff logic.
2278
2573
# The conditional test here is to avoid doing an
2289
2584
pp.next_phase()
2290
file_trans_id[wt.get_root_id()] = \
2291
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2585
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2586
with ui.ui_factory.nested_progress_bar() as pb:
2294
2587
deferred_contents = []
2296
total = len(tree.inventory)
2589
total = len(tree.all_versioned_paths())
2297
2590
if delta_from_tree:
2298
2591
precomputed_delta = []
2300
2593
precomputed_delta = None
2594
# Check if tree inventory has content. If so, we populate
2595
# existing_files with the directory content. If there are no
2596
# entries we skip populating existing_files as its not used.
2597
# This improves performance and unncessary work on large
2598
# directory trees. (#501307)
2600
existing_files = set()
2601
for dir, files in wt.walkdirs():
2602
existing_files.update(f[0] for f in files)
2301
2603
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2604
enumerate(tree.iter_entries_by_dir()):
2605
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2606
if entry.parent_id is None:
2306
2608
reparent = False
2330
2632
trans_id = tt.create_path(entry.name, parent_id)
2331
2633
file_trans_id[file_id] = trans_id
2332
2634
tt.version_file(file_id, trans_id)
2333
executable = tree.is_executable(file_id, tree_path)
2635
executable = tree.is_executable(tree_path, file_id)
2335
2637
tt.set_executability(executable, trans_id)
2336
trans_data = (trans_id, tree_path)
2337
deferred_contents.append((file_id, trans_data))
2638
trans_data = (trans_id, file_id, tree_path, entry.text_sha1)
2639
deferred_contents.append((tree_path, trans_data))
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2641
file_trans_id[file_id] = new_by_entry(
2642
tree_path, tt, entry, parent_id, tree)
2342
2644
new_trans_id = file_trans_id[file_id]
2343
2645
old_parent = tt.trans_id_tree_path(tree_path)
2376
2676
new_desired_files = desired_files
2378
2678
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2679
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2380
2680
in iter if not (c or e[0] != e[1])]
2381
2681
if accelerator_tree.supports_content_filtering():
2382
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2682
unchanged = [(tp, ap) for (tp, ap) in unchanged
2683
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2684
unchanged = dict(unchanged)
2385
2685
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2687
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2688
accelerator_path = unchanged.get(tree_path)
2389
2689
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2690
new_desired_files.append((tree_path,
2691
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2693
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2695
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2397
contents = accelerator_tree.get_file(file_id, accelerator_path)
2398
if wt.supports_content_filtering():
2399
filters = wt._content_filter_stack(tree_path)
2400
contents = filtered_output_bytes(contents, filters,
2401
ContentFilterContext(tree_path, tree))
2403
tt.create_file(contents, trans_id)
2407
except AttributeError:
2408
# after filtering, contents may no longer be file-like
2698
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2699
chunks = osutils.file_iterator(f)
2700
if wt.supports_content_filtering():
2701
filters = wt._content_filter_stack(tree_path)
2702
chunks = filtered_output_bytes(chunks, filters,
2703
ContentFilterContext(tree_path, tree))
2704
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2706
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2707
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2708
tree.iter_files_bytes(new_desired_files)):
2414
2709
if wt.supports_content_filtering():
2415
2710
filters = wt._content_filter_stack(tree_path)
2416
2711
contents = filtered_output_bytes(contents, filters,
2417
2712
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2713
tt.create_file(contents, trans_id, sha1=text_sha1)
2714
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2717
def _reparent_children(tt, old_parent, new_parent):
2423
2718
for child in tt.iter_tree_children(old_parent):
2424
2719
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2722
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2723
by_parent = tt.by_parent()
2428
2724
for child in by_parent[old_parent]:
2429
2725
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2726
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2729
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2433
2730
if entry.kind != kind:
2435
2732
if entry.kind == "directory":
2437
2734
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2735
with open(target_path, 'rb') as f1, \
2736
tree.get_file(tree_path, file_id) as f2:
2737
if osutils.compare_files(f1, f2):
2440
2739
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2740
if tree.get_symlink_target(tree_path, file_id) == os.readlink(target_path):
2473
2772
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2775
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2776
"""Create a new file according to its inventory entry"""
2478
2777
name = entry.name
2479
2778
kind = entry.kind
2480
2779
if kind == 'file':
2481
contents = tree.get_file(entry.file_id).readlines()
2482
executable = tree.is_executable(entry.file_id)
2483
return tt.new_file(name, parent_id, contents, entry.file_id,
2780
with tree.get_file(path, entry.file_id) as f:
2781
executable = tree.is_executable(path, entry.file_id)
2783
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2785
elif kind in ('directory', 'tree-reference'):
2486
2786
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2787
if kind == 'tree-reference':
2488
2788
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2789
return trans_id
2490
2790
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2791
target = tree.get_symlink_target(path, entry.file_id)
2492
2792
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2794
raise errors.BadFileKindError(name, kind)
2497
@deprecated_function(deprecated_in((1, 9, 0)))
2498
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
"""Create new file contents according to an inventory entry.
2501
DEPRECATED. Use create_from_tree instead.
2503
if entry.kind == "file":
2505
lines = tree.get_file(entry.file_id).readlines()
2506
tt.create_file(lines, trans_id, mode_id=mode_id)
2507
elif entry.kind == "symlink":
2508
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2509
elif entry.kind == "directory":
2510
tt.create_directory(trans_id)
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2797
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2514
2798
filter_tree_path=None):
2515
2799
"""Create new file contents according to tree contents.
2517
2801
:param filter_tree_path: the tree path to use to lookup
2518
2802
content filters to apply to the bytes output in the working tree.
2519
2803
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2805
kind = tree.kind(path, file_id)
2522
2806
if kind == 'directory':
2523
2807
tt.create_directory(trans_id)
2524
2808
elif kind == "file":
2526
tree_file = tree.get_file(file_id)
2528
bytes = tree_file.readlines()
2532
if wt.supports_content_filtering() and filter_tree_path is not None:
2533
filters = wt._content_filter_stack(filter_tree_path)
2534
bytes = filtered_output_bytes(bytes, filters,
2535
ContentFilterContext(filter_tree_path, tree))
2536
tt.create_file(bytes, trans_id)
2810
f = tree.get_file(path, file_id)
2811
chunks = osutils.file_iterator(f)
2816
if wt.supports_content_filtering() and filter_tree_path is not None:
2817
filters = wt._content_filter_stack(filter_tree_path)
2818
chunks = filtered_output_bytes(chunks, filters,
2819
ContentFilterContext(filter_tree_path, tree))
2820
tt.create_file(chunks, trans_id)
2537
2824
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2825
tt.create_symlink(tree.get_symlink_target(path, file_id), trans_id)
2540
2827
raise AssertionError('Unknown kind %r' % kind)
2546
2833
tt.set_executability(entry.executable, trans_id)
2549
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2553
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
"""Produce a backup-style name that appears to be available"""
2558
yield "%s.~%d~" % (name, counter)
2560
for new_name in name_gen():
2561
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2565
def _entry_changes(file_id, entry, working_tree):
2566
"""Determine in which ways the inventory entry has changed.
2568
Returns booleans: has_contents, content_mod, meta_mod
2569
has_contents means there are currently contents, but they differ
2570
contents_mod means contents need to be modified
2571
meta_mod means the metadata needs to be modified
2573
cur_entry = working_tree.inventory[file_id]
2575
working_kind = working_tree.kind(file_id)
2578
has_contents = False
2581
if has_contents is True:
2582
if entry.kind != working_kind:
2583
contents_mod, meta_mod = True, False
2585
cur_entry._read_tree_state(working_tree.id2path(file_id),
2587
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
cur_entry._forget_tree_state()
2589
return has_contents, contents_mod, meta_mod
2592
2836
def revert(working_tree, target_tree, filenames, backups=False,
2593
2837
pb=None, change_reporter=None):
2594
2838
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2839
pb = ui.ui_factory.nested_progress_bar()
2597
tt = TreeTransform(working_tree, pb)
2599
pp = ProgressPhase("Revert phase", 3, pb)
2600
conflicts, merge_modified = _prepare_revert_transform(
2601
working_tree, target_tree, tt, filenames, backups, pp)
2603
change_reporter = delta._ChangeReporter(
2604
unversioned_filter=working_tree.is_ignored)
2605
delta.report_changes(tt.iter_changes(), change_reporter)
2606
for conflict in conflicts:
2610
working_tree.set_merge_modified(merge_modified)
2841
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2842
pp = ProgressPhase("Revert phase", 3, pb)
2843
conflicts, merge_modified = _prepare_revert_transform(
2844
working_tree, target_tree, tt, filenames, backups, pp)
2846
change_reporter = delta._ChangeReporter(
2847
unversioned_filter=working_tree.is_ignored)
2848
delta.report_changes(tt.iter_changes(), change_reporter)
2849
for conflict in conflicts:
2850
trace.warning(text_type(conflict))
2853
if working_tree.supports_merge_modified():
2854
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2857
return conflicts
2618
2860
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2861
backups, pp, basis_tree=None,
2620
2862
merge_modified=None):
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2863
with ui.ui_factory.nested_progress_bar() as child_pb:
2623
2864
if merge_modified is None:
2624
2865
merge_modified = working_tree.merge_modified()
2625
2866
merge_modified = _alter_files(working_tree, target_tree, tt,
2626
2867
child_pb, filenames, backups,
2627
2868
merge_modified, basis_tree)
2630
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2869
with ui.ui_factory.nested_progress_bar() as child_pb:
2632
2870
raw_conflicts = resolve_conflicts(tt, child_pb,
2633
2871
lambda t, c: conflict_pass(t, c, target_tree))
2636
2872
conflicts = cook_conflicts(raw_conflicts, tt)
2637
2873
return conflicts, merge_modified
2651
2891
deferred_files = []
2652
2892
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2893
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2894
target_path, wt_path = path
2895
target_versioned, wt_versioned = versioned
2896
target_parent, wt_parent = parent
2897
target_name, wt_name = name
2898
target_kind, wt_kind = kind
2899
target_executable, wt_executable = executable
2900
if skip_root and wt_parent is None:
2656
2902
trans_id = tt.trans_id_file_id(file_id)
2658
2904
if changed_content:
2659
2905
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2906
if wt_kind == 'file' and (backups or target_kind is None):
2907
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2662
2908
if merge_modified.get(file_id) != wt_sha1:
2663
2909
# acquire the basis tree lazily to prevent the
2664
2910
# expense of accessing it when it's not needed ?
2666
2912
if basis_tree is None:
2667
2913
basis_tree = working_tree.basis_tree()
2668
2914
basis_tree.lock_read()
2669
if file_id in basis_tree:
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2672
elif kind[1] is None and not versioned[1]:
2674
if kind[0] is not None:
2915
basis_path = find_previous_path(working_tree, basis_tree, wt_path)
2916
if basis_path is None:
2917
if target_kind is None and not target_versioned:
2920
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2922
if wt_kind is not None:
2675
2923
if not keep_content:
2676
2924
tt.delete_contents(trans_id)
2677
elif kind[1] is not None:
2678
parent_trans_id = tt.trans_id_file_id(parent[0])
2679
by_parent = tt.by_parent()
2680
backup_name = _get_backup_name(name[0], by_parent,
2681
parent_trans_id, tt)
2925
elif target_kind is not None:
2926
parent_trans_id = tt.trans_id_file_id(wt_parent)
2927
backup_name = tt._available_backup_name(
2928
wt_name, parent_trans_id)
2682
2929
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2930
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2931
if wt_versioned and target_versioned:
2685
2932
tt.unversion_file(trans_id)
2686
2933
tt.version_file(file_id, new_trans_id)
2687
2934
# New contents should have the same unix perms as old
2689
2936
mode_id = trans_id
2690
2937
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2938
if target_kind in ('directory', 'tree-reference'):
2692
2939
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2940
if target_kind == 'tree-reference':
2941
revision = target_tree.get_reference_revision(
2942
target_path, file_id)
2696
2943
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2701
deferred_files.append((file_id, (trans_id, mode_id)))
2944
elif target_kind == 'symlink':
2945
tt.create_symlink(target_tree.get_symlink_target(
2946
target_path, file_id), trans_id)
2947
elif target_kind == 'file':
2948
deferred_files.append((target_path, (trans_id, mode_id, file_id)))
2702
2949
if basis_tree is None:
2703
2950
basis_tree = working_tree.basis_tree()
2704
2951
basis_tree.lock_read()
2705
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2952
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2953
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2954
if (basis_path is not None and
2955
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2708
2956
if file_id in merge_modified:
2709
2957
del merge_modified[file_id]
2711
2959
merge_modified[file_id] = new_sha1
2713
2961
# preserve the execute bit when backing up
2714
if keep_content and executable[0] == executable[1]:
2715
tt.set_executability(executable[1], trans_id)
2716
elif kind[1] is not None:
2717
raise AssertionError(kind[1])
2718
if versioned == (False, True):
2962
if keep_content and wt_executable == target_executable:
2963
tt.set_executability(target_executable, trans_id)
2964
elif target_kind is not None:
2965
raise AssertionError(target_kind)
2966
if not wt_versioned and target_versioned:
2719
2967
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2968
if wt_versioned and not target_versioned:
2721
2969
tt.unversion_file(trans_id)
2722
if (name[1] is not None and
2723
(name[0] != name[1] or parent[0] != parent[1])):
2724
if name[1] == '' and parent[1] is None:
2970
if (target_name is not None and
2971
(wt_name != target_name or wt_parent != target_parent)):
2972
if target_name == '' and target_parent is None:
2725
2973
parent_trans = ROOT_PARENT
2727
parent_trans = tt.trans_id_file_id(parent[1])
2728
if parent[0] is None and versioned[0]:
2729
tt.adjust_root_path(name[1], parent_trans)
2975
parent_trans = tt.trans_id_file_id(target_parent)
2976
if wt_parent is None and wt_versioned:
2977
tt.adjust_root_path(target_name, parent_trans)
2731
tt.adjust_path(name[1], parent_trans, trans_id)
2732
if executable[0] != executable[1] and kind[1] == "file":
2733
tt.set_executability(executable[1], trans_id)
2979
tt.adjust_path(target_name, parent_trans, trans_id)
2980
if wt_executable != target_executable and target_kind == "file":
2981
tt.set_executability(target_executable, trans_id)
2734
2982
if working_tree.supports_content_filtering():
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2983
for (trans_id, mode_id, file_id), bytes in (
2736
2984
target_tree.iter_files_bytes(deferred_files)):
2737
file_id = deferred_files[index][0]
2738
2985
# We're reverting a tree to the target tree so using the
2739
2986
# target tree to find the file path seems the best choice
2740
2987
# here IMO - Ian C 27/Oct/2009
2878
3140
modified_path = fp.get_path(conflict[2])
2879
3141
modified_id = tt.final_file_id(conflict[2])
2880
3142
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3143
yield conflicts.Conflict.factory(
3144
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3147
conflicting_path = fp.get_path(conflict[3])
2886
3148
conflicting_id = tt.final_file_id(conflict[3])
2887
yield Conflict.factory(c_type, action=action, path=modified_path,
2888
file_id=modified_id,
2889
conflict_path=conflicting_path,
2890
conflict_file_id=conflicting_id)
3149
yield conflicts.Conflict.factory(
3150
c_type, action=action, path=modified_path,
3151
file_id=modified_id,
3152
conflict_path=conflicting_path,
3153
conflict_file_id=conflicting_id)
2893
3156
class _FileMover(object):
added
removed
breezy/transform.py
