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(), """
34
43
revision as _mod_revision,
47
from breezy.bzr import (
51
from breezy.i18n import gettext
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
39
ReusingTransform, CantMoveRoot,
40
ExistingLimbo, ImmortalLimbo, NoFinalPath,
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
from bzrlib.inventory import InventoryEntry
44
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 (
54
from bzrlib.progress import ProgressPhase
55
from bzrlib.symbol_versioning import (
59
from bzrlib.trace import mutter, warning
60
from bzrlib import tree
62
import bzrlib.urlutils as urlutils
67
from .progress import ProgressPhase
65
74
ROOT_PARENT = "root-parent"
68
76
def unique_add(map, key, value):
70
78
raise DuplicateKey(key=key)
74
83
class _TransformResults(object):
75
84
def __init__(self, modified_paths, rename_count):
76
85
object.__init__(self)
381
401
return sorted(FinalPaths(self).get_paths(new_ids))
383
403
def _inventory_altered(self):
384
"""Get the trans_ids and paths of files needing new inv entries."""
386
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,
387
422
self._new_executability]:
388
new_ids.update(id_set)
423
changed_ids.update(id_set)
424
# removing implies a kind change
389
425
changed_kind = set(self._removed_contents)
390
427
changed_kind.intersection_update(self._new_contents)
391
changed_kind.difference_update(new_ids)
392
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
394
new_ids.update(changed_kind)
395
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))
397
443
def final_kind(self, trans_id):
398
444
"""Determine the final file kind, after any changes applied.
400
Raises NoSuchFile if the file does not exist/has no contents.
401
(It is conceivable that a path would be created without the
402
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)
404
450
if trans_id in self._new_contents:
405
451
return self._new_contents[trans_id]
406
452
elif trans_id in self._removed_contents:
407
raise NoSuchFile(None)
409
455
return self.tree_kind(trans_id)
532
579
# ensure that all children are registered with the transaction
533
580
list(self.iter_tree_children(parent_id))
535
def has_named_child(self, by_parent, parent_id, name):
537
children = by_parent[parent_id]
540
for child in children:
582
def _has_named_child(self, name, parent_id, known_children):
583
"""Does a parent already have a name child.
585
:param name: The searched for name.
587
:param parent_id: The parent for which the check is made.
589
:param known_children: The already known children. This should have
590
been recently obtained from `self.by_parent.get(parent_id)`
591
(or will be if None is passed).
593
if known_children is None:
594
known_children = self.by_parent().get(parent_id, [])
595
for child in known_children:
541
596
if self.final_name(child) == name:
544
path = self._tree_id_paths[parent_id]
598
parent_path = self._tree_id_paths.get(parent_id, None)
599
if parent_path is None:
600
# No parent... no children
547
childpath = joinpath(path, name)
548
child_id = self._tree_path_ids.get(childpath)
602
child_path = joinpath(parent_path, name)
603
child_id = self._tree_path_ids.get(child_path, None)
549
604
if child_id is None:
550
return lexists(self._tree.abspath(childpath))
605
# Not known by the tree transform yet, check the filesystem
606
return osutils.lexists(self._tree.abspath(child_path))
552
if self.final_parent(child_id) != parent_id:
554
if child_id in self._removed_contents:
555
# XXX What about dangling file-ids?
608
raise AssertionError('child_id is missing: %s, %s, %s'
609
% (name, parent_id, child_id))
611
def _available_backup_name(self, name, target_id):
612
"""Find an available backup name.
614
:param name: The basename of the file.
616
:param target_id: The directory trans_id where the backup should
619
known_children = self.by_parent().get(target_id, [])
620
return osutils.available_backup_name(
622
lambda base: self._has_named_child(
623
base, target_id, known_children))
560
625
def _parent_loops(self):
561
626
"""No entry should be its own ancestor"""
645
703
if (self._new_name, self._new_parent) == ({}, {}):
647
for children in by_parent.itervalues():
648
name_ids = [(self.final_name(t), t) for t in children]
649
if not self._case_sensitive_target:
650
name_ids = [(n.lower(), t) for n, t in name_ids]
705
for children in viewvalues(by_parent):
707
for child_tid in children:
708
name = self.final_name(child_tid)
710
# Keep children only if they still exist in the end
711
if not self._case_sensitive_target:
713
name_ids.append((name, child_tid))
653
716
last_trans_id = None
654
717
for name, trans_id in name_ids:
656
kind = self.final_kind(trans_id)
718
kind = self.final_kind(trans_id)
659
719
file_id = self.final_file_id(trans_id)
660
720
if kind is None and file_id is None:
673
733
self._removed_id))
674
734
all_ids = self._tree.all_file_ids()
675
735
active_tree_ids = all_ids.difference(removed_tree_ids)
676
for trans_id, file_id in self._new_id.iteritems():
736
for trans_id, file_id in viewitems(self._new_id):
677
737
if file_id in active_tree_ids:
678
738
old_trans_id = self.trans_id_tree_file_id(file_id)
679
739
conflicts.append(('duplicate id', old_trans_id, trans_id))
682
742
def _parent_type_conflicts(self, by_parent):
683
"""parents must have directory 'contents'."""
743
"""Children must have a directory parent"""
685
for parent_id, children in by_parent.iteritems():
686
if parent_id is ROOT_PARENT:
688
if not self._any_contents(children):
690
for child in children:
692
self.final_kind(child)
696
kind = self.final_kind(parent_id)
745
for parent_id, children in viewitems(by_parent):
746
if parent_id == ROOT_PARENT:
749
for child_id in children:
750
if self.final_kind(child_id) is not None:
755
# There is at least a child, so we need an existing directory to
757
kind = self.final_kind(parent_id)
759
# The directory will be deleted
700
760
conflicts.append(('missing parent', parent_id))
701
761
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
702
763
conflicts.append(('non-directory parent', parent_id))
705
def _any_contents(self, trans_ids):
706
"""Return true if any of the trans_ids, will have contents."""
707
for trans_id in trans_ids:
709
kind = self.final_kind(trans_id)
715
766
def _set_executability(self, path, trans_id):
716
767
"""Set the executability of versioned files """
717
if supports_executable():
768
if self._tree._supports_executable():
718
769
new_executability = self._new_executability[trans_id]
719
770
abspath = self._tree.abspath(path)
720
771
current_mode = os.stat(abspath).st_mode
721
772
if new_executability:
722
773
umask = os.umask(0)
724
to_mode = current_mode | (0100 & ~umask)
775
to_mode = current_mode | (0o100 & ~umask)
725
776
# Enable x-bit for others only if they can read it.
726
if current_mode & 0004:
727
to_mode |= 0001 & ~umask
728
if current_mode & 0040:
729
to_mode |= 0010 & ~umask
777
if current_mode & 0o004:
778
to_mode |= 0o001 & ~umask
779
if current_mode & 0o040:
780
to_mode |= 0o010 & ~umask
731
to_mode = current_mode & ~0111
732
os.chmod(abspath, to_mode)
782
to_mode = current_mode & ~0o111
783
osutils.chmod_if_possible(abspath, to_mode)
734
785
def _new_entry(self, name, parent_id, file_id):
735
786
"""Helper function to create a new filesystem entry."""
781
832
self.create_symlink(target, trans_id)
835
def new_orphan(self, trans_id, parent_id):
836
"""Schedule an item to be orphaned.
838
When a directory is about to be removed, its children, if they are not
839
versioned are moved out of the way: they don't have a parent anymore.
841
:param trans_id: The trans_id of the existing item.
842
:param parent_id: The parent trans_id of the item.
844
raise NotImplementedError(self.new_orphan)
846
def _get_potential_orphans(self, dir_id):
847
"""Find the potential orphans in a directory.
849
A directory can't be safely deleted if there are versioned files in it.
850
If all the contained files are unversioned then they can be orphaned.
852
The 'None' return value means that the directory contains at least one
853
versioned file and should not be deleted.
855
:param dir_id: The directory trans id.
857
:return: A list of the orphan trans ids or None if at least one
858
versioned file is present.
861
# Find the potential orphans, stop if one item should be kept
862
for child_tid in self.by_parent()[dir_id]:
863
if child_tid in self._removed_contents:
864
# The child is removed as part of the transform. Since it was
865
# versioned before, it's not an orphan
867
elif self.final_file_id(child_tid) is None:
868
# The child is not versioned
869
orphans.append(child_tid)
871
# We have a versioned file here, searching for orphans is
784
877
def _affected_ids(self):
785
878
"""Return the set of transform ids affected by the transform"""
786
879
trans_ids = set(self._removed_id)
787
trans_ids.update(self._new_id.keys())
880
trans_ids.update(self._new_id)
788
881
trans_ids.update(self._removed_contents)
789
trans_ids.update(self._new_contents.keys())
790
trans_ids.update(self._new_executability.keys())
791
trans_ids.update(self._new_name.keys())
792
trans_ids.update(self._new_parent.keys())
882
trans_ids.update(self._new_contents)
883
trans_ids.update(self._new_executability)
884
trans_ids.update(self._new_name)
885
trans_ids.update(self._new_parent)
795
888
def _get_file_id_maps(self):
1052
1143
:param records: An iterable of (names, content) tuples, as per
1053
1144
pack.ContainerPushParser.
1055
names, content = records.next()
1146
names, content = next(records)
1056
1147
attribs = bencode.bdecode(content)
1057
1148
self._id_number = attribs['_id_number']
1058
1149
self._new_name = dict((k, v.decode('utf-8'))
1059
for k, v in attribs['_new_name'].items())
1150
for k, v in viewitems(attribs['_new_name']))
1060
1151
self._new_parent = attribs['_new_parent']
1061
self._new_executability = dict((k, bool(v)) for k, v in
1062
attribs['_new_executability'].items())
1152
self._new_executability = dict((k, bool(v))
1153
for k, v in viewitems(attribs['_new_executability']))
1063
1154
self._new_id = attribs['_new_id']
1064
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1155
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1065
1156
self._tree_path_ids = {}
1066
1157
self._tree_id_paths = {}
1067
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1158
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1068
1159
path = bytepath.decode('utf-8')
1069
1160
self._tree_path_ids[path] = trans_id
1070
1161
self._tree_id_paths[trans_id] = path
1195
1302
descendants.update(self._limbo_descendants(descendant))
1196
1303
return descendants
1198
def create_file(self, contents, trans_id, mode_id=None):
1305
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1199
1306
"""Schedule creation of a new file.
1203
Contents is an iterator of strings, all of which will be written
1204
to the target destination.
1206
New file takes the permissions of any existing file with that id,
1207
unless mode_id is specified.
1310
:param contents: an iterator of strings, all of which will be written
1311
to the target destination.
1312
:param trans_id: TreeTransform handle
1313
:param mode_id: If not None, force the mode of the target file to match
1314
the mode of the object referenced by mode_id.
1315
Otherwise, we will try to preserve mode bits of an existing file.
1316
:param sha1: If the sha1 of this content is already known, pass it in.
1317
We can use it to prevent future sha1 computations.
1209
1319
name = self._limbo_name(trans_id)
1210
1320
f = open(name, 'wb')
1213
unique_add(self._new_contents, trans_id, 'file')
1215
# Clean up the file, it never got registered so
1216
# TreeTransform.finalize() won't clean it up.
1322
unique_add(self._new_contents, trans_id, 'file')
1221
1323
f.writelines(contents)
1224
1326
self._set_mtime(name)
1225
1327
self._set_mode(trans_id, mode_id, S_ISREG)
1328
# It is unfortunate we have to use lstat instead of fstat, but we just
1329
# used utime and chmod on the file, so we need the accurate final
1331
if sha1 is not None:
1332
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1227
1334
def _read_file_chunks(self, trans_id):
1228
1335
cur_file = open(self._limbo_name(trans_id), 'rb')
1296
1405
del self._limbo_children_names[trans_id]
1297
1406
delete_any(self._limbo_name(trans_id))
1408
def new_orphan(self, trans_id, parent_id):
1409
conf = self._tree.get_config_stack()
1410
handle_orphan = conf.get('bzr.transform.orphan_policy')
1411
handle_orphan(self, trans_id, parent_id)
1414
class OrphaningError(errors.BzrError):
1416
# Only bugs could lead to such exception being seen by the user
1417
internal_error = True
1418
_fmt = "Error while orphaning %s in %s directory"
1420
def __init__(self, orphan, parent):
1421
errors.BzrError.__init__(self)
1422
self.orphan = orphan
1423
self.parent = parent
1426
class OrphaningForbidden(OrphaningError):
1428
_fmt = "Policy: %s doesn't allow creating orphans."
1430
def __init__(self, policy):
1431
errors.BzrError.__init__(self)
1432
self.policy = policy
1435
def move_orphan(tt, orphan_id, parent_id):
1436
"""See TreeTransformBase.new_orphan.
1438
This creates a new orphan in the `brz-orphans` dir at the root of the
1441
:param tt: The TreeTransform orphaning `trans_id`.
1443
:param orphan_id: The trans id that should be orphaned.
1445
:param parent_id: The orphan parent trans id.
1447
# Add the orphan dir if it doesn't exist
1448
orphan_dir_basename = 'brz-orphans'
1449
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1450
if tt.final_kind(od_id) is None:
1451
tt.create_directory(od_id)
1452
parent_path = tt._tree_id_paths[parent_id]
1453
# Find a name that doesn't exist yet in the orphan dir
1454
actual_name = tt.final_name(orphan_id)
1455
new_name = tt._available_backup_name(actual_name, od_id)
1456
tt.adjust_path(new_name, od_id, orphan_id)
1457
trace.warning('%s has been orphaned in %s'
1458
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1461
def refuse_orphan(tt, orphan_id, parent_id):
1462
"""See TreeTransformBase.new_orphan.
1464
This refuses to create orphan, letting the caller handle the conflict.
1466
raise OrphaningForbidden('never')
1469
orphaning_registry = registry.Registry()
1470
orphaning_registry.register(
1471
'conflict', refuse_orphan,
1472
'Leave orphans in place and create a conflict on the directory.')
1473
orphaning_registry.register(
1474
'move', move_orphan,
1475
'Move orphans into the brz-orphans directory.')
1476
orphaning_registry._set_default_key('conflict')
1479
opt_transform_orphan = _mod_config.RegistryOption(
1480
'bzr.transform.orphan_policy', orphaning_registry,
1481
help='Policy for orphaned files during transform operations.',
1300
1485
class TreeTransform(DiskTreeTransform):
1301
1486
"""Represent a tree transformation.
1594
1776
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1596
1778
entries = self._tree.iter_entries_by_dir(
1597
new_path_file_ids.values())
1779
viewvalues(new_path_file_ids))
1598
1780
old_paths = dict((e.file_id, p) for p, e in entries)
1599
1781
final_kinds = {}
1600
1782
for num, (path, trans_id) in enumerate(new_paths):
1601
1783
if (num % 10) == 0:
1602
child_pb.update('adding file',
1784
child_pb.update(gettext('adding file'),
1603
1785
num + len(self._removed_id), total_entries)
1604
1786
file_id = new_path_file_ids[trans_id]
1605
1787
if file_id is None:
1607
1789
needs_entry = False
1609
kind = self.final_kind(trans_id)
1611
kind = self._tree.stored_kind(file_id)
1790
kind = self.final_kind(trans_id)
1792
kind = self._tree.stored_kind(
1793
self._tree.id2path(file_id), file_id)
1612
1794
parent_trans_id = self.final_parent(trans_id)
1613
1795
parent_file_id = new_path_file_ids.get(parent_trans_id)
1614
1796
if parent_file_id is None:
1643
1825
If inventory_delta is None, no inventory delta generation is performed.
1645
tree_paths = list(self._tree_path_ids.iteritems())
1646
tree_paths.sort(reverse=True)
1647
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1827
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1828
child_pb = ui.ui_factory.nested_progress_bar()
1649
for num, data in enumerate(tree_paths):
1650
path, trans_id = data
1651
child_pb.update('removing file', num, len(tree_paths))
1830
for num, (path, trans_id) in enumerate(tree_paths):
1831
# do not attempt to move root into a subdirectory of itself.
1834
child_pb.update(gettext('removing file'), num, len(tree_paths))
1652
1835
full_path = self._tree.abspath(path)
1653
1836
if trans_id in self._removed_contents:
1654
1837
delete_path = os.path.join(self._deletiondir, trans_id)
1679
1862
modified_paths = []
1680
1863
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1682
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1865
child_pb = ui.ui_factory.nested_progress_bar()
1684
1867
for num, (path, trans_id) in enumerate(new_paths):
1685
1868
if (num % 10) == 0:
1686
child_pb.update('adding file', num, len(new_paths))
1869
child_pb.update(gettext('adding file'), num, len(new_paths))
1687
1870
full_path = self._tree.abspath(path)
1688
1871
if trans_id in self._needs_rename:
1690
1873
mover.rename(self._limbo_name(trans_id), full_path)
1874
except errors.TransformRenameFailed as e:
1692
1875
# We may be renaming a dangling inventory id
1693
1876
if e.errno != errno.ENOENT:
1696
1879
self.rename_count += 1
1880
# TODO: if trans_id in self._observed_sha1s, we should
1881
# re-stat the final target, since ctime will be
1882
# updated by the change.
1697
1883
if (trans_id in self._new_contents or
1698
1884
self.path_changed(trans_id)):
1699
1885
if trans_id in self._new_contents:
1700
1886
modified_paths.append(full_path)
1701
1887
if trans_id in self._new_executability:
1702
1888
self._set_executability(path, trans_id)
1889
if trans_id in self._observed_sha1s:
1890
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1891
st = osutils.lstat(full_path)
1892
self._observed_sha1s[trans_id] = (o_sha1, st)
1704
1894
child_pb.finished()
1895
for path, trans_id in new_paths:
1896
# new_paths includes stuff like workingtree conflicts. Only the
1897
# stuff in new_contents actually comes from limbo.
1898
if trans_id in self._limbo_files:
1899
del self._limbo_files[trans_id]
1705
1900
self._new_contents.clear()
1706
1901
return modified_paths
1903
def _apply_observed_sha1s(self):
1904
"""After we have finished renaming everything, update observed sha1s
1906
This has to be done after self._tree.apply_inventory_delta, otherwise
1907
it doesn't know anything about the files we are updating. Also, we want
1908
to do this as late as possible, so that most entries end up cached.
1910
# TODO: this doesn't update the stat information for directories. So
1911
# the first 'bzr status' will still need to rewrite
1912
# .bzr/checkout/dirstate. However, we at least don't need to
1913
# re-read all of the files.
1914
# TODO: If the operation took a while, we could do a time.sleep(3) here
1915
# to allow the clock to tick over and ensure we won't have any
1916
# problems. (we could observe start time, and finish time, and if
1917
# it is less than eg 10% overhead, add a sleep call.)
1918
paths = FinalPaths(self)
1919
for trans_id, observed in viewitems(self._observed_sha1s):
1920
path = paths.get_path(trans_id)
1921
# We could get the file_id, but dirstate prefers to use the path
1922
# anyway, and it is 'cheaper' to determine.
1923
# file_id = self._new_id[trans_id]
1924
self._tree._observed_sha1(None, path, observed)
1709
1927
class TransformPreview(DiskTreeTransform):
1710
1928
"""A TreeTransform for generating preview trees.
1788
2011
except errors.NoSuchRevisionInTree:
1789
2012
yield self._get_repository().revision_tree(revision_id)
1791
def _get_file_revision(self, file_id, vf, tree_revision):
1792
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
self._iter_parent_trees()]
2014
def _get_file_revision(self, path, file_id, vf, tree_revision):
2016
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
2017
for t in self._iter_parent_trees()]
1794
2018
vf.add_lines((file_id, tree_revision), parent_keys,
1795
self.get_file(file_id).readlines())
2019
self.get_file_lines(path, file_id))
1796
2020
repo = self._get_repository()
1797
2021
base_vf = repo.texts
1798
2022
if base_vf not in vf.fallback_versionedfiles:
1799
2023
vf.fallback_versionedfiles.append(base_vf)
1800
2024
return tree_revision
1802
def _stat_limbo_file(self, file_id):
1803
trans_id = self._transform.trans_id_file_id(file_id)
2026
def _stat_limbo_file(self, file_id=None, trans_id=None):
2027
if trans_id is None:
2028
trans_id = self._transform.trans_id_file_id(file_id)
1804
2029
name = self._transform._limbo_name(trans_id)
1805
2030
return os.lstat(name)
2000
2241
for path, entry in entries:
2001
2242
yield path, 'V', entry.kind, entry.file_id, entry
2003
def kind(self, file_id):
2244
def kind(self, path, file_id=None):
2246
file_id = self.path2id(path)
2004
2247
trans_id = self._transform.trans_id_file_id(file_id)
2005
2248
return self._transform.final_kind(trans_id)
2007
def stored_kind(self, file_id):
2250
def stored_kind(self, path, file_id=None):
2252
file_id = self.path2id(path)
2008
2253
trans_id = self._transform.trans_id_file_id(file_id)
2010
2255
return self._transform._new_contents[trans_id]
2011
2256
except KeyError:
2012
return self._transform._tree.stored_kind(file_id)
2257
return self._transform._tree.stored_kind(path, file_id)
2014
def get_file_mtime(self, file_id, path=None):
2259
def get_file_mtime(self, path, file_id=None):
2015
2260
"""See Tree.get_file_mtime"""
2262
file_id = self.path2id(path)
2264
raise errors.NoSuchFile(path)
2016
2265
if not self._content_change(file_id):
2017
return self._transform._tree.get_file_mtime(file_id)
2266
return self._transform._tree.get_file_mtime(
2267
self._transform._tree.id2path(file_id), file_id)
2018
2268
return self._stat_limbo_file(file_id).st_mtime
2020
2270
def _file_size(self, entry, stat_value):
2021
return self.get_file_size(entry.file_id)
2271
path = self.id2path(entry.file_id)
2272
return self.get_file_size(path, entry.file_id)
2023
def get_file_size(self, file_id):
2274
def get_file_size(self, path, file_id=None):
2024
2275
"""See Tree.get_file_size"""
2025
if self.kind(file_id) == 'file':
2026
return self._transform._tree.get_file_size(file_id)
2277
file_id = self.path2id(path)
2278
trans_id = self._transform.trans_id_file_id(file_id)
2279
kind = self._transform.final_kind(trans_id)
2282
if trans_id in self._transform._new_contents:
2283
return self._stat_limbo_file(trans_id=trans_id).st_size
2284
if self.kind(path, file_id) == 'file':
2285
return self._transform._tree.get_file_size(path, file_id)
2030
def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
trans_id = self._transform.trans_id_file_id(file_id)
2032
kind = self._transform._new_contents.get(trans_id)
2034
return self._transform._tree.get_file_sha1(file_id)
2036
fileobj = self.get_file(file_id)
2289
def get_file_verifier(self, path, file_id=None, stat_value=None):
2291
file_id = self.path2id(path)
2292
trans_id = self._transform.trans_id_file_id(file_id)
2293
kind = self._transform._new_contents.get(trans_id)
2295
return self._transform._tree.get_file_verifier(path, file_id)
2297
fileobj = self.get_file(path, file_id)
2299
return ("SHA1", sha_file(fileobj))
2303
def get_file_sha1(self, path, file_id=None, stat_value=None):
2305
file_id = self.path2id(path)
2306
trans_id = self._transform.trans_id_file_id(file_id)
2307
kind = self._transform._new_contents.get(trans_id)
2309
return self._transform._tree.get_file_sha1(path, file_id)
2311
fileobj = self.get_file(path, file_id)
2038
2313
return sha_file(fileobj)
2040
2315
fileobj.close()
2042
def is_executable(self, file_id, path=None):
2317
def is_executable(self, path, file_id=None):
2319
file_id = self.path2id(path)
2043
2320
if file_id is None:
2045
2322
trans_id = self._transform.trans_id_file_id(file_id)
2106
2392
raise ValueError('want_unversioned is not supported')
2107
2393
return self._transform.iter_changes()
2109
def get_file(self, file_id, path=None):
2395
def get_file(self, path, file_id=None):
2110
2396
"""See Tree.get_file"""
2398
file_id = self.path2id(path)
2111
2399
if not self._content_change(file_id):
2112
return self._transform._tree.get_file(file_id, path)
2400
return self._transform._tree.get_file(path, file_id)
2113
2401
trans_id = self._transform.trans_id_file_id(file_id)
2114
2402
name = self._transform._limbo_name(trans_id)
2115
2403
return open(name, 'rb')
2117
def get_file_with_stat(self, file_id, path=None):
2118
return self.get_file(file_id, path), None
2405
def get_file_with_stat(self, path, file_id=None):
2406
return self.get_file(path, file_id), None
2120
def annotate_iter(self, file_id,
2408
def annotate_iter(self, path, file_id=None,
2121
2409
default_revision=_mod_revision.CURRENT_REVISION):
2411
file_id = self.path2id(path)
2122
2412
changes = self._iter_changes_cache.get(file_id)
2123
2413
if changes is None:
2268
2562
:param delta_from_tree: If true, build_tree may use the input Tree to
2269
2563
generate the inventory delta.
2271
wt.lock_tree_write()
2565
with wt.lock_tree_write(), tree.lock_read():
2566
if accelerator_tree is not None:
2567
accelerator_tree.lock_read()
2569
return _build_tree(tree, wt, accelerator_tree, hardlink,
2275
2572
if accelerator_tree is not None:
2276
accelerator_tree.lock_read()
2278
return _build_tree(tree, wt, accelerator_tree, hardlink,
2281
if accelerator_tree is not None:
2282
accelerator_tree.unlock()
2573
accelerator_tree.unlock()
2289
2576
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2290
2577
"""See build_tree."""
2291
for num, _unused in enumerate(wt.all_file_ids()):
2578
for num, _unused in enumerate(wt.all_versioned_paths()):
2292
2579
if num > 0: # more than just a root
2293
2580
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2294
existing_files = set()
2295
for dir, files in wt.walkdirs():
2296
existing_files.update(f[0] for f in files)
2297
2581
file_trans_id = {}
2298
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2582
top_pb = ui.ui_factory.nested_progress_bar()
2299
2583
pp = ProgressPhase("Build phase", 2, top_pb)
2300
if tree.inventory.root is not None:
2584
if tree.get_root_id() is not None:
2301
2585
# This is kind of a hack: we should be altering the root
2302
2586
# as part of the regular tree shape diff logic.
2303
2587
# The conditional test here is to avoid doing an
2314
2598
pp.next_phase()
2315
2599
file_trans_id[wt.get_root_id()] = \
2316
2600
tt.trans_id_tree_file_id(wt.get_root_id())
2317
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2601
pb = ui.ui_factory.nested_progress_bar()
2319
2603
deferred_contents = []
2321
total = len(tree.inventory)
2605
total = len(tree.all_versioned_paths())
2322
2606
if delta_from_tree:
2323
2607
precomputed_delta = []
2325
2609
precomputed_delta = None
2610
# Check if tree inventory has content. If so, we populate
2611
# existing_files with the directory content. If there are no
2612
# entries we skip populating existing_files as its not used.
2613
# This improves performance and unncessary work on large
2614
# directory trees. (#501307)
2616
existing_files = set()
2617
for dir, files in wt.walkdirs():
2618
existing_files.update(f[0] for f in files)
2326
2619
for num, (tree_path, entry) in \
2327
enumerate(tree.inventory.iter_entries_by_dir()):
2328
pb.update("Building tree", num - len(deferred_contents), total)
2620
enumerate(tree.iter_entries_by_dir()):
2621
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2329
2622
if entry.parent_id is None:
2331
2624
reparent = False
2355
2648
trans_id = tt.create_path(entry.name, parent_id)
2356
2649
file_trans_id[file_id] = trans_id
2357
2650
tt.version_file(file_id, trans_id)
2358
executable = tree.is_executable(file_id, tree_path)
2651
executable = tree.is_executable(tree_path, file_id)
2360
2653
tt.set_executability(executable, trans_id)
2361
trans_data = (trans_id, tree_path)
2654
trans_data = (trans_id, tree_path, entry.text_sha1)
2362
2655
deferred_contents.append((file_id, trans_data))
2364
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2657
file_trans_id[file_id] = new_by_entry(
2658
tree_path, tt, entry, parent_id, tree)
2367
2660
new_trans_id = file_trans_id[file_id]
2368
2661
old_parent = tt.trans_id_tree_path(tree_path)
2405
2698
in iter if not (c or e[0] != e[1])]
2406
2699
if accelerator_tree.supports_content_filtering():
2407
2700
unchanged = [(f, p) for (f, p) in unchanged
2408
if not accelerator_tree.iter_search_rules([p]).next()]
2701
if not next(accelerator_tree.iter_search_rules([p]))]
2409
2702
unchanged = dict(unchanged)
2410
2703
new_desired_files = []
2412
for file_id, (trans_id, tree_path) in desired_files:
2705
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2413
2706
accelerator_path = unchanged.get(file_id)
2414
2707
if accelerator_path is None:
2415
new_desired_files.append((file_id, (trans_id, tree_path)))
2708
new_desired_files.append((file_id,
2709
(trans_id, tree_path, text_sha1)))
2417
pb.update('Adding file contents', count + offset, total)
2711
pb.update(gettext('Adding file contents'), count + offset, total)
2419
2713
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2422
contents = accelerator_tree.get_file(file_id, accelerator_path)
2716
contents = accelerator_tree.get_file(accelerator_path, file_id)
2423
2717
if wt.supports_content_filtering():
2424
2718
filters = wt._content_filter_stack(tree_path)
2425
2719
contents = filtered_output_bytes(contents, filters,
2426
2720
ContentFilterContext(tree_path, tree))
2428
tt.create_file(contents, trans_id)
2722
tt.create_file(contents, trans_id, sha1=text_sha1)
2431
2725
contents.close()
2436
2730
offset += count
2437
for count, ((trans_id, tree_path), contents) in enumerate(
2731
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2438
2732
tree.iter_files_bytes(new_desired_files)):
2439
2733
if wt.supports_content_filtering():
2440
2734
filters = wt._content_filter_stack(tree_path)
2441
2735
contents = filtered_output_bytes(contents, filters,
2442
2736
ContentFilterContext(tree_path, tree))
2443
tt.create_file(contents, trans_id)
2444
pb.update('Adding file contents', count + offset, total)
2737
tt.create_file(contents, trans_id, sha1=text_sha1)
2738
pb.update(gettext('Adding file contents'), count + offset, total)
2447
2741
def _reparent_children(tt, old_parent, new_parent):
2448
2742
for child in tt.iter_tree_children(old_parent):
2449
2743
tt.adjust_path(tt.final_name(child), new_parent, child)
2451
2746
def _reparent_transform_children(tt, old_parent, new_parent):
2452
2747
by_parent = tt.by_parent()
2453
2748
for child in by_parent[old_parent]:
2454
2749
tt.adjust_path(tt.final_name(child), new_parent, child)
2455
2750
return by_parent[old_parent]
2457
2753
def _content_match(tree, entry, file_id, kind, target_path):
2458
2754
if entry.kind != kind:
2460
2756
if entry.kind == "directory":
2758
path = tree.id2path(file_id)
2462
2759
if entry.kind == "file":
2463
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2760
f = file(target_path, 'rb')
2762
if tree.get_file_text(path, file_id) == f.read():
2465
2766
elif entry.kind == "symlink":
2466
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2767
if tree.get_symlink_target(path, file_id) == os.readlink(target_path):
2513
2814
tt.set_tree_reference(entry.reference_revision, trans_id)
2514
2815
return trans_id
2515
2816
elif kind == 'symlink':
2516
target = tree.get_symlink_target(entry.file_id)
2817
target = tree.get_symlink_target(path, entry.file_id)
2517
2818
return tt.new_symlink(name, parent_id, target, entry.file_id)
2519
2820
raise errors.BadFileKindError(name, kind)
2522
@deprecated_function(deprecated_in((1, 9, 0)))
2523
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2524
"""Create new file contents according to an inventory entry.
2526
DEPRECATED. Use create_from_tree instead.
2528
if entry.kind == "file":
2530
lines = tree.get_file(entry.file_id).readlines()
2531
tt.create_file(lines, trans_id, mode_id=mode_id)
2532
elif entry.kind == "symlink":
2533
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2534
elif entry.kind == "directory":
2535
tt.create_directory(trans_id)
2538
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2823
def create_from_tree(tt, trans_id, tree, path, file_id=None, bytes=None,
2539
2824
filter_tree_path=None):
2540
2825
"""Create new file contents according to tree contents.
2542
2827
:param filter_tree_path: the tree path to use to lookup
2543
2828
content filters to apply to the bytes output in the working tree.
2544
2829
This only applies if the working tree supports content filtering.
2546
kind = tree.kind(file_id)
2831
kind = tree.kind(path, file_id)
2547
2832
if kind == 'directory':
2548
2833
tt.create_directory(trans_id)
2549
2834
elif kind == "file":
2550
2835
if bytes is None:
2551
tree_file = tree.get_file(file_id)
2836
tree_file = tree.get_file(path, file_id)
2553
2838
bytes = tree_file.readlines()
2571
2856
tt.set_executability(entry.executable, trans_id)
2574
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2575
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2578
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2579
"""Produce a backup-style name that appears to be available"""
2583
yield "%s.~%d~" % (name, counter)
2585
for new_name in name_gen():
2586
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2590
def _entry_changes(file_id, entry, working_tree):
2591
"""Determine in which ways the inventory entry has changed.
2593
Returns booleans: has_contents, content_mod, meta_mod
2594
has_contents means there are currently contents, but they differ
2595
contents_mod means contents need to be modified
2596
meta_mod means the metadata needs to be modified
2598
cur_entry = working_tree.inventory[file_id]
2600
working_kind = working_tree.kind(file_id)
2603
has_contents = False
2606
if has_contents is True:
2607
if entry.kind != working_kind:
2608
contents_mod, meta_mod = True, False
2610
cur_entry._read_tree_state(working_tree.id2path(file_id),
2612
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2613
cur_entry._forget_tree_state()
2614
return has_contents, contents_mod, meta_mod
2617
2859
def revert(working_tree, target_tree, filenames, backups=False,
2618
2860
pb=None, change_reporter=None):
2619
2861
"""Revert a working tree's contents to those of a target tree."""
2676
2922
deferred_files = []
2677
2923
for id_num, (file_id, path, changed_content, versioned, parent, name,
2678
2924
kind, executable) in enumerate(change_list):
2679
if skip_root and file_id[0] is not None and parent[0] is None:
2925
target_path, wt_path = path
2926
target_versioned, wt_versioned = versioned
2927
target_parent, wt_parent = parent
2928
target_name, wt_name = name
2929
target_kind, wt_kind = kind
2930
target_executable, wt_executable = executable
2931
if skip_root and wt_parent is None:
2681
2933
trans_id = tt.trans_id_file_id(file_id)
2683
2935
if changed_content:
2684
2936
keep_content = False
2685
if kind[0] == 'file' and (backups or kind[1] is None):
2686
wt_sha1 = working_tree.get_file_sha1(file_id)
2937
if wt_kind == 'file' and (backups or target_kind is None):
2938
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2687
2939
if merge_modified.get(file_id) != wt_sha1:
2688
2940
# acquire the basis tree lazily to prevent the
2689
2941
# expense of accessing it when it's not needed ?
2691
2943
if basis_tree is None:
2692
2944
basis_tree = working_tree.basis_tree()
2693
2945
basis_tree.lock_read()
2694
if file_id in basis_tree:
2695
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2697
elif kind[1] is None and not versioned[1]:
2699
if kind[0] is not None:
2947
basis_path = basis_tree.id2path(file_id)
2948
except errors.NoSuchId:
2949
if target_kind is None and not target_versioned:
2952
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2954
if wt_kind is not None:
2700
2955
if not keep_content:
2701
2956
tt.delete_contents(trans_id)
2702
elif kind[1] is not None:
2703
parent_trans_id = tt.trans_id_file_id(parent[0])
2704
by_parent = tt.by_parent()
2705
backup_name = _get_backup_name(name[0], by_parent,
2706
parent_trans_id, tt)
2957
elif target_kind is not None:
2958
parent_trans_id = tt.trans_id_file_id(wt_parent)
2959
backup_name = tt._available_backup_name(
2960
wt_name, parent_trans_id)
2707
2961
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2708
new_trans_id = tt.create_path(name[0], parent_trans_id)
2709
if versioned == (True, True):
2962
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2963
if wt_versioned and target_versioned:
2710
2964
tt.unversion_file(trans_id)
2711
2965
tt.version_file(file_id, new_trans_id)
2712
2966
# New contents should have the same unix perms as old
2714
2968
mode_id = trans_id
2715
2969
trans_id = new_trans_id
2716
if kind[1] in ('directory', 'tree-reference'):
2970
if target_kind in ('directory', 'tree-reference'):
2717
2971
tt.create_directory(trans_id)
2718
if kind[1] == 'tree-reference':
2719
revision = target_tree.get_reference_revision(file_id,
2972
if target_kind == 'tree-reference':
2973
revision = target_tree.get_reference_revision(
2974
target_path, file_id)
2721
2975
tt.set_tree_reference(revision, trans_id)
2722
elif kind[1] == 'symlink':
2723
tt.create_symlink(target_tree.get_symlink_target(file_id),
2725
elif kind[1] == 'file':
2976
elif target_kind == 'symlink':
2977
tt.create_symlink(target_tree.get_symlink_target(
2978
target_path, file_id), trans_id)
2979
elif target_kind == 'file':
2726
2980
deferred_files.append((file_id, (trans_id, mode_id)))
2727
2981
if basis_tree is None:
2728
2982
basis_tree = working_tree.basis_tree()
2729
2983
basis_tree.lock_read()
2730
new_sha1 = target_tree.get_file_sha1(file_id)
2731
if (file_id in basis_tree and new_sha1 ==
2732
basis_tree.get_file_sha1(file_id)):
2984
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2986
basis_path = basis_tree.id2path(file_id)
2987
except errors.NoSuchId:
2989
if (basis_path is not None and
2990
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2733
2991
if file_id in merge_modified:
2734
2992
del merge_modified[file_id]
2736
2994
merge_modified[file_id] = new_sha1
2738
2996
# preserve the execute bit when backing up
2739
if keep_content and executable[0] == executable[1]:
2740
tt.set_executability(executable[1], trans_id)
2741
elif kind[1] is not None:
2742
raise AssertionError(kind[1])
2743
if versioned == (False, True):
2997
if keep_content and wt_executable == target_executable:
2998
tt.set_executability(target_executable, trans_id)
2999
elif target_kind is not None:
3000
raise AssertionError(target_kind)
3001
if not wt_versioned and target_versioned:
2744
3002
tt.version_file(file_id, trans_id)
2745
if versioned == (True, False):
3003
if wt_versioned and not target_versioned:
2746
3004
tt.unversion_file(trans_id)
2747
if (name[1] is not None and
2748
(name[0] != name[1] or parent[0] != parent[1])):
2749
if name[1] == '' and parent[1] is None:
3005
if (target_name is not None and
3006
(wt_name != target_name or wt_parent != target_parent)):
3007
if target_name == '' and target_parent is None:
2750
3008
parent_trans = ROOT_PARENT
2752
parent_trans = tt.trans_id_file_id(parent[1])
2753
if parent[0] is None and versioned[0]:
2754
tt.adjust_root_path(name[1], parent_trans)
3010
parent_trans = tt.trans_id_file_id(target_parent)
3011
if wt_parent is None and wt_versioned:
3012
tt.adjust_root_path(target_name, parent_trans)
2756
tt.adjust_path(name[1], parent_trans, trans_id)
2757
if executable[0] != executable[1] and kind[1] == "file":
2758
tt.set_executability(executable[1], trans_id)
3014
tt.adjust_path(target_name, parent_trans, trans_id)
3015
if wt_executable != target_executable and target_kind == "file":
3016
tt.set_executability(target_executable, trans_id)
2759
3017
if working_tree.supports_content_filtering():
2760
3018
for index, ((trans_id, mode_id), bytes) in enumerate(
2761
3019
target_tree.iter_files_bytes(deferred_files)):
2903
3180
modified_path = fp.get_path(conflict[2])
2904
3181
modified_id = tt.final_file_id(conflict[2])
2905
3182
if len(conflict) == 3:
2906
yield Conflict.factory(c_type, action=action, path=modified_path,
2907
file_id=modified_id)
3183
yield conflicts.Conflict.factory(
3184
c_type, action=action, path=modified_path, file_id=modified_id)
2910
3187
conflicting_path = fp.get_path(conflict[3])
2911
3188
conflicting_id = tt.final_file_id(conflict[3])
2912
yield Conflict.factory(c_type, action=action, path=modified_path,
2913
file_id=modified_id,
2914
conflict_path=conflicting_path,
2915
conflict_file_id=conflicting_id)
3189
yield conflicts.Conflict.factory(
3190
c_type, action=action, path=modified_path,
3191
file_id=modified_id,
3192
conflict_path=conflicting_path,
3193
conflict_file_id=conflicting_id)
2918
3196
class _FileMover(object):
2957
3240
# after apply_deletions, don't reuse _FileMover
2958
3241
past_renames = None
2959
3242
pending_deletions = None
3245
def link_tree(target_tree, source_tree):
3246
"""Where possible, hard-link files in a tree to those in another tree.
3248
:param target_tree: Tree to change
3249
:param source_tree: Tree to hard-link from
3251
tt = TreeTransform(target_tree)
3253
for (file_id, paths, changed_content, versioned, parent, name, kind,
3254
executable) in target_tree.iter_changes(source_tree,
3255
include_unchanged=True):
3258
if kind != ('file', 'file'):
3260
if executable[0] != executable[1]:
3262
trans_id = tt.trans_id_tree_file_id(file_id)
3263
tt.delete_contents(trans_id)
3264
tt.create_hardlink(source_tree.id2abspath(file_id), trans_id)
added
removed
breezy/transform.py
