14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
21
19
from stat import S_ISREG, S_IEXEC
25
config as _mod_config,
32
lazy_import.lazy_import(globals(), """
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
42
33
revision as _mod_revision,
46
from breezy.bzr import (
49
from breezy.i18n import gettext
51
from .errors import (DuplicateKey, MalformedTransform,
52
ReusingTransform, CantMoveRoot,
53
ImmortalLimbo, NoFinalPath,
55
from .filters import filtered_output_bytes, ContentFilterContext
56
from .mutabletree import MutableTree
57
from .osutils import (
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
from bzrlib.osutils import (
65
from .progress import ProgressPhase
53
from bzrlib.progress import ProgressPhase
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
72
64
ROOT_PARENT = "root-parent"
74
67
def unique_add(map, key, value):
76
69
raise DuplicateKey(key=key)
81
73
class _TransformResults(object):
82
74
def __init__(self, modified_paths, rename_count):
83
75
object.__init__(self)
399
380
return sorted(FinalPaths(self).get_paths(new_ids))
401
382
def _inventory_altered(self):
402
"""Determine which trans_ids need new Inventory entries.
404
An new entry is needed when anything that would be reflected by an
405
inventory entry changes, including file name, file_id, parent file_id,
406
file kind, and the execute bit.
408
Some care is taken to return entries with real changes, not cases
409
where the value is deleted and then restored to its original value,
410
but some actually unchanged values may be returned.
412
:returns: A list of (path, trans_id) for all items requiring an
413
inventory change. Ordered by path.
416
# Find entries whose file_ids are new (or changed).
417
new_file_id = set(t for t in self._new_id
418
if self._new_id[t] != self.tree_file_id(t))
419
for id_set in [self._new_name, self._new_parent, new_file_id,
383
"""Get the trans_ids and paths of files needing new inv entries."""
385
for id_set in [self._new_name, self._new_parent, self._new_id,
420
386
self._new_executability]:
421
changed_ids.update(id_set)
422
# removing implies a kind change
387
new_ids.update(id_set)
423
388
changed_kind = set(self._removed_contents)
425
389
changed_kind.intersection_update(self._new_contents)
426
# Ignore entries that are already known to have changed.
427
changed_kind.difference_update(changed_ids)
428
# to keep only the truly changed ones
429
changed_kind = (t for t in changed_kind
430
if self.tree_kind(t) != self.final_kind(t))
431
# all kind changes will alter the inventory
432
changed_ids.update(changed_kind)
433
# To find entries with changed parent_ids, find parents which existed,
434
# but changed file_id.
435
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
436
# Now add all their children to the set.
437
for parent_trans_id in new_file_id:
438
changed_ids.update(self.iter_tree_children(parent_trans_id))
439
return sorted(FinalPaths(self).get_paths(changed_ids))
390
changed_kind.difference_update(new_ids)
391
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
393
new_ids.update(changed_kind)
394
return sorted(FinalPaths(self).get_paths(new_ids))
441
396
def final_kind(self, trans_id):
442
397
"""Determine the final file kind, after any changes applied.
444
:return: None if the file does not exist/has no contents. (It is
445
conceivable that a path would be created without the corresponding
446
contents insertion command)
399
Raises NoSuchFile if the file does not exist/has no contents.
400
(It is conceivable that a path would be created without the
401
corresponding contents insertion command)
448
403
if trans_id in self._new_contents:
449
404
return self._new_contents[trans_id]
450
405
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
453
408
return self.tree_kind(trans_id)
576
531
# ensure that all children are registered with the transaction
577
532
list(self.iter_tree_children(parent_id))
579
def _has_named_child(self, name, parent_id, known_children):
580
"""Does a parent already have a name child.
582
:param name: The searched for name.
584
:param parent_id: The parent for which the check is made.
586
:param known_children: The already known children. This should have
587
been recently obtained from `self.by_parent.get(parent_id)`
588
(or will be if None is passed).
590
if known_children is None:
591
known_children = self.by_parent().get(parent_id, [])
592
for child in known_children:
534
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
593
540
if self.final_name(child) == name:
595
parent_path = self._tree_id_paths.get(parent_id, None)
596
if parent_path is None:
597
# No parent... no children
543
path = self._tree_id_paths[parent_id]
599
child_path = joinpath(parent_path, name)
600
child_id = self._tree_path_ids.get(child_path, None)
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
601
548
if child_id is None:
602
# Not known by the tree transform yet, check the filesystem
603
return osutils.lexists(self._tree.abspath(child_path))
549
return lexists(self._tree.abspath(childpath))
605
raise AssertionError('child_id is missing: %s, %s, %s'
606
% (name, parent_id, child_id))
608
def _available_backup_name(self, name, target_id):
609
"""Find an available backup name.
611
:param name: The basename of the file.
613
:param target_id: The directory trans_id where the backup should
616
known_children = self.by_parent().get(target_id, [])
617
return osutils.available_backup_name(
619
lambda base: self._has_named_child(
620
base, target_id, known_children))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# XXX What about dangling file-ids?
622
559
def _parent_loops(self):
623
560
"""No entry should be its own ancestor"""
700
644
if (self._new_name, self._new_parent) == ({}, {}):
702
for children in viewvalues(by_parent):
704
for child_tid in children:
705
name = self.final_name(child_tid)
707
# Keep children only if they still exist in the end
708
if not self._case_sensitive_target:
710
name_ids.append((name, child_tid))
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]
713
652
last_trans_id = None
714
653
for name, trans_id in name_ids:
715
kind = self.final_kind(trans_id)
655
kind = self.final_kind(trans_id)
716
658
file_id = self.final_file_id(trans_id)
717
659
if kind is None and file_id is None:
730
672
self._removed_id))
731
673
all_ids = self._tree.all_file_ids()
732
674
active_tree_ids = all_ids.difference(removed_tree_ids)
733
for trans_id, file_id in viewitems(self._new_id):
675
for trans_id, file_id in self._new_id.iteritems():
734
676
if file_id in active_tree_ids:
735
677
old_trans_id = self.trans_id_tree_file_id(file_id)
736
678
conflicts.append(('duplicate id', old_trans_id, trans_id))
739
681
def _parent_type_conflicts(self, by_parent):
740
"""Children must have a directory parent"""
682
"""parents must have directory 'contents'."""
742
for parent_id, children in viewitems(by_parent):
743
if parent_id == ROOT_PARENT:
746
for child_id in children:
747
if self.final_kind(child_id) is not None:
752
# There is at least a child, so we need an existing directory to
754
kind = self.final_kind(parent_id)
684
for parent_id, children in by_parent.iteritems():
685
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
756
# The directory will be deleted
757
699
conflicts.append(('missing parent', parent_id))
758
700
elif kind != "directory":
759
# Meh, we need a *directory* to put something in it
760
701
conflicts.append(('non-directory parent', parent_id))
704
def _any_contents(self, trans_ids):
705
"""Return true if any of the trans_ids, will have contents."""
706
for trans_id in trans_ids:
708
kind = self.final_kind(trans_id)
763
714
def _set_executability(self, path, trans_id):
764
715
"""Set the executability of versioned files """
765
if self._tree._supports_executable():
716
if supports_executable():
766
717
new_executability = self._new_executability[trans_id]
767
718
abspath = self._tree.abspath(path)
768
719
current_mode = os.stat(abspath).st_mode
769
720
if new_executability:
770
721
umask = os.umask(0)
772
to_mode = current_mode | (0o100 & ~umask)
723
to_mode = current_mode | (0100 & ~umask)
773
724
# Enable x-bit for others only if they can read it.
774
if current_mode & 0o004:
775
to_mode |= 0o001 & ~umask
776
if current_mode & 0o040:
777
to_mode |= 0o010 & ~umask
725
if current_mode & 0004:
726
to_mode |= 0001 & ~umask
727
if current_mode & 0040:
728
to_mode |= 0010 & ~umask
779
to_mode = current_mode & ~0o111
780
osutils.chmod_if_possible(abspath, to_mode)
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
782
733
def _new_entry(self, name, parent_id, file_id):
783
734
"""Helper function to create a new filesystem entry."""
829
780
self.create_symlink(target, trans_id)
832
def new_orphan(self, trans_id, parent_id):
833
"""Schedule an item to be orphaned.
835
When a directory is about to be removed, its children, if they are not
836
versioned are moved out of the way: they don't have a parent anymore.
838
:param trans_id: The trans_id of the existing item.
839
:param parent_id: The parent trans_id of the item.
841
raise NotImplementedError(self.new_orphan)
843
def _get_potential_orphans(self, dir_id):
844
"""Find the potential orphans in a directory.
846
A directory can't be safely deleted if there are versioned files in it.
847
If all the contained files are unversioned then they can be orphaned.
849
The 'None' return value means that the directory contains at least one
850
versioned file and should not be deleted.
852
:param dir_id: The directory trans id.
854
:return: A list of the orphan trans ids or None if at least one
855
versioned file is present.
858
# Find the potential orphans, stop if one item should be kept
859
for child_tid in self.by_parent()[dir_id]:
860
if child_tid in self._removed_contents:
861
# The child is removed as part of the transform. Since it was
862
# versioned before, it's not an orphan
864
elif self.final_file_id(child_tid) is None:
865
# The child is not versioned
866
orphans.append(child_tid)
868
# We have a versioned file here, searching for orphans is
874
783
def _affected_ids(self):
875
784
"""Return the set of transform ids affected by the transform"""
876
785
trans_ids = set(self._removed_id)
877
trans_ids.update(self._new_id)
786
trans_ids.update(self._new_id.keys())
878
787
trans_ids.update(self._removed_contents)
879
trans_ids.update(self._new_contents)
880
trans_ids.update(self._new_executability)
881
trans_ids.update(self._new_name)
882
trans_ids.update(self._new_parent)
788
trans_ids.update(self._new_contents.keys())
789
trans_ids.update(self._new_executability.keys())
790
trans_ids.update(self._new_name.keys())
791
trans_ids.update(self._new_parent.keys())
885
794
def _get_file_id_maps(self):
1016
928
return _PreviewTree(self)
1018
def commit(self, branch, message, merge_parents=None, strict=False,
1019
timestamp=None, timezone=None, committer=None, authors=None,
1020
revprops=None, revision_id=None):
930
def commit(self, branch, message, merge_parents=None, strict=False):
1021
931
"""Commit the result of this TreeTransform to a branch.
1023
933
:param branch: The branch to commit to.
1024
934
:param message: The message to attach to the commit.
1025
:param merge_parents: Additional parent revision-ids specified by
1027
:param strict: If True, abort the commit if there are unversioned
1029
:param timestamp: if not None, seconds-since-epoch for the time and
1030
date. (May be a float.)
1031
:param timezone: Optional timezone for timestamp, as an offset in
1033
:param committer: Optional committer in email-id format.
1034
(e.g. "J Random Hacker <jrandom@example.com>")
1035
:param authors: Optional list of authors in email-id format.
1036
:param revprops: Optional dictionary of revision properties.
1037
:param revision_id: Optional revision id. (Specifying a revision-id
1038
may reduce performance for some non-native formats.)
935
:param merge_parents: Additional parents specified by pending merges.
1039
936
:return: The revision_id of the revision committed.
1041
938
self._check_malformed()
1139
1030
:param records: An iterable of (names, content) tuples, as per
1140
1031
pack.ContainerPushParser.
1142
names, content = next(records)
1033
names, content = records.next()
1143
1034
attribs = bencode.bdecode(content)
1144
1035
self._id_number = attribs['_id_number']
1145
1036
self._new_name = dict((k, v.decode('utf-8'))
1146
for k, v in viewitems(attribs['_new_name']))
1037
for k, v in attribs['_new_name'].items())
1147
1038
self._new_parent = attribs['_new_parent']
1148
self._new_executability = dict((k, bool(v))
1149
for k, v in viewitems(attribs['_new_executability']))
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1150
1041
self._new_id = attribs['_new_id']
1151
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1152
1043
self._tree_path_ids = {}
1153
1044
self._tree_id_paths = {}
1154
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1155
1046
path = bytepath.decode('utf-8')
1156
1047
self._tree_path_ids[path] = trans_id
1157
1048
self._tree_id_paths[trans_id] = path
1298
1173
descendants.update(self._limbo_descendants(descendant))
1299
1174
return descendants
1301
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1176
def create_file(self, contents, trans_id, mode_id=None):
1302
1177
"""Schedule creation of a new file.
1306
:param contents: an iterator of strings, all of which will be written
1307
to the target destination.
1308
:param trans_id: TreeTransform handle
1309
:param mode_id: If not None, force the mode of the target file to match
1310
the mode of the object referenced by mode_id.
1311
Otherwise, we will try to preserve mode bits of an existing file.
1312
:param sha1: If the sha1 of this content is already known, pass it in.
1313
We can use it to prevent future sha1 computations.
1181
Contents is an iterator of strings, all of which will be written
1182
to the target destination.
1184
New file takes the permissions of any existing file with that id,
1185
unless mode_id is specified.
1315
1187
name = self._limbo_name(trans_id)
1316
1188
f = open(name, 'wb')
1318
unique_add(self._new_contents, trans_id, 'file')
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.
1319
1199
f.writelines(contents)
1322
1202
self._set_mtime(name)
1323
1203
self._set_mode(trans_id, mode_id, S_ISREG)
1324
# It is unfortunate we have to use lstat instead of fstat, but we just
1325
# used utime and chmod on the file, so we need the accurate final
1327
if sha1 is not None:
1328
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1330
1205
def _read_file_chunks(self, trans_id):
1331
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1401
1274
del self._limbo_children_names[trans_id]
1402
1275
delete_any(self._limbo_name(trans_id))
1404
def new_orphan(self, trans_id, parent_id):
1405
conf = self._tree.get_config_stack()
1406
handle_orphan = conf.get('bzr.transform.orphan_policy')
1407
handle_orphan(self, trans_id, parent_id)
1410
class OrphaningError(errors.BzrError):
1412
# Only bugs could lead to such exception being seen by the user
1413
internal_error = True
1414
_fmt = "Error while orphaning %s in %s directory"
1416
def __init__(self, orphan, parent):
1417
errors.BzrError.__init__(self)
1418
self.orphan = orphan
1419
self.parent = parent
1422
class OrphaningForbidden(OrphaningError):
1424
_fmt = "Policy: %s doesn't allow creating orphans."
1426
def __init__(self, policy):
1427
errors.BzrError.__init__(self)
1428
self.policy = policy
1431
def move_orphan(tt, orphan_id, parent_id):
1432
"""See TreeTransformBase.new_orphan.
1434
This creates a new orphan in the `bzr-orphans` dir at the root of the
1437
:param tt: The TreeTransform orphaning `trans_id`.
1439
:param orphan_id: The trans id that should be orphaned.
1441
:param parent_id: The orphan parent trans id.
1443
# Add the orphan dir if it doesn't exist
1444
orphan_dir_basename = 'bzr-orphans'
1445
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1446
if tt.final_kind(od_id) is None:
1447
tt.create_directory(od_id)
1448
parent_path = tt._tree_id_paths[parent_id]
1449
# Find a name that doesn't exist yet in the orphan dir
1450
actual_name = tt.final_name(orphan_id)
1451
new_name = tt._available_backup_name(actual_name, od_id)
1452
tt.adjust_path(new_name, od_id, orphan_id)
1453
trace.warning('%s has been orphaned in %s'
1454
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1457
def refuse_orphan(tt, orphan_id, parent_id):
1458
"""See TreeTransformBase.new_orphan.
1460
This refuses to create orphan, letting the caller handle the conflict.
1462
raise OrphaningForbidden('never')
1465
orphaning_registry = registry.Registry()
1466
orphaning_registry.register(
1467
'conflict', refuse_orphan,
1468
'Leave orphans in place and create a conflict on the directory.')
1469
orphaning_registry.register(
1470
'move', move_orphan,
1471
'Move orphans into the bzr-orphans directory.')
1472
orphaning_registry._set_default_key('conflict')
1475
opt_transform_orphan = _mod_config.RegistryOption(
1476
'bzr.transform.orphan_policy', orphaning_registry,
1477
help='Policy for orphaned files during transform operations.',
1481
1278
class TreeTransform(DiskTreeTransform):
1482
1279
"""Represent a tree transformation.
1773
1572
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1775
1574
entries = self._tree.iter_entries_by_dir(
1776
viewvalues(new_path_file_ids))
1575
new_path_file_ids.values())
1777
1576
old_paths = dict((e.file_id, p) for p, e in entries)
1778
1577
final_kinds = {}
1779
1578
for num, (path, trans_id) in enumerate(new_paths):
1780
1579
if (num % 10) == 0:
1781
child_pb.update(gettext('adding file'),
1580
child_pb.update('adding file',
1782
1581
num + len(self._removed_id), total_entries)
1783
1582
file_id = new_path_file_ids[trans_id]
1784
1583
if file_id is None:
1786
1585
needs_entry = False
1787
kind = self.final_kind(trans_id)
1587
kind = self.final_kind(trans_id)
1789
1589
kind = self._tree.stored_kind(file_id)
1790
1590
parent_trans_id = self.final_parent(trans_id)
1791
1591
parent_file_id = new_path_file_ids.get(parent_trans_id)
1821
1621
If inventory_delta is None, no inventory delta generation is performed.
1823
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1824
child_pb = ui.ui_factory.nested_progress_bar()
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()
1826
for num, (path, trans_id) in enumerate(tree_paths):
1827
# do not attempt to move root into a subdirectory of itself.
1830
child_pb.update(gettext('removing file'), num, len(tree_paths))
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1629
child_pb.update('removing file', num, len(tree_paths))
1831
1630
full_path = self._tree.abspath(path)
1832
1631
if trans_id in self._removed_contents:
1833
1632
delete_path = os.path.join(self._deletiondir, trans_id)
1858
1657
modified_paths = []
1859
1658
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1861
child_pb = ui.ui_factory.nested_progress_bar()
1660
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1863
1662
for num, (path, trans_id) in enumerate(new_paths):
1864
1663
if (num % 10) == 0:
1865
child_pb.update(gettext('adding file'), num, len(new_paths))
1664
child_pb.update('adding file', num, len(new_paths))
1866
1665
full_path = self._tree.abspath(path)
1867
1666
if trans_id in self._needs_rename:
1869
1668
mover.rename(self._limbo_name(trans_id), full_path)
1870
except errors.TransformRenameFailed as e:
1871
1670
# We may be renaming a dangling inventory id
1872
1671
if e.errno != errno.ENOENT:
1875
1674
self.rename_count += 1
1876
# TODO: if trans_id in self._observed_sha1s, we should
1877
# re-stat the final target, since ctime will be
1878
# updated by the change.
1879
1675
if (trans_id in self._new_contents or
1880
1676
self.path_changed(trans_id)):
1881
1677
if trans_id in self._new_contents:
1882
1678
modified_paths.append(full_path)
1883
1679
if trans_id in self._new_executability:
1884
1680
self._set_executability(path, trans_id)
1885
if trans_id in self._observed_sha1s:
1886
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1887
st = osutils.lstat(full_path)
1888
self._observed_sha1s[trans_id] = (o_sha1, st)
1890
1682
child_pb.finished()
1891
for path, trans_id in new_paths:
1892
# new_paths includes stuff like workingtree conflicts. Only the
1893
# stuff in new_contents actually comes from limbo.
1894
if trans_id in self._limbo_files:
1895
del self._limbo_files[trans_id]
1896
1683
self._new_contents.clear()
1897
1684
return modified_paths
1899
def _apply_observed_sha1s(self):
1900
"""After we have finished renaming everything, update observed sha1s
1902
This has to be done after self._tree.apply_inventory_delta, otherwise
1903
it doesn't know anything about the files we are updating. Also, we want
1904
to do this as late as possible, so that most entries end up cached.
1906
# TODO: this doesn't update the stat information for directories. So
1907
# the first 'bzr status' will still need to rewrite
1908
# .bzr/checkout/dirstate. However, we at least don't need to
1909
# re-read all of the files.
1910
# TODO: If the operation took a while, we could do a time.sleep(3) here
1911
# to allow the clock to tick over and ensure we won't have any
1912
# problems. (we could observe start time, and finish time, and if
1913
# it is less than eg 10% overhead, add a sleep call.)
1914
paths = FinalPaths(self)
1915
for trans_id, observed in viewitems(self._observed_sha1s):
1916
path = paths.get_path(trans_id)
1917
# We could get the file_id, but dirstate prefers to use the path
1918
# anyway, and it is 'cheaper' to determine.
1919
# file_id = self._new_id[trans_id]
1920
self._tree._observed_sha1(None, path, observed)
1923
1687
class TransformPreview(DiskTreeTransform):
1924
1688
"""A TreeTransform for generating preview trees.
2008
1767
yield self._get_repository().revision_tree(revision_id)
2010
1769
def _get_file_revision(self, file_id, vf, tree_revision):
2011
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2012
1771
self._iter_parent_trees()]
2013
1772
vf.add_lines((file_id, tree_revision), parent_keys,
2014
self.get_file_lines(file_id))
1773
self.get_file(file_id).readlines())
2015
1774
repo = self._get_repository()
2016
1775
base_vf = repo.texts
2017
1776
if base_vf not in vf.fallback_versionedfiles:
2018
1777
vf.fallback_versionedfiles.append(base_vf)
2019
1778
return tree_revision
2021
def _stat_limbo_file(self, file_id=None, trans_id=None):
2022
if trans_id is None:
2023
trans_id = self._transform.trans_id_file_id(file_id)
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2024
1782
name = self._transform._limbo_name(trans_id)
2025
1783
return os.lstat(name)
2254
1998
def get_file_size(self, file_id):
2255
1999
"""See Tree.get_file_size"""
2256
trans_id = self._transform.trans_id_file_id(file_id)
2257
kind = self._transform.final_kind(trans_id)
2260
if trans_id in self._transform._new_contents:
2261
return self._stat_limbo_file(trans_id=trans_id).st_size
2262
2000
if self.kind(file_id) == 'file':
2263
2001
return self._transform._tree.get_file_size(file_id)
2267
def get_file_verifier(self, file_id, path=None, stat_value=None):
2268
trans_id = self._transform.trans_id_file_id(file_id)
2269
kind = self._transform._new_contents.get(trans_id)
2271
return self._transform._tree.get_file_verifier(file_id)
2273
fileobj = self.get_file(file_id)
2275
return ("SHA1", sha_file(fileobj))
2279
2005
def get_file_sha1(self, file_id, path=None, stat_value=None):
2280
2006
trans_id = self._transform.trans_id_file_id(file_id)
2281
2007
kind = self._transform._new_contents.get(trans_id)
2569
2289
pp.next_phase()
2570
2290
file_trans_id[wt.get_root_id()] = \
2571
2291
tt.trans_id_tree_file_id(wt.get_root_id())
2572
pb = ui.ui_factory.nested_progress_bar()
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2574
2294
deferred_contents = []
2576
total = len(tree.all_file_ids())
2296
total = len(tree.inventory)
2577
2297
if delta_from_tree:
2578
2298
precomputed_delta = []
2580
2300
precomputed_delta = None
2581
# Check if tree inventory has content. If so, we populate
2582
# existing_files with the directory content. If there are no
2583
# entries we skip populating existing_files as its not used.
2584
# This improves performance and unncessary work on large
2585
# directory trees. (#501307)
2587
existing_files = set()
2588
for dir, files in wt.walkdirs():
2589
existing_files.update(f[0] for f in files)
2590
2301
for num, (tree_path, entry) in \
2591
enumerate(tree.iter_entries_by_dir()):
2592
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2593
2304
if entry.parent_id is None:
2595
2306
reparent = False
2669
2380
in iter if not (c or e[0] != e[1])]
2670
2381
if accelerator_tree.supports_content_filtering():
2671
2382
unchanged = [(f, p) for (f, p) in unchanged
2672
if not next(accelerator_tree.iter_search_rules([p]))]
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2673
2384
unchanged = dict(unchanged)
2674
2385
new_desired_files = []
2676
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2387
for file_id, (trans_id, tree_path) in desired_files:
2677
2388
accelerator_path = unchanged.get(file_id)
2678
2389
if accelerator_path is None:
2679
new_desired_files.append((file_id,
2680
(trans_id, tree_path, text_sha1)))
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2682
pb.update(gettext('Adding file contents'), count + offset, total)
2392
pb.update('Adding file contents', count + offset, total)
2684
2394
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2701
2411
offset += count
2702
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2703
2413
tree.iter_files_bytes(new_desired_files)):
2704
2414
if wt.supports_content_filtering():
2705
2415
filters = wt._content_filter_stack(tree_path)
2706
2416
contents = filtered_output_bytes(contents, filters,
2707
2417
ContentFilterContext(tree_path, tree))
2708
tt.create_file(contents, trans_id, sha1=text_sha1)
2709
pb.update(gettext('Adding file contents'), count + offset, total)
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2712
2422
def _reparent_children(tt, old_parent, new_parent):
2713
2423
for child in tt.iter_tree_children(old_parent):
2714
2424
tt.adjust_path(tt.final_name(child), new_parent, child)
2717
2426
def _reparent_transform_children(tt, old_parent, new_parent):
2718
2427
by_parent = tt.by_parent()
2719
2428
for child in by_parent[old_parent]:
2720
2429
tt.adjust_path(tt.final_name(child), new_parent, child)
2721
2430
return by_parent[old_parent]
2724
2432
def _content_match(tree, entry, file_id, kind, target_path):
2725
2433
if entry.kind != kind:
2727
2435
if entry.kind == "directory":
2729
2437
if entry.kind == "file":
2730
f = file(target_path, 'rb')
2732
if tree.get_file_text(file_id) == f.read():
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2736
2440
elif entry.kind == "symlink":
2737
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2790
2494
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)
2793
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2794
2514
filter_tree_path=None):
2795
2515
"""Create new file contents according to tree contents.
2826
2546
tt.set_executability(entry.executable, trans_id)
2549
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2553
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
"""Produce a backup-style name that appears to be available"""
2558
yield "%s.~%d~" % (name, counter)
2560
for new_name in name_gen():
2561
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2565
def _entry_changes(file_id, entry, working_tree):
2566
"""Determine in which ways the inventory entry has changed.
2568
Returns booleans: has_contents, content_mod, meta_mod
2569
has_contents means there are currently contents, but they differ
2570
contents_mod means contents need to be modified
2571
meta_mod means the metadata needs to be modified
2573
cur_entry = working_tree.inventory[file_id]
2575
working_kind = working_tree.kind(file_id)
2578
has_contents = False
2581
if has_contents is True:
2582
if entry.kind != working_kind:
2583
contents_mod, meta_mod = True, False
2585
cur_entry._read_tree_state(working_tree.id2path(file_id),
2587
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
cur_entry._forget_tree_state()
2589
return has_contents, contents_mod, meta_mod
2829
2592
def revert(working_tree, target_tree, filenames, backups=False,
2830
2593
pb=None, change_reporter=None):
2831
2594
"""Revert a working tree's contents to those of a target tree."""
2892
2651
deferred_files = []
2893
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2894
2653
kind, executable) in enumerate(change_list):
2895
target_path, wt_path = path
2896
target_versioned, wt_versioned = versioned
2897
target_parent, wt_parent = parent
2898
target_name, wt_name = name
2899
target_kind, wt_kind = kind
2900
target_executable, wt_executable = executable
2901
if skip_root and wt_parent is None:
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2903
2656
trans_id = tt.trans_id_file_id(file_id)
2905
2658
if changed_content:
2906
2659
keep_content = False
2907
if wt_kind == 'file' and (backups or target_kind is None):
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2908
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2909
2662
if merge_modified.get(file_id) != wt_sha1:
2910
2663
# acquire the basis tree lazily to prevent the
2913
2666
if basis_tree is None:
2914
2667
basis_tree = working_tree.basis_tree()
2915
2668
basis_tree.lock_read()
2916
if basis_tree.has_id(file_id):
2669
if file_id in basis_tree:
2917
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2918
2671
keep_content = True
2919
elif target_kind is None and not target_versioned:
2672
elif kind[1] is None and not versioned[1]:
2920
2673
keep_content = True
2921
if wt_kind is not None:
2674
if kind[0] is not None:
2922
2675
if not keep_content:
2923
2676
tt.delete_contents(trans_id)
2924
elif target_kind is not None:
2925
parent_trans_id = tt.trans_id_file_id(wt_parent)
2926
backup_name = tt._available_backup_name(
2927
wt_name, parent_trans_id)
2677
elif kind[1] is not None:
2678
parent_trans_id = tt.trans_id_file_id(parent[0])
2679
by_parent = tt.by_parent()
2680
backup_name = _get_backup_name(name[0], by_parent,
2681
parent_trans_id, tt)
2928
2682
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2929
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2930
if wt_versioned and target_versioned:
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2931
2685
tt.unversion_file(trans_id)
2932
2686
tt.version_file(file_id, new_trans_id)
2933
2687
# New contents should have the same unix perms as old
2935
2689
mode_id = trans_id
2936
2690
trans_id = new_trans_id
2937
if target_kind in ('directory', 'tree-reference'):
2691
if kind[1] in ('directory', 'tree-reference'):
2938
2692
tt.create_directory(trans_id)
2939
if target_kind == 'tree-reference':
2693
if kind[1] == 'tree-reference':
2940
2694
revision = target_tree.get_reference_revision(file_id,
2942
2696
tt.set_tree_reference(revision, trans_id)
2943
elif target_kind == 'symlink':
2697
elif kind[1] == 'symlink':
2944
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2946
elif target_kind == 'file':
2700
elif kind[1] == 'file':
2947
2701
deferred_files.append((file_id, (trans_id, mode_id)))
2948
2702
if basis_tree is None:
2949
2703
basis_tree = working_tree.basis_tree()
2950
2704
basis_tree.lock_read()
2951
2705
new_sha1 = target_tree.get_file_sha1(file_id)
2952
if (basis_tree.has_id(file_id) and
2953
new_sha1 == basis_tree.get_file_sha1(file_id)):
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2954
2708
if file_id in merge_modified:
2955
2709
del merge_modified[file_id]
2957
2711
merge_modified[file_id] = new_sha1
2959
2713
# preserve the execute bit when backing up
2960
if keep_content and wt_executable == target_executable:
2961
tt.set_executability(target_executable, trans_id)
2962
elif target_kind is not None:
2963
raise AssertionError(target_kind)
2964
if not wt_versioned and target_versioned:
2714
if keep_content and executable[0] == executable[1]:
2715
tt.set_executability(executable[1], trans_id)
2716
elif kind[1] is not None:
2717
raise AssertionError(kind[1])
2718
if versioned == (False, True):
2965
2719
tt.version_file(file_id, trans_id)
2966
if wt_versioned and not target_versioned:
2720
if versioned == (True, False):
2967
2721
tt.unversion_file(trans_id)
2968
if (target_name is not None and
2969
(wt_name != target_name or wt_parent != target_parent)):
2970
if target_name == '' and target_parent is None:
2722
if (name[1] is not None and
2723
(name[0] != name[1] or parent[0] != parent[1])):
2724
if name[1] == '' and parent[1] is None:
2971
2725
parent_trans = ROOT_PARENT
2973
parent_trans = tt.trans_id_file_id(target_parent)
2974
if wt_parent is None and wt_versioned:
2975
tt.adjust_root_path(target_name, parent_trans)
2727
parent_trans = tt.trans_id_file_id(parent[1])
2728
if parent[0] is None and versioned[0]:
2729
tt.adjust_root_path(name[1], parent_trans)
2977
tt.adjust_path(target_name, parent_trans, trans_id)
2978
if wt_executable != target_executable and target_kind == "file":
2979
tt.set_executability(target_executable, trans_id)
2731
tt.adjust_path(name[1], parent_trans, trans_id)
2732
if executable[0] != executable[1] and kind[1] == "file":
2733
tt.set_executability(executable[1], trans_id)
2980
2734
if working_tree.supports_content_filtering():
2981
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2982
2736
target_tree.iter_files_bytes(deferred_files)):
3054
2808
elif c_type == 'missing parent':
3055
2809
trans_id = conflict[1]
3056
if trans_id in tt._removed_contents:
3057
cancel_deletion = True
3058
orphans = tt._get_potential_orphans(trans_id)
3060
cancel_deletion = False
3061
# All children are orphans
3064
tt.new_orphan(o, trans_id)
3065
except OrphaningError:
3066
# Something bad happened so we cancel the directory
3067
# deletion which will leave it in place with a
3068
# conflict. The user can deal with it from there.
3069
# Note that this also catch the case where we don't
3070
# want to create orphans and leave the directory in
3072
cancel_deletion = True
3075
# Cancel the directory deletion
3076
tt.cancel_deletion(trans_id)
3077
new_conflicts.add(('deleting parent', 'Not deleting',
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3082
2817
tt.final_name(trans_id)
3143
2878
modified_path = fp.get_path(conflict[2])
3144
2879
modified_id = tt.final_file_id(conflict[2])
3145
2880
if len(conflict) == 3:
3146
yield conflicts.Conflict.factory(
3147
c_type, action=action, path=modified_path, file_id=modified_id)
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3150
2885
conflicting_path = fp.get_path(conflict[3])
3151
2886
conflicting_id = tt.final_file_id(conflict[3])
3152
yield conflicts.Conflict.factory(
3153
c_type, action=action, path=modified_path,
3154
file_id=modified_id,
3155
conflict_path=conflicting_path,
3156
conflict_file_id=conflicting_id)
2887
yield Conflict.factory(c_type, action=action, path=modified_path,
2888
file_id=modified_id,
2889
conflict_path=conflicting_path,
2890
conflict_file_id=conflicting_id)
3159
2893
class _FileMover(object):
added
removed
bzrlib/transform.py
