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
1014
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
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):
931
1019
"""Commit the result of this TreeTransform to a branch.
933
1021
:param branch: The branch to commit to.
934
1022
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
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.)
936
1037
:return: The revision_id of the revision committed.
938
1039
self._check_malformed()
965
1072
return revision_id
967
1074
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1075
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1077
if path is None or self._tree.kind(path) != 'file':
972
1079
except errors.NoSuchFile:
976
1083
def _get_parents_texts(self, trans_id):
977
1084
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1085
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1088
return (self._tree.get_file_text(path),)
983
1090
def _get_parents_lines(self, trans_id):
984
1091
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1092
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1095
return (self._tree.get_file_lines(path),)
990
1097
def serialize(self, serializer):
991
1098
"""Serialize this TreeTransform.
993
1100
:param serializer: A Serialiser like pack.ContainerSerializer.
995
1102
new_name = dict((k, v.encode('utf-8')) for k, v in
996
self._new_name.items())
1103
viewitems(self._new_name))
997
1104
new_executability = dict((k, int(v)) for k, v in
998
self._new_executability.items())
1105
viewitems(self._new_executability))
999
1106
tree_path_ids = dict((k.encode('utf-8'), v)
1000
for k, v in self._tree_path_ids.items())
1107
for k, v in viewitems(self._tree_path_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,
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,
1012
1119
yield serializer.bytes_record(bencode.bencode(attribs),
1014
for trans_id, kind in self._new_contents.items():
1121
for trans_id, kind in viewitems(self._new_contents):
1015
1122
if kind == 'file':
1016
lines = osutils.chunks_to_lines(
1017
self._read_file_chunks(trans_id))
1123
with open(self._limbo_name(trans_id), 'rb') as cur_file:
1124
lines = cur_file.readlines()
1018
1125
parents = self._get_parents_lines(trans_id)
1019
1126
mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
content = ''.join(mpdiff.to_patch())
1127
content = b''.join(mpdiff.to_patch())
1021
1128
if kind == 'directory':
1023
1130
if kind == 'symlink':
1024
1131
content = self._read_symlink_target(trans_id)
1025
1132
yield serializer.bytes_record(content, ((trans_id, kind),))
1030
1137
:param records: An iterable of (names, content) tuples, as per
1031
1138
pack.ContainerPushParser.
1033
names, content = records.next()
1140
names, content = next(records)
1034
1141
attribs = bencode.bdecode(content)
1035
self._id_number = attribs['_id_number']
1142
self._id_number = attribs[b'_id_number']
1036
1143
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())
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))
1043
1150
self._tree_path_ids = {}
1044
1151
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1152
for bytepath, trans_id in viewitems(attribs[b'_tree_path_ids']):
1046
1153
path = bytepath.decode('utf-8')
1047
1154
self._tree_path_ids[path] = trans_id
1048
1155
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']
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']
1052
1159
for ((trans_id, kind),), content in records:
1053
1160
if kind == 'file':
1054
1161
mpdiff = multiparent.MultiParent.from_patch(content)
1173
1296
descendants.update(self._limbo_descendants(descendant))
1174
1297
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1299
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1300
"""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.
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.
1187
1313
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.
1314
with open(name, 'wb') as f:
1315
unique_add(self._new_contents, trans_id, 'file')
1199
1316
f.writelines(contents)
1202
1317
self._set_mtime(name)
1203
1318
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()
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))
1212
1325
def _read_symlink_target(self, trans_id):
1213
1326
return os.readlink(self._limbo_name(trans_id))
1274
1389
del self._limbo_children_names[trans_id]
1275
1390
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.',
1278
1469
class TreeTransform(DiskTreeTransform):
1279
1470
"""Represent a tree transformation.
1571
1755
inventory_delta.append((path, None, file_id, None))
1572
1756
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
1758
final_kinds = {}
1578
1759
for num, (path, trans_id) in enumerate(new_paths):
1579
1760
if (num % 10) == 0:
1580
child_pb.update('adding file',
1761
child_pb.update(gettext('adding file'),
1581
1762
num + len(self._removed_id), total_entries)
1582
1763
file_id = new_path_file_ids[trans_id]
1583
1764
if file_id is None:
1585
1766
needs_entry = False
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1767
kind = self.final_kind(trans_id)
1769
kind = self._tree.stored_kind(
1770
self._tree.id2path(file_id), file_id)
1590
1771
parent_trans_id = self.final_parent(trans_id)
1591
1772
parent_file_id = new_path_file_ids.get(parent_trans_id)
1592
1773
if parent_file_id is None:
1657
1837
modified_paths = []
1658
1838
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()
1840
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1841
for num, (path, trans_id) in enumerate(new_paths):
1663
1842
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1843
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1844
full_path = self._tree.abspath(path)
1666
1845
if trans_id in self._needs_rename:
1668
1847
mover.rename(self._limbo_name(trans_id), full_path)
1848
except errors.TransformRenameFailed as e:
1670
1849
# We may be renaming a dangling inventory id
1671
1850
if e.errno != errno.ENOENT:
1674
1853
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.
1675
1857
if (trans_id in self._new_contents or
1676
1858
self.path_changed(trans_id)):
1677
1859
if trans_id in self._new_contents:
1678
1860
modified_paths.append(full_path)
1679
1861
if trans_id in self._new_executability:
1680
1862
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]
1683
1872
self._new_contents.clear()
1684
1873
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)
1687
1899
class TransformPreview(DiskTreeTransform):
1688
1900
"""A TreeTransform for generating preview trees.
1766
1981
except errors.NoSuchRevisionInTree:
1767
1982
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()]
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()]
1772
1988
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
1989
self.get_file_lines(path, file_id))
1774
1990
repo = self._get_repository()
1775
1991
base_vf = repo.texts
1776
1992
if base_vf not in vf.fallback_versionedfiles:
1777
1993
vf.fallback_versionedfiles.append(base_vf)
1778
1994
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
1996
def _stat_limbo_file(self, trans_id):
1782
1997
name = self._transform._limbo_name(trans_id)
1783
1998
return os.lstat(name)
1895
2117
if self._transform.final_file_id(trans_id) is None:
1896
2118
yield self._final_paths._determine_path(trans_id)
1898
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1899
yield_parents=False):
2120
def _make_inv_entries(self, ordered_entries, specific_files=None):
1900
2121
for trans_id, parent_file_id in ordered_entries:
1901
2122
file_id = self._transform.final_file_id(trans_id)
1902
2123
if file_id is None:
1904
if (specific_file_ids is not None
1905
and file_id not in specific_file_ids):
2125
if (specific_files is not None and
2126
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)
2128
kind = self._transform.final_kind(trans_id)
2130
kind = self._transform._tree.stored_kind(
2131
self._transform._tree.id2path(file_id),
1911
2133
new_entry = inventory.make_entry(
1913
2135
self._transform.final_name(trans_id),
1937
2168
ordered_ids = self._list_files_by_dir()
1938
2169
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
2171
yield self._final_paths.get_path(trans_id), entry
1942
2173
def _iter_entries_for_dir(self, dir_path):
1943
2174
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
1945
2175
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))
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))
1949
2180
for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
yield unicode(self._final_paths.get_path(trans_id)), entry
2181
yield self._final_paths.get_path(trans_id), entry
1952
2183
def list_files(self, include_root=False, from_dir=None, recursive=True):
1953
2184
"""See WorkingTree.list_files."""
1975
2206
for path, entry in entries:
1976
2207
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)
2209
def kind(self, path, file_id=None):
2210
trans_id = self._path2trans_id(path)
2211
if trans_id is None:
2212
raise errors.NoSuchFile(path)
1980
2213
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)
2215
def stored_kind(self, path, file_id=None):
2216
trans_id = self._path2trans_id(path)
2217
if trans_id is None:
2218
raise errors.NoSuchFile(path)
1985
2220
return self._transform._new_contents[trans_id]
1986
2221
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2222
return self._transform._tree.stored_kind(path, file_id)
1989
def get_file_mtime(self, file_id, path=None):
2224
def get_file_mtime(self, path, file_id=None):
1990
2225
"""See Tree.get_file_mtime"""
2227
file_id = self.path2id(path)
2229
raise errors.NoSuchFile(path)
1991
2230
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):
2231
return self._transform._tree.get_file_mtime(
2232
self._transform._tree.id2path(file_id), file_id)
2233
trans_id = self._path2trans_id(path)
2234
return self._stat_limbo_file(trans_id).st_mtime
2236
def get_file_size(self, path, file_id=None):
1999
2237
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2238
trans_id = self._path2trans_id(path)
2239
if trans_id is None:
2240
raise errors.NoSuchFile(path)
2241
kind = self._transform.final_kind(trans_id)
2244
if trans_id in self._transform._new_contents:
2245
return self._stat_limbo_file(trans_id).st_size
2246
if self.kind(path, file_id) == 'file':
2247
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)
2251
def get_file_verifier(self, path, file_id=None, stat_value=None):
2252
trans_id = self._path2trans_id(path)
2253
if trans_id is None:
2254
raise errors.NoSuchFile(path)
2255
kind = self._transform._new_contents.get(trans_id)
2257
return self._transform._tree.get_file_verifier(path, file_id)
2259
with self.get_file(path, file_id) as fileobj:
2260
return ("SHA1", sha_file(fileobj))
2262
def get_file_sha1(self, path, file_id=None, stat_value=None):
2263
trans_id = self._path2trans_id(path)
2264
if trans_id is None:
2265
raise errors.NoSuchFile(path)
2266
kind = self._transform._new_contents.get(trans_id)
2268
return self._transform._tree.get_file_sha1(path, file_id)
2270
with self.get_file(path, file_id) as fileobj:
2013
2271
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2273
def is_executable(self, path, file_id=None):
2274
trans_id = self._path2trans_id(path)
2275
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2278
return self._transform._new_executability[trans_id]
2023
2279
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2281
return self._transform._tree.is_executable(path, file_id)
2282
except OSError as e:
2027
2283
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2286
except errors.NoSuchFile:
2289
def has_filename(self, path):
2290
trans_id = self._path2trans_id(path)
2291
if trans_id in self._transform._new_contents:
2293
elif trans_id in self._transform._removed_contents:
2296
return self._transform._tree.has_filename(path)
2033
2298
def path_content_summary(self, path):
2034
2299
trans_id = self._path2trans_id(path)
2035
2300
tt = self._transform
2081
2346
raise ValueError('want_unversioned is not supported')
2082
2347
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2349
def get_file(self, path, file_id=None):
2085
2350
"""See Tree.get_file"""
2352
file_id = self.path2id(path)
2086
2353
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)
2354
return self._transform._tree.get_file(path, file_id)
2355
trans_id = self._path2trans_id(path)
2089
2356
name = self._transform._limbo_name(trans_id)
2090
2357
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2359
def get_file_with_stat(self, path, file_id=None):
2360
return self.get_file(path, file_id), None
2095
def annotate_iter(self, file_id,
2362
def annotate_iter(self, path, file_id=None,
2096
2363
default_revision=_mod_revision.CURRENT_REVISION):
2365
file_id = self.path2id(path)
2097
2366
changes = self._iter_changes_cache.get(file_id)
2098
2367
if changes is None:
2243
2516
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2517
generate the inventory delta.
2246
wt.lock_tree_write()
2519
with wt.lock_tree_write(), tree.lock_read():
2520
if accelerator_tree is not None:
2521
accelerator_tree.lock_read()
2523
return _build_tree(tree, wt, accelerator_tree, hardlink,
2250
2526
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()
2527
accelerator_tree.unlock()
2264
2530
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2531
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2532
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2533
if num > 0: # more than just a root
2268
2534
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
2535
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2536
top_pb = ui.ui_factory.nested_progress_bar()
2274
2537
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2538
if tree.get_root_id() is not None:
2276
2539
# This is kind of a hack: we should be altering the root
2277
2540
# as part of the regular tree shape diff logic.
2278
2541
# The conditional test here is to avoid doing an
2289
2552
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()
2553
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2554
with ui.ui_factory.nested_progress_bar() as pb:
2294
2555
deferred_contents = []
2296
total = len(tree.inventory)
2557
total = len(tree.all_versioned_paths())
2297
2558
if delta_from_tree:
2298
2559
precomputed_delta = []
2300
2561
precomputed_delta = None
2562
# Check if tree inventory has content. If so, we populate
2563
# existing_files with the directory content. If there are no
2564
# entries we skip populating existing_files as its not used.
2565
# This improves performance and unncessary work on large
2566
# directory trees. (#501307)
2568
existing_files = set()
2569
for dir, files in wt.walkdirs():
2570
existing_files.update(f[0] for f in files)
2301
2571
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2572
enumerate(tree.iter_entries_by_dir()):
2573
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2574
if entry.parent_id is None:
2306
2576
reparent = False
2330
2600
trans_id = tt.create_path(entry.name, parent_id)
2331
2601
file_trans_id[file_id] = trans_id
2332
2602
tt.version_file(file_id, trans_id)
2333
executable = tree.is_executable(file_id, tree_path)
2603
executable = tree.is_executable(tree_path, file_id)
2335
2605
tt.set_executability(executable, trans_id)
2336
trans_data = (trans_id, tree_path)
2337
deferred_contents.append((file_id, trans_data))
2606
trans_data = (trans_id, file_id, tree_path, entry.text_sha1)
2607
deferred_contents.append((tree_path, trans_data))
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2609
file_trans_id[file_id] = new_by_entry(
2610
tree_path, tt, entry, parent_id, tree)
2342
2612
new_trans_id = file_trans_id[file_id]
2343
2613
old_parent = tt.trans_id_tree_path(tree_path)
2376
2644
new_desired_files = desired_files
2378
2646
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2647
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2380
2648
in iter if not (c or e[0] != e[1])]
2381
2649
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()]
2650
unchanged = [(tp, ap) for (tp, ap) in unchanged
2651
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2652
unchanged = dict(unchanged)
2385
2653
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2655
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2656
accelerator_path = unchanged.get(tree_path)
2389
2657
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2658
new_desired_files.append((tree_path,
2659
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2661
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2663
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
2666
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2667
chunks = osutils.file_iterator(f)
2668
if wt.supports_content_filtering():
2669
filters = wt._content_filter_stack(tree_path)
2670
chunks = filtered_output_bytes(chunks, filters,
2671
ContentFilterContext(tree_path, tree))
2672
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2674
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2675
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2676
tree.iter_files_bytes(new_desired_files)):
2414
2677
if wt.supports_content_filtering():
2415
2678
filters = wt._content_filter_stack(tree_path)
2416
2679
contents = filtered_output_bytes(contents, filters,
2417
2680
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2681
tt.create_file(contents, trans_id, sha1=text_sha1)
2682
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2685
def _reparent_children(tt, old_parent, new_parent):
2423
2686
for child in tt.iter_tree_children(old_parent):
2424
2687
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2690
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2691
by_parent = tt.by_parent()
2428
2692
for child in by_parent[old_parent]:
2429
2693
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2694
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2697
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2433
2698
if entry.kind != kind:
2435
2700
if entry.kind == "directory":
2437
2702
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2703
with open(target_path, 'rb') as f1, \
2704
tree.get_file(tree_path, file_id) as f2:
2705
if osutils.compare_files(f1, f2):
2440
2707
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2708
if tree.get_symlink_target(tree_path, file_id) == os.readlink(target_path):
2473
2740
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2743
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2744
"""Create a new file according to its inventory entry"""
2478
2745
name = entry.name
2479
2746
kind = entry.kind
2480
2747
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,
2748
with tree.get_file(path, entry.file_id) as f:
2749
executable = tree.is_executable(path, entry.file_id)
2751
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2753
elif kind in ('directory', 'tree-reference'):
2486
2754
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2755
if kind == 'tree-reference':
2488
2756
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2757
return trans_id
2490
2758
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2759
target = tree.get_symlink_target(path, entry.file_id)
2492
2760
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2762
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,
2765
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2514
2766
filter_tree_path=None):
2515
2767
"""Create new file contents according to tree contents.
2517
2769
:param filter_tree_path: the tree path to use to lookup
2518
2770
content filters to apply to the bytes output in the working tree.
2519
2771
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2773
kind = tree.kind(path, file_id)
2522
2774
if kind == 'directory':
2523
2775
tt.create_directory(trans_id)
2524
2776
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)
2778
f = tree.get_file(path, file_id)
2779
chunks = osutils.file_iterator(f)
2784
if wt.supports_content_filtering() and filter_tree_path is not None:
2785
filters = wt._content_filter_stack(filter_tree_path)
2786
chunks = filtered_output_bytes(chunks, filters,
2787
ContentFilterContext(filter_tree_path, tree))
2788
tt.create_file(chunks, trans_id)
2537
2792
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2793
tt.create_symlink(tree.get_symlink_target(path, file_id), trans_id)
2540
2795
raise AssertionError('Unknown kind %r' % kind)
2546
2801
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
2804
def revert(working_tree, target_tree, filenames, backups=False,
2593
2805
pb=None, change_reporter=None):
2594
2806
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2807
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)
2809
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2810
pp = ProgressPhase("Revert phase", 3, pb)
2811
conflicts, merge_modified = _prepare_revert_transform(
2812
working_tree, target_tree, tt, filenames, backups, pp)
2814
change_reporter = delta._ChangeReporter(
2815
unversioned_filter=working_tree.is_ignored)
2816
delta.report_changes(tt.iter_changes(), change_reporter)
2817
for conflict in conflicts:
2818
trace.warning(text_type(conflict))
2821
if working_tree.supports_merge_modified():
2822
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2825
return conflicts
2618
2828
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2829
backups, pp, basis_tree=None,
2620
2830
merge_modified=None):
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2831
with ui.ui_factory.nested_progress_bar() as child_pb:
2623
2832
if merge_modified is None:
2624
2833
merge_modified = working_tree.merge_modified()
2625
2834
merge_modified = _alter_files(working_tree, target_tree, tt,
2626
2835
child_pb, filenames, backups,
2627
2836
merge_modified, basis_tree)
2630
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2837
with ui.ui_factory.nested_progress_bar() as child_pb:
2632
2838
raw_conflicts = resolve_conflicts(tt, child_pb,
2633
2839
lambda t, c: conflict_pass(t, c, target_tree))
2636
2840
conflicts = cook_conflicts(raw_conflicts, tt)
2637
2841
return conflicts, merge_modified
2651
2859
deferred_files = []
2652
2860
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2861
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2862
target_path, wt_path = path
2863
target_versioned, wt_versioned = versioned
2864
target_parent, wt_parent = parent
2865
target_name, wt_name = name
2866
target_kind, wt_kind = kind
2867
target_executable, wt_executable = executable
2868
if skip_root and wt_parent is None:
2656
2870
trans_id = tt.trans_id_file_id(file_id)
2658
2872
if changed_content:
2659
2873
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)
2874
if wt_kind == 'file' and (backups or target_kind is None):
2875
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2662
2876
if merge_modified.get(file_id) != wt_sha1:
2663
2877
# acquire the basis tree lazily to prevent the
2664
2878
# expense of accessing it when it's not needed ?
2666
2880
if basis_tree is None:
2667
2881
basis_tree = working_tree.basis_tree()
2668
2882
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:
2883
basis_path = find_previous_path(working_tree, basis_tree, wt_path)
2884
if basis_path is None:
2885
if target_kind is None and not target_versioned:
2888
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2890
if wt_kind is not None:
2675
2891
if not keep_content:
2676
2892
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)
2893
elif target_kind is not None:
2894
parent_trans_id = tt.trans_id_file_id(wt_parent)
2895
backup_name = tt._available_backup_name(
2896
wt_name, parent_trans_id)
2682
2897
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):
2898
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2899
if wt_versioned and target_versioned:
2685
2900
tt.unversion_file(trans_id)
2686
2901
tt.version_file(file_id, new_trans_id)
2687
2902
# New contents should have the same unix perms as old
2689
2904
mode_id = trans_id
2690
2905
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2906
if target_kind in ('directory', 'tree-reference'):
2692
2907
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2908
if target_kind == 'tree-reference':
2909
revision = target_tree.get_reference_revision(
2910
target_path, file_id)
2696
2911
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)))
2912
elif target_kind == 'symlink':
2913
tt.create_symlink(target_tree.get_symlink_target(
2914
target_path, file_id), trans_id)
2915
elif target_kind == 'file':
2916
deferred_files.append((target_path, (trans_id, mode_id, file_id)))
2702
2917
if basis_tree is None:
2703
2918
basis_tree = working_tree.basis_tree()
2704
2919
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)):
2920
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2921
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2922
if (basis_path is not None and
2923
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2708
2924
if file_id in merge_modified:
2709
2925
del merge_modified[file_id]
2711
2927
merge_modified[file_id] = new_sha1
2713
2929
# 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):
2930
if keep_content and wt_executable == target_executable:
2931
tt.set_executability(target_executable, trans_id)
2932
elif target_kind is not None:
2933
raise AssertionError(target_kind)
2934
if not wt_versioned and target_versioned:
2719
2935
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2936
if wt_versioned and not target_versioned:
2721
2937
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:
2938
if (target_name is not None and
2939
(wt_name != target_name or wt_parent != target_parent)):
2940
if target_name == '' and target_parent is None:
2725
2941
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)
2943
parent_trans = tt.trans_id_file_id(target_parent)
2944
if wt_parent is None and wt_versioned:
2945
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)
2947
tt.adjust_path(target_name, parent_trans, trans_id)
2948
if wt_executable != target_executable and target_kind == "file":
2949
tt.set_executability(target_executable, trans_id)
2734
2950
if working_tree.supports_content_filtering():
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2951
for (trans_id, mode_id, file_id), bytes in (
2736
2952
target_tree.iter_files_bytes(deferred_files)):
2737
file_id = deferred_files[index][0]
2738
2953
# We're reverting a tree to the target tree so using the
2739
2954
# target tree to find the file path seems the best choice
2740
2955
# here IMO - Ian C 27/Oct/2009
2878
3108
modified_path = fp.get_path(conflict[2])
2879
3109
modified_id = tt.final_file_id(conflict[2])
2880
3110
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3111
yield conflicts.Conflict.factory(
3112
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3115
conflicting_path = fp.get_path(conflict[3])
2886
3116
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)
3117
yield conflicts.Conflict.factory(
3118
c_type, action=action, path=modified_path,
3119
file_id=modified_id,
3120
conflict_path=conflicting_path,
3121
conflict_file_id=conflicting_id)
2893
3124
class _FileMover(object):
added
removed
breezy/transform.py
