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
392
return sorted(FinalPaths(self).get_paths(new_ids))
382
394
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,
395
"""Determine which trans_ids need new Inventory entries.
397
An new entry is needed when anything that would be reflected by an
398
inventory entry changes, including file name, file_id, parent file_id,
399
file kind, and the execute bit.
401
Some care is taken to return entries with real changes, not cases
402
where the value is deleted and then restored to its original value,
403
but some actually unchanged values may be returned.
405
:returns: A list of (path, trans_id) for all items requiring an
406
inventory change. Ordered by path.
409
# Find entries whose file_ids are new (or changed).
410
new_file_id = set(t for t in self._new_id
411
if self._new_id[t] != self.tree_file_id(t))
412
for id_set in [self._new_name, self._new_parent, new_file_id,
386
413
self._new_executability]:
387
new_ids.update(id_set)
414
changed_ids.update(id_set)
415
# removing implies a kind change
388
416
changed_kind = set(self._removed_contents)
389
418
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))
419
# Ignore entries that are already known to have changed.
420
changed_kind.difference_update(changed_ids)
421
# to keep only the truly changed ones
422
changed_kind = (t for t in changed_kind
423
if self.tree_kind(t) != self.final_kind(t))
424
# all kind changes will alter the inventory
425
changed_ids.update(changed_kind)
426
# To find entries with changed parent_ids, find parents which existed,
427
# but changed file_id.
428
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
429
# Now add all their children to the set.
430
for parent_trans_id in new_file_id:
431
changed_ids.update(self.iter_tree_children(parent_trans_id))
432
return sorted(FinalPaths(self).get_paths(changed_ids))
396
434
def final_kind(self, trans_id):
397
435
"""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)
437
:return: None if the file does not exist/has no contents. (It is
438
conceivable that a path would be created without the corresponding
439
contents insertion command)
403
441
if trans_id in self._new_contents:
404
442
return self._new_contents[trans_id]
405
443
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
446
return self.tree_kind(trans_id)
448
def tree_path(self, trans_id):
449
"""Determine the tree path associated with the trans_id."""
450
return self._tree_id_paths.get(trans_id)
410
452
def tree_file_id(self, trans_id):
411
453
"""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
454
path = self.tree_path(trans_id)
417
457
# the file is old; the old id is still valid
418
458
if self._new_root == trans_id:
531
571
# ensure that all children are registered with the transaction
532
572
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:
574
def _has_named_child(self, name, parent_id, known_children):
575
"""Does a parent already have a name child.
577
:param name: The searched for name.
579
:param parent_id: The parent for which the check is made.
581
:param known_children: The already known children. This should have
582
been recently obtained from `self.by_parent.get(parent_id)`
583
(or will be if None is passed).
585
if known_children is None:
586
known_children = self.by_parent().get(parent_id, [])
587
for child in known_children:
540
588
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
590
parent_path = self._tree_id_paths.get(parent_id, None)
591
if parent_path is None:
592
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
594
child_path = joinpath(parent_path, name)
595
child_id = self._tree_path_ids.get(child_path, None)
548
596
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
597
# Not known by the tree transform yet, check the filesystem
598
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?
600
raise AssertionError('child_id is missing: %s, %s, %s'
601
% (name, parent_id, child_id))
603
def _available_backup_name(self, name, target_id):
604
"""Find an available backup name.
606
:param name: The basename of the file.
608
:param target_id: The directory trans_id where the backup should
611
known_children = self.by_parent().get(target_id, [])
612
return osutils.available_backup_name(
614
lambda base: self._has_named_child(
615
base, target_id, known_children))
559
617
def _parent_loops(self):
560
618
"""No entry should be its own ancestor"""
672
725
self._removed_id))
673
726
all_ids = self._tree.all_file_ids()
674
727
active_tree_ids = all_ids.difference(removed_tree_ids)
675
for trans_id, file_id in self._new_id.iteritems():
728
for trans_id, file_id in viewitems(self._new_id):
676
729
if file_id in active_tree_ids:
677
old_trans_id = self.trans_id_tree_file_id(file_id)
730
path = self._tree.id2path(file_id)
731
old_trans_id = self.trans_id_tree_path(path)
678
732
conflicts.append(('duplicate id', old_trans_id, trans_id))
681
735
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
736
"""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)
738
for parent_id, children in viewitems(by_parent):
739
if parent_id == ROOT_PARENT:
742
for child_id in children:
743
if self.final_kind(child_id) is not None:
748
# There is at least a child, so we need an existing directory to
750
kind = self.final_kind(parent_id)
752
# The directory will be deleted
699
753
conflicts.append(('missing parent', parent_id))
700
754
elif kind != "directory":
755
# Meh, we need a *directory* to put something in it
701
756
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
759
def _set_executability(self, path, trans_id):
715
760
"""Set the executability of versioned files """
716
if supports_executable():
761
if self._tree._supports_executable():
717
762
new_executability = self._new_executability[trans_id]
718
763
abspath = self._tree.abspath(path)
719
764
current_mode = os.stat(abspath).st_mode
720
765
if new_executability:
721
766
umask = os.umask(0)
723
to_mode = current_mode | (0100 & ~umask)
768
to_mode = current_mode | (0o100 & ~umask)
724
769
# 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
770
if current_mode & 0o004:
771
to_mode |= 0o001 & ~umask
772
if current_mode & 0o040:
773
to_mode |= 0o010 & ~umask
730
to_mode = current_mode & ~0111
731
os.chmod(abspath, to_mode)
775
to_mode = current_mode & ~0o111
776
osutils.chmod_if_possible(abspath, to_mode)
733
778
def _new_entry(self, name, parent_id, file_id):
734
779
"""Helper function to create a new filesystem entry."""
780
825
self.create_symlink(target, trans_id)
828
def new_orphan(self, trans_id, parent_id):
829
"""Schedule an item to be orphaned.
831
When a directory is about to be removed, its children, if they are not
832
versioned are moved out of the way: they don't have a parent anymore.
834
:param trans_id: The trans_id of the existing item.
835
:param parent_id: The parent trans_id of the item.
837
raise NotImplementedError(self.new_orphan)
839
def _get_potential_orphans(self, dir_id):
840
"""Find the potential orphans in a directory.
842
A directory can't be safely deleted if there are versioned files in it.
843
If all the contained files are unversioned then they can be orphaned.
845
The 'None' return value means that the directory contains at least one
846
versioned file and should not be deleted.
848
:param dir_id: The directory trans id.
850
:return: A list of the orphan trans ids or None if at least one
851
versioned file is present.
854
# Find the potential orphans, stop if one item should be kept
855
for child_tid in self.by_parent()[dir_id]:
856
if child_tid in self._removed_contents:
857
# The child is removed as part of the transform. Since it was
858
# versioned before, it's not an orphan
860
elif self.final_file_id(child_tid) is None:
861
# The child is not versioned
862
orphans.append(child_tid)
864
# We have a versioned file here, searching for orphans is
783
870
def _affected_ids(self):
784
871
"""Return the set of transform ids affected by the transform"""
785
872
trans_ids = set(self._removed_id)
786
trans_ids.update(self._new_id.keys())
873
trans_ids.update(self._new_id)
787
874
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())
875
trans_ids.update(self._new_contents)
876
trans_ids.update(self._new_executability)
877
trans_ids.update(self._new_name)
878
trans_ids.update(self._new_parent)
794
881
def _get_file_id_maps(self):
928
1014
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1016
def commit(self, branch, message, merge_parents=None, strict=False,
1017
timestamp=None, timezone=None, committer=None, authors=None,
1018
revprops=None, revision_id=None):
931
1019
"""Commit the result of this TreeTransform to a branch.
933
1021
:param branch: The branch to commit to.
934
1022
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1023
:param merge_parents: Additional parent revision-ids specified by
1025
:param strict: If True, abort the commit if there are unversioned
1027
:param timestamp: if not None, seconds-since-epoch for the time and
1028
date. (May be a float.)
1029
:param timezone: Optional timezone for timestamp, as an offset in
1031
:param committer: Optional committer in email-id format.
1032
(e.g. "J Random Hacker <jrandom@example.com>")
1033
:param authors: Optional list of authors in email-id format.
1034
:param revprops: Optional dictionary of revision properties.
1035
:param revision_id: Optional revision id. (Specifying a revision-id
1036
may reduce performance for some non-native formats.)
936
1037
:return: The revision_id of the revision committed.
938
1039
self._check_malformed()
965
1072
return revision_id
967
1074
def _text_parent(self, trans_id):
968
file_id = self.tree_file_id(trans_id)
1075
path = self.tree_path(trans_id)
970
if file_id is None or self._tree.kind(file_id) != 'file':
1077
if path is None or self._tree.kind(path) != 'file':
972
1079
except errors.NoSuchFile:
976
1083
def _get_parents_texts(self, trans_id):
977
1084
"""Get texts for compression parents of this file."""
978
file_id = self._text_parent(trans_id)
1085
path = self._text_parent(trans_id)
981
return (self._tree.get_file_text(file_id),)
1088
return (self._tree.get_file_text(path),)
983
1090
def _get_parents_lines(self, trans_id):
984
1091
"""Get lines for compression parents of this file."""
985
file_id = self._text_parent(trans_id)
1092
path = self._text_parent(trans_id)
988
return (self._tree.get_file_lines(file_id),)
1095
return (self._tree.get_file_lines(path),)
990
1097
def serialize(self, serializer):
991
1098
"""Serialize this TreeTransform.
1030
1137
:param records: An iterable of (names, content) tuples, as per
1031
1138
pack.ContainerPushParser.
1033
names, content = records.next()
1140
names, content = next(records)
1034
1141
attribs = bencode.bdecode(content)
1035
1142
self._id_number = attribs['_id_number']
1036
1143
self._new_name = dict((k, v.decode('utf-8'))
1037
for k, v in attribs['_new_name'].items())
1144
for k, v in viewitems(attribs['_new_name']))
1038
1145
self._new_parent = attribs['_new_parent']
1039
self._new_executability = dict((k, bool(v)) for k, v in
1040
attribs['_new_executability'].items())
1146
self._new_executability = dict((k, bool(v))
1147
for k, v in viewitems(attribs['_new_executability']))
1041
1148
self._new_id = attribs['_new_id']
1042
self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1149
self._r_new_id = dict((v, k) for k, v in viewitems(self._new_id))
1043
1150
self._tree_path_ids = {}
1044
1151
self._tree_id_paths = {}
1045
for bytepath, trans_id in attribs['_tree_path_ids'].items():
1152
for bytepath, trans_id in viewitems(attribs['_tree_path_ids']):
1046
1153
path = bytepath.decode('utf-8')
1047
1154
self._tree_path_ids[path] = trans_id
1048
1155
self._tree_id_paths[trans_id] = path
1173
1296
descendants.update(self._limbo_descendants(descendant))
1174
1297
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1299
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1300
"""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.
1304
:param contents: an iterator of strings, all of which will be written
1305
to the target destination.
1306
:param trans_id: TreeTransform handle
1307
:param mode_id: If not None, force the mode of the target file to match
1308
the mode of the object referenced by mode_id.
1309
Otherwise, we will try to preserve mode bits of an existing file.
1310
:param sha1: If the sha1 of this content is already known, pass it in.
1311
We can use it to prevent future sha1 computations.
1187
1313
name = self._limbo_name(trans_id)
1188
1314
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.
1316
unique_add(self._new_contents, trans_id, 'file')
1199
1317
f.writelines(contents)
1202
1320
self._set_mtime(name)
1203
1321
self._set_mode(trans_id, mode_id, S_ISREG)
1322
# It is unfortunate we have to use lstat instead of fstat, but we just
1323
# used utime and chmod on the file, so we need the accurate final
1325
if sha1 is not None:
1326
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1328
def _read_file_chunks(self, trans_id):
1206
1329
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1399
del self._limbo_children_names[trans_id]
1275
1400
delete_any(self._limbo_name(trans_id))
1402
def new_orphan(self, trans_id, parent_id):
1403
conf = self._tree.get_config_stack()
1404
handle_orphan = conf.get('transform.orphan_policy')
1405
handle_orphan(self, trans_id, parent_id)
1408
class OrphaningError(errors.BzrError):
1410
# Only bugs could lead to such exception being seen by the user
1411
internal_error = True
1412
_fmt = "Error while orphaning %s in %s directory"
1414
def __init__(self, orphan, parent):
1415
errors.BzrError.__init__(self)
1416
self.orphan = orphan
1417
self.parent = parent
1420
class OrphaningForbidden(OrphaningError):
1422
_fmt = "Policy: %s doesn't allow creating orphans."
1424
def __init__(self, policy):
1425
errors.BzrError.__init__(self)
1426
self.policy = policy
1429
def move_orphan(tt, orphan_id, parent_id):
1430
"""See TreeTransformBase.new_orphan.
1432
This creates a new orphan in the `brz-orphans` dir at the root of the
1435
:param tt: The TreeTransform orphaning `trans_id`.
1437
:param orphan_id: The trans id that should be orphaned.
1439
:param parent_id: The orphan parent trans id.
1441
# Add the orphan dir if it doesn't exist
1442
orphan_dir_basename = 'brz-orphans'
1443
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1444
if tt.final_kind(od_id) is None:
1445
tt.create_directory(od_id)
1446
parent_path = tt._tree_id_paths[parent_id]
1447
# Find a name that doesn't exist yet in the orphan dir
1448
actual_name = tt.final_name(orphan_id)
1449
new_name = tt._available_backup_name(actual_name, od_id)
1450
tt.adjust_path(new_name, od_id, orphan_id)
1451
trace.warning('%s has been orphaned in %s'
1452
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1455
def refuse_orphan(tt, orphan_id, parent_id):
1456
"""See TreeTransformBase.new_orphan.
1458
This refuses to create orphan, letting the caller handle the conflict.
1460
raise OrphaningForbidden('never')
1463
orphaning_registry = registry.Registry()
1464
orphaning_registry.register(
1465
'conflict', refuse_orphan,
1466
'Leave orphans in place and create a conflict on the directory.')
1467
orphaning_registry.register(
1468
'move', move_orphan,
1469
'Move orphans into the brz-orphans directory.')
1470
orphaning_registry._set_default_key('conflict')
1473
opt_transform_orphan = _mod_config.RegistryOption(
1474
'transform.orphan_policy', orphaning_registry,
1475
help='Policy for orphaned files during transform operations.',
1278
1479
class TreeTransform(DiskTreeTransform):
1279
1480
"""Represent a tree transformation.
1571
1765
inventory_delta.append((path, None, file_id, None))
1572
1766
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
1768
final_kinds = {}
1578
1769
for num, (path, trans_id) in enumerate(new_paths):
1579
1770
if (num % 10) == 0:
1580
child_pb.update('adding file',
1771
child_pb.update(gettext('adding file'),
1581
1772
num + len(self._removed_id), total_entries)
1582
1773
file_id = new_path_file_ids[trans_id]
1583
1774
if file_id is None:
1585
1776
needs_entry = False
1587
kind = self.final_kind(trans_id)
1589
kind = self._tree.stored_kind(file_id)
1777
kind = self.final_kind(trans_id)
1779
kind = self._tree.stored_kind(
1780
self._tree.id2path(file_id), file_id)
1590
1781
parent_trans_id = self.final_parent(trans_id)
1591
1782
parent_file_id = new_path_file_ids.get(parent_trans_id)
1592
1783
if parent_file_id is None:
1657
1847
modified_paths = []
1658
1848
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()
1850
with ui.ui_factory.nested_progress_bar() as child_pb:
1662
1851
for num, (path, trans_id) in enumerate(new_paths):
1663
1852
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1853
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1854
full_path = self._tree.abspath(path)
1666
1855
if trans_id in self._needs_rename:
1668
1857
mover.rename(self._limbo_name(trans_id), full_path)
1858
except errors.TransformRenameFailed as e:
1670
1859
# We may be renaming a dangling inventory id
1671
1860
if e.errno != errno.ENOENT:
1674
1863
self.rename_count += 1
1864
# TODO: if trans_id in self._observed_sha1s, we should
1865
# re-stat the final target, since ctime will be
1866
# updated by the change.
1675
1867
if (trans_id in self._new_contents or
1676
1868
self.path_changed(trans_id)):
1677
1869
if trans_id in self._new_contents:
1678
1870
modified_paths.append(full_path)
1679
1871
if trans_id in self._new_executability:
1680
1872
self._set_executability(path, trans_id)
1873
if trans_id in self._observed_sha1s:
1874
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1875
st = osutils.lstat(full_path)
1876
self._observed_sha1s[trans_id] = (o_sha1, st)
1877
for path, trans_id in new_paths:
1878
# new_paths includes stuff like workingtree conflicts. Only the
1879
# stuff in new_contents actually comes from limbo.
1880
if trans_id in self._limbo_files:
1881
del self._limbo_files[trans_id]
1683
1882
self._new_contents.clear()
1684
1883
return modified_paths
1885
def _apply_observed_sha1s(self):
1886
"""After we have finished renaming everything, update observed sha1s
1888
This has to be done after self._tree.apply_inventory_delta, otherwise
1889
it doesn't know anything about the files we are updating. Also, we want
1890
to do this as late as possible, so that most entries end up cached.
1892
# TODO: this doesn't update the stat information for directories. So
1893
# the first 'bzr status' will still need to rewrite
1894
# .bzr/checkout/dirstate. However, we at least don't need to
1895
# re-read all of the files.
1896
# TODO: If the operation took a while, we could do a time.sleep(3) here
1897
# to allow the clock to tick over and ensure we won't have any
1898
# problems. (we could observe start time, and finish time, and if
1899
# it is less than eg 10% overhead, add a sleep call.)
1900
paths = FinalPaths(self)
1901
for trans_id, observed in viewitems(self._observed_sha1s):
1902
path = paths.get_path(trans_id)
1903
# We could get the file_id, but dirstate prefers to use the path
1904
# anyway, and it is 'cheaper' to determine.
1905
# file_id = self._new_id[trans_id]
1906
self._tree._observed_sha1(None, path, observed)
1687
1909
class TransformPreview(DiskTreeTransform):
1688
1910
"""A TreeTransform for generating preview trees.
1766
1991
except errors.NoSuchRevisionInTree:
1767
1992
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()]
1994
def _get_file_revision(self, path, file_id, vf, tree_revision):
1996
(file_id, t.get_file_revision(t.id2path(file_id), file_id))
1997
for t in self._iter_parent_trees()]
1772
1998
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
1999
self.get_file_lines(path, file_id))
1774
2000
repo = self._get_repository()
1775
2001
base_vf = repo.texts
1776
2002
if base_vf not in vf.fallback_versionedfiles:
1777
2003
vf.fallback_versionedfiles.append(base_vf)
1778
2004
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2006
def _stat_limbo_file(self, trans_id):
1782
2007
name = self._transform._limbo_name(trans_id)
1783
2008
return os.lstat(name)
1898
2127
if self._transform.final_file_id(trans_id) is None:
1899
2128
yield self._final_paths._determine_path(trans_id)
1901
def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1902
yield_parents=False):
2130
def _make_inv_entries(self, ordered_entries, specific_files=None):
1903
2131
for trans_id, parent_file_id in ordered_entries:
1904
2132
file_id = self._transform.final_file_id(trans_id)
1905
2133
if file_id is None:
1907
if (specific_file_ids is not None
1908
and file_id not in specific_file_ids):
2135
if (specific_files is not None and
2136
unicode(self._final_paths.get_path(trans_id)) not in specific_files):
1911
kind = self._transform.final_kind(trans_id)
1913
kind = self._transform._tree.stored_kind(file_id)
2138
kind = self._transform.final_kind(trans_id)
2140
kind = self._transform._tree.stored_kind(
2141
self._transform._tree.id2path(file_id),
1914
2143
new_entry = inventory.make_entry(
1916
2145
self._transform.final_name(trans_id),
1940
2178
ordered_ids = self._list_files_by_dir()
1941
2179
for entry, trans_id in self._make_inv_entries(ordered_ids,
1942
specific_file_ids, yield_parents=yield_parents):
1943
2181
yield unicode(self._final_paths.get_path(trans_id)), entry
1945
2183
def _iter_entries_for_dir(self, dir_path):
1946
2184
"""Return path, entry for items in a directory without recursing down."""
1947
dir_file_id = self.path2id(dir_path)
1948
2185
ordered_ids = []
1949
for file_id in self.iter_children(dir_file_id):
1950
trans_id = self._transform.trans_id_file_id(file_id)
1951
ordered_ids.append((trans_id, file_id))
2186
dir_trans_id = self._path2trans_id(dir_path)
2187
dir_id = self._transform.final_file_id(dir_trans_id)
2188
for child_trans_id in self._all_children(dir_trans_id):
2189
ordered_ids.append((child_trans_id, dir_id))
1952
2190
for entry, trans_id in self._make_inv_entries(ordered_ids):
1953
2191
yield unicode(self._final_paths.get_path(trans_id)), entry
1978
2216
for path, entry in entries:
1979
2217
yield path, 'V', entry.kind, entry.file_id, entry
1981
def kind(self, file_id):
1982
trans_id = self._transform.trans_id_file_id(file_id)
2219
def kind(self, path, file_id=None):
2220
trans_id = self._path2trans_id(path)
2221
if trans_id is None:
2222
raise errors.NoSuchFile(path)
1983
2223
return self._transform.final_kind(trans_id)
1985
def stored_kind(self, file_id):
1986
trans_id = self._transform.trans_id_file_id(file_id)
2225
def stored_kind(self, path, file_id=None):
2226
trans_id = self._path2trans_id(path)
2227
if trans_id is None:
2228
raise errors.NoSuchFile(path)
1988
2230
return self._transform._new_contents[trans_id]
1989
2231
except KeyError:
1990
return self._transform._tree.stored_kind(file_id)
2232
return self._transform._tree.stored_kind(path, file_id)
1992
def get_file_mtime(self, file_id, path=None):
2234
def get_file_mtime(self, path, file_id=None):
1993
2235
"""See Tree.get_file_mtime"""
2237
file_id = self.path2id(path)
2239
raise errors.NoSuchFile(path)
1994
2240
if not self._content_change(file_id):
1995
return self._transform._tree.get_file_mtime(file_id)
1996
return self._stat_limbo_file(file_id).st_mtime
1998
def _file_size(self, entry, stat_value):
1999
return self.get_file_size(entry.file_id)
2001
def get_file_size(self, file_id):
2241
return self._transform._tree.get_file_mtime(
2242
self._transform._tree.id2path(file_id), file_id)
2243
trans_id = self._path2trans_id(path)
2244
return self._stat_limbo_file(trans_id).st_mtime
2246
def get_file_size(self, path, file_id=None):
2002
2247
"""See Tree.get_file_size"""
2003
if self.kind(file_id) == 'file':
2004
return self._transform._tree.get_file_size(file_id)
2248
trans_id = self._path2trans_id(path)
2249
if trans_id is None:
2250
raise errors.NoSuchFile(path)
2251
kind = self._transform.final_kind(trans_id)
2254
if trans_id in self._transform._new_contents:
2255
return self._stat_limbo_file(trans_id).st_size
2256
if self.kind(path, file_id) == 'file':
2257
return self._transform._tree.get_file_size(path, file_id)
2008
def get_file_sha1(self, file_id, path=None, stat_value=None):
2009
trans_id = self._transform.trans_id_file_id(file_id)
2010
kind = self._transform._new_contents.get(trans_id)
2012
return self._transform._tree.get_file_sha1(file_id)
2014
fileobj = self.get_file(file_id)
2261
def get_file_verifier(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_verifier(path, file_id)
2269
fileobj = self.get_file(path, file_id)
2271
return ("SHA1", sha_file(fileobj))
2275
def get_file_sha1(self, path, file_id=None, stat_value=None):
2276
trans_id = self._path2trans_id(path)
2277
if trans_id is None:
2278
raise errors.NoSuchFile(path)
2279
kind = self._transform._new_contents.get(trans_id)
2281
return self._transform._tree.get_file_sha1(path, file_id)
2283
fileobj = self.get_file(path, file_id)
2016
2285
return sha_file(fileobj)
2018
2287
fileobj.close()
2020
def is_executable(self, file_id, path=None):
2289
def is_executable(self, path, file_id=None):
2290
trans_id = self._path2trans_id(path)
2291
if trans_id is None:
2023
trans_id = self._transform.trans_id_file_id(file_id)
2025
2294
return self._transform._new_executability[trans_id]
2026
2295
except KeyError:
2028
return self._transform._tree.is_executable(file_id, path)
2297
return self._transform._tree.is_executable(path, file_id)
2298
except OSError as e:
2030
2299
if e.errno == errno.ENOENT:
2033
except errors.NoSuchId:
2302
except errors.NoSuchFile:
2305
def has_filename(self, path):
2306
trans_id = self._path2trans_id(path)
2307
if trans_id in self._transform._new_contents:
2309
elif trans_id in self._transform._removed_contents:
2312
return self._transform._tree.has_filename(path)
2036
2314
def path_content_summary(self, path):
2037
2315
trans_id = self._path2trans_id(path)
2038
2316
tt = self._transform
2084
2362
raise ValueError('want_unversioned is not supported')
2085
2363
return self._transform.iter_changes()
2087
def get_file(self, file_id, path=None):
2365
def get_file(self, path, file_id=None):
2088
2366
"""See Tree.get_file"""
2368
file_id = self.path2id(path)
2089
2369
if not self._content_change(file_id):
2090
return self._transform._tree.get_file(file_id, path)
2091
trans_id = self._transform.trans_id_file_id(file_id)
2370
return self._transform._tree.get_file(path, file_id)
2371
trans_id = self._path2trans_id(path)
2092
2372
name = self._transform._limbo_name(trans_id)
2093
2373
return open(name, 'rb')
2095
def get_file_with_stat(self, file_id, path=None):
2096
return self.get_file(file_id, path), None
2375
def get_file_with_stat(self, path, file_id=None):
2376
return self.get_file(path, file_id), None
2098
def annotate_iter(self, file_id,
2378
def annotate_iter(self, path, file_id=None,
2099
2379
default_revision=_mod_revision.CURRENT_REVISION):
2381
file_id = self.path2id(path)
2100
2382
changes = self._iter_changes_cache.get(file_id)
2101
2383
if changes is None:
2246
2532
:param delta_from_tree: If true, build_tree may use the input Tree to
2247
2533
generate the inventory delta.
2249
wt.lock_tree_write()
2535
with wt.lock_tree_write(), tree.lock_read():
2536
if accelerator_tree is not None:
2537
accelerator_tree.lock_read()
2539
return _build_tree(tree, wt, accelerator_tree, hardlink,
2253
2542
if accelerator_tree is not None:
2254
accelerator_tree.lock_read()
2256
return _build_tree(tree, wt, accelerator_tree, hardlink,
2259
if accelerator_tree is not None:
2260
accelerator_tree.unlock()
2543
accelerator_tree.unlock()
2267
2546
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
2268
2547
"""See build_tree."""
2269
for num, _unused in enumerate(wt.all_file_ids()):
2548
for num, _unused in enumerate(wt.all_versioned_paths()):
2270
2549
if num > 0: # more than just a root
2271
2550
raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2272
existing_files = set()
2273
for dir, files in wt.walkdirs():
2274
existing_files.update(f[0] for f in files)
2275
2551
file_trans_id = {}
2276
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2552
top_pb = ui.ui_factory.nested_progress_bar()
2277
2553
pp = ProgressPhase("Build phase", 2, top_pb)
2278
if tree.inventory.root is not None:
2554
if tree.get_root_id() is not None:
2279
2555
# This is kind of a hack: we should be altering the root
2280
2556
# as part of the regular tree shape diff logic.
2281
2557
# The conditional test here is to avoid doing an
2292
2568
pp.next_phase()
2293
file_trans_id[wt.get_root_id()] = \
2294
tt.trans_id_tree_file_id(wt.get_root_id())
2295
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2569
file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2570
with ui.ui_factory.nested_progress_bar() as pb:
2297
2571
deferred_contents = []
2299
total = len(tree.inventory)
2573
total = len(tree.all_versioned_paths())
2300
2574
if delta_from_tree:
2301
2575
precomputed_delta = []
2303
2577
precomputed_delta = None
2578
# Check if tree inventory has content. If so, we populate
2579
# existing_files with the directory content. If there are no
2580
# entries we skip populating existing_files as its not used.
2581
# This improves performance and unncessary work on large
2582
# directory trees. (#501307)
2584
existing_files = set()
2585
for dir, files in wt.walkdirs():
2586
existing_files.update(f[0] for f in files)
2304
2587
for num, (tree_path, entry) in \
2305
enumerate(tree.inventory.iter_entries_by_dir()):
2306
pb.update("Building tree", num - len(deferred_contents), total)
2588
enumerate(tree.iter_entries_by_dir()):
2589
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2307
2590
if entry.parent_id is None:
2309
2592
reparent = False
2333
2616
trans_id = tt.create_path(entry.name, parent_id)
2334
2617
file_trans_id[file_id] = trans_id
2335
2618
tt.version_file(file_id, trans_id)
2336
executable = tree.is_executable(file_id, tree_path)
2619
executable = tree.is_executable(tree_path, file_id)
2338
2621
tt.set_executability(executable, trans_id)
2339
trans_data = (trans_id, tree_path)
2340
deferred_contents.append((file_id, trans_data))
2622
trans_data = (trans_id, file_id, tree_path, entry.text_sha1)
2623
deferred_contents.append((tree_path, trans_data))
2342
file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2625
file_trans_id[file_id] = new_by_entry(
2626
tree_path, tt, entry, parent_id, tree)
2345
2628
new_trans_id = file_trans_id[file_id]
2346
2629
old_parent = tt.trans_id_tree_path(tree_path)
2379
2660
new_desired_files = desired_files
2381
2662
iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2382
unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2663
unchanged = [(p[0], p[1]) for (f, p, c, v, d, n, k, e)
2383
2664
in iter if not (c or e[0] != e[1])]
2384
2665
if accelerator_tree.supports_content_filtering():
2385
unchanged = [(f, p) for (f, p) in unchanged
2386
if not accelerator_tree.iter_search_rules([p]).next()]
2666
unchanged = [(tp, ap) for (tp, ap) in unchanged
2667
if not next(accelerator_tree.iter_search_rules([ap]))]
2387
2668
unchanged = dict(unchanged)
2388
2669
new_desired_files = []
2390
for file_id, (trans_id, tree_path) in desired_files:
2391
accelerator_path = unchanged.get(file_id)
2671
for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
2672
accelerator_path = unchanged.get(tree_path)
2392
2673
if accelerator_path is None:
2393
new_desired_files.append((file_id, (trans_id, tree_path)))
2674
new_desired_files.append((tree_path,
2675
(trans_id, file_id, tree_path, text_sha1)))
2395
pb.update('Adding file contents', count + offset, total)
2677
pb.update(gettext('Adding file contents'), count + offset, total)
2397
2679
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2400
contents = accelerator_tree.get_file(file_id, accelerator_path)
2682
contents = accelerator_tree.get_file(accelerator_path, file_id)
2401
2683
if wt.supports_content_filtering():
2402
2684
filters = wt._content_filter_stack(tree_path)
2403
2685
contents = filtered_output_bytes(contents, filters,
2404
2686
ContentFilterContext(tree_path, tree))
2406
tt.create_file(contents, trans_id)
2688
tt.create_file(contents, trans_id, sha1=text_sha1)
2409
2691
contents.close()
2414
2696
offset += count
2415
for count, ((trans_id, tree_path), contents) in enumerate(
2697
for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
2416
2698
tree.iter_files_bytes(new_desired_files)):
2417
2699
if wt.supports_content_filtering():
2418
2700
filters = wt._content_filter_stack(tree_path)
2419
2701
contents = filtered_output_bytes(contents, filters,
2420
2702
ContentFilterContext(tree_path, tree))
2421
tt.create_file(contents, trans_id)
2422
pb.update('Adding file contents', count + offset, total)
2703
tt.create_file(contents, trans_id, sha1=text_sha1)
2704
pb.update(gettext('Adding file contents'), count + offset, total)
2425
2707
def _reparent_children(tt, old_parent, new_parent):
2426
2708
for child in tt.iter_tree_children(old_parent):
2427
2709
tt.adjust_path(tt.final_name(child), new_parent, child)
2429
2712
def _reparent_transform_children(tt, old_parent, new_parent):
2430
2713
by_parent = tt.by_parent()
2431
2714
for child in by_parent[old_parent]:
2432
2715
tt.adjust_path(tt.final_name(child), new_parent, child)
2433
2716
return by_parent[old_parent]
2435
def _content_match(tree, entry, file_id, kind, target_path):
2719
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
2436
2720
if entry.kind != kind:
2438
2722
if entry.kind == "directory":
2440
2724
if entry.kind == "file":
2441
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2725
f = file(target_path, 'rb')
2727
if tree.get_file_text(tree_path, file_id) == f.read():
2443
2731
elif entry.kind == "symlink":
2444
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2732
if tree.get_symlink_target(tree_path, file_id) == os.readlink(target_path):
2491
2779
tt.set_tree_reference(entry.reference_revision, trans_id)
2492
2780
return trans_id
2493
2781
elif kind == 'symlink':
2494
target = tree.get_symlink_target(entry.file_id)
2782
target = tree.get_symlink_target(path, entry.file_id)
2495
2783
return tt.new_symlink(name, parent_id, target, entry.file_id)
2497
2785
raise errors.BadFileKindError(name, kind)
2500
@deprecated_function(deprecated_in((1, 9, 0)))
2501
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2502
"""Create new file contents according to an inventory entry.
2504
DEPRECATED. Use create_from_tree instead.
2506
if entry.kind == "file":
2508
lines = tree.get_file(entry.file_id).readlines()
2509
tt.create_file(lines, trans_id, mode_id=mode_id)
2510
elif entry.kind == "symlink":
2511
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2512
elif entry.kind == "directory":
2513
tt.create_directory(trans_id)
2516
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2788
def create_from_tree(tt, trans_id, tree, path, file_id=None, bytes=None,
2517
2789
filter_tree_path=None):
2518
2790
"""Create new file contents according to tree contents.
2520
2792
:param filter_tree_path: the tree path to use to lookup
2521
2793
content filters to apply to the bytes output in the working tree.
2522
2794
This only applies if the working tree supports content filtering.
2524
kind = tree.kind(file_id)
2796
kind = tree.kind(path, file_id)
2525
2797
if kind == 'directory':
2526
2798
tt.create_directory(trans_id)
2527
2799
elif kind == "file":
2528
2800
if bytes is None:
2529
tree_file = tree.get_file(file_id)
2801
tree_file = tree.get_file(path, file_id)
2531
2803
bytes = tree_file.readlines()
2549
2821
tt.set_executability(entry.executable, trans_id)
2552
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2553
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2556
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2557
"""Produce a backup-style name that appears to be available"""
2561
yield "%s.~%d~" % (name, counter)
2563
for new_name in name_gen():
2564
if not tt.has_named_child(by_parent, parent_trans_id, new_name):
2568
def _entry_changes(file_id, entry, working_tree):
2569
"""Determine in which ways the inventory entry has changed.
2571
Returns booleans: has_contents, content_mod, meta_mod
2572
has_contents means there are currently contents, but they differ
2573
contents_mod means contents need to be modified
2574
meta_mod means the metadata needs to be modified
2576
cur_entry = working_tree.inventory[file_id]
2578
working_kind = working_tree.kind(file_id)
2581
has_contents = False
2584
if has_contents is True:
2585
if entry.kind != working_kind:
2586
contents_mod, meta_mod = True, False
2588
cur_entry._read_tree_state(working_tree.id2path(file_id),
2590
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2591
cur_entry._forget_tree_state()
2592
return has_contents, contents_mod, meta_mod
2595
2824
def revert(working_tree, target_tree, filenames, backups=False,
2596
2825
pb=None, change_reporter=None):
2597
2826
"""Revert a working tree's contents to those of a target tree."""
2621
2851
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2622
2852
backups, pp, basis_tree=None,
2623
2853
merge_modified=None):
2624
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2854
with ui.ui_factory.nested_progress_bar() as child_pb:
2626
2855
if merge_modified is None:
2627
2856
merge_modified = working_tree.merge_modified()
2628
2857
merge_modified = _alter_files(working_tree, target_tree, tt,
2629
2858
child_pb, filenames, backups,
2630
2859
merge_modified, basis_tree)
2633
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2860
with ui.ui_factory.nested_progress_bar() as child_pb:
2635
2861
raw_conflicts = resolve_conflicts(tt, child_pb,
2636
2862
lambda t, c: conflict_pass(t, c, target_tree))
2639
2863
conflicts = cook_conflicts(raw_conflicts, tt)
2640
2864
return conflicts, merge_modified
2654
2882
deferred_files = []
2655
2883
for id_num, (file_id, path, changed_content, versioned, parent, name,
2656
2884
kind, executable) in enumerate(change_list):
2657
if skip_root and file_id[0] is not None and parent[0] is None:
2885
target_path, wt_path = path
2886
target_versioned, wt_versioned = versioned
2887
target_parent, wt_parent = parent
2888
target_name, wt_name = name
2889
target_kind, wt_kind = kind
2890
target_executable, wt_executable = executable
2891
if skip_root and wt_parent is None:
2659
2893
trans_id = tt.trans_id_file_id(file_id)
2661
2895
if changed_content:
2662
2896
keep_content = False
2663
if kind[0] == 'file' and (backups or kind[1] is None):
2664
wt_sha1 = working_tree.get_file_sha1(file_id)
2897
if wt_kind == 'file' and (backups or target_kind is None):
2898
wt_sha1 = working_tree.get_file_sha1(wt_path, file_id)
2665
2899
if merge_modified.get(file_id) != wt_sha1:
2666
2900
# acquire the basis tree lazily to prevent the
2667
2901
# expense of accessing it when it's not needed ?
2669
2903
if basis_tree is None:
2670
2904
basis_tree = working_tree.basis_tree()
2671
2905
basis_tree.lock_read()
2672
if file_id in basis_tree:
2673
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2675
elif kind[1] is None and not versioned[1]:
2677
if kind[0] is not None:
2906
basis_path = find_previous_path(working_tree, basis_tree, wt_path)
2907
if basis_path is None:
2908
if target_kind is None and not target_versioned:
2911
if wt_sha1 != basis_tree.get_file_sha1(basis_path, file_id):
2913
if wt_kind is not None:
2678
2914
if not keep_content:
2679
2915
tt.delete_contents(trans_id)
2680
elif kind[1] is not None:
2681
parent_trans_id = tt.trans_id_file_id(parent[0])
2682
by_parent = tt.by_parent()
2683
backup_name = _get_backup_name(name[0], by_parent,
2684
parent_trans_id, tt)
2916
elif target_kind is not None:
2917
parent_trans_id = tt.trans_id_file_id(wt_parent)
2918
backup_name = tt._available_backup_name(
2919
wt_name, parent_trans_id)
2685
2920
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2686
new_trans_id = tt.create_path(name[0], parent_trans_id)
2687
if versioned == (True, True):
2921
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2922
if wt_versioned and target_versioned:
2688
2923
tt.unversion_file(trans_id)
2689
2924
tt.version_file(file_id, new_trans_id)
2690
2925
# New contents should have the same unix perms as old
2692
2927
mode_id = trans_id
2693
2928
trans_id = new_trans_id
2694
if kind[1] in ('directory', 'tree-reference'):
2929
if target_kind in ('directory', 'tree-reference'):
2695
2930
tt.create_directory(trans_id)
2696
if kind[1] == 'tree-reference':
2697
revision = target_tree.get_reference_revision(file_id,
2931
if target_kind == 'tree-reference':
2932
revision = target_tree.get_reference_revision(
2933
target_path, file_id)
2699
2934
tt.set_tree_reference(revision, trans_id)
2700
elif kind[1] == 'symlink':
2701
tt.create_symlink(target_tree.get_symlink_target(file_id),
2703
elif kind[1] == 'file':
2704
deferred_files.append((file_id, (trans_id, mode_id)))
2935
elif target_kind == 'symlink':
2936
tt.create_symlink(target_tree.get_symlink_target(
2937
target_path, file_id), trans_id)
2938
elif target_kind == 'file':
2939
deferred_files.append((target_path, (trans_id, mode_id, file_id)))
2705
2940
if basis_tree is None:
2706
2941
basis_tree = working_tree.basis_tree()
2707
2942
basis_tree.lock_read()
2708
new_sha1 = target_tree.get_file_sha1(file_id)
2709
if (file_id in basis_tree and new_sha1 ==
2710
basis_tree.get_file_sha1(file_id)):
2943
new_sha1 = target_tree.get_file_sha1(target_path, file_id)
2944
basis_path = find_previous_path(target_tree, basis_tree, target_path)
2945
if (basis_path is not None and
2946
new_sha1 == basis_tree.get_file_sha1(basis_path, file_id)):
2711
2947
if file_id in merge_modified:
2712
2948
del merge_modified[file_id]
2714
2950
merge_modified[file_id] = new_sha1
2716
2952
# preserve the execute bit when backing up
2717
if keep_content and executable[0] == executable[1]:
2718
tt.set_executability(executable[1], trans_id)
2719
elif kind[1] is not None:
2720
raise AssertionError(kind[1])
2721
if versioned == (False, True):
2953
if keep_content and wt_executable == target_executable:
2954
tt.set_executability(target_executable, trans_id)
2955
elif target_kind is not None:
2956
raise AssertionError(target_kind)
2957
if not wt_versioned and target_versioned:
2722
2958
tt.version_file(file_id, trans_id)
2723
if versioned == (True, False):
2959
if wt_versioned and not target_versioned:
2724
2960
tt.unversion_file(trans_id)
2725
if (name[1] is not None and
2726
(name[0] != name[1] or parent[0] != parent[1])):
2727
if name[1] == '' and parent[1] is None:
2961
if (target_name is not None and
2962
(wt_name != target_name or wt_parent != target_parent)):
2963
if target_name == '' and target_parent is None:
2728
2964
parent_trans = ROOT_PARENT
2730
parent_trans = tt.trans_id_file_id(parent[1])
2731
if parent[0] is None and versioned[0]:
2732
tt.adjust_root_path(name[1], parent_trans)
2966
parent_trans = tt.trans_id_file_id(target_parent)
2967
if wt_parent is None and wt_versioned:
2968
tt.adjust_root_path(target_name, parent_trans)
2734
tt.adjust_path(name[1], parent_trans, trans_id)
2735
if executable[0] != executable[1] and kind[1] == "file":
2736
tt.set_executability(executable[1], trans_id)
2970
tt.adjust_path(target_name, parent_trans, trans_id)
2971
if wt_executable != target_executable and target_kind == "file":
2972
tt.set_executability(target_executable, trans_id)
2737
2973
if working_tree.supports_content_filtering():
2738
for index, ((trans_id, mode_id), bytes) in enumerate(
2974
for (trans_id, mode_id, file_id), bytes in (
2739
2975
target_tree.iter_files_bytes(deferred_files)):
2740
file_id = deferred_files[index][0]
2741
2976
# We're reverting a tree to the target tree so using the
2742
2977
# target tree to find the file path seems the best choice
2743
2978
# here IMO - Ian C 27/Oct/2009
2881
3131
modified_path = fp.get_path(conflict[2])
2882
3132
modified_id = tt.final_file_id(conflict[2])
2883
3133
if len(conflict) == 3:
2884
yield Conflict.factory(c_type, action=action, path=modified_path,
2885
file_id=modified_id)
3134
yield conflicts.Conflict.factory(
3135
c_type, action=action, path=modified_path, file_id=modified_id)
2888
3138
conflicting_path = fp.get_path(conflict[3])
2889
3139
conflicting_id = tt.final_file_id(conflict[3])
2890
yield Conflict.factory(c_type, action=action, path=modified_path,
2891
file_id=modified_id,
2892
conflict_path=conflicting_path,
2893
conflict_file_id=conflicting_id)
3140
yield conflicts.Conflict.factory(
3141
c_type, action=action, path=modified_path,
3142
file_id=modified_id,
3143
conflict_path=conflicting_path,
3144
conflict_file_id=conflicting_id)
2896
3147
class _FileMover(object):
added
removed
breezy/transform.py
