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
77
ROOT_PARENT = "root-parent"
67
79
def unique_add(map, key, value):
69
81
raise DuplicateKey(key=key)
73
86
class _TransformResults(object):
74
87
def __init__(self, modified_paths, rename_count):
75
88
object.__init__(self)
380
391
return sorted(FinalPaths(self).get_paths(new_ids))
382
393
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,
394
"""Determine which trans_ids need new Inventory entries.
396
An new entry is needed when anything that would be reflected by an
397
inventory entry changes, including file name, file_id, parent file_id,
398
file kind, and the execute bit.
400
Some care is taken to return entries with real changes, not cases
401
where the value is deleted and then restored to its original value,
402
but some actually unchanged values may be returned.
404
:returns: A list of (path, trans_id) for all items requiring an
405
inventory change. Ordered by path.
408
# Find entries whose file_ids are new (or changed).
409
new_file_id = set(t for t in self._new_id
410
if self._new_id[t] != self.tree_file_id(t))
411
for id_set in [self._new_name, self._new_parent, new_file_id,
386
412
self._new_executability]:
387
new_ids.update(id_set)
413
changed_ids.update(id_set)
414
# removing implies a kind change
388
415
changed_kind = set(self._removed_contents)
389
417
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))
418
# Ignore entries that are already known to have changed.
419
changed_kind.difference_update(changed_ids)
420
# to keep only the truly changed ones
421
changed_kind = (t for t in changed_kind
422
if self.tree_kind(t) != self.final_kind(t))
423
# all kind changes will alter the inventory
424
changed_ids.update(changed_kind)
425
# To find entries with changed parent_ids, find parents which existed,
426
# but changed file_id.
427
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
428
# Now add all their children to the set.
429
for parent_trans_id in new_file_id:
430
changed_ids.update(self.iter_tree_children(parent_trans_id))
431
return sorted(FinalPaths(self).get_paths(changed_ids))
396
433
def final_kind(self, trans_id):
397
434
"""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)
436
:return: None if the file does not exist/has no contents. (It is
437
conceivable that a path would be created without the corresponding
438
contents insertion command)
403
440
if trans_id in self._new_contents:
404
441
return self._new_contents[trans_id]
405
442
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
445
return self.tree_kind(trans_id)
447
def tree_path(self, trans_id):
448
"""Determine the tree path associated with the trans_id."""
449
return self._tree_id_paths.get(trans_id)
410
451
def tree_file_id(self, trans_id):
411
452
"""Determine the file id associated with the trans_id in the tree"""
413
path = self._tree_id_paths[trans_id]
415
# the file is a new, unversioned file, or invalid trans_id
453
path = self.tree_path(trans_id)
417
456
# the file is old; the old id is still valid
418
457
if self._new_root == trans_id:
531
570
# ensure that all children are registered with the transaction
532
571
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:
573
def _has_named_child(self, name, parent_id, known_children):
574
"""Does a parent already have a name child.
576
:param name: The searched for name.
578
:param parent_id: The parent for which the check is made.
580
:param known_children: The already known children. This should have
581
been recently obtained from `self.by_parent.get(parent_id)`
582
(or will be if None is passed).
584
if known_children is None:
585
known_children = self.by_parent().get(parent_id, [])
586
for child in known_children:
540
587
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
589
parent_path = self._tree_id_paths.get(parent_id, None)
590
if parent_path is None:
591
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
593
child_path = joinpath(parent_path, name)
594
child_id = self._tree_path_ids.get(child_path, None)
548
595
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
596
# Not known by the tree transform yet, check the filesystem
597
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?
599
raise AssertionError('child_id is missing: %s, %s, %s'
600
% (name, parent_id, child_id))
602
def _available_backup_name(self, name, target_id):
603
"""Find an available backup name.
605
:param name: The basename of the file.
607
:param target_id: The directory trans_id where the backup should
610
known_children = self.by_parent().get(target_id, [])
611
return osutils.available_backup_name(
613
lambda base: self._has_named_child(
614
base, target_id, known_children))
559
616
def _parent_loops(self):
560
617
"""No entry should be its own ancestor"""
672
724
self._removed_id))
673
725
all_ids = self._tree.all_file_ids()
674
726
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
727
for trans_id, file_id in viewitems(self._new_id):
676
728
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
729
path = self._tree.id2path(file_id)
730
old_trans_id = self.trans_id_tree_path(path)
678
731
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
734
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
735
"""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)
737
for parent_id, children in viewitems(by_parent):
738
if parent_id == ROOT_PARENT:
741
for child_id in children:
742
if self.final_kind(child_id) is not None:
747
# There is at least a child, so we need an existing directory to
749
kind = self.final_kind(parent_id)
751
# The directory will be deleted
699
752
conflicts.append(('missing parent', parent_id))
700
753
elif kind != "directory":
754
# Meh, we need a *directory* to put something in it
701
755
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
758
def _set_executability(self, path, trans_id):
715
759
"""Set the executability of versioned files """
716
if supports_executable():
760
if self._tree._supports_executable():
717
761
new_executability = self._new_executability[trans_id]
718
762
abspath = self._tree.abspath(path)
719
763
current_mode = os.stat(abspath).st_mode
720
764
if new_executability:
721
765
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
767
to_mode = current_mode | (0o100 & ~umask)
724
768
# 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
769
if current_mode & 0o004:
770
to_mode |= 0o001 & ~umask
771
if current_mode & 0o040:
772
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
774
to_mode = current_mode & ~0o111
775
osutils.chmod_if_possible(abspath, to_mode)
733
777
def _new_entry(self, name, parent_id, file_id):
734
778
"""Helper function to create a new filesystem entry."""
780
824
self.create_symlink(target, trans_id)
827
def new_orphan(self, trans_id, parent_id):
828
"""Schedule an item to be orphaned.
830
When a directory is about to be removed, its children, if they are not
831
versioned are moved out of the way: they don't have a parent anymore.
833
:param trans_id: The trans_id of the existing item.
834
:param parent_id: The parent trans_id of the item.
836
raise NotImplementedError(self.new_orphan)
838
def _get_potential_orphans(self, dir_id):
839
"""Find the potential orphans in a directory.
841
A directory can't be safely deleted if there are versioned files in it.
842
If all the contained files are unversioned then they can be orphaned.
844
The 'None' return value means that the directory contains at least one
845
versioned file and should not be deleted.
847
:param dir_id: The directory trans id.
849
:return: A list of the orphan trans ids or None if at least one
850
versioned file is present.
853
# Find the potential orphans, stop if one item should be kept
854
for child_tid in self.by_parent()[dir_id]:
855
if child_tid in self._removed_contents:
856
# The child is removed as part of the transform. Since it was
857
# versioned before, it's not an orphan
859
elif self.final_file_id(child_tid) is None:
860
# The child is not versioned
861
orphans.append(child_tid)
863
# We have a versioned file here, searching for orphans is
783
869
def _affected_ids(self):
784
870
"""Return the set of transform ids affected by the transform"""
785
871
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
872
trans_ids.update(self._new_id)
787
873
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())
874
trans_ids.update(self._new_contents)
875
trans_ids.update(self._new_executability)
876
trans_ids.update(self._new_name)
877
trans_ids.update(self._new_parent)
794
880
def _get_file_id_maps(self):
928
1013
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1015
def commit(self, branch, message, merge_parents=None, strict=False,
1016
timestamp=None, timezone=None, committer=None, authors=None,
1017
revprops=None, revision_id=None):
931
1018
"""Commit the result of this TreeTransform to a branch.
933
1020
:param branch: The branch to commit to.
934
1021
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1022
:param merge_parents: Additional parent revision-ids specified by
1024
:param strict: If True, abort the commit if there are unversioned
1026
:param timestamp: if not None, seconds-since-epoch for the time and
1027
date. (May be a float.)
1028
:param timezone: Optional timezone for timestamp, as an offset in
1030
:param committer: Optional committer in email-id format.
1031
(e.g. "J Random Hacker <jrandom@example.com>")
1032
:param authors: Optional list of authors in email-id format.
1033
:param revprops: Optional dictionary of revision properties.
1034
:param revision_id: Optional revision id. (Specifying a revision-id
1035
may reduce performance for some non-native formats.)
936
1036
:return: The revision_id of the revision committed.
938
1038
self._check_malformed()
965
1071
return revision_id
967
1073
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1074
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1076
if path is None or self._tree.kind(path) != 'file':
972
1078
except errors.NoSuchFile:
976
1082
def _get_parents_texts(self, trans_id):
977
1083
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1084
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1087
return (self._tree.get_file_text(path),)
983
1089
def _get_parents_lines(self, trans_id):
984
1090
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1091
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1094
return (self._tree.get_file_lines(path),)
990
1096
def serialize(self, serializer):
991
1097
"""Serialize this TreeTransform.
1030
1136
:param records: An iterable of (names, content) tuples, as per
1031
1137
pack.ContainerPushParser.
1033
names, content = records.next()
1139
names, content = next(records)
1034
1140
attribs = bencode.bdecode(content)
1035
1141
self._id_number = attribs['_id_number']
1036
1142
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1143
for k, v in viewitems(attribs['_new_name']))
1038
1144
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1145
self._new_executability = dict((k, bool(v))
1146
for k, v in viewitems(attribs['_new_executability']))
1041
1147
self._new_id = attribs['_new_id']
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1148
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1043
1149
self._tree_path_ids = {}
1044
1150
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1151
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1046
1152
path = bytepath.decode('utf-8')
1047
1153
self._tree_path_ids[path] = trans_id
1048
1154
self._tree_id_paths[trans_id] = path
1173
1295
descendants.update(self._limbo_descendants(descendant))
1174
1296
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1298
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1299
"""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.
1303
:param contents: an iterator of strings, all of which will be written
1304
to the target destination.
1305
:param trans_id: TreeTransform handle
1306
:param mode_id: If not None, force the mode of the target file to match
1307
the mode of the object referenced by mode_id.
1308
Otherwise, we will try to preserve mode bits of an existing file.
1309
:param sha1: If the sha1 of this content is already known, pass it in.
1310
We can use it to prevent future sha1 computations.
1187
1312
name = self._limbo_name(trans_id)
1188
f = open(name, 'wb')
1191
unique_add(self._new_contents, trans_id, 'file')
1193
# Clean up the file, it never got registered so
1194
# TreeTransform.finalize() won't clean it up.
1313
with open(name, 'wb') as f:
1314
unique_add(self._new_contents, trans_id, 'file')
1199
1315
f.writelines(contents)
1202
1316
self._set_mtime(name)
1203
1317
self._set_mode(trans_id, mode_id, S_ISREG)
1205
def _read_file_chunks(self, trans_id):
1206
cur_file = open(self._limbo_name(trans_id), 'rb')
1208
return cur_file.readlines()
1318
# It is unfortunate we have to use lstat instead of fstat, but we just
1319
# used utime and chmod on the file, so we need the accurate final
1321
if sha1 is not None:
1322
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1212
1324
def _read_symlink_target(self, trans_id):
1213
1325
return os.readlink(self._limbo_name(trans_id))
1274
1388
del self._limbo_children_names[trans_id]
1275
1389
delete_any(self._limbo_name(trans_id))
1391
def new_orphan(self, trans_id, parent_id):
1392
conf = self._tree.get_config_stack()
1393
handle_orphan = conf.get('transform.orphan_policy')
1394
handle_orphan(self, trans_id, parent_id)
1397
class OrphaningError(errors.BzrError):
1399
# Only bugs could lead to such exception being seen by the user
1400
internal_error = True
1401
_fmt = "Error while orphaning %s in %s directory"
1403
def __init__(self, orphan, parent):
1404
errors.BzrError.__init__(self)
1405
self.orphan = orphan
1406
self.parent = parent
1409
class OrphaningForbidden(OrphaningError):
1411
_fmt = "Policy: %s doesn't allow creating orphans."
1413
def __init__(self, policy):
1414
errors.BzrError.__init__(self)
1415
self.policy = policy
1418
def move_orphan(tt, orphan_id, parent_id):
1419
"""See TreeTransformBase.new_orphan.
1421
This creates a new orphan in the `brz-orphans` dir at the root of the
1424
:param tt: The TreeTransform orphaning `trans_id`.
1426
:param orphan_id: The trans id that should be orphaned.
1428
:param parent_id: The orphan parent trans id.
1430
# Add the orphan dir if it doesn't exist
1431
orphan_dir_basename = 'brz-orphans'
1432
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1433
if tt.final_kind(od_id) is None:
1434
tt.create_directory(od_id)
1435
parent_path = tt._tree_id_paths[parent_id]
1436
# Find a name that doesn't exist yet in the orphan dir
1437
actual_name = tt.final_name(orphan_id)
1438
new_name = tt._available_backup_name(actual_name, od_id)
1439
tt.adjust_path(new_name, od_id, orphan_id)
1440
trace.warning('%s has been orphaned in %s'
1441
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1444
def refuse_orphan(tt, orphan_id, parent_id):
1445
"""See TreeTransformBase.new_orphan.
1447
This refuses to create orphan, letting the caller handle the conflict.
1449
raise OrphaningForbidden('never')
1452
orphaning_registry = registry.Registry()
1453
orphaning_registry.register(
1454
'conflict', refuse_orphan,
1455
'Leave orphans in place and create a conflict on the directory.')
1456
orphaning_registry.register(
1457
'move', move_orphan,
1458
'Move orphans into the brz-orphans directory.')
1459
orphaning_registry._set_default_key('conflict')
1462
opt_transform_orphan = _mod_config.RegistryOption(
1463
'transform.orphan_policy', orphaning_registry,
1464
help='Policy for orphaned files during transform operations.',
1278
1468
class TreeTransform(DiskTreeTransform):
1279
1469
"""Represent a tree transformation.
1571
1754
inventory_delta.append((path, None, file_id, None))
1572
1755
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1574
entries = self._tree.iter_entries_by_dir(
1575
new_path_file_ids.values())
1576
old_paths = dict((e.file_id, p) for p, e in entries)
1577
1757
final_kinds = {}
1578
1758
for num, (path, trans_id) in enumerate(new_paths):
1579
1759
if (num % 10) == 0:
1580
child_pb.update('adding file',
1760
child_pb.update(gettext('adding file'),
1581
1761
num + len(self._removed_id), total_entries)
1582
1762
file_id = new_path_file_ids[trans_id]
1583
1763
if file_id is None:
1585
1765
needs_entry = False
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1766
kind = self.final_kind(trans_id)
1768
kind = self._tree.stored_kind(
1769
self._tree.id2path(file_id), file_id)
1590
1770
parent_trans_id = self.final_parent(trans_id)
1591
1771
parent_file_id = new_path_file_ids.get(parent_trans_id)
1592
1772
if parent_file_id is None:
1657
1836
modified_paths = []
1658
1837
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()
1839
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1840
for num, (path, trans_id) in enumerate(new_paths):
1663
1841
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1842
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1843
full_path = self._tree.abspath(path)
1666
1844
if trans_id in self._needs_rename:
1668
1846
mover.rename(self._limbo_name(trans_id), full_path)
1847
except errors.TransformRenameFailed as e:
1670
1848
# We may be renaming a dangling inventory id
1671
1849
if e.errno != errno.ENOENT:
1674
1852
self.rename_count += 1
1853
# TODO: if trans_id in self._observed_sha1s, we should
1854
# re-stat the final target, since ctime will be
1855
# updated by the change.
1675
1856
if (trans_id in self._new_contents or
1676
1857
self.path_changed(trans_id)):
1677
1858
if trans_id in self._new_contents:
1678
1859
modified_paths.append(full_path)
1679
1860
if trans_id in self._new_executability:
1680
1861
self._set_executability(path, trans_id)
1862
if trans_id in self._observed_sha1s:
1863
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1864
st = osutils.lstat(full_path)
1865
self._observed_sha1s[trans_id] = (o_sha1, st)
1866
for path, trans_id in new_paths:
1867
# new_paths includes stuff like workingtree conflicts. Only the
1868
# stuff in new_contents actually comes from limbo.
1869
if trans_id in self._limbo_files:
1870
del self._limbo_files[trans_id]
1683
1871
self._new_contents.clear()
1684
1872
return modified_paths
1874
def _apply_observed_sha1s(self):
1875
"""After we have finished renaming everything, update observed sha1s
1877
This has to be done after self._tree.apply_inventory_delta, otherwise
1878
it doesn't know anything about the files we are updating. Also, we want
1879
to do this as late as possible, so that most entries end up cached.
1881
# TODO: this doesn't update the stat information for directories. So
1882
# the first 'bzr status' will still need to rewrite
1883
# .bzr/checkout/dirstate. However, we at least don't need to
1884
# re-read all of the files.
1885
# TODO: If the operation took a while, we could do a time.sleep(3) here
1886
# to allow the clock to tick over and ensure we won't have any
1887
# problems. (we could observe start time, and finish time, and if
1888
# it is less than eg 10% overhead, add a sleep call.)
1889
paths = FinalPaths(self)
1890
for trans_id, observed in viewitems(self._observed_sha1s):
1891
path = paths.get_path(trans_id)
1892
# We could get the file_id, but dirstate prefers to use the path
1893
# anyway, and it is 'cheaper' to determine.
1894
# file_id = self._new_id[trans_id]
1895
self._tree._observed_sha1(None, path, observed)
1687
1898
class TransformPreview(DiskTreeTransform):
1688
1899
"""A TreeTransform for generating preview trees.
1766
1980
except errors.NoSuchRevisionInTree:
1767
1981
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()]
1983
def _get_file_revision(self, path, file_id, vf, tree_revision):
1985
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
1986
for t in self._iter_parent_trees()]
1772
1987
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
1988
self.get_file_lines(path, file_id))
1774
1989
repo = self._get_repository()
1775
1990
base_vf = repo.texts
1776
1991
if base_vf not in vf.fallback_versionedfiles:
1777
1992
vf.fallback_versionedfiles.append(base_vf)
1778
1993
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
1995
def _stat_limbo_file(self, trans_id):
1782
1996
name = self._transform._limbo_name(trans_id)
1783
1997
return os.lstat(name)
1895
2116
if self._transform.final_file_id(trans_id) is None:
1896
2117
yield self._final_paths._determine_path(trans_id)
1898
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1899
yield_parents=False):
2119
def _make_inv_entries(self, ordered_entries, specific_files=None):
1900
2120
for trans_id, parent_file_id in ordered_entries:
1901
2121
file_id = self._transform.final_file_id(trans_id)
1902
2122
if file_id is None:
1904
if (specific_file_ids is not None
1905
and file_id not in specific_file_ids):
2124
if (specific_files is not None and
2125
unicode(self._final_paths.get_path(trans_id)) not in specific_files):
1908
kind = self._transform.final_kind(trans_id)
1910
kind = self._transform._tree.stored_kind(file_id)
2127
kind = self._transform.final_kind(trans_id)
2129
kind = self._transform._tree.stored_kind(
2130
self._transform._tree.id2path(file_id),
1911
2132
new_entry = inventory.make_entry(
1913
2134
self._transform.final_name(trans_id),
1937
2167
ordered_ids = self._list_files_by_dir()
1938
2168
for entry, trans_id in self._make_inv_entries(ordered_ids,
1939
specific_file_ids, yield_parents=yield_parents):
1940
2170
yield unicode(self._final_paths.get_path(trans_id)), entry
1942
2172
def _iter_entries_for_dir(self, dir_path):
1943
2173
"""Return path, entry for items in a directory without recursing down."""
1944
dir_file_id = self.path2id(dir_path)
1945
2174
ordered_ids = []
1946
for file_id in self.iter_children(dir_file_id):
1947
trans_id = self._transform.trans_id_file_id(file_id)
1948
ordered_ids.append((trans_id, file_id))
2175
dir_trans_id = self._path2trans_id(dir_path)
2176
dir_id = self._transform.final_file_id(dir_trans_id)
2177
for child_trans_id in self._all_children(dir_trans_id):
2178
ordered_ids.append((child_trans_id, dir_id))
1949
2179
for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
2180
yield unicode(self._final_paths.get_path(trans_id)), entry
1975
2205
for path, entry in entries:
1976
2206
yield path, 'V', entry.kind, entry.file_id, entry
1978
def kind(self, file_id):
1979
trans_id = self._transform.trans_id_file_id(file_id)
2208
def kind(self, path, file_id=None):
2209
trans_id = self._path2trans_id(path)
2210
if trans_id is None:
2211
raise errors.NoSuchFile(path)
1980
2212
return self._transform.final_kind(trans_id)
1982
def stored_kind(self, file_id):
1983
trans_id = self._transform.trans_id_file_id(file_id)
2214
def stored_kind(self, path, file_id=None):
2215
trans_id = self._path2trans_id(path)
2216
if trans_id is None:
2217
raise errors.NoSuchFile(path)
1985
2219
return self._transform._new_contents[trans_id]
1986
2220
except KeyError:
1987
return self._transform._tree.stored_kind(file_id)
2221
return self._transform._tree.stored_kind(path, file_id)
1989
def get_file_mtime(self, file_id, path=None):
2223
def get_file_mtime(self, path, file_id=None):
1990
2224
"""See Tree.get_file_mtime"""
2226
file_id = self.path2id(path)
2228
raise errors.NoSuchFile(path)
1991
2229
if not self._content_change(file_id):
1992
return self._transform._tree.get_file_mtime(file_id)
1993
return self._stat_limbo_file(file_id).st_mtime
1995
def _file_size(self, entry, stat_value):
1996
return self.get_file_size(entry.file_id)
1998
def get_file_size(self, file_id):
2230
return self._transform._tree.get_file_mtime(
2231
self._transform._tree.id2path(file_id), file_id)
2232
trans_id = self._path2trans_id(path)
2233
return self._stat_limbo_file(trans_id).st_mtime
2235
def get_file_size(self, path, file_id=None):
1999
2236
"""See Tree.get_file_size"""
2000
if self.kind(file_id) == 'file':
2001
return self._transform._tree.get_file_size(file_id)
2237
trans_id = self._path2trans_id(path)
2238
if trans_id is None:
2239
raise errors.NoSuchFile(path)
2240
kind = self._transform.final_kind(trans_id)
2243
if trans_id in self._transform._new_contents:
2244
return self._stat_limbo_file(trans_id).st_size
2245
if self.kind(path, file_id) == 'file':
2246
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)
2250
def get_file_verifier(self, path, file_id=None, stat_value=None):
2251
trans_id = self._path2trans_id(path)
2252
if trans_id is None:
2253
raise errors.NoSuchFile(path)
2254
kind = self._transform._new_contents.get(trans_id)
2256
return self._transform._tree.get_file_verifier(path, file_id)
2258
with self.get_file(path, file_id) as fileobj:
2259
return ("SHA1", sha_file(fileobj))
2261
def get_file_sha1(self, path, file_id=None, stat_value=None):
2262
trans_id = self._path2trans_id(path)
2263
if trans_id is None:
2264
raise errors.NoSuchFile(path)
2265
kind = self._transform._new_contents.get(trans_id)
2267
return self._transform._tree.get_file_sha1(path, file_id)
2269
with self.get_file(path, file_id) as fileobj:
2013
2270
return sha_file(fileobj)
2017
def is_executable(self, file_id, path=None):
2272
def is_executable(self, path, file_id=None):
2273
trans_id = self._path2trans_id(path)
2274
if trans_id is None:
2020
trans_id = self._transform.trans_id_file_id(file_id)
2022
2277
return self._transform._new_executability[trans_id]
2023
2278
except KeyError:
2025
return self._transform._tree.is_executable(file_id, path)
2280
return self._transform._tree.is_executable(path, file_id)
2281
except OSError as e:
2027
2282
if e.errno == errno.ENOENT:
2030
except errors.NoSuchId:
2285
except errors.NoSuchFile:
2288
def has_filename(self, path):
2289
trans_id = self._path2trans_id(path)
2290
if trans_id in self._transform._new_contents:
2292
elif trans_id in self._transform._removed_contents:
2295
return self._transform._tree.has_filename(path)
2033
2297
def path_content_summary(self, path):
2034
2298
trans_id = self._path2trans_id(path)
2035
2299
tt = self._transform
2081
2345
raise ValueError('want_unversioned is not supported')
2082
2346
return self._transform.iter_changes()
2084
def get_file(self, file_id, path=None):
2348
def get_file(self, path, file_id=None):
2085
2349
"""See Tree.get_file"""
2351
file_id = self.path2id(path)
2086
2352
if not self._content_change(file_id):
2087
return self._transform._tree.get_file(file_id, path)
2088
trans_id = self._transform.trans_id_file_id(file_id)
2353
return self._transform._tree.get_file(path, file_id)
2354
trans_id = self._path2trans_id(path)
2089
2355
name = self._transform._limbo_name(trans_id)
2090
2356
return open(name, 'rb')
2092
def get_file_with_stat(self, file_id, path=None):
2093
return self.get_file(file_id, path), None
2358
def get_file_with_stat(self, path, file_id=None):
2359
return self.get_file(path, file_id), None
2095
def annotate_iter(self, file_id,
2361
def annotate_iter(self, path, file_id=None,
2096
2362
default_revision=_mod_revision.CURRENT_REVISION):
2364
file_id = self.path2id(path)
2097
2365
changes = self._iter_changes_cache.get(file_id)
2098
2366
if changes is None:
2243
2515
:param delta_from_tree: If true, build_tree may use the input Tree to
2244
2516
generate the inventory delta.
2246
wt.lock_tree_write()
2518
with wt.lock_tree_write(), tree.lock_read():
2519
if accelerator_tree is not None:
2520
accelerator_tree.lock_read()
2522
return _build_tree(tree, wt, accelerator_tree, hardlink,
2250
2525
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()
2526
accelerator_tree.unlock()
2264
2529
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2265
2530
"""See build_tree."""
2266
for num, _unused in enumerate(wt.all_file_ids()):
2531
for num, _unused in enumerate(wt.all_versioned_paths()):
2267
2532
if num > 0: # more than just a root
2268
2533
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
2534
file_trans_id = {}
2273
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2535
top_pb = ui.ui_factory.nested_progress_bar()
2274
2536
pp = ProgressPhase("Build phase", 2, top_pb)
2275
if tree.inventory.root is not None:
2537
if tree.get_root_id() is not None:
2276
2538
# This is kind of a hack: we should be altering the root
2277
2539
# as part of the regular tree shape diff logic.
2278
2540
# The conditional test here is to avoid doing an
2289
2551
pp.next_phase()
2290
file_trans_id[wt.get_root_id()] = \
2291
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2552
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2553
with ui.ui_factory.nested_progress_bar() as pb:
2294
2554
deferred_contents = []
2296
total = len(tree.inventory)
2556
total = len(tree.all_versioned_paths())
2297
2557
if delta_from_tree:
2298
2558
precomputed_delta = []
2300
2560
precomputed_delta = None
2561
# Check if tree inventory has content. If so, we populate
2562
# existing_files with the directory content. If there are no
2563
# entries we skip populating existing_files as its not used.
2564
# This improves performance and unncessary work on large
2565
# directory trees. (#501307)
2567
existing_files = set()
2568
for dir, files in wt.walkdirs():
2569
existing_files.update(f[0] for f in files)
2301
2570
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2571
enumerate(tree.iter_entries_by_dir()):
2572
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2573
if entry.parent_id is None:
2306
2575
reparent = False
2330
2599
trans_id = tt.create_path(entry.name, parent_id)
2331
2600
file_trans_id[file_id] = trans_id
2332
2601
tt.version_file(file_id, trans_id)
2333
executable = tree.is_executable(file_id, tree_path)
2602
executable = tree.is_executable(tree_path, file_id)
2335
2604
tt.set_executability(executable, trans_id)
2336
trans_data = (trans_id, tree_path)
2337
deferred_contents.append((file_id, trans_data))
2605
trans_data = (trans_id, file_id, tree_path, entry.text_sha1)
2606
deferred_contents.append((tree_path, trans_data))
2339
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2608
file_trans_id[file_id] = new_by_entry(
2609
tree_path, tt, entry, parent_id, tree)
2342
2611
new_trans_id = file_trans_id[file_id]
2343
2612
old_parent = tt.trans_id_tree_path(tree_path)
2376
2643
new_desired_files = desired_files
2378
2645
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2646
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2380
2647
in iter if not (c or e[0] != e[1])]
2381
2648
if accelerator_tree.supports_content_filtering():
2382
unchanged = [(f, p) for (f, p) in unchanged
2383
if not accelerator_tree.iter_search_rules([p]).next()]
2649
unchanged = [(tp, ap) for (tp, ap) in unchanged
2650
if not next(accelerator_tree.iter_search_rules([ap]))]
2384
2651
unchanged = dict(unchanged)
2385
2652
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2388
accelerator_path = unchanged.get(file_id)
2654
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2655
accelerator_path = unchanged.get(tree_path)
2389
2656
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2657
new_desired_files.append((tree_path,
2658
(trans_id, file_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2660
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2662
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2397
contents = accelerator_tree.get_file(file_id, accelerator_path)
2398
if wt.supports_content_filtering():
2399
filters = wt._content_filter_stack(tree_path)
2400
contents = filtered_output_bytes(contents, filters,
2401
ContentFilterContext(tree_path, tree))
2403
tt.create_file(contents, trans_id)
2407
except AttributeError:
2408
# after filtering, contents may no longer be file-like
2665
with accelerator_tree.get_file(accelerator_path, file_id) as f:
2666
chunks = osutils.file_iterator(f)
2667
if wt.supports_content_filtering():
2668
filters = wt._content_filter_stack(tree_path)
2669
chunks = filtered_output_bytes(chunks, filters,
2670
ContentFilterContext(tree_path, tree))
2671
tt.create_file(chunks, trans_id, sha1=text_sha1)
2411
2673
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2674
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2413
2675
tree.iter_files_bytes(new_desired_files)):
2414
2676
if wt.supports_content_filtering():
2415
2677
filters = wt._content_filter_stack(tree_path)
2416
2678
contents = filtered_output_bytes(contents, filters,
2417
2679
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2680
tt.create_file(contents, trans_id, sha1=text_sha1)
2681
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2684
def _reparent_children(tt, old_parent, new_parent):
2423
2685
for child in tt.iter_tree_children(old_parent):
2424
2686
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2689
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2690
by_parent = tt.by_parent()
2428
2691
for child in by_parent[old_parent]:
2429
2692
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2693
return by_parent[old_parent]
2432
def _content_match(tree, entry, file_id, kind, target_path):
2696
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2433
2697
if entry.kind != kind:
2435
2699
if entry.kind == "directory":
2437
2701
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2702
with open(target_path, 'rb') as f1, \
2703
tree.get_file(tree_path, file_id) as f2:
2704
if osutils.compare_files(f1, f2):
2440
2706
elif entry.kind == "symlink":
2441
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2707
if tree.get_symlink_target(tree_path, file_id) == os.readlink(target_path):
2473
2739
return new_conflicts
2476
def new_by_entry(tt, entry, parent_id, tree):
2742
def new_by_entry(path, tt, entry, parent_id, tree):
2477
2743
"""Create a new file according to its inventory entry"""
2478
2744
name = entry.name
2479
2745
kind = entry.kind
2480
2746
if kind == 'file':
2481
contents = tree.get_file(entry.file_id).readlines()
2482
executable = tree.is_executable(entry.file_id)
2483
return tt.new_file(name, parent_id, contents, entry.file_id,
2747
with tree.get_file(path, entry.file_id) as f:
2748
executable = tree.is_executable(path, entry.file_id)
2750
name, parent_id, osutils.file_iterator(f), entry.file_id,
2485
2752
elif kind in ('directory', 'tree-reference'):
2486
2753
trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2754
if kind == 'tree-reference':
2488
2755
tt.set_tree_reference(entry.reference_revision, trans_id)
2489
2756
return trans_id
2490
2757
elif kind == 'symlink':
2491
target = tree.get_symlink_target(entry.file_id)
2758
target = tree.get_symlink_target(path, entry.file_id)
2492
2759
return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2761
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,
2764
def create_from_tree(tt, trans_id, tree, path, file_id=None, chunks=None,
2514
2765
filter_tree_path=None):
2515
2766
"""Create new file contents according to tree contents.
2517
2768
:param filter_tree_path: the tree path to use to lookup
2518
2769
content filters to apply to the bytes output in the working tree.
2519
2770
This only applies if the working tree supports content filtering.
2521
kind = tree.kind(file_id)
2772
kind = tree.kind(path, file_id)
2522
2773
if kind == 'directory':
2523
2774
tt.create_directory(trans_id)
2524
2775
elif kind == "file":
2526
tree_file = tree.get_file(file_id)
2528
bytes = tree_file.readlines()
2532
if wt.supports_content_filtering() and filter_tree_path is not None:
2533
filters = wt._content_filter_stack(filter_tree_path)
2534
bytes = filtered_output_bytes(bytes, filters,
2535
ContentFilterContext(filter_tree_path, tree))
2536
tt.create_file(bytes, trans_id)
2777
f = tree.get_file(path, file_id)
2778
chunks = osutils.file_iterator(f)
2783
if wt.supports_content_filtering() and filter_tree_path is not None:
2784
filters = wt._content_filter_stack(filter_tree_path)
2785
chunks = filtered_output_bytes(chunks, filters,
2786
ContentFilterContext(filter_tree_path, tree))
2787
tt.create_file(chunks, trans_id)
2537
2791
elif kind == "symlink":
2538
tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2792
tt.create_symlink(tree.get_symlink_target(path, file_id), trans_id)
2540
2794
raise AssertionError('Unknown kind %r' % kind)
2546
2800
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
2803
def revert(working_tree, target_tree, filenames, backups=False,
2593
2804
pb=None, change_reporter=None):
2594
2805
"""Revert a working tree's contents to those of a target tree."""
2595
target_tree.lock_read()
2596
2806
pb = ui.ui_factory.nested_progress_bar()
2597
tt = TreeTransform(working_tree, pb)
2599
pp = ProgressPhase("Revert phase", 3, pb)
2600
conflicts, merge_modified = _prepare_revert_transform(
2601
working_tree, target_tree, tt, filenames, backups, pp)
2603
change_reporter = delta._ChangeReporter(
2604
unversioned_filter=working_tree.is_ignored)
2605
delta.report_changes(tt.iter_changes(), change_reporter)
2606
for conflict in conflicts:
2610
working_tree.set_merge_modified(merge_modified)
2808
with target_tree.lock_read(), TreeTransform(working_tree, pb) as tt:
2809
pp = ProgressPhase("Revert phase", 3, pb)
2810
conflicts, merge_modified = _prepare_revert_transform(
2811
working_tree, target_tree, tt, filenames, backups, pp)
2813
change_reporter = delta._ChangeReporter(
2814
unversioned_filter=working_tree.is_ignored)
2815
delta.report_changes(tt.iter_changes(), change_reporter)
2816
for conflict in conflicts:
2817
trace.warning(unicode(conflict))
2820
if working_tree.supports_merge_modified():
2821
working_tree.set_merge_modified(merge_modified)
2612
target_tree.unlock()
2615
2824
return conflicts
2618
2827
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2828
backups, pp, basis_tree=None,
2620
2829
merge_modified=None):
2621
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2830
with ui.ui_factory.nested_progress_bar() as child_pb:
2623
2831
if merge_modified is None:
2624
2832
merge_modified = working_tree.merge_modified()
2625
2833
merge_modified = _alter_files(working_tree, target_tree, tt,
2626
2834
child_pb, filenames, backups,
2627
2835
merge_modified, basis_tree)
2630
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2836
with ui.ui_factory.nested_progress_bar() as child_pb:
2632
2837
raw_conflicts = resolve_conflicts(tt, child_pb,
2633
2838
lambda t, c: conflict_pass(t, c, target_tree))
2636
2839
conflicts = cook_conflicts(raw_conflicts, tt)
2637
2840
return conflicts, merge_modified
2651
2858
deferred_files = []
2652
2859
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2860
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2861
target_path, wt_path = path
2862
target_versioned, wt_versioned = versioned
2863
target_parent, wt_parent = parent
2864
target_name, wt_name = name
2865
target_kind, wt_kind = kind
2866
target_executable, wt_executable = executable
2867
if skip_root and wt_parent is None:
2656
2869
trans_id = tt.trans_id_file_id(file_id)
2658
2871
if changed_content:
2659
2872
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)
2873
if wt_kind == 'file' and (backups or target_kind is None):
2874
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2662
2875
if merge_modified.get(file_id) != wt_sha1:
2663
2876
# acquire the basis tree lazily to prevent the
2664
2877
# expense of accessing it when it's not needed ?
2666
2879
if basis_tree is None:
2667
2880
basis_tree = working_tree.basis_tree()
2668
2881
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:
2882
basis_path = find_previous_path(working_tree, basis_tree, wt_path)
2883
if basis_path is None:
2884
if target_kind is None and not target_versioned:
2887
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2889
if wt_kind is not None:
2675
2890
if not keep_content:
2676
2891
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)
2892
elif target_kind is not None:
2893
parent_trans_id = tt.trans_id_file_id(wt_parent)
2894
backup_name = tt._available_backup_name(
2895
wt_name, parent_trans_id)
2682
2896
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):
2897
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2898
if wt_versioned and target_versioned:
2685
2899
tt.unversion_file(trans_id)
2686
2900
tt.version_file(file_id, new_trans_id)
2687
2901
# New contents should have the same unix perms as old
2689
2903
mode_id = trans_id
2690
2904
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2905
if target_kind in ('directory', 'tree-reference'):
2692
2906
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2694
revision = target_tree.get_reference_revision(file_id,
2907
if target_kind == 'tree-reference':
2908
revision = target_tree.get_reference_revision(
2909
target_path, file_id)
2696
2910
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2701
deferred_files.append((file_id, (trans_id, mode_id)))
2911
elif target_kind == 'symlink':
2912
tt.create_symlink(target_tree.get_symlink_target(
2913
target_path, file_id), trans_id)
2914
elif target_kind == 'file':
2915
deferred_files.append((target_path, (trans_id, mode_id, file_id)))
2702
2916
if basis_tree is None:
2703
2917
basis_tree = working_tree.basis_tree()
2704
2918
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)):
2919
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2920
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2921
if (basis_path is not None and
2922
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2708
2923
if file_id in merge_modified:
2709
2924
del merge_modified[file_id]
2711
2926
merge_modified[file_id] = new_sha1
2713
2928
# 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):
2929
if keep_content and wt_executable == target_executable:
2930
tt.set_executability(target_executable, trans_id)
2931
elif target_kind is not None:
2932
raise AssertionError(target_kind)
2933
if not wt_versioned and target_versioned:
2719
2934
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2935
if wt_versioned and not target_versioned:
2721
2936
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:
2937
if (target_name is not None and
2938
(wt_name != target_name or wt_parent != target_parent)):
2939
if target_name == '' and target_parent is None:
2725
2940
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)
2942
parent_trans = tt.trans_id_file_id(target_parent)
2943
if wt_parent is None and wt_versioned:
2944
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)
2946
tt.adjust_path(target_name, parent_trans, trans_id)
2947
if wt_executable != target_executable and target_kind == "file":
2948
tt.set_executability(target_executable, trans_id)
2734
2949
if working_tree.supports_content_filtering():
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2950
for (trans_id, mode_id, file_id), bytes in (
2736
2951
target_tree.iter_files_bytes(deferred_files)):
2737
file_id = deferred_files[index][0]
2738
2952
# We're reverting a tree to the target tree so using the
2739
2953
# target tree to find the file path seems the best choice
2740
2954
# here IMO - Ian C 27/Oct/2009
2878
3107
modified_path = fp.get_path(conflict[2])
2879
3108
modified_id = tt.final_file_id(conflict[2])
2880
3109
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3110
yield conflicts.Conflict.factory(
3111
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3114
conflicting_path = fp.get_path(conflict[3])
2886
3115
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)
3116
yield conflicts.Conflict.factory(
3117
c_type, action=action, path=modified_path,
3118
file_id=modified_id,
3119
conflict_path=conflicting_path,
3120
conflict_file_id=conflicting_id)
2893
3123
class _FileMover(object):
added
removed
breezy/transform.py
