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(), """
31
lazy_import.lazy_import(globals(), """
24
32
from bzrlib import (
33
42
revision as _mod_revision,
46
from bzrlib.i18n import gettext
37
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
ReusingTransform, NotVersionedError, CantMoveRoot,
48
from bzrlib.errors import (DuplicateKey, MalformedTransform,
49
ReusingTransform, CantMoveRoot,
39
50
ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
51
UnableCreateSymlink)
41
52
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
from bzrlib.inventory import InventoryEntry
43
53
from bzrlib.osutils import (
51
60
supports_executable,
53
62
from bzrlib.progress import ProgressPhase
54
63
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, warning
59
from bzrlib import tree
61
import bzrlib.urlutils as urlutils
64
70
ROOT_PARENT = "root-parent"
67
72
def unique_add(map, key, value):
69
74
raise DuplicateKey(key=key)
73
79
class _TransformResults(object):
74
80
def __init__(self, modified_paths, rename_count):
75
81
object.__init__(self)
380
395
return sorted(FinalPaths(self).get_paths(new_ids))
382
397
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,
398
"""Determine which trans_ids need new Inventory entries.
400
An new entry is needed when anything that would be reflected by an
401
inventory entry changes, including file name, file_id, parent file_id,
402
file kind, and the execute bit.
404
Some care is taken to return entries with real changes, not cases
405
where the value is deleted and then restored to its original value,
406
but some actually unchanged values may be returned.
408
:returns: A list of (path, trans_id) for all items requiring an
409
inventory change. Ordered by path.
412
# Find entries whose file_ids are new (or changed).
413
new_file_id = set(t for t in self._new_id
414
if self._new_id[t] != self.tree_file_id(t))
415
for id_set in [self._new_name, self._new_parent, new_file_id,
386
416
self._new_executability]:
387
new_ids.update(id_set)
417
changed_ids.update(id_set)
418
# removing implies a kind change
388
419
changed_kind = set(self._removed_contents)
389
421
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))
422
# Ignore entries that are already known to have changed.
423
changed_kind.difference_update(changed_ids)
424
# to keep only the truly changed ones
425
changed_kind = (t for t in changed_kind
426
if self.tree_kind(t) != self.final_kind(t))
427
# all kind changes will alter the inventory
428
changed_ids.update(changed_kind)
429
# To find entries with changed parent_ids, find parents which existed,
430
# but changed file_id.
431
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
432
# Now add all their children to the set.
433
for parent_trans_id in new_file_id:
434
changed_ids.update(self.iter_tree_children(parent_trans_id))
435
return sorted(FinalPaths(self).get_paths(changed_ids))
396
437
def final_kind(self, trans_id):
397
438
"""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)
440
:return: None if the file does not exist/has no contents. (It is
441
conceivable that a path would be created without the corresponding
442
contents insertion command)
403
444
if trans_id in self._new_contents:
404
445
return self._new_contents[trans_id]
405
446
elif trans_id in self._removed_contents:
406
raise NoSuchFile(None)
408
449
return self.tree_kind(trans_id)
531
572
# ensure that all children are registered with the transaction
532
573
list(self.iter_tree_children(parent_id))
575
@deprecated_method(deprecated_in((2, 3, 0)))
534
576
def has_named_child(self, by_parent, parent_id, name):
536
children = by_parent[parent_id]
539
for child in children:
577
return self._has_named_child(
578
name, parent_id, known_children=by_parent.get(parent_id, []))
580
def _has_named_child(self, name, parent_id, known_children):
581
"""Does a parent already have a name child.
583
:param name: The searched for name.
585
:param parent_id: The parent for which the check is made.
587
:param known_children: The already known children. This should have
588
been recently obtained from `self.by_parent.get(parent_id)`
589
(or will be if None is passed).
591
if known_children is None:
592
known_children = self.by_parent().get(parent_id, [])
593
for child in known_children:
540
594
if self.final_name(child) == name:
543
path = self._tree_id_paths[parent_id]
596
parent_path = self._tree_id_paths.get(parent_id, None)
597
if parent_path is None:
598
# No parent... no children
546
childpath = joinpath(path, name)
547
child_id = self._tree_path_ids.get(childpath)
600
child_path = joinpath(parent_path, name)
601
child_id = self._tree_path_ids.get(child_path, None)
548
602
if child_id is None:
549
return lexists(self._tree.abspath(childpath))
603
# Not known by the tree transform yet, check the filesystem
604
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?
606
raise AssertionError('child_id is missing: %s, %s, %s'
607
% (name, parent_id, child_id))
609
def _available_backup_name(self, name, target_id):
610
"""Find an available backup name.
612
:param name: The basename of the file.
614
:param target_id: The directory trans_id where the backup should
617
known_children = self.by_parent().get(target_id, [])
618
return osutils.available_backup_name(
620
lambda base: self._has_named_child(
621
base, target_id, known_children))
559
623
def _parent_loops(self):
560
624
"""No entry should be its own ancestor"""
644
701
if (self._new_name, self._new_parent) == ({}, {}):
646
703
for children in by_parent.itervalues():
647
name_ids = [(self.final_name(t), t) for t in children]
648
if not self._case_sensitive_target:
649
name_ids = [(n.lower(), t) for n, t in name_ids]
705
for child_tid in children:
706
name = self.final_name(child_tid)
708
# Keep children only if they still exist in the end
709
if not self._case_sensitive_target:
711
name_ids.append((name, child_tid))
652
714
last_trans_id = None
653
715
for name, trans_id in name_ids:
655
kind = self.final_kind(trans_id)
716
kind = self.final_kind(trans_id)
658
717
file_id = self.final_file_id(trans_id)
659
718
if kind is None and file_id is None:
681
740
def _parent_type_conflicts(self, by_parent):
682
"""parents must have directory 'contents'."""
741
"""Children must have a directory parent"""
684
743
for parent_id, children in by_parent.iteritems():
685
744
if parent_id is ROOT_PARENT:
687
if not self._any_contents(children):
747
for child_id in children:
748
if self.final_kind(child_id) is not None:
689
for child in children:
691
self.final_kind(child)
695
kind = self.final_kind(parent_id)
753
# There is at least a child, so we need an existing directory to
755
kind = self.final_kind(parent_id)
757
# The directory will be deleted
699
758
conflicts.append(('missing parent', parent_id))
700
759
elif kind != "directory":
760
# Meh, we need a *directory* to put something in it
701
761
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
764
def _set_executability(self, path, trans_id):
715
765
"""Set the executability of versioned files """
716
if supports_executable():
766
if self._tree._supports_executable():
717
767
new_executability = self._new_executability[trans_id]
718
768
abspath = self._tree.abspath(path)
719
769
current_mode = os.stat(abspath).st_mode
780
830
self.create_symlink(target, trans_id)
833
def new_orphan(self, trans_id, parent_id):
834
"""Schedule an item to be orphaned.
836
When a directory is about to be removed, its children, if they are not
837
versioned are moved out of the way: they don't have a parent anymore.
839
:param trans_id: The trans_id of the existing item.
840
:param parent_id: The parent trans_id of the item.
842
raise NotImplementedError(self.new_orphan)
844
def _get_potential_orphans(self, dir_id):
845
"""Find the potential orphans in a directory.
847
A directory can't be safely deleted if there are versioned files in it.
848
If all the contained files are unversioned then they can be orphaned.
850
The 'None' return value means that the directory contains at least one
851
versioned file and should not be deleted.
853
:param dir_id: The directory trans id.
855
:return: A list of the orphan trans ids or None if at least one
856
versioned file is present.
859
# Find the potential orphans, stop if one item should be kept
860
for child_tid in self.by_parent()[dir_id]:
861
if child_tid in self._removed_contents:
862
# The child is removed as part of the transform. Since it was
863
# versioned before, it's not an orphan
865
elif self.final_file_id(child_tid) is None:
866
# The child is not versioned
867
orphans.append(child_tid)
869
# We have a versioned file here, searching for orphans is
783
875
def _affected_ids(self):
784
876
"""Return the set of transform ids affected by the transform"""
785
877
trans_ids = set(self._removed_id)
928
1017
return _PreviewTree(self)
930
def commit(self, branch, message, merge_parents=None, strict=False):
1019
def commit(self, branch, message, merge_parents=None, strict=False,
1020
timestamp=None, timezone=None, committer=None, authors=None,
1021
revprops=None, revision_id=None):
931
1022
"""Commit the result of this TreeTransform to a branch.
933
1024
:param branch: The branch to commit to.
934
1025
:param message: The message to attach to the commit.
935
:param merge_parents: Additional parents specified by pending merges.
1026
:param merge_parents: Additional parent revision-ids specified by
1028
:param strict: If True, abort the commit if there are unversioned
1030
:param timestamp: if not None, seconds-since-epoch for the time and
1031
date. (May be a float.)
1032
:param timezone: Optional timezone for timestamp, as an offset in
1034
:param committer: Optional committer in email-id format.
1035
(e.g. "J Random Hacker <jrandom@example.com>")
1036
:param authors: Optional list of authors in email-id format.
1037
:param revprops: Optional dictionary of revision properties.
1038
:param revision_id: Optional revision id. (Specifying a revision-id
1039
may reduce performance for some non-native formats.)
936
1040
:return: The revision_id of the revision committed.
938
1042
self._check_malformed()
1173
1299
descendants.update(self._limbo_descendants(descendant))
1174
1300
return descendants
1176
def create_file(self, contents, trans_id, mode_id=None):
1302
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1303
"""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.
1307
:param contents: an iterator of strings, all of which will be written
1308
to the target destination.
1309
:param trans_id: TreeTransform handle
1310
:param mode_id: If not None, force the mode of the target file to match
1311
the mode of the object referenced by mode_id.
1312
Otherwise, we will try to preserve mode bits of an existing file.
1313
:param sha1: If the sha1 of this content is already known, pass it in.
1314
We can use it to prevent future sha1 computations.
1187
1316
name = self._limbo_name(trans_id)
1188
1317
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.
1319
unique_add(self._new_contents, trans_id, 'file')
1199
1320
f.writelines(contents)
1202
1323
self._set_mtime(name)
1203
1324
self._set_mode(trans_id, mode_id, S_ISREG)
1325
# It is unfortunate we have to use lstat instead of fstat, but we just
1326
# used utime and chmod on the file, so we need the accurate final
1328
if sha1 is not None:
1329
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1205
1331
def _read_file_chunks(self, trans_id):
1206
1332
cur_file = open(self._limbo_name(trans_id), 'rb')
1274
1402
del self._limbo_children_names[trans_id]
1275
1403
delete_any(self._limbo_name(trans_id))
1405
def new_orphan(self, trans_id, parent_id):
1406
# FIXME: There is no tree config, so we use the branch one (it's weird
1407
# to define it this way as orphaning can only occur in a working tree,
1408
# but that's all we have (for now). It will find the option in
1409
# locations.conf or bazaar.conf though) -- vila 20100916
1410
conf = self._tree.branch.get_config()
1411
conf_var_name = 'bzr.transform.orphan_policy'
1412
orphan_policy = conf.get_user_option(conf_var_name)
1413
default_policy = orphaning_registry.default_key
1414
if orphan_policy is None:
1415
orphan_policy = default_policy
1416
if orphan_policy not in orphaning_registry:
1417
trace.warning('%s (from %s) is not a known policy, defaulting '
1418
'to %s' % (orphan_policy, conf_var_name, default_policy))
1419
orphan_policy = default_policy
1420
handle_orphan = orphaning_registry.get(orphan_policy)
1421
handle_orphan(self, trans_id, parent_id)
1424
class OrphaningError(errors.BzrError):
1426
# Only bugs could lead to such exception being seen by the user
1427
internal_error = True
1428
_fmt = "Error while orphaning %s in %s directory"
1430
def __init__(self, orphan, parent):
1431
errors.BzrError.__init__(self)
1432
self.orphan = orphan
1433
self.parent = parent
1436
class OrphaningForbidden(OrphaningError):
1438
_fmt = "Policy: %s doesn't allow creating orphans."
1440
def __init__(self, policy):
1441
errors.BzrError.__init__(self)
1442
self.policy = policy
1445
def move_orphan(tt, orphan_id, parent_id):
1446
"""See TreeTransformBase.new_orphan.
1448
This creates a new orphan in the `bzr-orphans` dir at the root of the
1451
:param tt: The TreeTransform orphaning `trans_id`.
1453
:param orphan_id: The trans id that should be orphaned.
1455
:param parent_id: The orphan parent trans id.
1457
# Add the orphan dir if it doesn't exist
1458
orphan_dir_basename = 'bzr-orphans'
1459
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1460
if tt.final_kind(od_id) is None:
1461
tt.create_directory(od_id)
1462
parent_path = tt._tree_id_paths[parent_id]
1463
# Find a name that doesn't exist yet in the orphan dir
1464
actual_name = tt.final_name(orphan_id)
1465
new_name = tt._available_backup_name(actual_name, od_id)
1466
tt.adjust_path(new_name, od_id, orphan_id)
1467
trace.warning('%s has been orphaned in %s'
1468
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1471
def refuse_orphan(tt, orphan_id, parent_id):
1472
"""See TreeTransformBase.new_orphan.
1474
This refuses to create orphan, letting the caller handle the conflict.
1476
raise OrphaningForbidden('never')
1479
orphaning_registry = registry.Registry()
1480
orphaning_registry.register(
1481
'conflict', refuse_orphan,
1482
'Leave orphans in place and create a conflict on the directory.')
1483
orphaning_registry.register(
1484
'move', move_orphan,
1485
'Move orphans into the bzr-orphans directory.')
1486
orphaning_registry._set_default_key('conflict')
1278
1489
class TreeTransform(DiskTreeTransform):
1279
1490
"""Represent a tree transformation.
1623
1829
tree_paths = list(self._tree_path_ids.iteritems())
1624
1830
tree_paths.sort(reverse=True)
1625
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1831
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))
1833
for num, (path, trans_id) in enumerate(tree_paths):
1834
# do not attempt to move root into a subdirectory of itself.
1837
child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1838
full_path = self._tree.abspath(path)
1631
1839
if trans_id in self._removed_contents:
1632
1840
delete_path = os.path.join(self._deletiondir, trans_id)
1657
1865
modified_paths = []
1658
1866
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()
1868
child_pb = ui.ui_factory.nested_progress_bar()
1662
1870
for num, (path, trans_id) in enumerate(new_paths):
1663
1871
if (num % 10) == 0:
1664
child_pb.update('adding file', num, len(new_paths))
1872
child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1873
full_path = self._tree.abspath(path)
1666
1874
if trans_id in self._needs_rename:
1668
1876
mover.rename(self._limbo_name(trans_id), full_path)
1877
except errors.TransformRenameFailed, e:
1670
1878
# We may be renaming a dangling inventory id
1671
1879
if e.errno != errno.ENOENT:
1674
1882
self.rename_count += 1
1883
# TODO: if trans_id in self._observed_sha1s, we should
1884
# re-stat the final target, since ctime will be
1885
# updated by the change.
1675
1886
if (trans_id in self._new_contents or
1676
1887
self.path_changed(trans_id)):
1677
1888
if trans_id in self._new_contents:
1678
1889
modified_paths.append(full_path)
1679
1890
if trans_id in self._new_executability:
1680
1891
self._set_executability(path, trans_id)
1892
if trans_id in self._observed_sha1s:
1893
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1894
st = osutils.lstat(full_path)
1895
self._observed_sha1s[trans_id] = (o_sha1, st)
1682
1897
child_pb.finished()
1898
for path, trans_id in new_paths:
1899
# new_paths includes stuff like workingtree conflicts. Only the
1900
# stuff in new_contents actually comes from limbo.
1901
if trans_id in self._limbo_files:
1902
del self._limbo_files[trans_id]
1683
1903
self._new_contents.clear()
1684
1904
return modified_paths
1906
def _apply_observed_sha1s(self):
1907
"""After we have finished renaming everything, update observed sha1s
1909
This has to be done after self._tree.apply_inventory_delta, otherwise
1910
it doesn't know anything about the files we are updating. Also, we want
1911
to do this as late as possible, so that most entries end up cached.
1913
# TODO: this doesn't update the stat information for directories. So
1914
# the first 'bzr status' will still need to rewrite
1915
# .bzr/checkout/dirstate. However, we at least don't need to
1916
# re-read all of the files.
1917
# TODO: If the operation took a while, we could do a time.sleep(3) here
1918
# to allow the clock to tick over and ensure we won't have any
1919
# problems. (we could observe start time, and finish time, and if
1920
# it is less than eg 10% overhead, add a sleep call.)
1921
paths = FinalPaths(self)
1922
for trans_id, observed in self._observed_sha1s.iteritems():
1923
path = paths.get_path(trans_id)
1924
# We could get the file_id, but dirstate prefers to use the path
1925
# anyway, and it is 'cheaper' to determine.
1926
# file_id = self._new_id[trans_id]
1927
self._tree._observed_sha1(None, path, observed)
1687
1930
class TransformPreview(DiskTreeTransform):
1688
1931
"""A TreeTransform for generating preview trees.
1767
2015
yield self._get_repository().revision_tree(revision_id)
1769
2017
def _get_file_revision(self, file_id, vf, tree_revision):
1770
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2018
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2019
self._iter_parent_trees()]
1772
2020
vf.add_lines((file_id, tree_revision), parent_keys,
1773
self.get_file(file_id).readlines())
2021
self.get_file_lines(file_id))
1774
2022
repo = self._get_repository()
1775
2023
base_vf = repo.texts
1776
2024
if base_vf not in vf.fallback_versionedfiles:
1777
2025
vf.fallback_versionedfiles.append(base_vf)
1778
2026
return tree_revision
1780
def _stat_limbo_file(self, file_id):
1781
trans_id = self._transform.trans_id_file_id(file_id)
2028
def _stat_limbo_file(self, file_id=None, trans_id=None):
2029
if trans_id is None:
2030
trans_id = self._transform.trans_id_file_id(file_id)
1782
2031
name = self._transform._limbo_name(trans_id)
1783
2032
return os.lstat(name)
1998
2249
def get_file_size(self, file_id):
1999
2250
"""See Tree.get_file_size"""
2251
trans_id = self._transform.trans_id_file_id(file_id)
2252
kind = self._transform.final_kind(trans_id)
2255
if trans_id in self._transform._new_contents:
2256
return self._stat_limbo_file(trans_id=trans_id).st_size
2000
2257
if self.kind(file_id) == 'file':
2001
2258
return self._transform._tree.get_file_size(file_id)
2262
def get_file_verifier(self, file_id, path=None, stat_value=None):
2263
trans_id = self._transform.trans_id_file_id(file_id)
2264
kind = self._transform._new_contents.get(trans_id)
2266
return self._transform._tree.get_file_verifier(file_id)
2268
fileobj = self.get_file(file_id)
2270
return ("SHA1", sha_file(fileobj))
2005
2274
def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
2275
trans_id = self._transform.trans_id_file_id(file_id)
2007
2276
kind = self._transform._new_contents.get(trans_id)
2289
2564
pp.next_phase()
2290
2565
file_trans_id[wt.get_root_id()] = \
2291
2566
tt.trans_id_tree_file_id(wt.get_root_id())
2292
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2567
pb = ui.ui_factory.nested_progress_bar()
2294
2569
deferred_contents = []
2296
total = len(tree.inventory)
2571
total = len(tree.all_file_ids())
2297
2572
if delta_from_tree:
2298
2573
precomputed_delta = []
2300
2575
precomputed_delta = None
2576
# Check if tree inventory has content. If so, we populate
2577
# existing_files with the directory content. If there are no
2578
# entries we skip populating existing_files as its not used.
2579
# This improves performance and unncessary work on large
2580
# directory trees. (#501307)
2582
existing_files = set()
2583
for dir, files in wt.walkdirs():
2584
existing_files.update(f[0] for f in files)
2301
2585
for num, (tree_path, entry) in \
2302
enumerate(tree.inventory.iter_entries_by_dir()):
2303
pb.update("Building tree", num - len(deferred_contents), total)
2586
enumerate(tree.iter_entries_by_dir()):
2587
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2588
if entry.parent_id is None:
2306
2590
reparent = False
2384
2668
unchanged = dict(unchanged)
2385
2669
new_desired_files = []
2387
for file_id, (trans_id, tree_path) in desired_files:
2671
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2672
accelerator_path = unchanged.get(file_id)
2389
2673
if accelerator_path is None:
2390
new_desired_files.append((file_id, (trans_id, tree_path)))
2674
new_desired_files.append((file_id,
2675
(trans_id, tree_path, text_sha1)))
2392
pb.update('Adding file contents', count + offset, total)
2677
pb.update(gettext('Adding file contents'), count + offset, total)
2394
2679
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2411
2696
offset += count
2412
for count, ((trans_id, tree_path), contents) in enumerate(
2697
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2698
tree.iter_files_bytes(new_desired_files)):
2414
2699
if wt.supports_content_filtering():
2415
2700
filters = wt._content_filter_stack(tree_path)
2416
2701
contents = filtered_output_bytes(contents, filters,
2417
2702
ContentFilterContext(tree_path, tree))
2418
tt.create_file(contents, trans_id)
2419
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)
2422
2707
def _reparent_children(tt, old_parent, new_parent):
2423
2708
for child in tt.iter_tree_children(old_parent):
2424
2709
tt.adjust_path(tt.final_name(child), new_parent, child)
2426
2712
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2713
by_parent = tt.by_parent()
2428
2714
for child in by_parent[old_parent]:
2429
2715
tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2716
return by_parent[old_parent]
2432
2719
def _content_match(tree, entry, file_id, kind, target_path):
2433
2720
if entry.kind != kind:
2435
2722
if entry.kind == "directory":
2437
2724
if entry.kind == "file":
2438
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2725
f = file(target_path, 'rb')
2727
if tree.get_file_text(file_id) == f.read():
2440
2731
elif entry.kind == "symlink":
2441
2732
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2494
2785
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
2788
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2789
filter_tree_path=None):
2515
2790
"""Create new file contents according to tree contents.
2562
2839
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
2842
def revert(working_tree, target_tree, filenames, backups=False,
2593
2843
pb=None, change_reporter=None):
2594
2844
"""Revert a working tree's contents to those of a target tree."""
2651
2905
deferred_files = []
2652
2906
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2907
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2908
target_path, wt_path = path
2909
target_versioned, wt_versioned = versioned
2910
target_parent, wt_parent = parent
2911
target_name, wt_name = name
2912
target_kind, wt_kind = kind
2913
target_executable, wt_executable = executable
2914
if skip_root and wt_parent is None:
2656
2916
trans_id = tt.trans_id_file_id(file_id)
2658
2918
if changed_content:
2659
2919
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2920
if wt_kind == 'file' and (backups or target_kind is None):
2661
2921
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2922
if merge_modified.get(file_id) != wt_sha1:
2663
2923
# acquire the basis tree lazily to prevent the
2666
2926
if basis_tree is None:
2667
2927
basis_tree = working_tree.basis_tree()
2668
2928
basis_tree.lock_read()
2669
if file_id in basis_tree:
2929
if basis_tree.has_id(file_id):
2670
2930
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2931
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2932
elif target_kind is None and not target_versioned:
2673
2933
keep_content = True
2674
if kind[0] is not None:
2934
if wt_kind is not None:
2675
2935
if not keep_content:
2676
2936
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)
2937
elif target_kind is not None:
2938
parent_trans_id = tt.trans_id_file_id(wt_parent)
2939
backup_name = tt._available_backup_name(
2940
wt_name, parent_trans_id)
2682
2941
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):
2942
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2943
if wt_versioned and target_versioned:
2685
2944
tt.unversion_file(trans_id)
2686
2945
tt.version_file(file_id, new_trans_id)
2687
2946
# New contents should have the same unix perms as old
2689
2948
mode_id = trans_id
2690
2949
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2950
if target_kind in ('directory', 'tree-reference'):
2692
2951
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2952
if target_kind == 'tree-reference':
2694
2953
revision = target_tree.get_reference_revision(file_id,
2696
2955
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2956
elif target_kind == 'symlink':
2698
2957
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2959
elif target_kind == 'file':
2701
2960
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2961
if basis_tree is None:
2703
2962
basis_tree = working_tree.basis_tree()
2704
2963
basis_tree.lock_read()
2705
2964
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)):
2965
if (basis_tree.has_id(file_id) and
2966
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2967
if file_id in merge_modified:
2709
2968
del merge_modified[file_id]
2711
2970
merge_modified[file_id] = new_sha1
2713
2972
# 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):
2973
if keep_content and wt_executable == target_executable:
2974
tt.set_executability(target_executable, trans_id)
2975
elif target_kind is not None:
2976
raise AssertionError(target_kind)
2977
if not wt_versioned and target_versioned:
2719
2978
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2979
if wt_versioned and not target_versioned:
2721
2980
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:
2981
if (target_name is not None and
2982
(wt_name != target_name or wt_parent != target_parent)):
2983
if target_name == '' and target_parent is None:
2725
2984
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)
2986
parent_trans = tt.trans_id_file_id(target_parent)
2987
if wt_parent is None and wt_versioned:
2988
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)
2990
tt.adjust_path(target_name, parent_trans, trans_id)
2991
if wt_executable != target_executable and target_kind == "file":
2992
tt.set_executability(target_executable, trans_id)
2734
2993
if working_tree.supports_content_filtering():
2735
2994
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
2995
target_tree.iter_files_bytes(deferred_files)):
2808
3067
elif c_type == 'missing parent':
2809
3068
trans_id = conflict[1]
2811
tt.cancel_deletion(trans_id)
2812
new_conflicts.add(('deleting parent', 'Not deleting',
3069
if trans_id in tt._removed_contents:
3070
cancel_deletion = True
3071
orphans = tt._get_potential_orphans(trans_id)
3073
cancel_deletion = False
3074
# All children are orphans
3077
tt.new_orphan(o, trans_id)
3078
except OrphaningError:
3079
# Something bad happened so we cancel the directory
3080
# deletion which will leave it in place with a
3081
# conflict. The user can deal with it from there.
3082
# Note that this also catch the case where we don't
3083
# want to create orphans and leave the directory in
3085
cancel_deletion = True
3088
# Cancel the directory deletion
3089
tt.cancel_deletion(trans_id)
3090
new_conflicts.add(('deleting parent', 'Not deleting',
2817
3095
tt.final_name(trans_id)
2878
3156
modified_path = fp.get_path(conflict[2])
2879
3157
modified_id = tt.final_file_id(conflict[2])
2880
3158
if len(conflict) == 3:
2881
yield Conflict.factory(c_type, action=action, path=modified_path,
2882
file_id=modified_id)
3159
yield conflicts.Conflict.factory(
3160
c_type, action=action, path=modified_path, file_id=modified_id)
2885
3163
conflicting_path = fp.get_path(conflict[3])
2886
3164
conflicting_id = tt.final_file_id(conflict[3])
2887
yield Conflict.factory(c_type, action=action, path=modified_path,
2888
file_id=modified_id,
2889
conflict_path=conflicting_path,
2890
conflict_file_id=conflicting_id)
3165
yield conflicts.Conflict.factory(
3166
c_type, action=action, path=modified_path,
3167
file_id=modified_id,
3168
conflict_path=conflicting_path,
3169
conflict_file_id=conflicting_id)
2893
3172
class _FileMover(object):
2898
3177
self.pending_deletions = []
2900
3179
def rename(self, from_, to):
2901
"""Rename a file from one path to another. Functions like os.rename"""
3180
"""Rename a file from one path to another."""
2903
3182
os.rename(from_, to)
2904
3183
except OSError, e:
2905
3184
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3185
raise errors.FileExists(to, str(e))
3186
# normal OSError doesn't include filenames so it's hard to see where
3187
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3188
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
3189
self.past_renames.append((from_, to))
2910
3191
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
