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
74
ROOT_PARENT = "root-parent"
67
76
def unique_add(map, key, value):
69
78
raise DuplicateKey(key=key)
73
83
class _TransformResults(object):
74
84
def __init__(self, modified_paths, rename_count):
75
85
object.__init__(self)
380
401
return sorted(FinalPaths(self).get_paths(new_ids))
382
403
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,
404
"""Determine which trans_ids need new Inventory entries.
406
An new entry is needed when anything that would be reflected by an
407
inventory entry changes, including file name, file_id, parent file_id,
408
file kind, and the execute bit.
410
Some care is taken to return entries with real changes, not cases
411
where the value is deleted and then restored to its original value,
412
but some actually unchanged values may be returned.
414
:returns: A list of (path, trans_id) for all items requiring an
415
inventory change. Ordered by path.
418
# Find entries whose file_ids are new (or changed).
419
new_file_id = set(t for t in self._new_id
420
if self._new_id[t] != self.tree_file_id(t))
421
for id_set in [self._new_name, self._new_parent, new_file_id,
386
422
self._new_executability]:
387
new_ids.update(id_set)
423
changed_ids.update(id_set)
424
# removing implies a kind change
388
425
changed_kind = set(self._removed_contents)
389
427
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))
428
# Ignore entries that are already known to have changed.
429
changed_kind.difference_update(changed_ids)
430
# to keep only the truly changed ones
431
changed_kind = (t for t in changed_kind
432
if self.tree_kind(t) != self.final_kind(t))
433
# all kind changes will alter the inventory
434
changed_ids.update(changed_kind)
435
# To find entries with changed parent_ids, find parents which existed,
436
# but changed file_id.
437
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
438
# Now add all their children to the set.
439
for parent_trans_id in new_file_id:
440
changed_ids.update(self.iter_tree_children(parent_trans_id))
441
return sorted(FinalPaths(self).get_paths(changed_ids))
396
443
def final_kind(self, trans_id):
397
444
"""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)
446
:return: None if the file does not exist/has no contents. (It is
447
conceivable that a path would be created without the corresponding
448
contents insertion command)
403
450
if trans_id in self._new_contents:
404
451
return self._new_contents[trans_id]
405
452
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
455
return self.tree_kind(trans_id)
531
578
# ensure that all children are registered with the transaction
532
579
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:
581
def _has_named_child(self, name, parent_id, known_children):
582
"""Does a parent already have a name child.
584
:param name: The searched for name.
586
:param parent_id: The parent for which the check is made.
588
:param known_children: The already known children. This should have
589
been recently obtained from `self.by_parent.get(parent_id)`
590
(or will be if None is passed).
592
if known_children is None:
593
known_children = self.by_parent().get(parent_id, [])
594
for child in known_children:
540
595
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
597
parent_path = self._tree_id_paths.get(parent_id, None)
598
if parent_path is None:
599
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
601
child_path = joinpath(parent_path, name)
602
child_id = self._tree_path_ids.get(child_path, None)
548
603
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
604
# Not known by the tree transform yet, check the filesystem
605
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?
607
raise AssertionError('child_id is missing: %s, %s, %s'
608
% (name, parent_id, child_id))
610
def _available_backup_name(self, name, target_id):
611
"""Find an available backup name.
613
:param name: The basename of the file.
615
:param target_id: The directory trans_id where the backup should
618
known_children = self.by_parent().get(target_id, [])
619
return osutils.available_backup_name(
621
lambda base: self._has_named_child(
622
base, target_id, known_children))
559
624
def _parent_loops(self):
560
625
"""No entry should be its own ancestor"""
644
702
if (self._new_name, self._new_parent) == ({}, {}):
646
for children in by_parent.itervalues():
647
name_ids = [(self.final_name(t), t) for t in children]
648
if not self._case_sensitive_target:
649
name_ids = [(n.lower(), t) for n, t in name_ids]
704
for children in viewvalues(by_parent):
706
for child_tid in children:
707
name = self.final_name(child_tid)
709
# Keep children only if they still exist in the end
710
if not self._case_sensitive_target:
712
name_ids.append((name, child_tid))
652
715
last_trans_id = None
653
716
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
717
kind = self.final_kind(trans_id)
658
718
file_id = self.final_file_id(trans_id)
659
719
if kind is None and file_id is None:
672
732
self._removed_id))
673
733
all_ids = self._tree.all_file_ids()
674
734
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
735
for trans_id, file_id in viewitems(self._new_id):
676
736
if file_id in active_tree_ids:
677
737
old_trans_id = self.trans_id_tree_file_id(file_id)
678
738
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
741
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
742
"""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)
744
for parent_id, children in viewitems(by_parent):
745
if parent_id == ROOT_PARENT:
748
for child_id in children:
749
if self.final_kind(child_id) is not None:
754
# There is at least a child, so we need an existing directory to
756
kind = self.final_kind(parent_id)
758
# The directory will be deleted
699
759
conflicts.append(('missing parent', parent_id))
700
760
elif kind != "directory":
761
# Meh, we need a *directory* to put something in it
701
762
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
765
def _set_executability(self, path, trans_id):
715
766
"""Set the executability of versioned files """
716
if supports_executable():
767
if self._tree._supports_executable():
717
768
new_executability = self._new_executability[trans_id]
718
769
abspath = self._tree.abspath(path)
719
770
current_mode = os.stat(abspath).st_mode
720
771
if new_executability:
721
772
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
774
to_mode = current_mode | (0o100 & ~umask)
724
775
# 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
776
if current_mode & 0o004:
777
to_mode |= 0o001 & ~umask
778
if current_mode & 0o040:
779
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
781
to_mode = current_mode & ~0o111
782
osutils.chmod_if_possible(abspath, to_mode)
733
784
def _new_entry(self, name, parent_id, file_id):
734
785
"""Helper function to create a new filesystem entry."""
780
831
self.create_symlink(target, trans_id)
834
def new_orphan(self, trans_id, parent_id):
835
"""Schedule an item to be orphaned.
837
When a directory is about to be removed, its children, if they are not
838
versioned are moved out of the way: they don't have a parent anymore.
840
:param trans_id: The trans_id of the existing item.
841
:param parent_id: The parent trans_id of the item.
843
raise NotImplementedError(self.new_orphan)
845
def _get_potential_orphans(self, dir_id):
846
"""Find the potential orphans in a directory.
848
A directory can't be safely deleted if there are versioned files in it.
849
If all the contained files are unversioned then they can be orphaned.
851
The 'None' return value means that the directory contains at least one
852
versioned file and should not be deleted.
854
:param dir_id: The directory trans id.
856
:return: A list of the orphan trans ids or None if at least one
857
versioned file is present.
860
# Find the potential orphans, stop if one item should be kept
861
for child_tid in self.by_parent()[dir_id]:
862
if child_tid in self._removed_contents:
863
# The child is removed as part of the transform. Since it was
864
# versioned before, it's not an orphan
866
elif self.final_file_id(child_tid) is None:
867
# The child is not versioned
868
orphans.append(child_tid)
870
# We have a versioned file here, searching for orphans is
783
876
def _affected_ids(self):
784
877
"""Return the set of transform ids affected by the transform"""
785
878
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
879
trans_ids.update(self._new_id)
787
880
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())
881
trans_ids.update(self._new_contents)
882
trans_ids.update(self._new_executability)
883
trans_ids.update(self._new_name)
884
trans_ids.update(self._new_parent)
794
887
def _get_file_id_maps(self):
928
1018
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1020
def commit(self, branch, message, merge_parents=None, strict=False,
1021
timestamp=None, timezone=None, committer=None, authors=None,
1022
revprops=None, revision_id=None):
931
1023
"""Commit the result of this TreeTransform to a branch.
933
1025
:param branch: The branch to commit to.
934
1026
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1027
:param merge_parents: Additional parent revision-ids specified by
1029
:param strict: If True, abort the commit if there are unversioned
1031
:param timestamp: if not None, seconds-since-epoch for the time and
1032
date. (May be a float.)
1033
:param timezone: Optional timezone for timestamp, as an offset in
1035
:param committer: Optional committer in email-id format.
1036
(e.g. "J Random Hacker <jrandom@example.com>")
1037
:param authors: Optional list of authors in email-id format.
1038
:param revprops: Optional dictionary of revision properties.
1039
:param revision_id: Optional revision id. (Specifying a revision-id
1040
may reduce performance for some non-native formats.)
936
1041
:return: The revision_id of the revision committed.
938
1043
self._check_malformed()
1030
1141
:param records: An iterable of (names, content) tuples, as per
1031
1142
pack.ContainerPushParser.
1033
names, content = records.next()
1144
names, content = next(records)
1034
1145
attribs = bencode.bdecode(content)
1035
1146
self._id_number = attribs['_id_number']
1036
1147
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1148
for k, v in viewitems(attribs['_new_name']))
1038
1149
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1150
self._new_executability = dict((k, bool(v))
1151
for k, v in viewitems(attribs['_new_executability']))
1041
1152
self._new_id = attribs['_new_id']
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1153
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1043
1154
self._tree_path_ids = {}
1044
1155
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1156
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1046
1157
path = bytepath.decode('utf-8')
1047
1158
self._tree_path_ids[path] = trans_id
1048
1159
self._tree_id_paths[trans_id] = path
1173
1300
descendants.update(self._limbo_descendants(descendant))
1174
1301
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1303
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1304
"""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.
1308
:param contents: an iterator of strings, all of which will be written
1309
to the target destination.
1310
:param trans_id: TreeTransform handle
1311
:param mode_id: If not None, force the mode of the target file to match
1312
the mode of the object referenced by mode_id.
1313
Otherwise, we will try to preserve mode bits of an existing file.
1314
:param sha1: If the sha1 of this content is already known, pass it in.
1315
We can use it to prevent future sha1 computations.
1187
1317
name = self._limbo_name(trans_id)
1188
1318
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.
1320
unique_add(self._new_contents, trans_id, 'file')
1199
1321
f.writelines(contents)
1202
1324
self._set_mtime(name)
1203
1325
self._set_mode(trans_id, mode_id, S_ISREG)
1326
# It is unfortunate we have to use lstat instead of fstat, but we just
1327
# used utime and chmod on the file, so we need the accurate final
1329
if sha1 is not None:
1330
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1332
def _read_file_chunks(self, trans_id):
1206
1333
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1403
del self._limbo_children_names[trans_id]
1275
1404
delete_any(self._limbo_name(trans_id))
1406
def new_orphan(self, trans_id, parent_id):
1407
conf = self._tree.get_config_stack()
1408
handle_orphan = conf.get('bzr.transform.orphan_policy')
1409
handle_orphan(self, trans_id, parent_id)
1412
class OrphaningError(errors.BzrError):
1414
# Only bugs could lead to such exception being seen by the user
1415
internal_error = True
1416
_fmt = "Error while orphaning %s in %s directory"
1418
def __init__(self, orphan, parent):
1419
errors.BzrError.__init__(self)
1420
self.orphan = orphan
1421
self.parent = parent
1424
class OrphaningForbidden(OrphaningError):
1426
_fmt = "Policy: %s doesn't allow creating orphans."
1428
def __init__(self, policy):
1429
errors.BzrError.__init__(self)
1430
self.policy = policy
1433
def move_orphan(tt, orphan_id, parent_id):
1434
"""See TreeTransformBase.new_orphan.
1436
This creates a new orphan in the `brz-orphans` dir at the root of the
1439
:param tt: The TreeTransform orphaning `trans_id`.
1441
:param orphan_id: The trans id that should be orphaned.
1443
:param parent_id: The orphan parent trans id.
1445
# Add the orphan dir if it doesn't exist
1446
orphan_dir_basename = 'brz-orphans'
1447
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1448
if tt.final_kind(od_id) is None:
1449
tt.create_directory(od_id)
1450
parent_path = tt._tree_id_paths[parent_id]
1451
# Find a name that doesn't exist yet in the orphan dir
1452
actual_name = tt.final_name(orphan_id)
1453
new_name = tt._available_backup_name(actual_name, od_id)
1454
tt.adjust_path(new_name, od_id, orphan_id)
1455
trace.warning('%s has been orphaned in %s'
1456
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1459
def refuse_orphan(tt, orphan_id, parent_id):
1460
"""See TreeTransformBase.new_orphan.
1462
This refuses to create orphan, letting the caller handle the conflict.
1464
raise OrphaningForbidden('never')
1467
orphaning_registry = registry.Registry()
1468
orphaning_registry.register(
1469
'conflict', refuse_orphan,
1470
'Leave orphans in place and create a conflict on the directory.')
1471
orphaning_registry.register(
1472
'move', move_orphan,
1473
'Move orphans into the brz-orphans directory.')
1474
orphaning_registry._set_default_key('conflict')
1477
opt_transform_orphan = _mod_config.RegistryOption(
1478
'bzr.transform.orphan_policy', orphaning_registry,
1479
help='Policy for orphaned files during transform operations.',
1278
1483
class TreeTransform(DiskTreeTransform):
1279
1484
"""Represent a tree transformation.
1572
1775
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1574
1777
entries = self._tree.iter_entries_by_dir(
1575
new_path_file_ids.values())
1778
viewvalues(new_path_file_ids))
1576
1779
old_paths = dict((e.file_id, p) for p, e in entries)
1577
1780
final_kinds = {}
1578
1781
for num, (path, trans_id) in enumerate(new_paths):
1579
1782
if (num % 10) == 0:
1580
child_pb.update('adding file',
1783
child_pb.update(gettext('adding file'),
1581
1784
num + len(self._removed_id), total_entries)
1582
1785
file_id = new_path_file_ids[trans_id]
1583
1786
if file_id is None:
1585
1788
needs_entry = False
1587
kind = self.final_kind(trans_id)
1789
kind = self.final_kind(trans_id)
1589
1791
kind = self._tree.stored_kind(file_id)
1590
1792
parent_trans_id = self.final_parent(trans_id)
1591
1793
parent_file_id = new_path_file_ids.get(parent_trans_id)
1621
1823
If inventory_delta is None, no inventory delta generation is performed.
1623
tree_paths = list(self._tree_path_ids.iteritems())
1624
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1825
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1826
child_pb = ui.ui_factory.nested_progress_bar()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1629
child_pb.update('removing file', num, len(tree_paths))
1828
for num, (path, trans_id) in enumerate(tree_paths):
1829
# do not attempt to move root into a subdirectory of itself.
1832
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1833
full_path = self._tree.abspath(path)
1631
1834
if trans_id in self._removed_contents:
1632
1835
delete_path = os.path.join(self._deletiondir, trans_id)
1657
1860
modified_paths = []
1658
1861
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()
1863
child_pb = ui.ui_factory.nested_progress_bar()
1662
1865
for num, (path, trans_id) in enumerate(new_paths):
1663
1866
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1867
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1868
full_path = self._tree.abspath(path)
1666
1869
if trans_id in self._needs_rename:
1668
1871
mover.rename(self._limbo_name(trans_id), full_path)
1872
except errors.TransformRenameFailed as e:
1670
1873
# We may be renaming a dangling inventory id
1671
1874
if e.errno != errno.ENOENT:
1674
1877
self.rename_count += 1
1878
# TODO: if trans_id in self._observed_sha1s, we should
1879
# re-stat the final target, since ctime will be
1880
# updated by the change.
1675
1881
if (trans_id in self._new_contents or
1676
1882
self.path_changed(trans_id)):
1677
1883
if trans_id in self._new_contents:
1678
1884
modified_paths.append(full_path)
1679
1885
if trans_id in self._new_executability:
1680
1886
self._set_executability(path, trans_id)
1887
if trans_id in self._observed_sha1s:
1888
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1889
st = osutils.lstat(full_path)
1890
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1892
child_pb.finished()
1893
for path, trans_id in new_paths:
1894
# new_paths includes stuff like workingtree conflicts. Only the
1895
# stuff in new_contents actually comes from limbo.
1896
if trans_id in self._limbo_files:
1897
del self._limbo_files[trans_id]
1683
1898
self._new_contents.clear()
1684
1899
return modified_paths
1901
def _apply_observed_sha1s(self):
1902
"""After we have finished renaming everything, update observed sha1s
1904
This has to be done after self._tree.apply_inventory_delta, otherwise
1905
it doesn't know anything about the files we are updating. Also, we want
1906
to do this as late as possible, so that most entries end up cached.
1908
# TODO: this doesn't update the stat information for directories. So
1909
# the first 'bzr status' will still need to rewrite
1910
# .bzr/checkout/dirstate. However, we at least don't need to
1911
# re-read all of the files.
1912
# TODO: If the operation took a while, we could do a time.sleep(3) here
1913
# to allow the clock to tick over and ensure we won't have any
1914
# problems. (we could observe start time, and finish time, and if
1915
# it is less than eg 10% overhead, add a sleep call.)
1916
paths = FinalPaths(self)
1917
for trans_id, observed in viewitems(self._observed_sha1s):
1918
path = paths.get_path(trans_id)
1919
# We could get the file_id, but dirstate prefers to use the path
1920
# anyway, and it is 'cheaper' to determine.
1921
# file_id = self._new_id[trans_id]
1922
self._tree._observed_sha1(None, path, observed)
1687
1925
class TransformPreview(DiskTreeTransform):
1688
1926
"""A TreeTransform for generating preview trees.
1767
2010
yield self._get_repository().revision_tree(revision_id)
1769
2012
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2013
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2014
self._iter_parent_trees()]
1772
2015
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2016
self.get_file_lines(file_id))
1774
2017
repo = self._get_repository()
1775
2018
base_vf = repo.texts
1776
2019
if base_vf not in vf.fallback_versionedfiles:
1777
2020
vf.fallback_versionedfiles.append(base_vf)
1778
2021
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2023
def _stat_limbo_file(self, file_id=None, trans_id=None):
2024
if trans_id is None:
2025
trans_id = self._transform.trans_id_file_id(file_id)
1782
2026
name = self._transform._limbo_name(trans_id)
1783
2027
return os.lstat(name)
1998
2256
def get_file_size(self, file_id):
1999
2257
"""See Tree.get_file_size"""
2258
trans_id = self._transform.trans_id_file_id(file_id)
2259
kind = self._transform.final_kind(trans_id)
2262
if trans_id in self._transform._new_contents:
2263
return self._stat_limbo_file(trans_id=trans_id).st_size
2000
2264
if self.kind(file_id) == 'file':
2001
2265
return self._transform._tree.get_file_size(file_id)
2269
def get_file_verifier(self, file_id, path=None, stat_value=None):
2270
trans_id = self._transform.trans_id_file_id(file_id)
2271
kind = self._transform._new_contents.get(trans_id)
2273
return self._transform._tree.get_file_verifier(file_id)
2275
fileobj = self.get_file(file_id)
2277
return ("SHA1", sha_file(fileobj))
2005
2281
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
2282
trans_id = self._transform.trans_id_file_id(file_id)
2007
2283
kind = self._transform._new_contents.get(trans_id)
2243
2528
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2529
generate the inventory delta.
2246
wt.lock_tree_write()
2531
with wt.lock_tree_write(), tree.lock_read():
2532
if accelerator_tree is not None:
2533
accelerator_tree.lock_read()
2535
return _build_tree(tree, wt, accelerator_tree, hardlink,
2250
2538
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()
2539
accelerator_tree.unlock()
2264
2542
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2289
2564
pp.next_phase()
2290
2565
file_trans_id[wt.get_root_id()] = \
2291
2566
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2567
pb = ui.ui_factory.nested_progress_bar()
2294
2569
deferred_contents = []
2296
total = len(tree.inventory)
2571
total = len(tree.all_file_ids())
2297
2572
if delta_from_tree:
2298
2573
precomputed_delta = []
2300
2575
precomputed_delta = None
2576
# Check if tree inventory has content. If so, we populate
2577
# existing_files with the directory content. If there are no
2578
# entries we skip populating existing_files as its not used.
2579
# This improves performance and unncessary work on large
2580
# directory trees. (#501307)
2582
existing_files = set()
2583
for dir, files in wt.walkdirs():
2584
existing_files.update(f[0] for f in files)
2301
2585
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2586
enumerate(tree.iter_entries_by_dir()):
2587
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2588
if entry.parent_id is None:
2306
2590
reparent = False
2380
2664
in iter if not (c or e[0] != e[1])]
2381
2665
if accelerator_tree.supports_content_filtering():
2382
2666
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2667
if not next(accelerator_tree.iter_search_rules([p]))]
2384
2668
unchanged = dict(unchanged)
2385
2669
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2671
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2672
accelerator_path = unchanged.get(file_id)
2389
2673
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2674
new_desired_files.append((file_id,
2675
(trans_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2677
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2679
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2411
2696
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2697
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2698
tree.iter_files_bytes(new_desired_files)):
2414
2699
if wt.supports_content_filtering():
2415
2700
filters = wt._content_filter_stack(tree_path)
2416
2701
contents = filtered_output_bytes(contents, filters,
2417
2702
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2703
tt.create_file(contents, trans_id, sha1=text_sha1)
2704
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2707
def _reparent_children(tt, old_parent, new_parent):
2423
2708
for child in tt.iter_tree_children(old_parent):
2424
2709
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2712
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2713
by_parent = tt.by_parent()
2428
2714
for child in by_parent[old_parent]:
2429
2715
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2716
return by_parent[old_parent]
2432
2719
def _content_match(tree, entry, file_id, kind, target_path):
2433
2720
if entry.kind != kind:
2435
2722
if entry.kind == "directory":
2437
2724
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2725
f = file(target_path, 'rb')
2727
if tree.get_file_text(file_id) == f.read():
2440
2731
elif entry.kind == "symlink":
2441
2732
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2785
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
2788
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2789
filter_tree_path=None):
2515
2790
"""Create new file contents according to tree contents.
2546
2821
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
2824
def revert(working_tree, target_tree, filenames, backups=False,
2593
2825
pb=None, change_reporter=None):
2594
2826
"""Revert a working tree's contents to those of a target tree."""
2651
2887
deferred_files = []
2652
2888
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2889
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2890
target_path, wt_path = path
2891
target_versioned, wt_versioned = versioned
2892
target_parent, wt_parent = parent
2893
target_name, wt_name = name
2894
target_kind, wt_kind = kind
2895
target_executable, wt_executable = executable
2896
if skip_root and wt_parent is None:
2656
2898
trans_id = tt.trans_id_file_id(file_id)
2658
2900
if changed_content:
2659
2901
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2902
if wt_kind == 'file' and (backups or target_kind is None):
2661
2903
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2904
if merge_modified.get(file_id) != wt_sha1:
2663
2905
# acquire the basis tree lazily to prevent the
2666
2908
if basis_tree is None:
2667
2909
basis_tree = working_tree.basis_tree()
2668
2910
basis_tree.lock_read()
2669
if file_id in basis_tree:
2911
if basis_tree.has_id(file_id):
2670
2912
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2913
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2914
elif target_kind is None and not target_versioned:
2673
2915
keep_content = True
2674
if kind[0] is not None:
2916
if wt_kind is not None:
2675
2917
if not keep_content:
2676
2918
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)
2919
elif target_kind is not None:
2920
parent_trans_id = tt.trans_id_file_id(wt_parent)
2921
backup_name = tt._available_backup_name(
2922
wt_name, parent_trans_id)
2682
2923
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):
2924
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2925
if wt_versioned and target_versioned:
2685
2926
tt.unversion_file(trans_id)
2686
2927
tt.version_file(file_id, new_trans_id)
2687
2928
# New contents should have the same unix perms as old
2689
2930
mode_id = trans_id
2690
2931
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2932
if target_kind in ('directory', 'tree-reference'):
2692
2933
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2934
if target_kind == 'tree-reference':
2694
2935
revision = target_tree.get_reference_revision(file_id,
2696
2937
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2938
elif target_kind == 'symlink':
2698
2939
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2941
elif target_kind == 'file':
2701
2942
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2943
if basis_tree is None:
2703
2944
basis_tree = working_tree.basis_tree()
2704
2945
basis_tree.lock_read()
2705
2946
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)):
2947
if (basis_tree.has_id(file_id) and
2948
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2949
if file_id in merge_modified:
2709
2950
del merge_modified[file_id]
2711
2952
merge_modified[file_id] = new_sha1
2713
2954
# 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):
2955
if keep_content and wt_executable == target_executable:
2956
tt.set_executability(target_executable, trans_id)
2957
elif target_kind is not None:
2958
raise AssertionError(target_kind)
2959
if not wt_versioned and target_versioned:
2719
2960
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2961
if wt_versioned and not target_versioned:
2721
2962
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:
2963
if (target_name is not None and
2964
(wt_name != target_name or wt_parent != target_parent)):
2965
if target_name == '' and target_parent is None:
2725
2966
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)
2968
parent_trans = tt.trans_id_file_id(target_parent)
2969
if wt_parent is None and wt_versioned:
2970
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)
2972
tt.adjust_path(target_name, parent_trans, trans_id)
2973
if wt_executable != target_executable and target_kind == "file":
2974
tt.set_executability(target_executable, trans_id)
2734
2975
if working_tree.supports_content_filtering():
2735
2976
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
2977
target_tree.iter_files_bytes(deferred_files)):
2808
3049
elif c_type == 'missing parent':
2809
3050
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3051
if trans_id in tt._removed_contents:
3052
cancel_deletion = True
3053
orphans = tt._get_potential_orphans(trans_id)
3055
cancel_deletion = False
3056
# All children are orphans
3059
tt.new_orphan(o, trans_id)
3060
except OrphaningError:
3061
# Something bad happened so we cancel the directory
3062
# deletion which will leave it in place with a
3063
# conflict. The user can deal with it from there.
3064
# Note that this also catch the case where we don't
3065
# want to create orphans and leave the directory in
3067
cancel_deletion = True
3070
# Cancel the directory deletion
3071
tt.cancel_deletion(trans_id)
3072
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3077
tt.final_name(trans_id)
2878
3138
modified_path = fp.get_path(conflict[2])
2879
3139
modified_id = tt.final_file_id(conflict[2])
2880
3140
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3141
yield conflicts.Conflict.factory(
3142
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3145
conflicting_path = fp.get_path(conflict[3])
2886
3146
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)
3147
yield conflicts.Conflict.factory(
3148
c_type, action=action, path=modified_path,
3149
file_id=modified_id,
3150
conflict_path=conflicting_path,
3151
conflict_file_id=conflicting_id)
2893
3154
class _FileMover(object):
added
removed
breezy/transform.py
