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(), """
24
33
from bzrlib import (
33
43
revision as _mod_revision,
47
from bzrlib.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, NotVersionedError, CantMoveRoot,
39
ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
from bzrlib.errors import (DuplicateKey, MalformedTransform,
50
ReusingTransform, CantMoveRoot,
51
ImmortalLimbo, NoFinalPath,
40
52
UnableCreateSymlink)
41
53
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
54
from bzrlib.mutabletree import MutableTree
43
55
from bzrlib.osutils import (
53
63
from bzrlib.progress import ProgressPhase
54
64
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
64
71
ROOT_PARENT = "root-parent"
67
73
def unique_add(map, key, value):
69
75
raise DuplicateKey(key=key)
73
80
class _TransformResults(object):
74
81
def __init__(self, modified_paths, rename_count):
75
82
object.__init__(self)
380
398
return sorted(FinalPaths(self).get_paths(new_ids))
382
400
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,
401
"""Determine which trans_ids need new Inventory entries.
403
An new entry is needed when anything that would be reflected by an
404
inventory entry changes, including file name, file_id, parent file_id,
405
file kind, and the execute bit.
407
Some care is taken to return entries with real changes, not cases
408
where the value is deleted and then restored to its original value,
409
but some actually unchanged values may be returned.
411
:returns: A list of (path, trans_id) for all items requiring an
412
inventory change. Ordered by path.
415
# Find entries whose file_ids are new (or changed).
416
new_file_id = set(t for t in self._new_id
417
if self._new_id[t] != self.tree_file_id(t))
418
for id_set in [self._new_name, self._new_parent, new_file_id,
386
419
self._new_executability]:
387
new_ids.update(id_set)
420
changed_ids.update(id_set)
421
# removing implies a kind change
388
422
changed_kind = set(self._removed_contents)
389
424
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))
425
# Ignore entries that are already known to have changed.
426
changed_kind.difference_update(changed_ids)
427
# to keep only the truly changed ones
428
changed_kind = (t for t in changed_kind
429
if self.tree_kind(t) != self.final_kind(t))
430
# all kind changes will alter the inventory
431
changed_ids.update(changed_kind)
432
# To find entries with changed parent_ids, find parents which existed,
433
# but changed file_id.
434
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
435
# Now add all their children to the set.
436
for parent_trans_id in new_file_id:
437
changed_ids.update(self.iter_tree_children(parent_trans_id))
438
return sorted(FinalPaths(self).get_paths(changed_ids))
396
440
def final_kind(self, trans_id):
397
441
"""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)
443
:return: None if the file does not exist/has no contents. (It is
444
conceivable that a path would be created without the corresponding
445
contents insertion command)
403
447
if trans_id in self._new_contents:
404
448
return self._new_contents[trans_id]
405
449
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
452
return self.tree_kind(trans_id)
531
575
# ensure that all children are registered with the transaction
532
576
list(self.iter_tree_children(parent_id))
578
@deprecated_method(deprecated_in((2, 3, 0)))
534
579
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
580
return self._has_named_child(
581
name, parent_id, known_children=by_parent.get(parent_id, []))
583
def _has_named_child(self, name, parent_id, known_children):
584
"""Does a parent already have a name child.
586
:param name: The searched for name.
588
:param parent_id: The parent for which the check is made.
590
:param known_children: The already known children. This should have
591
been recently obtained from `self.by_parent.get(parent_id)`
592
(or will be if None is passed).
594
if known_children is None:
595
known_children = self.by_parent().get(parent_id, [])
596
for child in known_children:
540
597
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
599
parent_path = self._tree_id_paths.get(parent_id, None)
600
if parent_path is None:
601
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
603
child_path = joinpath(parent_path, name)
604
child_id = self._tree_path_ids.get(child_path, None)
548
605
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
606
# Not known by the tree transform yet, check the filesystem
607
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?
609
raise AssertionError('child_id is missing: %s, %s, %s'
610
% (name, parent_id, child_id))
612
def _available_backup_name(self, name, target_id):
613
"""Find an available backup name.
615
:param name: The basename of the file.
617
:param target_id: The directory trans_id where the backup should
620
known_children = self.by_parent().get(target_id, [])
621
return osutils.available_backup_name(
623
lambda base: self._has_named_child(
624
base, target_id, known_children))
559
626
def _parent_loops(self):
560
627
"""No entry should be its own ancestor"""
644
704
if (self._new_name, self._new_parent) == ({}, {}):
646
706
for children in by_parent.itervalues():
647
name_ids = [(self.final_name(t), t) for t in children]
648
if not self._case_sensitive_target:
649
name_ids = [(n.lower(), t) for n, t in name_ids]
708
for child_tid in children:
709
name = self.final_name(child_tid)
711
# Keep children only if they still exist in the end
712
if not self._case_sensitive_target:
714
name_ids.append((name, child_tid))
652
717
last_trans_id = None
653
718
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
719
kind = self.final_kind(trans_id)
658
720
file_id = self.final_file_id(trans_id)
659
721
if kind is None and file_id is None:
681
743
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
744
"""Children must have a directory parent"""
684
746
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)
747
if parent_id == ROOT_PARENT:
750
for child_id in children:
751
if self.final_kind(child_id) is not None:
756
# There is at least a child, so we need an existing directory to
758
kind = self.final_kind(parent_id)
760
# The directory will be deleted
699
761
conflicts.append(('missing parent', parent_id))
700
762
elif kind != "directory":
763
# Meh, we need a *directory* to put something in it
701
764
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
767
def _set_executability(self, path, trans_id):
715
768
"""Set the executability of versioned files """
716
if supports_executable():
769
if self._tree._supports_executable():
717
770
new_executability = self._new_executability[trans_id]
718
771
abspath = self._tree.abspath(path)
719
772
current_mode = os.stat(abspath).st_mode
780
833
self.create_symlink(target, trans_id)
836
def new_orphan(self, trans_id, parent_id):
837
"""Schedule an item to be orphaned.
839
When a directory is about to be removed, its children, if they are not
840
versioned are moved out of the way: they don't have a parent anymore.
842
:param trans_id: The trans_id of the existing item.
843
:param parent_id: The parent trans_id of the item.
845
raise NotImplementedError(self.new_orphan)
847
def _get_potential_orphans(self, dir_id):
848
"""Find the potential orphans in a directory.
850
A directory can't be safely deleted if there are versioned files in it.
851
If all the contained files are unversioned then they can be orphaned.
853
The 'None' return value means that the directory contains at least one
854
versioned file and should not be deleted.
856
:param dir_id: The directory trans id.
858
:return: A list of the orphan trans ids or None if at least one
859
versioned file is present.
862
# Find the potential orphans, stop if one item should be kept
863
for child_tid in self.by_parent()[dir_id]:
864
if child_tid in self._removed_contents:
865
# The child is removed as part of the transform. Since it was
866
# versioned before, it's not an orphan
868
elif self.final_file_id(child_tid) is None:
869
# The child is not versioned
870
orphans.append(child_tid)
872
# We have a versioned file here, searching for orphans is
783
878
def _affected_ids(self):
784
879
"""Return the set of transform ids affected by the transform"""
785
880
trans_ids = set(self._removed_id)
928
1020
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1022
def commit(self, branch, message, merge_parents=None, strict=False,
1023
timestamp=None, timezone=None, committer=None, authors=None,
1024
revprops=None, revision_id=None):
931
1025
"""Commit the result of this TreeTransform to a branch.
933
1027
:param branch: The branch to commit to.
934
1028
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1029
:param merge_parents: Additional parent revision-ids specified by
1031
:param strict: If True, abort the commit if there are unversioned
1033
:param timestamp: if not None, seconds-since-epoch for the time and
1034
date. (May be a float.)
1035
:param timezone: Optional timezone for timestamp, as an offset in
1037
:param committer: Optional committer in email-id format.
1038
(e.g. "J Random Hacker <jrandom@example.com>")
1039
:param authors: Optional list of authors in email-id format.
1040
:param revprops: Optional dictionary of revision properties.
1041
:param revision_id: Optional revision id. (Specifying a revision-id
1042
may reduce performance for some non-native formats.)
936
1043
:return: The revision_id of the revision committed.
938
1045
self._check_malformed()
1173
1302
descendants.update(self._limbo_descendants(descendant))
1174
1303
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1305
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1306
"""Schedule creation of a new file.
1181
Contents is an iterator of strings, all of which will be written
1182
to the target destination.
1184
New file takes the permissions of any existing file with that id,
1185
unless mode_id is specified.
1310
:param contents: an iterator of strings, all of which will be written
1311
to the target destination.
1312
:param trans_id: TreeTransform handle
1313
:param mode_id: If not None, force the mode of the target file to match
1314
the mode of the object referenced by mode_id.
1315
Otherwise, we will try to preserve mode bits of an existing file.
1316
:param sha1: If the sha1 of this content is already known, pass it in.
1317
We can use it to prevent future sha1 computations.
1187
1319
name = self._limbo_name(trans_id)
1188
1320
f = open(name, 'wb')
1191
unique_add(self._new_contents, trans_id, 'file')
1193
# Clean up the file, it never got registered so
1194
# TreeTransform.finalize() won't clean it up.
1322
unique_add(self._new_contents, trans_id, 'file')
1199
1323
f.writelines(contents)
1202
1326
self._set_mtime(name)
1203
1327
self._set_mode(trans_id, mode_id, S_ISREG)
1328
# It is unfortunate we have to use lstat instead of fstat, but we just
1329
# used utime and chmod on the file, so we need the accurate final
1331
if sha1 is not None:
1332
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1334
def _read_file_chunks(self, trans_id):
1206
1335
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1405
del self._limbo_children_names[trans_id]
1275
1406
delete_any(self._limbo_name(trans_id))
1408
def new_orphan(self, trans_id, parent_id):
1409
conf = self._tree.get_config_stack()
1410
handle_orphan = conf.get('bzr.transform.orphan_policy')
1411
handle_orphan(self, trans_id, parent_id)
1414
class OrphaningError(errors.BzrError):
1416
# Only bugs could lead to such exception being seen by the user
1417
internal_error = True
1418
_fmt = "Error while orphaning %s in %s directory"
1420
def __init__(self, orphan, parent):
1421
errors.BzrError.__init__(self)
1422
self.orphan = orphan
1423
self.parent = parent
1426
class OrphaningForbidden(OrphaningError):
1428
_fmt = "Policy: %s doesn't allow creating orphans."
1430
def __init__(self, policy):
1431
errors.BzrError.__init__(self)
1432
self.policy = policy
1435
def move_orphan(tt, orphan_id, parent_id):
1436
"""See TreeTransformBase.new_orphan.
1438
This creates a new orphan in the `bzr-orphans` dir at the root of the
1441
:param tt: The TreeTransform orphaning `trans_id`.
1443
:param orphan_id: The trans id that should be orphaned.
1445
:param parent_id: The orphan parent trans id.
1447
# Add the orphan dir if it doesn't exist
1448
orphan_dir_basename = 'bzr-orphans'
1449
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1450
if tt.final_kind(od_id) is None:
1451
tt.create_directory(od_id)
1452
parent_path = tt._tree_id_paths[parent_id]
1453
# Find a name that doesn't exist yet in the orphan dir
1454
actual_name = tt.final_name(orphan_id)
1455
new_name = tt._available_backup_name(actual_name, od_id)
1456
tt.adjust_path(new_name, od_id, orphan_id)
1457
trace.warning('%s has been orphaned in %s'
1458
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1461
def refuse_orphan(tt, orphan_id, parent_id):
1462
"""See TreeTransformBase.new_orphan.
1464
This refuses to create orphan, letting the caller handle the conflict.
1466
raise OrphaningForbidden('never')
1469
orphaning_registry = registry.Registry()
1470
orphaning_registry.register(
1471
'conflict', refuse_orphan,
1472
'Leave orphans in place and create a conflict on the directory.')
1473
orphaning_registry.register(
1474
'move', move_orphan,
1475
'Move orphans into the bzr-orphans directory.')
1476
orphaning_registry._set_default_key('conflict')
1479
opt_transform_orphan = _mod_config.RegistryOption(
1480
'bzr.transform.orphan_policy', orphaning_registry,
1481
help='Policy for orphaned files during transform operations.',
1278
1485
class TreeTransform(DiskTreeTransform):
1279
1486
"""Represent a tree transformation.
1623
1827
tree_paths = list(self._tree_path_ids.iteritems())
1624
1828
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1829
child_pb = ui.ui_factory.nested_progress_bar()
1627
for num, data in enumerate(tree_paths):
1628
path, trans_id = data
1629
child_pb.update('removing file', num, len(tree_paths))
1831
for num, (path, trans_id) in enumerate(tree_paths):
1832
# do not attempt to move root into a subdirectory of itself.
1835
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1836
full_path = self._tree.abspath(path)
1631
1837
if trans_id in self._removed_contents:
1632
1838
delete_path = os.path.join(self._deletiondir, trans_id)
1657
1863
modified_paths = []
1658
1864
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()
1866
child_pb = ui.ui_factory.nested_progress_bar()
1662
1868
for num, (path, trans_id) in enumerate(new_paths):
1663
1869
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1870
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1871
full_path = self._tree.abspath(path)
1666
1872
if trans_id in self._needs_rename:
1668
1874
mover.rename(self._limbo_name(trans_id), full_path)
1875
except errors.TransformRenameFailed, e:
1670
1876
# We may be renaming a dangling inventory id
1671
1877
if e.errno != errno.ENOENT:
1674
1880
self.rename_count += 1
1881
# TODO: if trans_id in self._observed_sha1s, we should
1882
# re-stat the final target, since ctime will be
1883
# updated by the change.
1675
1884
if (trans_id in self._new_contents or
1676
1885
self.path_changed(trans_id)):
1677
1886
if trans_id in self._new_contents:
1678
1887
modified_paths.append(full_path)
1679
1888
if trans_id in self._new_executability:
1680
1889
self._set_executability(path, trans_id)
1890
if trans_id in self._observed_sha1s:
1891
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1892
st = osutils.lstat(full_path)
1893
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1895
child_pb.finished()
1896
for path, trans_id in new_paths:
1897
# new_paths includes stuff like workingtree conflicts. Only the
1898
# stuff in new_contents actually comes from limbo.
1899
if trans_id in self._limbo_files:
1900
del self._limbo_files[trans_id]
1683
1901
self._new_contents.clear()
1684
1902
return modified_paths
1904
def _apply_observed_sha1s(self):
1905
"""After we have finished renaming everything, update observed sha1s
1907
This has to be done after self._tree.apply_inventory_delta, otherwise
1908
it doesn't know anything about the files we are updating. Also, we want
1909
to do this as late as possible, so that most entries end up cached.
1911
# TODO: this doesn't update the stat information for directories. So
1912
# the first 'bzr status' will still need to rewrite
1913
# .bzr/checkout/dirstate. However, we at least don't need to
1914
# re-read all of the files.
1915
# TODO: If the operation took a while, we could do a time.sleep(3) here
1916
# to allow the clock to tick over and ensure we won't have any
1917
# problems. (we could observe start time, and finish time, and if
1918
# it is less than eg 10% overhead, add a sleep call.)
1919
paths = FinalPaths(self)
1920
for trans_id, observed in self._observed_sha1s.iteritems():
1921
path = paths.get_path(trans_id)
1922
# We could get the file_id, but dirstate prefers to use the path
1923
# anyway, and it is 'cheaper' to determine.
1924
# file_id = self._new_id[trans_id]
1925
self._tree._observed_sha1(None, path, observed)
1687
1928
class TransformPreview(DiskTreeTransform):
1688
1929
"""A TreeTransform for generating preview trees.
1767
2013
yield self._get_repository().revision_tree(revision_id)
1769
2015
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2016
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2017
self._iter_parent_trees()]
1772
2018
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2019
self.get_file_lines(file_id))
1774
2020
repo = self._get_repository()
1775
2021
base_vf = repo.texts
1776
2022
if base_vf not in vf.fallback_versionedfiles:
1777
2023
vf.fallback_versionedfiles.append(base_vf)
1778
2024
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2026
def _stat_limbo_file(self, file_id=None, trans_id=None):
2027
if trans_id is None:
2028
trans_id = self._transform.trans_id_file_id(file_id)
1782
2029
name = self._transform._limbo_name(trans_id)
1783
2030
return os.lstat(name)
1998
2253
def get_file_size(self, file_id):
1999
2254
"""See Tree.get_file_size"""
2255
trans_id = self._transform.trans_id_file_id(file_id)
2256
kind = self._transform.final_kind(trans_id)
2259
if trans_id in self._transform._new_contents:
2260
return self._stat_limbo_file(trans_id=trans_id).st_size
2000
2261
if self.kind(file_id) == 'file':
2001
2262
return self._transform._tree.get_file_size(file_id)
2266
def get_file_verifier(self, file_id, path=None, stat_value=None):
2267
trans_id = self._transform.trans_id_file_id(file_id)
2268
kind = self._transform._new_contents.get(trans_id)
2270
return self._transform._tree.get_file_verifier(file_id)
2272
fileobj = self.get_file(file_id)
2274
return ("SHA1", sha_file(fileobj))
2005
2278
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
2279
trans_id = self._transform.trans_id_file_id(file_id)
2007
2280
kind = self._transform._new_contents.get(trans_id)
2289
2568
pp.next_phase()
2290
2569
file_trans_id[wt.get_root_id()] = \
2291
2570
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2571
pb = ui.ui_factory.nested_progress_bar()
2294
2573
deferred_contents = []
2296
total = len(tree.inventory)
2575
total = len(tree.all_file_ids())
2297
2576
if delta_from_tree:
2298
2577
precomputed_delta = []
2300
2579
precomputed_delta = None
2580
# Check if tree inventory has content. If so, we populate
2581
# existing_files with the directory content. If there are no
2582
# entries we skip populating existing_files as its not used.
2583
# This improves performance and unncessary work on large
2584
# directory trees. (#501307)
2586
existing_files = set()
2587
for dir, files in wt.walkdirs():
2588
existing_files.update(f[0] for f in files)
2301
2589
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2590
enumerate(tree.iter_entries_by_dir()):
2591
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2592
if entry.parent_id is None:
2306
2594
reparent = False
2384
2672
unchanged = dict(unchanged)
2385
2673
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2675
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2676
accelerator_path = unchanged.get(file_id)
2389
2677
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2678
new_desired_files.append((file_id,
2679
(trans_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2681
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2683
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2411
2700
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2701
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2702
tree.iter_files_bytes(new_desired_files)):
2414
2703
if wt.supports_content_filtering():
2415
2704
filters = wt._content_filter_stack(tree_path)
2416
2705
contents = filtered_output_bytes(contents, filters,
2417
2706
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
pb.update('Adding file contents', count + offset, total)
2707
tt.create_file(contents, trans_id, sha1=text_sha1)
2708
pb.update(gettext('Adding file contents'), count + offset, total)
2422
2711
def _reparent_children(tt, old_parent, new_parent):
2423
2712
for child in tt.iter_tree_children(old_parent):
2424
2713
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2716
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2717
by_parent = tt.by_parent()
2428
2718
for child in by_parent[old_parent]:
2429
2719
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2720
return by_parent[old_parent]
2432
2723
def _content_match(tree, entry, file_id, kind, target_path):
2433
2724
if entry.kind != kind:
2435
2726
if entry.kind == "directory":
2437
2728
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2729
f = file(target_path, 'rb')
2731
if tree.get_file_text(file_id) == f.read():
2440
2735
elif entry.kind == "symlink":
2441
2736
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2789
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
2792
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2793
filter_tree_path=None):
2515
2794
"""Create new file contents according to tree contents.
2562
2843
return 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
2846
def revert(working_tree, target_tree, filenames, backups=False,
2593
2847
pb=None, change_reporter=None):
2594
2848
"""Revert a working tree's contents to those of a target tree."""
2651
2909
deferred_files = []
2652
2910
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2911
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2912
target_path, wt_path = path
2913
target_versioned, wt_versioned = versioned
2914
target_parent, wt_parent = parent
2915
target_name, wt_name = name
2916
target_kind, wt_kind = kind
2917
target_executable, wt_executable = executable
2918
if skip_root and wt_parent is None:
2656
2920
trans_id = tt.trans_id_file_id(file_id)
2658
2922
if changed_content:
2659
2923
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2924
if wt_kind == 'file' and (backups or target_kind is None):
2661
2925
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2926
if merge_modified.get(file_id) != wt_sha1:
2663
2927
# acquire the basis tree lazily to prevent the
2666
2930
if basis_tree is None:
2667
2931
basis_tree = working_tree.basis_tree()
2668
2932
basis_tree.lock_read()
2669
if file_id in basis_tree:
2933
if basis_tree.has_id(file_id):
2670
2934
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2935
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2936
elif target_kind is None and not target_versioned:
2673
2937
keep_content = True
2674
if kind[0] is not None:
2938
if wt_kind is not None:
2675
2939
if not keep_content:
2676
2940
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)
2941
elif target_kind is not None:
2942
parent_trans_id = tt.trans_id_file_id(wt_parent)
2943
backup_name = tt._available_backup_name(
2944
wt_name, parent_trans_id)
2682
2945
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):
2946
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2947
if wt_versioned and target_versioned:
2685
2948
tt.unversion_file(trans_id)
2686
2949
tt.version_file(file_id, new_trans_id)
2687
2950
# New contents should have the same unix perms as old
2689
2952
mode_id = trans_id
2690
2953
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2954
if target_kind in ('directory', 'tree-reference'):
2692
2955
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2956
if target_kind == 'tree-reference':
2694
2957
revision = target_tree.get_reference_revision(file_id,
2696
2959
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2960
elif target_kind == 'symlink':
2698
2961
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2963
elif target_kind == 'file':
2701
2964
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2965
if basis_tree is None:
2703
2966
basis_tree = working_tree.basis_tree()
2704
2967
basis_tree.lock_read()
2705
2968
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)):
2969
if (basis_tree.has_id(file_id) and
2970
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2971
if file_id in merge_modified:
2709
2972
del merge_modified[file_id]
2711
2974
merge_modified[file_id] = new_sha1
2713
2976
# 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):
2977
if keep_content and wt_executable == target_executable:
2978
tt.set_executability(target_executable, trans_id)
2979
elif target_kind is not None:
2980
raise AssertionError(target_kind)
2981
if not wt_versioned and target_versioned:
2719
2982
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2983
if wt_versioned and not target_versioned:
2721
2984
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:
2985
if (target_name is not None and
2986
(wt_name != target_name or wt_parent != target_parent)):
2987
if target_name == '' and target_parent is None:
2725
2988
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)
2990
parent_trans = tt.trans_id_file_id(target_parent)
2991
if wt_parent is None and wt_versioned:
2992
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)
2994
tt.adjust_path(target_name, parent_trans, trans_id)
2995
if wt_executable != target_executable and target_kind == "file":
2996
tt.set_executability(target_executable, trans_id)
2734
2997
if working_tree.supports_content_filtering():
2735
2998
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
2999
target_tree.iter_files_bytes(deferred_files)):
2808
3071
elif c_type == 'missing parent':
2809
3072
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3073
if trans_id in tt._removed_contents:
3074
cancel_deletion = True
3075
orphans = tt._get_potential_orphans(trans_id)
3077
cancel_deletion = False
3078
# All children are orphans
3081
tt.new_orphan(o, trans_id)
3082
except OrphaningError:
3083
# Something bad happened so we cancel the directory
3084
# deletion which will leave it in place with a
3085
# conflict. The user can deal with it from there.
3086
# Note that this also catch the case where we don't
3087
# want to create orphans and leave the directory in
3089
cancel_deletion = True
3092
# Cancel the directory deletion
3093
tt.cancel_deletion(trans_id)
3094
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3099
tt.final_name(trans_id)
2878
3160
modified_path = fp.get_path(conflict[2])
2879
3161
modified_id = tt.final_file_id(conflict[2])
2880
3162
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3163
yield conflicts.Conflict.factory(
3164
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3167
conflicting_path = fp.get_path(conflict[3])
2886
3168
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)
3169
yield conflicts.Conflict.factory(
3170
c_type, action=action, path=modified_path,
3171
file_id=modified_id,
3172
conflict_path=conflicting_path,
3173
conflict_file_id=conflicting_id)
2893
3176
class _FileMover(object):
2898
3181
self.pending_deletions = []
2900
3183
def rename(self, from_, to):
2901
"""Rename a file from one path to another. Functions like os.rename"""
3184
"""Rename a file from one path to another."""
2903
3186
os.rename(from_, to)
2904
3187
except OSError, e:
2905
3188
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3189
raise errors.FileExists(to, str(e))
3190
# normal OSError doesn't include filenames so it's hard to see where
3191
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3192
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
3193
self.past_renames.append((from_, to))
2910
3195
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
