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
579
# ensure that all children are registered with the transaction
532
580
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:
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:
540
596
if self.final_name(child) == name:
543
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
546
childpath = joinpath(path, name)
547
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)
548
604
if child_id is None:
549
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))
551
if self.final_parent(child_id) != parent_id:
553
if child_id in self._removed_contents:
554
# 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))
559
625
def _parent_loops(self):
560
626
"""No entry should be its own ancestor"""
644
703
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]
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))
652
716
last_trans_id = None
653
717
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
718
kind = self.final_kind(trans_id)
658
719
file_id = self.final_file_id(trans_id)
659
720
if kind is None and file_id is None:
672
733
self._removed_id))
673
734
all_ids = self._tree.all_file_ids()
674
735
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
736
for trans_id, file_id in viewitems(self._new_id):
676
737
if file_id in active_tree_ids:
677
738
old_trans_id = self.trans_id_tree_file_id(file_id)
678
739
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
742
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
743
"""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)
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
699
760
conflicts.append(('missing parent', parent_id))
700
761
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
701
763
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
766
def _set_executability(self, path, trans_id):
715
767
"""Set the executability of versioned files """
716
if supports_executable():
768
if self._tree._supports_executable():
717
769
new_executability = self._new_executability[trans_id]
718
770
abspath = self._tree.abspath(path)
719
771
current_mode = os.stat(abspath).st_mode
720
772
if new_executability:
721
773
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
775
to_mode = current_mode | (0o100 & ~umask)
724
776
# 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
777
if current_mode & 0o004:
778
to_mode |= 0o001 & ~umask
779
if current_mode & 0o040:
780
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
782
to_mode = current_mode & ~0o111
783
osutils.chmod_if_possible(abspath, to_mode)
733
785
def _new_entry(self, name, parent_id, file_id):
734
786
"""Helper function to create a new filesystem entry."""
780
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
783
877
def _affected_ids(self):
784
878
"""Return the set of transform ids affected by the transform"""
785
879
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
880
trans_ids.update(self._new_id)
787
881
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())
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)
794
888
def _get_file_id_maps(self):
928
1019
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1021
def commit(self, branch, message, merge_parents=None, strict=False,
1022
timestamp=None, timezone=None, committer=None, authors=None,
1023
revprops=None, revision_id=None):
931
1024
"""Commit the result of this TreeTransform to a branch.
933
1026
:param branch: The branch to commit to.
934
1027
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1028
:param merge_parents: Additional parent revision-ids specified by
1030
:param strict: If True, abort the commit if there are unversioned
1032
:param timestamp: if not None, seconds-since-epoch for the time and
1033
date. (May be a float.)
1034
:param timezone: Optional timezone for timestamp, as an offset in
1036
:param committer: Optional committer in email-id format.
1037
(e.g. "J Random Hacker <jrandom@example.com>")
1038
:param authors: Optional list of authors in email-id format.
1039
:param revprops: Optional dictionary of revision properties.
1040
:param revision_id: Optional revision id. (Specifying a revision-id
1041
may reduce performance for some non-native formats.)
936
1042
:return: The revision_id of the revision committed.
938
1044
self._check_malformed()
1030
1143
:param records: An iterable of (names, content) tuples, as per
1031
1144
pack.ContainerPushParser.
1033
names, content = records.next()
1146
names, content = next(records)
1034
1147
attribs = bencode.bdecode(content)
1035
1148
self._id_number = attribs['_id_number']
1036
1149
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1150
for k, v in viewitems(attribs['_new_name']))
1038
1151
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1152
self._new_executability = dict((k, bool(v))
1153
for k, v in viewitems(attribs['_new_executability']))
1041
1154
self._new_id = attribs['_new_id']
1042
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))
1043
1156
self._tree_path_ids = {}
1044
1157
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1158
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1046
1159
path = bytepath.decode('utf-8')
1047
1160
self._tree_path_ids[path] = trans_id
1048
1161
self._tree_id_paths[trans_id] = path
1173
1302
descendants.update(self._limbo_descendants(descendant))
1174
1303
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1305
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1306
"""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.
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.
1187
1319
name = self._limbo_name(trans_id)
1188
1320
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.
1322
unique_add(self._new_contents, trans_id, 'file')
1199
1323
f.writelines(contents)
1202
1326
self._set_mtime(name)
1203
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))
1205
1334
def _read_file_chunks(self, trans_id):
1206
1335
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1405
del self._limbo_children_names[trans_id]
1275
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.',
1278
1485
class TreeTransform(DiskTreeTransform):
1279
1486
"""Represent a tree transformation.
1572
1772
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1574
1774
entries = self._tree.iter_entries_by_dir(
1575
new_path_file_ids.values())
1775
viewvalues(new_path_file_ids))
1576
1776
old_paths = dict((e.file_id, p) for p, e in entries)
1577
1777
final_kinds = {}
1578
1778
for num, (path, trans_id) in enumerate(new_paths):
1579
1779
if (num % 10) == 0:
1580
child_pb.update('adding file',
1780
child_pb.update(gettext('adding file'),
1581
1781
num + len(self._removed_id), total_entries)
1582
1782
file_id = new_path_file_ids[trans_id]
1583
1783
if file_id is None:
1585
1785
needs_entry = False
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1786
kind = self.final_kind(trans_id)
1788
kind = self._tree.stored_kind(
1789
self._tree.id2path(file_id), file_id)
1590
1790
parent_trans_id = self.final_parent(trans_id)
1591
1791
parent_file_id = new_path_file_ids.get(parent_trans_id)
1592
1792
if parent_file_id is None:
1621
1819
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()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1629
child_pb.update('removing file', num, len(tree_paths))
1821
tree_paths = sorted(viewitems(self._tree_path_ids), reverse=True)
1822
with ui.ui_factory.nested_progress_bar() as child_pb:
1823
for num, (path, trans_id) in enumerate(tree_paths):
1824
# do not attempt to move root into a subdirectory of itself.
1827
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1828
full_path = self._tree.abspath(path)
1631
1829
if trans_id in self._removed_contents:
1632
1830
delete_path = os.path.join(self._deletiondir, trans_id)
1657
1853
modified_paths = []
1658
1854
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()
1856
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1857
for num, (path, trans_id) in enumerate(new_paths):
1663
1858
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1859
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1860
full_path = self._tree.abspath(path)
1666
1861
if trans_id in self._needs_rename:
1668
1863
mover.rename(self._limbo_name(trans_id), full_path)
1864
except errors.TransformRenameFailed as e:
1670
1865
# We may be renaming a dangling inventory id
1671
1866
if e.errno != errno.ENOENT:
1674
1869
self.rename_count += 1
1870
# TODO: if trans_id in self._observed_sha1s, we should
1871
# re-stat the final target, since ctime will be
1872
# updated by the change.
1675
1873
if (trans_id in self._new_contents or
1676
1874
self.path_changed(trans_id)):
1677
1875
if trans_id in self._new_contents:
1678
1876
modified_paths.append(full_path)
1679
1877
if trans_id in self._new_executability:
1680
1878
self._set_executability(path, trans_id)
1879
if trans_id in self._observed_sha1s:
1880
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1881
st = osutils.lstat(full_path)
1882
self._observed_sha1s[trans_id] = (o_sha1, st)
1883
for path, trans_id in new_paths:
1884
# new_paths includes stuff like workingtree conflicts. Only the
1885
# stuff in new_contents actually comes from limbo.
1886
if trans_id in self._limbo_files:
1887
del self._limbo_files[trans_id]
1683
1888
self._new_contents.clear()
1684
1889
return modified_paths
1891
def _apply_observed_sha1s(self):
1892
"""After we have finished renaming everything, update observed sha1s
1894
This has to be done after self._tree.apply_inventory_delta, otherwise
1895
it doesn't know anything about the files we are updating. Also, we want
1896
to do this as late as possible, so that most entries end up cached.
1898
# TODO: this doesn't update the stat information for directories. So
1899
# the first 'bzr status' will still need to rewrite
1900
# .bzr/checkout/dirstate. However, we at least don't need to
1901
# re-read all of the files.
1902
# TODO: If the operation took a while, we could do a time.sleep(3) here
1903
# to allow the clock to tick over and ensure we won't have any
1904
# problems. (we could observe start time, and finish time, and if
1905
# it is less than eg 10% overhead, add a sleep call.)
1906
paths = FinalPaths(self)
1907
for trans_id, observed in viewitems(self._observed_sha1s):
1908
path = paths.get_path(trans_id)
1909
# We could get the file_id, but dirstate prefers to use the path
1910
# anyway, and it is 'cheaper' to determine.
1911
# file_id = self._new_id[trans_id]
1912
self._tree._observed_sha1(None, path, observed)
1687
1915
class TransformPreview(DiskTreeTransform):
1688
1916
"""A TreeTransform for generating preview trees.
1766
1999
except errors.NoSuchRevisionInTree:
1767
2000
yield self._get_repository().revision_tree(revision_id)
1769
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1771
self._iter_parent_trees()]
2002
def _get_file_revision(self, path, file_id, vf, tree_revision):
2004
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
2005
for t in self._iter_parent_trees()]
1772
2006
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2007
self.get_file_lines(path, file_id))
1774
2008
repo = self._get_repository()
1775
2009
base_vf = repo.texts
1776
2010
if base_vf not in vf.fallback_versionedfiles:
1777
2011
vf.fallback_versionedfiles.append(base_vf)
1778
2012
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2014
def _stat_limbo_file(self, file_id=None, trans_id=None):
2015
if trans_id is None:
2016
trans_id = self._transform.trans_id_file_id(file_id)
1782
2017
name = self._transform._limbo_name(trans_id)
1783
2018
return os.lstat(name)
1975
2229
for path, entry in entries:
1976
2230
yield path, 'V', entry.kind, entry.file_id, entry
1978
def kind(self, file_id):
2232
def kind(self, path, file_id=None):
2234
file_id = self.path2id(path)
1979
2235
trans_id = self._transform.trans_id_file_id(file_id)
1980
2236
return self._transform.final_kind(trans_id)
1982
def stored_kind(self, file_id):
2238
def stored_kind(self, path, file_id=None):
2240
file_id = self.path2id(path)
1983
2241
trans_id = self._transform.trans_id_file_id(file_id)
1985
2243
return self._transform._new_contents[trans_id]
1986
2244
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2245
return self._transform._tree.stored_kind(path, file_id)
1989
def get_file_mtime(self, file_id, path=None):
2247
def get_file_mtime(self, path, file_id=None):
1990
2248
"""See Tree.get_file_mtime"""
2250
file_id = self.path2id(path)
2252
raise errors.NoSuchFile(path)
1991
2253
if not self._content_change(file_id):
1992
return self._transform._tree.get_file_mtime(file_id)
2254
return self._transform._tree.get_file_mtime(
2255
self._transform._tree.id2path(file_id), file_id)
1993
2256
return self._stat_limbo_file(file_id).st_mtime
1995
2258
def _file_size(self, entry, stat_value):
1996
return self.get_file_size(entry.file_id)
2259
path = self.id2path(entry.file_id)
2260
return self.get_file_size(path, entry.file_id)
1998
def get_file_size(self, file_id):
2262
def get_file_size(self, path, file_id=None):
1999
2263
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2265
file_id = self.path2id(path)
2266
trans_id = self._transform.trans_id_file_id(file_id)
2267
kind = self._transform.final_kind(trans_id)
2270
if trans_id in self._transform._new_contents:
2271
return self._stat_limbo_file(trans_id=trans_id).st_size
2272
if self.kind(path, file_id) == 'file':
2273
return self._transform._tree.get_file_size(path, file_id)
2005
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
trans_id = self._transform.trans_id_file_id(file_id)
2007
kind = self._transform._new_contents.get(trans_id)
2009
return self._transform._tree.get_file_sha1(file_id)
2011
fileobj = self.get_file(file_id)
2277
def get_file_verifier(self, path, file_id=None, stat_value=None):
2279
file_id = self.path2id(path)
2280
trans_id = self._transform.trans_id_file_id(file_id)
2281
kind = self._transform._new_contents.get(trans_id)
2283
return self._transform._tree.get_file_verifier(path, file_id)
2285
fileobj = self.get_file(path, file_id)
2287
return ("SHA1", sha_file(fileobj))
2291
def get_file_sha1(self, path, file_id=None, stat_value=None):
2293
file_id = self.path2id(path)
2294
trans_id = self._transform.trans_id_file_id(file_id)
2295
kind = self._transform._new_contents.get(trans_id)
2297
return self._transform._tree.get_file_sha1(path, file_id)
2299
fileobj = self.get_file(path, file_id)
2013
2301
return sha_file(fileobj)
2015
2303
fileobj.close()
2017
def is_executable(self, file_id, path=None):
2305
def is_executable(self, path, file_id=None):
2307
file_id = self.path2id(path)
2018
2308
if file_id is None:
2020
2310
trans_id = self._transform.trans_id_file_id(file_id)
2081
2380
raise ValueError('want_unversioned is not supported')
2082
2381
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2383
def get_file(self, path, file_id=None):
2085
2384
"""See Tree.get_file"""
2386
file_id = self.path2id(path)
2086
2387
if not self._content_change(file_id):
2087
return self._transform._tree.get_file(file_id, path)
2388
return self._transform._tree.get_file(path, file_id)
2088
2389
trans_id = self._transform.trans_id_file_id(file_id)
2089
2390
name = self._transform._limbo_name(trans_id)
2090
2391
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2393
def get_file_with_stat(self, path, file_id=None):
2394
return self.get_file(path, file_id), None
2095
def annotate_iter(self, file_id,
2396
def annotate_iter(self, path, file_id=None,
2096
2397
default_revision=_mod_revision.CURRENT_REVISION):
2399
file_id = self.path2id(path)
2097
2400
changes = self._iter_changes_cache.get(file_id)
2098
2401
if changes is None:
2243
2550
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2551
generate the inventory delta.
2246
wt.lock_tree_write()
2553
with wt.lock_tree_write(), tree.lock_read():
2554
if accelerator_tree is not None:
2555
accelerator_tree.lock_read()
2557
return _build_tree(tree, wt, accelerator_tree, hardlink,
2250
2560
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()
2561
accelerator_tree.unlock()
2264
2564
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2565
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2566
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2567
if num > 0: # more than just a root
2268
2568
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
existing_files = set()
2270
for dir, files in wt.walkdirs():
2271
existing_files.update(f[0] for f in files)
2272
2569
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2570
top_pb = ui.ui_factory.nested_progress_bar()
2274
2571
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2572
if tree.get_root_id() is not None:
2276
2573
# This is kind of a hack: we should be altering the root
2277
2574
# as part of the regular tree shape diff logic.
2278
2575
# The conditional test here is to avoid doing an
2289
2586
pp.next_phase()
2290
2587
file_trans_id[wt.get_root_id()] = \
2291
2588
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2589
with ui.ui_factory.nested_progress_bar() as pb:
2294
2590
deferred_contents = []
2296
total = len(tree.inventory)
2592
total = len(tree.all_versioned_paths())
2297
2593
if delta_from_tree:
2298
2594
precomputed_delta = []
2300
2596
precomputed_delta = None
2597
# Check if tree inventory has content. If so, we populate
2598
# existing_files with the directory content. If there are no
2599
# entries we skip populating existing_files as its not used.
2600
# This improves performance and unncessary work on large
2601
# directory trees. (#501307)
2603
existing_files = set()
2604
for dir, files in wt.walkdirs():
2605
existing_files.update(f[0] for f in files)
2301
2606
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2607
enumerate(tree.iter_entries_by_dir()):
2608
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2609
if entry.parent_id is None:
2306
2611
reparent = False
2330
2635
trans_id = tt.create_path(entry.name, parent_id)
2331
2636
file_trans_id[file_id] = trans_id
2332
2637
tt.version_file(file_id, trans_id)
2333
executable = tree.is_executable(file_id, tree_path)
2638
executable = tree.is_executable(tree_path, file_id)
2335
2640
tt.set_executability(executable, trans_id)
2336
trans_data = (trans_id, tree_path)
2641
trans_data = (trans_id, tree_path, entry.text_sha1)
2337
2642
deferred_contents.append((file_id, trans_data))
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2644
file_trans_id[file_id] = new_by_entry(
2645
tree_path, tt, entry, parent_id, tree)
2342
2647
new_trans_id = file_trans_id[file_id]
2343
2648
old_parent = tt.trans_id_tree_path(tree_path)
2380
2683
in iter if not (c or e[0] != e[1])]
2381
2684
if accelerator_tree.supports_content_filtering():
2382
2685
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2686
if not next(accelerator_tree.iter_search_rules([p]))]
2384
2687
unchanged = dict(unchanged)
2385
2688
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2690
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2691
accelerator_path = unchanged.get(file_id)
2389
2692
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2693
new_desired_files.append((file_id,
2694
(trans_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2696
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2698
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2397
contents = accelerator_tree.get_file(file_id, accelerator_path)
2701
contents = accelerator_tree.get_file(accelerator_path, file_id)
2398
2702
if wt.supports_content_filtering():
2399
2703
filters = wt._content_filter_stack(tree_path)
2400
2704
contents = filtered_output_bytes(contents, filters,
2401
2705
ContentFilterContext(tree_path, tree))
2403
tt.create_file(contents, trans_id)
2707
tt.create_file(contents, trans_id, sha1=text_sha1)
2406
2710
contents.close()
2411
2715
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2716
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2717
tree.iter_files_bytes(new_desired_files)):
2414
2718
if wt.supports_content_filtering():
2415
2719
filters = wt._content_filter_stack(tree_path)
2416
2720
contents = filtered_output_bytes(contents, filters,
2417
2721
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2722
tt.create_file(contents, trans_id, sha1=text_sha1)
2723
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2726
def _reparent_children(tt, old_parent, new_parent):
2423
2727
for child in tt.iter_tree_children(old_parent):
2424
2728
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2731
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2732
by_parent = tt.by_parent()
2428
2733
for child in by_parent[old_parent]:
2429
2734
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2735
return by_parent[old_parent]
2432
2738
def _content_match(tree, entry, file_id, kind, target_path):
2433
2739
if entry.kind != kind:
2435
2741
if entry.kind == "directory":
2743
path = tree.id2path(file_id)
2437
2744
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2745
f = file(target_path, 'rb')
2747
if tree.get_file_text(path, file_id) == f.read():
2440
2751
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2752
if tree.get_symlink_target(path, file_id) == os.readlink(target_path):
2488
2799
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2800
return trans_id
2490
2801
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2802
target = tree.get_symlink_target(path, entry.file_id)
2492
2803
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2805
raise errors.BadFileKindError(name, kind)
2497
@deprecated_function(deprecated_in((1, 9, 0)))
2498
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
"""Create new file contents according to an inventory entry.
2501
DEPRECATED. Use create_from_tree instead.
2503
if entry.kind == "file":
2505
lines = tree.get_file(entry.file_id).readlines()
2506
tt.create_file(lines, trans_id, mode_id=mode_id)
2507
elif entry.kind == "symlink":
2508
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2509
elif entry.kind == "directory":
2510
tt.create_directory(trans_id)
2513
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2808
def create_from_tree(tt, trans_id, tree, path, file_id=None, bytes=None,
2514
2809
filter_tree_path=None):
2515
2810
"""Create new file contents according to tree contents.
2517
2812
:param filter_tree_path: the tree path to use to lookup
2518
2813
content filters to apply to the bytes output in the working tree.
2519
2814
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2816
kind = tree.kind(path, file_id)
2522
2817
if kind == 'directory':
2523
2818
tt.create_directory(trans_id)
2524
2819
elif kind == "file":
2525
2820
if bytes is None:
2526
tree_file = tree.get_file(file_id)
2821
tree_file = tree.get_file(path, file_id)
2528
2823
bytes = tree_file.readlines()
2546
2841
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
2844
def revert(working_tree, target_tree, filenames, backups=False,
2593
2845
pb=None, change_reporter=None):
2594
2846
"""Revert a working tree's contents to those of a target tree."""
2618
2870
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2871
backups, pp, basis_tree=None,
2620
2872
merge_modified=None):
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2873
with ui.ui_factory.nested_progress_bar() as child_pb:
2623
2874
if merge_modified is None:
2624
2875
merge_modified = working_tree.merge_modified()
2625
2876
merge_modified = _alter_files(working_tree, target_tree, tt,
2626
2877
child_pb, filenames, backups,
2627
2878
merge_modified, basis_tree)
2630
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2879
with ui.ui_factory.nested_progress_bar() as child_pb:
2632
2880
raw_conflicts = resolve_conflicts(tt, child_pb,
2633
2881
lambda t, c: conflict_pass(t, c, target_tree))
2636
2882
conflicts = cook_conflicts(raw_conflicts, tt)
2637
2883
return conflicts, merge_modified
2651
2901
deferred_files = []
2652
2902
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2903
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2904
target_path, wt_path = path
2905
target_versioned, wt_versioned = versioned
2906
target_parent, wt_parent = parent
2907
target_name, wt_name = name
2908
target_kind, wt_kind = kind
2909
target_executable, wt_executable = executable
2910
if skip_root and wt_parent is None:
2656
2912
trans_id = tt.trans_id_file_id(file_id)
2658
2914
if changed_content:
2659
2915
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2916
if wt_kind == 'file' and (backups or target_kind is None):
2917
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2662
2918
if merge_modified.get(file_id) != wt_sha1:
2663
2919
# acquire the basis tree lazily to prevent the
2664
2920
# expense of accessing it when it's not needed ?
2666
2922
if basis_tree is None:
2667
2923
basis_tree = working_tree.basis_tree()
2668
2924
basis_tree.lock_read()
2669
if file_id in basis_tree:
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2672
elif kind[1] is None and not versioned[1]:
2674
if kind[0] is not None:
2926
basis_path = basis_tree.id2path(file_id)
2927
except errors.NoSuchId:
2928
if target_kind is None and not target_versioned:
2931
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2933
if wt_kind is not None:
2675
2934
if not keep_content:
2676
2935
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)
2936
elif target_kind is not None:
2937
parent_trans_id = tt.trans_id_file_id(wt_parent)
2938
backup_name = tt._available_backup_name(
2939
wt_name, parent_trans_id)
2682
2940
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):
2941
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2942
if wt_versioned and target_versioned:
2685
2943
tt.unversion_file(trans_id)
2686
2944
tt.version_file(file_id, new_trans_id)
2687
2945
# New contents should have the same unix perms as old
2689
2947
mode_id = trans_id
2690
2948
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2949
if target_kind in ('directory', 'tree-reference'):
2692
2950
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2951
if target_kind == 'tree-reference':
2952
revision = target_tree.get_reference_revision(
2953
target_path, file_id)
2696
2954
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2955
elif target_kind == 'symlink':
2956
tt.create_symlink(target_tree.get_symlink_target(
2957
target_path, file_id), trans_id)
2958
elif target_kind == 'file':
2701
2959
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2960
if basis_tree is None:
2703
2961
basis_tree = working_tree.basis_tree()
2704
2962
basis_tree.lock_read()
2705
new_sha1 = target_tree.get_file_sha1(file_id)
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2963
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2965
basis_path = basis_tree.id2path(file_id)
2966
except errors.NoSuchId:
2968
if (basis_path is not None and
2969
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2708
2970
if file_id in merge_modified:
2709
2971
del merge_modified[file_id]
2711
2973
merge_modified[file_id] = new_sha1
2713
2975
# 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):
2976
if keep_content and wt_executable == target_executable:
2977
tt.set_executability(target_executable, trans_id)
2978
elif target_kind is not None:
2979
raise AssertionError(target_kind)
2980
if not wt_versioned and target_versioned:
2719
2981
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2982
if wt_versioned and not target_versioned:
2721
2983
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:
2984
if (target_name is not None and
2985
(wt_name != target_name or wt_parent != target_parent)):
2986
if target_name == '' and target_parent is None:
2725
2987
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)
2989
parent_trans = tt.trans_id_file_id(target_parent)
2990
if wt_parent is None and wt_versioned:
2991
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)
2993
tt.adjust_path(target_name, parent_trans, trans_id)
2994
if wt_executable != target_executable and target_kind == "file":
2995
tt.set_executability(target_executable, trans_id)
2734
2996
if working_tree.supports_content_filtering():
2735
2997
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
2998
target_tree.iter_files_bytes(deferred_files)):
2878
3156
modified_path = fp.get_path(conflict[2])
2879
3157
modified_id = tt.final_file_id(conflict[2])
2880
3158
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3159
yield conflicts.Conflict.factory(
3160
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3163
conflicting_path = fp.get_path(conflict[3])
2886
3164
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)
3165
yield conflicts.Conflict.factory(
3166
c_type, action=action, path=modified_path,
3167
file_id=modified_id,
3168
conflict_path=conflicting_path,
3169
conflict_file_id=conflicting_id)
2893
3172
class _FileMover(object):
2932
3216
# after apply_deletions, don't reuse _FileMover
2933
3217
past_renames = None
2934
3218
pending_deletions = None
3221
def link_tree(target_tree, source_tree):
3222
"""Where possible, hard-link files in a tree to those in another tree.
3224
:param target_tree: Tree to change
3225
:param source_tree: Tree to hard-link from
3227
tt = TreeTransform(target_tree)
3229
for (file_id, paths, changed_content, versioned, parent, name, kind,
3230
executable) in target_tree.iter_changes(source_tree,
3231
include_unchanged=True):
3234
if kind != ('file', 'file'):
3236
if executable[0] != executable[1]:
3238
trans_id = tt.trans_id_tree_file_id(file_id)
3239
tt.delete_contents(trans_id)
3240
tt.create_hardlink(source_tree.id2abspath(file_id), trans_id)
added
removed
breezy/transform.py
