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
21
19
from stat import S_ISREG, S_IEXEC
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
43
33
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
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 (
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 (
67
from .progress import ProgressPhase
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
78
64
ROOT_PARENT = "root-parent"
80
67
def unique_add(map, key, value):
82
69
raise DuplicateKey(key=key)
87
73
class _TransformResults(object):
88
74
def __init__(self, modified_paths, rename_count):
89
75
object.__init__(self)
392
380
return sorted(FinalPaths(self).get_paths(new_ids))
394
382
def _inventory_altered(self):
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,
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,
413
386
self._new_executability]:
414
changed_ids.update(id_set)
415
# removing implies a kind change
387
new_ids.update(id_set)
416
388
changed_kind = set(self._removed_contents)
418
389
changed_kind.intersection_update(self._new_contents)
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))
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))
434
396
def final_kind(self, trans_id):
435
397
"""Determine the final file kind, after any changes applied.
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)
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)
441
403
if trans_id in self._new_contents:
442
404
return self._new_contents[trans_id]
443
405
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
446
408
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)
452
410
def tree_file_id(self, trans_id):
453
411
"""Determine the file id associated with the trans_id in the tree"""
454
path = self.tree_path(trans_id)
413
path = self._tree_id_paths[trans_id]
415
# the file is a new, unversioned file, or invalid trans_id
457
417
# the file is old; the old id is still valid
458
418
if self._new_root == trans_id:
571
531
# ensure that all children are registered with the transaction
572
532
list(self.iter_tree_children(parent_id))
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:
534
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
588
540
if self.final_name(child) == name:
590
parent_path = self._tree_id_paths.get(parent_id, None)
591
if parent_path is None:
592
# No parent... no children
543
path = self._tree_id_paths[parent_id]
594
child_path = joinpath(parent_path, name)
595
child_id = self._tree_path_ids.get(child_path, None)
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
596
548
if child_id is None:
597
# Not known by the tree transform yet, check the filesystem
598
return osutils.lexists(self._tree.abspath(child_path))
549
return lexists(self._tree.abspath(childpath))
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))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
617
559
def _parent_loops(self):
618
560
"""No entry should be its own ancestor"""
725
672
self._removed_id))
726
673
all_ids = self._tree.all_file_ids()
727
674
active_tree_ids = all_ids.difference(removed_tree_ids)
728
for trans_id, file_id in viewitems(self._new_id):
675
for trans_id, file_id in self._new_id.iteritems():
729
676
if file_id in active_tree_ids:
730
path = self._tree.id2path(file_id)
731
old_trans_id = self.trans_id_tree_path(path)
677
old_trans_id = self.trans_id_tree_file_id(file_id)
732
678
conflicts.append(('duplicate id', old_trans_id, trans_id))
735
681
def _parent_type_conflicts(self, by_parent):
736
"""Children must have a directory parent"""
682
"""parents must have directory 'contents'."""
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)
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)
752
# The directory will be deleted
753
699
conflicts.append(('missing parent', parent_id))
754
700
elif kind != "directory":
755
# Meh, we need a *directory* to put something in it
756
701
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)
759
714
def _set_executability(self, path, trans_id):
760
715
"""Set the executability of versioned files """
761
if self._tree._supports_executable():
716
if supports_executable():
762
717
new_executability = self._new_executability[trans_id]
763
718
abspath = self._tree.abspath(path)
764
719
current_mode = os.stat(abspath).st_mode
765
720
if new_executability:
766
721
umask = os.umask(0)
768
to_mode = current_mode | (0o100 & ~umask)
723
to_mode = current_mode | (0100 & ~umask)
769
724
# Enable x-bit for others only if they can read it.
770
if current_mode & 0o004:
771
to_mode |= 0o001 & ~umask
772
if current_mode & 0o040:
773
to_mode |= 0o010 & ~umask
725
if current_mode & 0004:
726
to_mode |= 0001 & ~umask
727
if current_mode & 0040:
728
to_mode |= 0010 & ~umask
775
to_mode = current_mode & ~0o111
776
osutils.chmod_if_possible(abspath, to_mode)
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
778
733
def _new_entry(self, name, parent_id, file_id):
779
734
"""Helper function to create a new filesystem entry."""
825
780
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
870
783
def _affected_ids(self):
871
784
"""Return the set of transform ids affected by the transform"""
872
785
trans_ids = set(self._removed_id)
873
trans_ids.update(self._new_id)
786
trans_ids.update(self._new_id.keys())
874
787
trans_ids.update(self._removed_contents)
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)
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())
881
794
def _get_file_id_maps(self):
1014
928
return _PreviewTree(self)
1016
def commit(self, branch, message, merge_parents=None, strict=False,
1017
timestamp=None, timezone=None, committer=None, authors=None,
1018
revprops=None, revision_id=None):
930
def commit(self, branch, message, merge_parents=None, strict=False):
1019
931
"""Commit the result of this TreeTransform to a branch.
1021
933
:param branch: The branch to commit to.
1022
934
:param message: The message to attach to the commit.
1023
:param merge_parents: Additional parent revision-ids specified by
1025
:param strict: If True, abort the commit if there are unversioned
1027
:param timestamp: if not None, seconds-since-epoch for the time and
1028
date. (May be a float.)
1029
:param timezone: Optional timezone for timestamp, as an offset in
1031
:param committer: Optional committer in email-id format.
1032
(e.g. "J Random Hacker <jrandom@example.com>")
1033
:param authors: Optional list of authors in email-id format.
1034
:param revprops: Optional dictionary of revision properties.
1035
:param revision_id: Optional revision id. (Specifying a revision-id
1036
may reduce performance for some non-native formats.)
935
:param merge_parents: Additional parents specified by pending merges.
1037
936
:return: The revision_id of the revision committed.
1039
938
self._check_malformed()
1072
965
return revision_id
1074
967
def _text_parent(self, trans_id):
1075
path = self.tree_path(trans_id)
968
file_id = self.tree_file_id(trans_id)
1077
if path is None or self._tree.kind(path) != 'file':
970
if file_id is None or self._tree.kind(file_id) != 'file':
1079
972
except errors.NoSuchFile:
1083
976
def _get_parents_texts(self, trans_id):
1084
977
"""Get texts for compression parents of this file."""
1085
path = self._text_parent(trans_id)
978
file_id = self._text_parent(trans_id)
1088
return (self._tree.get_file_text(path),)
981
return (self._tree.get_file_text(file_id),)
1090
983
def _get_parents_lines(self, trans_id):
1091
984
"""Get lines for compression parents of this file."""
1092
path = self._text_parent(trans_id)
985
file_id = self._text_parent(trans_id)
1095
return (self._tree.get_file_lines(path),)
988
return (self._tree.get_file_lines(file_id),)
1097
990
def serialize(self, serializer):
1098
991
"""Serialize this TreeTransform.
1100
993
:param serializer: A Serialiser like pack.ContainerSerializer.
1102
995
new_name = dict((k, v.encode('utf-8')) for k, v in
1103
viewitems(self._new_name))
996
self._new_name.items())
1104
997
new_executability = dict((k, int(v)) for k, v in
1105
viewitems(self._new_executability))
998
self._new_executability.items())
1106
999
tree_path_ids = dict((k.encode('utf-8'), v)
1107
for k, v in viewitems(self._tree_path_ids))
1000
for k, v in self._tree_path_ids.items())
1109
b'_id_number': self._id_number,
1110
b'_new_name': new_name,
1111
b'_new_parent': self._new_parent,
1112
b'_new_executability': new_executability,
1113
b'_new_id': self._new_id,
1114
b'_tree_path_ids': tree_path_ids,
1115
b'_removed_id': list(self._removed_id),
1116
b'_removed_contents': list(self._removed_contents),
1117
b'_non_present_ids': self._non_present_ids,
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,
1119
1012
yield serializer.bytes_record(bencode.bencode(attribs),
1121
for trans_id, kind in viewitems(self._new_contents):
1014
for trans_id, kind in self._new_contents.items():
1122
1015
if kind == 'file':
1123
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1124
lines = cur_file.readlines()
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1125
1018
parents = self._get_parents_lines(trans_id)
1126
1019
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1127
content = b''.join(mpdiff.to_patch())
1020
content = ''.join(mpdiff.to_patch())
1128
1021
if kind == 'directory':
1130
1023
if kind == 'symlink':
1131
1024
content = self._read_symlink_target(trans_id)
1132
1025
yield serializer.bytes_record(content, ((trans_id, kind),))
1137
1030
:param records: An iterable of (names, content) tuples, as per
1138
1031
pack.ContainerPushParser.
1140
names, content = next(records)
1033
names, content = records.next()
1141
1034
attribs = bencode.bdecode(content)
1142
self._id_number = attribs[b'_id_number']
1035
self._id_number = attribs['_id_number']
1143
1036
self._new_name = dict((k, v.decode('utf-8'))
1144
for k, v in viewitems(attribs[b'_new_name']))
1145
self._new_parent = attribs[b'_new_parent']
1146
self._new_executability = dict((k, bool(v))
1147
for k, v in viewitems(attribs[b'_new_executability']))
1148
self._new_id = attribs[b'_new_id']
1149
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
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())
1150
1043
self._tree_path_ids = {}
1151
1044
self._tree_id_paths = {}
1152
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1153
1046
path = bytepath.decode('utf-8')
1154
1047
self._tree_path_ids[path] = trans_id
1155
1048
self._tree_id_paths[trans_id] = path
1156
self._removed_id = set(attribs[b'_removed_id'])
1157
self._removed_contents = set(attribs[b'_removed_contents'])
1158
self._non_present_ids = attribs[b'_non_present_ids']
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']
1159
1052
for ((trans_id, kind),), content in records:
1160
1053
if kind == 'file':
1161
1054
mpdiff = multiparent.MultiParent.from_patch(content)
1296
1173
descendants.update(self._limbo_descendants(descendant))
1297
1174
return descendants
1299
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1176
def create_file(self, contents, trans_id, mode_id=None):
1300
1177
"""Schedule creation of a new file.
1304
:param contents: an iterator of strings, all of which will be written
1305
to the target destination.
1306
:param trans_id: TreeTransform handle
1307
:param mode_id: If not None, force the mode of the target file to match
1308
the mode of the object referenced by mode_id.
1309
Otherwise, we will try to preserve mode bits of an existing file.
1310
:param sha1: If the sha1 of this content is already known, pass it in.
1311
We can use it to prevent future sha1 computations.
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.
1313
1187
name = self._limbo_name(trans_id)
1314
with open(name, 'wb') as f:
1315
unique_add(self._new_contents, trans_id, 'file')
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.
1316
1199
f.writelines(contents)
1317
1202
self._set_mtime(name)
1318
1203
self._set_mode(trans_id, mode_id, S_ISREG)
1319
# It is unfortunate we have to use lstat instead of fstat, but we just
1320
# used utime and chmod on the file, so we need the accurate final
1322
if sha1 is not None:
1323
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
def _read_file_chunks(self, trans_id):
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1208
return cur_file.readlines()
1325
1212
def _read_symlink_target(self, trans_id):
1326
1213
return os.readlink(self._limbo_name(trans_id))
1389
1274
del self._limbo_children_names[trans_id]
1390
1275
delete_any(self._limbo_name(trans_id))
1392
def new_orphan(self, trans_id, parent_id):
1393
conf = self._tree.get_config_stack()
1394
handle_orphan = conf.get('transform.orphan_policy')
1395
handle_orphan(self, trans_id, parent_id)
1398
class OrphaningError(errors.BzrError):
1400
# Only bugs could lead to such exception being seen by the user
1401
internal_error = True
1402
_fmt = "Error while orphaning %s in %s directory"
1404
def __init__(self, orphan, parent):
1405
errors.BzrError.__init__(self)
1406
self.orphan = orphan
1407
self.parent = parent
1410
class OrphaningForbidden(OrphaningError):
1412
_fmt = "Policy: %s doesn't allow creating orphans."
1414
def __init__(self, policy):
1415
errors.BzrError.__init__(self)
1416
self.policy = policy
1419
def move_orphan(tt, orphan_id, parent_id):
1420
"""See TreeTransformBase.new_orphan.
1422
This creates a new orphan in the `brz-orphans` dir at the root of the
1425
:param tt: The TreeTransform orphaning `trans_id`.
1427
:param orphan_id: The trans id that should be orphaned.
1429
:param parent_id: The orphan parent trans id.
1431
# Add the orphan dir if it doesn't exist
1432
orphan_dir_basename = 'brz-orphans'
1433
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1434
if tt.final_kind(od_id) is None:
1435
tt.create_directory(od_id)
1436
parent_path = tt._tree_id_paths[parent_id]
1437
# Find a name that doesn't exist yet in the orphan dir
1438
actual_name = tt.final_name(orphan_id)
1439
new_name = tt._available_backup_name(actual_name, od_id)
1440
tt.adjust_path(new_name, od_id, orphan_id)
1441
trace.warning('%s has been orphaned in %s'
1442
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1445
def refuse_orphan(tt, orphan_id, parent_id):
1446
"""See TreeTransformBase.new_orphan.
1448
This refuses to create orphan, letting the caller handle the conflict.
1450
raise OrphaningForbidden('never')
1453
orphaning_registry = registry.Registry()
1454
orphaning_registry.register(
1455
u'conflict', refuse_orphan,
1456
'Leave orphans in place and create a conflict on the directory.')
1457
orphaning_registry.register(
1458
u'move', move_orphan,
1459
'Move orphans into the brz-orphans directory.')
1460
orphaning_registry._set_default_key(u'conflict')
1463
opt_transform_orphan = _mod_config.RegistryOption(
1464
'transform.orphan_policy', orphaning_registry,
1465
help='Policy for orphaned files during transform operations.',
1469
1278
class TreeTransform(DiskTreeTransform):
1470
1279
"""Represent a tree transformation.
1755
1571
inventory_delta.append((path, None, file_id, None))
1756
1572
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)
1758
1577
final_kinds = {}
1759
1578
for num, (path, trans_id) in enumerate(new_paths):
1760
1579
if (num % 10) == 0:
1761
child_pb.update(gettext('adding file'),
1580
child_pb.update('adding file',
1762
1581
num + len(self._removed_id), total_entries)
1763
1582
file_id = new_path_file_ids[trans_id]
1764
1583
if file_id is None:
1766
1585
needs_entry = False
1767
kind = self.final_kind(trans_id)
1769
kind = self._tree.stored_kind(
1770
self._tree.id2path(file_id), file_id)
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1771
1590
parent_trans_id = self.final_parent(trans_id)
1772
1591
parent_file_id = new_path_file_ids.get(parent_trans_id)
1773
1592
if parent_file_id is None:
1837
1657
modified_paths = []
1838
1658
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1840
with ui.ui_factory.nested_progress_bar() as child_pb:
1660
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1841
1662
for num, (path, trans_id) in enumerate(new_paths):
1842
1663
if (num % 10) == 0:
1843
child_pb.update(gettext('adding file'), num, len(new_paths))
1664
child_pb.update('adding file', num, len(new_paths))
1844
1665
full_path = self._tree.abspath(path)
1845
1666
if trans_id in self._needs_rename:
1847
1668
mover.rename(self._limbo_name(trans_id), full_path)
1848
except errors.TransformRenameFailed as e:
1849
1670
# We may be renaming a dangling inventory id
1850
1671
if e.errno != errno.ENOENT:
1853
1674
self.rename_count += 1
1854
# TODO: if trans_id in self._observed_sha1s, we should
1855
# re-stat the final target, since ctime will be
1856
# updated by the change.
1857
1675
if (trans_id in self._new_contents or
1858
1676
self.path_changed(trans_id)):
1859
1677
if trans_id in self._new_contents:
1860
1678
modified_paths.append(full_path)
1861
1679
if trans_id in self._new_executability:
1862
1680
self._set_executability(path, trans_id)
1863
if trans_id in self._observed_sha1s:
1864
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1865
st = osutils.lstat(full_path)
1866
self._observed_sha1s[trans_id] = (o_sha1, st)
1867
for path, trans_id in new_paths:
1868
# new_paths includes stuff like workingtree conflicts. Only the
1869
# stuff in new_contents actually comes from limbo.
1870
if trans_id in self._limbo_files:
1871
del self._limbo_files[trans_id]
1872
1683
self._new_contents.clear()
1873
1684
return modified_paths
1875
def _apply_observed_sha1s(self):
1876
"""After we have finished renaming everything, update observed sha1s
1878
This has to be done after self._tree.apply_inventory_delta, otherwise
1879
it doesn't know anything about the files we are updating. Also, we want
1880
to do this as late as possible, so that most entries end up cached.
1882
# TODO: this doesn't update the stat information for directories. So
1883
# the first 'bzr status' will still need to rewrite
1884
# .bzr/checkout/dirstate. However, we at least don't need to
1885
# re-read all of the files.
1886
# TODO: If the operation took a while, we could do a time.sleep(3) here
1887
# to allow the clock to tick over and ensure we won't have any
1888
# problems. (we could observe start time, and finish time, and if
1889
# it is less than eg 10% overhead, add a sleep call.)
1890
paths = FinalPaths(self)
1891
for trans_id, observed in viewitems(self._observed_sha1s):
1892
path = paths.get_path(trans_id)
1893
# We could get the file_id, but dirstate prefers to use the path
1894
# anyway, and it is 'cheaper' to determine.
1895
# file_id = self._new_id[trans_id]
1896
self._tree._observed_sha1(None, path, observed)
1899
1687
class TransformPreview(DiskTreeTransform):
1900
1688
"""A TreeTransform for generating preview trees.
1981
1766
except errors.NoSuchRevisionInTree:
1982
1767
yield self._get_repository().revision_tree(revision_id)
1984
def _get_file_revision(self, path, file_id, vf, tree_revision):
1986
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
1987
for t in self._iter_parent_trees()]
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()]
1988
1772
vf.add_lines((file_id, tree_revision), parent_keys,
1989
self.get_file_lines(path, file_id))
1773
self.get_file(file_id).readlines())
1990
1774
repo = self._get_repository()
1991
1775
base_vf = repo.texts
1992
1776
if base_vf not in vf.fallback_versionedfiles:
1993
1777
vf.fallback_versionedfiles.append(base_vf)
1994
1778
return tree_revision
1996
def _stat_limbo_file(self, trans_id):
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
1997
1782
name = self._transform._limbo_name(trans_id)
1998
1783
return os.lstat(name)
2117
1895
if self._transform.final_file_id(trans_id) is None:
2118
1896
yield self._final_paths._determine_path(trans_id)
2120
def _make_inv_entries(self, ordered_entries, specific_files=None):
1898
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1899
yield_parents=False):
2121
1900
for trans_id, parent_file_id in ordered_entries:
2122
1901
file_id = self._transform.final_file_id(trans_id)
2123
1902
if file_id is None:
2125
if (specific_files is not None and
2126
self._final_paths.get_path(trans_id) not in specific_files):
1904
if (specific_file_ids is not None
1905
and file_id not in specific_file_ids):
2128
kind = self._transform.final_kind(trans_id)
2130
kind = self._transform._tree.stored_kind(
2131
self._transform._tree.id2path(file_id),
1908
kind = self._transform.final_kind(trans_id)
1910
kind = self._transform._tree.stored_kind(file_id)
2133
1911
new_entry = inventory.make_entry(
2135
1913
self._transform.final_name(trans_id),
2168
1937
ordered_ids = self._list_files_by_dir()
2169
1938
for entry, trans_id in self._make_inv_entries(ordered_ids,
2171
yield self._final_paths.get_path(trans_id), entry
1939
specific_file_ids, yield_parents=yield_parents):
1940
yield unicode(self._final_paths.get_path(trans_id)), entry
2173
1942
def _iter_entries_for_dir(self, dir_path):
2174
1943
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
2175
1945
ordered_ids = []
2176
dir_trans_id = self._path2trans_id(dir_path)
2177
dir_id = self._transform.final_file_id(dir_trans_id)
2178
for child_trans_id in self._all_children(dir_trans_id):
2179
ordered_ids.append((child_trans_id, dir_id))
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))
2181
1949
for entry, trans_id in self._make_inv_entries(ordered_ids):
2182
path_entries.append((self._final_paths.get_path(trans_id), entry))
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2186
1952
def list_files(self, include_root=False, from_dir=None, recursive=True):
2187
1953
"""See WorkingTree.list_files."""
2209
1975
for path, entry in entries:
2210
1976
yield path, 'V', entry.kind, entry.file_id, entry
2212
def kind(self, path, file_id=None):
2213
trans_id = self._path2trans_id(path)
2214
if trans_id is None:
2215
raise errors.NoSuchFile(path)
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2216
1980
return self._transform.final_kind(trans_id)
2218
def stored_kind(self, path, file_id=None):
2219
trans_id = self._path2trans_id(path)
2220
if trans_id is None:
2221
raise errors.NoSuchFile(path)
1982
def stored_kind(self, file_id):
1983
trans_id = self._transform.trans_id_file_id(file_id)
2223
1985
return self._transform._new_contents[trans_id]
2224
1986
except KeyError:
2225
return self._transform._tree.stored_kind(path, file_id)
1987
return self._transform._tree.stored_kind(file_id)
2227
def get_file_mtime(self, path, file_id=None):
1989
def get_file_mtime(self, file_id, path=None):
2228
1990
"""See Tree.get_file_mtime"""
2230
file_id = self.path2id(path)
2232
raise errors.NoSuchFile(path)
2233
1991
if not self._content_change(file_id):
2234
return self._transform._tree.get_file_mtime(
2235
self._transform._tree.id2path(file_id), file_id)
2236
trans_id = self._path2trans_id(path)
2237
return self._stat_limbo_file(trans_id).st_mtime
2239
def get_file_size(self, path, file_id=None):
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):
2240
1999
"""See Tree.get_file_size"""
2241
trans_id = self._path2trans_id(path)
2242
if trans_id is None:
2243
raise errors.NoSuchFile(path)
2244
kind = self._transform.final_kind(trans_id)
2247
if trans_id in self._transform._new_contents:
2248
return self._stat_limbo_file(trans_id).st_size
2249
if self.kind(path, file_id) == 'file':
2250
return self._transform._tree.get_file_size(path, file_id)
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2254
def get_file_verifier(self, path, file_id=None, stat_value=None):
2255
trans_id = self._path2trans_id(path)
2256
if trans_id is None:
2257
raise errors.NoSuchFile(path)
2258
kind = self._transform._new_contents.get(trans_id)
2260
return self._transform._tree.get_file_verifier(path, file_id)
2262
with self.get_file(path, file_id) as fileobj:
2263
return ("SHA1", sha_file(fileobj))
2265
def get_file_sha1(self, path, file_id=None, stat_value=None):
2266
trans_id = self._path2trans_id(path)
2267
if trans_id is None:
2268
raise errors.NoSuchFile(path)
2269
kind = self._transform._new_contents.get(trans_id)
2271
return self._transform._tree.get_file_sha1(path, file_id)
2273
with self.get_file(path, file_id) as fileobj:
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)
2274
2013
return sha_file(fileobj)
2276
def is_executable(self, path, file_id=None):
2277
trans_id = self._path2trans_id(path)
2278
if trans_id is None:
2017
def is_executable(self, file_id, path=None):
2020
trans_id = self._transform.trans_id_file_id(file_id)
2281
2022
return self._transform._new_executability[trans_id]
2282
2023
except KeyError:
2284
return self._transform._tree.is_executable(path, file_id)
2285
except OSError as e:
2025
return self._transform._tree.is_executable(file_id, path)
2286
2027
if e.errno == errno.ENOENT:
2289
except errors.NoSuchFile:
2030
except errors.NoSuchId:
2292
def has_filename(self, path):
2293
trans_id = self._path2trans_id(path)
2294
if trans_id in self._transform._new_contents:
2296
elif trans_id in self._transform._removed_contents:
2299
return self._transform._tree.has_filename(path)
2301
2033
def path_content_summary(self, path):
2302
2034
trans_id = self._path2trans_id(path)
2303
2035
tt = self._transform
2349
2081
raise ValueError('want_unversioned is not supported')
2350
2082
return self._transform.iter_changes()
2352
def get_file(self, path, file_id=None):
2084
def get_file(self, file_id, path=None):
2353
2085
"""See Tree.get_file"""
2355
file_id = self.path2id(path)
2356
2086
if not self._content_change(file_id):
2357
return self._transform._tree.get_file(path, file_id)
2358
trans_id = self._path2trans_id(path)
2087
return self._transform._tree.get_file(file_id, path)
2088
trans_id = self._transform.trans_id_file_id(file_id)
2359
2089
name = self._transform._limbo_name(trans_id)
2360
2090
return open(name, 'rb')
2362
def get_file_with_stat(self, path, file_id=None):
2363
return self.get_file(path, file_id), None
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2365
def annotate_iter(self, path, file_id=None,
2095
def annotate_iter(self, file_id,
2366
2096
default_revision=_mod_revision.CURRENT_REVISION):
2368
file_id = self.path2id(path)
2369
2097
changes = self._iter_changes_cache.get(file_id)
2370
2098
if changes is None:
2519
2243
:param delta_from_tree: If true, build_tree may use the input Tree to
2520
2244
generate the inventory delta.
2522
with wt.lock_tree_write(), tree.lock_read():
2523
if accelerator_tree is not None:
2524
accelerator_tree.lock_read()
2246
wt.lock_tree_write()
2526
return _build_tree(tree, wt, accelerator_tree, hardlink,
2529
2250
if accelerator_tree is not None:
2530
accelerator_tree.unlock()
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()
2533
2264
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2534
2265
"""See build_tree."""
2535
for num, _unused in enumerate(wt.all_versioned_paths()):
2266
for num, _unused in enumerate(wt.all_file_ids()):
2536
2267
if num > 0: # more than just a root
2537
2268
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)
2538
2272
file_trans_id = {}
2539
top_pb = ui.ui_factory.nested_progress_bar()
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2540
2274
pp = ProgressPhase("Build phase", 2, top_pb)
2541
if tree.get_root_id() is not None:
2275
if tree.inventory.root is not None:
2542
2276
# This is kind of a hack: we should be altering the root
2543
2277
# as part of the regular tree shape diff logic.
2544
2278
# The conditional test here is to avoid doing an
2555
2289
pp.next_phase()
2556
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2557
with ui.ui_factory.nested_progress_bar() as pb:
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()
2558
2294
deferred_contents = []
2560
total = len(tree.all_versioned_paths())
2296
total = len(tree.inventory)
2561
2297
if delta_from_tree:
2562
2298
precomputed_delta = []
2564
2300
precomputed_delta = None
2565
# Check if tree inventory has content. If so, we populate
2566
# existing_files with the directory content. If there are no
2567
# entries we skip populating existing_files as its not used.
2568
# This improves performance and unncessary work on large
2569
# directory trees. (#501307)
2571
existing_files = set()
2572
for dir, files in wt.walkdirs():
2573
existing_files.update(f[0] for f in files)
2574
2301
for num, (tree_path, entry) in \
2575
enumerate(tree.iter_entries_by_dir()):
2576
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2577
2304
if entry.parent_id is None:
2579
2306
reparent = False
2603
2330
trans_id = tt.create_path(entry.name, parent_id)
2604
2331
file_trans_id[file_id] = trans_id
2605
2332
tt.version_file(file_id, trans_id)
2606
executable = tree.is_executable(tree_path, file_id)
2333
executable = tree.is_executable(file_id, tree_path)
2608
2335
tt.set_executability(executable, trans_id)
2609
trans_data = (trans_id, file_id, tree_path, entry.text_sha1)
2610
deferred_contents.append((tree_path, trans_data))
2336
trans_data = (trans_id, tree_path)
2337
deferred_contents.append((file_id, trans_data))
2612
file_trans_id[file_id] = new_by_entry(
2613
tree_path, tt, entry, parent_id, tree)
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2615
2342
new_trans_id = file_trans_id[file_id]
2616
2343
old_parent = tt.trans_id_tree_path(tree_path)
2647
2376
new_desired_files = desired_files
2649
2378
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2650
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2651
2380
in iter if not (c or e[0] != e[1])]
2652
2381
if accelerator_tree.supports_content_filtering():
2653
unchanged = [(tp, ap) for (tp, ap) in unchanged
2654
if not next(accelerator_tree.iter_search_rules([ap]))]
2382
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2655
2384
unchanged = dict(unchanged)
2656
2385
new_desired_files = []
2658
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2659
accelerator_path = unchanged.get(tree_path)
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2660
2389
if accelerator_path is None:
2661
new_desired_files.append((tree_path,
2662
(trans_id, file_id, tree_path, text_sha1)))
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2664
pb.update(gettext('Adding file contents'), count + offset, total)
2392
pb.update('Adding file contents', count + offset, total)
2666
2394
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2669
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2670
chunks = osutils.file_iterator(f)
2671
if wt.supports_content_filtering():
2672
filters = wt._content_filter_stack(tree_path)
2673
chunks = filtered_output_bytes(chunks, filters,
2674
ContentFilterContext(tree_path, tree))
2675
tt.create_file(chunks, trans_id, sha1=text_sha1)
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
2677
2411
offset += count
2678
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2679
2413
tree.iter_files_bytes(new_desired_files)):
2680
2414
if wt.supports_content_filtering():
2681
2415
filters = wt._content_filter_stack(tree_path)
2682
2416
contents = filtered_output_bytes(contents, filters,
2683
2417
ContentFilterContext(tree_path, tree))
2684
tt.create_file(contents, trans_id, sha1=text_sha1)
2685
pb.update(gettext('Adding file contents'), count + offset, total)
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2688
2422
def _reparent_children(tt, old_parent, new_parent):
2689
2423
for child in tt.iter_tree_children(old_parent):
2690
2424
tt.adjust_path(tt.final_name(child), new_parent, child)
2693
2426
def _reparent_transform_children(tt, old_parent, new_parent):
2694
2427
by_parent = tt.by_parent()
2695
2428
for child in by_parent[old_parent]:
2696
2429
tt.adjust_path(tt.final_name(child), new_parent, child)
2697
2430
return by_parent[old_parent]
2700
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2432
def _content_match(tree, entry, file_id, kind, target_path):
2701
2433
if entry.kind != kind:
2703
2435
if entry.kind == "directory":
2705
2437
if entry.kind == "file":
2706
with open(target_path, 'rb') as f1, \
2707
tree.get_file(tree_path, file_id) as f2:
2708
if osutils.compare_files(f1, f2):
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2710
2440
elif entry.kind == "symlink":
2711
if tree.get_symlink_target(tree_path, file_id) == os.readlink(target_path):
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2743
2473
return new_conflicts
2746
def new_by_entry(path, tt, entry, parent_id, tree):
2476
def new_by_entry(tt, entry, parent_id, tree):
2747
2477
"""Create a new file according to its inventory entry"""
2748
2478
name = entry.name
2749
2479
kind = entry.kind
2750
2480
if kind == 'file':
2751
with tree.get_file(path, entry.file_id) as f:
2752
executable = tree.is_executable(path, entry.file_id)
2754
name, parent_id, osutils.file_iterator(f), entry.file_id,
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,
2756
2485
elif kind in ('directory', 'tree-reference'):
2757
2486
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2758
2487
if kind == 'tree-reference':
2759
2488
tt.set_tree_reference(entry.reference_revision, trans_id)
2760
2489
return trans_id
2761
2490
elif kind == 'symlink':
2762
target = tree.get_symlink_target(path, entry.file_id)
2491
target = tree.get_symlink_target(entry.file_id)
2763
2492
return tt.new_symlink(name, parent_id, target, entry.file_id)
2765
2494
raise errors.BadFileKindError(name, kind)
2768
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
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,
2769
2514
filter_tree_path=None):
2770
2515
"""Create new file contents according to tree contents.
2772
2517
:param filter_tree_path: the tree path to use to lookup
2773
2518
content filters to apply to the bytes output in the working tree.
2774
2519
This only applies if the working tree supports content filtering.
2776
kind = tree.kind(path, file_id)
2521
kind = tree.kind(file_id)
2777
2522
if kind == 'directory':
2778
2523
tt.create_directory(trans_id)
2779
2524
elif kind == "file":
2781
f = tree.get_file(path, file_id)
2782
chunks = osutils.file_iterator(f)
2787
if wt.supports_content_filtering() and filter_tree_path is not None:
2788
filters = wt._content_filter_stack(filter_tree_path)
2789
chunks = filtered_output_bytes(chunks, filters,
2790
ContentFilterContext(filter_tree_path, tree))
2791
tt.create_file(chunks, trans_id)
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)
2795
2537
elif kind == "symlink":
2796
tt.create_symlink(tree.get_symlink_target(path, file_id), trans_id)
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2798
2540
raise AssertionError('Unknown kind %r' % kind)
2804
2546
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
2807
2592
def revert(working_tree, target_tree, filenames, backups=False,
2808
2593
pb=None, change_reporter=None):
2809
2594
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2810
2596
pb = ui.ui_factory.nested_progress_bar()
2597
tt = TreeTransform(working_tree, pb)
2812
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2813
pp = ProgressPhase("Revert phase", 3, pb)
2814
conflicts, merge_modified = _prepare_revert_transform(
2815
working_tree, target_tree, tt, filenames, backups, pp)
2817
change_reporter = delta._ChangeReporter(
2818
unversioned_filter=working_tree.is_ignored)
2819
delta.report_changes(tt.iter_changes(), change_reporter)
2820
for conflict in conflicts:
2821
trace.warning(text_type(conflict))
2824
if working_tree.supports_merge_modified():
2825
working_tree.set_merge_modified(merge_modified)
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)
2612
target_tree.unlock()
2828
2615
return conflicts
2831
2618
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2832
2619
backups, pp, basis_tree=None,
2833
2620
merge_modified=None):
2834
with ui.ui_factory.nested_progress_bar() as child_pb:
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2835
2623
if merge_modified is None:
2836
2624
merge_modified = working_tree.merge_modified()
2837
2625
merge_modified = _alter_files(working_tree, target_tree, tt,
2838
2626
child_pb, filenames, backups,
2839
2627
merge_modified, basis_tree)
2840
with ui.ui_factory.nested_progress_bar() as child_pb:
2630
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2841
2632
raw_conflicts = resolve_conflicts(tt, child_pb,
2842
2633
lambda t, c: conflict_pass(t, c, target_tree))
2843
2636
conflicts = cook_conflicts(raw_conflicts, tt)
2844
2637
return conflicts, merge_modified
2862
2651
deferred_files = []
2863
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2864
2653
kind, executable) in enumerate(change_list):
2865
target_path, wt_path = path
2866
target_versioned, wt_versioned = versioned
2867
target_parent, wt_parent = parent
2868
target_name, wt_name = name
2869
target_kind, wt_kind = kind
2870
target_executable, wt_executable = executable
2871
if skip_root and wt_parent is None:
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2873
2656
trans_id = tt.trans_id_file_id(file_id)
2875
2658
if changed_content:
2876
2659
keep_content = False
2877
if wt_kind == 'file' and (backups or target_kind is None):
2878
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2879
2662
if merge_modified.get(file_id) != wt_sha1:
2880
2663
# acquire the basis tree lazily to prevent the
2881
2664
# expense of accessing it when it's not needed ?
2883
2666
if basis_tree is None:
2884
2667
basis_tree = working_tree.basis_tree()
2885
2668
basis_tree.lock_read()
2886
basis_path = find_previous_path(working_tree, basis_tree, wt_path)
2887
if basis_path is None:
2888
if target_kind is None and not target_versioned:
2891
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2893
if wt_kind is not None:
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:
2894
2675
if not keep_content:
2895
2676
tt.delete_contents(trans_id)
2896
elif target_kind is not None:
2897
parent_trans_id = tt.trans_id_file_id(wt_parent)
2898
backup_name = tt._available_backup_name(
2899
wt_name, parent_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)
2900
2682
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2901
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2902
if wt_versioned and target_versioned:
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2903
2685
tt.unversion_file(trans_id)
2904
2686
tt.version_file(file_id, new_trans_id)
2905
2687
# New contents should have the same unix perms as old
2907
2689
mode_id = trans_id
2908
2690
trans_id = new_trans_id
2909
if target_kind in ('directory', 'tree-reference'):
2691
if kind[1] in ('directory', 'tree-reference'):
2910
2692
tt.create_directory(trans_id)
2911
if target_kind == 'tree-reference':
2912
revision = target_tree.get_reference_revision(
2913
target_path, file_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2914
2696
tt.set_tree_reference(revision, trans_id)
2915
elif target_kind == 'symlink':
2916
tt.create_symlink(target_tree.get_symlink_target(
2917
target_path, file_id), trans_id)
2918
elif target_kind == 'file':
2919
deferred_files.append((target_path, (trans_id, mode_id, file_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)))
2920
2702
if basis_tree is None:
2921
2703
basis_tree = working_tree.basis_tree()
2922
2704
basis_tree.lock_read()
2923
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2924
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2925
if (basis_path is not None and
2926
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
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)):
2927
2708
if file_id in merge_modified:
2928
2709
del merge_modified[file_id]
2930
2711
merge_modified[file_id] = new_sha1
2932
2713
# preserve the execute bit when backing up
2933
if keep_content and wt_executable == target_executable:
2934
tt.set_executability(target_executable, trans_id)
2935
elif target_kind is not None:
2936
raise AssertionError(target_kind)
2937
if not wt_versioned and target_versioned:
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):
2938
2719
tt.version_file(file_id, trans_id)
2939
if wt_versioned and not target_versioned:
2720
if versioned == (True, False):
2940
2721
tt.unversion_file(trans_id)
2941
if (target_name is not None and
2942
(wt_name != target_name or wt_parent != target_parent)):
2943
if target_name == '' and target_parent is None:
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:
2944
2725
parent_trans = ROOT_PARENT
2946
parent_trans = tt.trans_id_file_id(target_parent)
2947
if wt_parent is None and wt_versioned:
2948
tt.adjust_root_path(target_name, parent_trans)
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)
2950
tt.adjust_path(target_name, parent_trans, trans_id)
2951
if wt_executable != target_executable and target_kind == "file":
2952
tt.set_executability(target_executable, trans_id)
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)
2953
2734
if working_tree.supports_content_filtering():
2954
for (trans_id, mode_id, file_id), bytes in (
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2955
2736
target_tree.iter_files_bytes(deferred_files)):
2737
file_id = deferred_files[index][0]
2956
2738
# We're reverting a tree to the target tree so using the
2957
2739
# target tree to find the file path seems the best choice
2958
2740
# here IMO - Ian C 27/Oct/2009
3111
2878
modified_path = fp.get_path(conflict[2])
3112
2879
modified_id = tt.final_file_id(conflict[2])
3113
2880
if len(conflict) == 3:
3114
yield conflicts.Conflict.factory(
3115
c_type, action=action, path=modified_path, file_id=modified_id)
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3118
2885
conflicting_path = fp.get_path(conflict[3])
3119
2886
conflicting_id = tt.final_file_id(conflict[3])
3120
yield conflicts.Conflict.factory(
3121
c_type, action=action, path=modified_path,
3122
file_id=modified_id,
3123
conflict_path=conflicting_path,
3124
conflict_file_id=conflicting_id)
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)
3127
2893
class _FileMover(object):
added
removed
bzrlib/transform.py
