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
21
19
from stat import S_ISREG, S_IEXEC
31
lazy_import.lazy_import(globals(), """
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
32
24
from bzrlib import (
42
33
revision as _mod_revision,
46
from bzrlib.i18n import gettext
48
from bzrlib.errors import (DuplicateKey, MalformedTransform,
49
ReusingTransform, CantMoveRoot,
50
ImmortalLimbo, NoFinalPath,
36
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
37
ReusingTransform, NotVersionedError, CantMoveRoot,
38
ExistingLimbo, ImmortalLimbo, NoFinalPath,
51
39
UnableCreateSymlink)
52
40
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
53
from bzrlib.mutabletree import MutableTree
41
from bzrlib.inventory import InventoryEntry
54
42
from bzrlib.osutils import (
62
from bzrlib.progress import ProgressPhase
52
from bzrlib.progress import DummyProgress, ProgressPhase
63
53
from bzrlib.symbol_versioning import (
57
from bzrlib.trace import mutter, warning
58
from bzrlib import tree
60
import bzrlib.urlutils as urlutils
70
63
ROOT_PARENT = "root-parent"
72
66
def unique_add(map, key, value):
74
68
raise DuplicateKey(key=key)
79
72
class _TransformResults(object):
80
73
def __init__(self, modified_paths, rename_count):
81
74
object.__init__(self)
397
379
return sorted(FinalPaths(self).get_paths(new_ids))
399
381
def _inventory_altered(self):
400
"""Determine which trans_ids need new Inventory entries.
402
An new entry is needed when anything that would be reflected by an
403
inventory entry changes, including file name, file_id, parent file_id,
404
file kind, and the execute bit.
406
Some care is taken to return entries with real changes, not cases
407
where the value is deleted and then restored to its original value,
408
but some actually unchanged values may be returned.
410
:returns: A list of (path, trans_id) for all items requiring an
411
inventory change. Ordered by path.
414
# Find entries whose file_ids are new (or changed).
415
new_file_id = set(t for t in self._new_id
416
if self._new_id[t] != self.tree_file_id(t))
417
for id_set in [self._new_name, self._new_parent, new_file_id,
382
"""Get the trans_ids and paths of files needing new inv entries."""
384
for id_set in [self._new_name, self._new_parent, self._new_id,
418
385
self._new_executability]:
419
changed_ids.update(id_set)
420
# removing implies a kind change
386
new_ids.update(id_set)
421
387
changed_kind = set(self._removed_contents)
423
388
changed_kind.intersection_update(self._new_contents)
424
# Ignore entries that are already known to have changed.
425
changed_kind.difference_update(changed_ids)
426
# to keep only the truly changed ones
427
changed_kind = (t for t in changed_kind
428
if self.tree_kind(t) != self.final_kind(t))
429
# all kind changes will alter the inventory
430
changed_ids.update(changed_kind)
431
# To find entries with changed parent_ids, find parents which existed,
432
# but changed file_id.
433
changed_file_id = set(t for t in new_file_id if t in self._removed_id)
434
# Now add all their children to the set.
435
for parent_trans_id in new_file_id:
436
changed_ids.update(self.iter_tree_children(parent_trans_id))
437
return sorted(FinalPaths(self).get_paths(changed_ids))
389
changed_kind.difference_update(new_ids)
390
changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
392
new_ids.update(changed_kind)
393
return sorted(FinalPaths(self).get_paths(new_ids))
439
395
def final_kind(self, trans_id):
440
396
"""Determine the final file kind, after any changes applied.
442
:return: None if the file does not exist/has no contents. (It is
443
conceivable that a path would be created without the corresponding
444
contents insertion command)
398
Raises NoSuchFile if the file does not exist/has no contents.
399
(It is conceivable that a path would be created without the
400
corresponding contents insertion command)
446
402
if trans_id in self._new_contents:
447
403
return self._new_contents[trans_id]
448
404
elif trans_id in self._removed_contents:
405
raise NoSuchFile(None)
451
407
return self.tree_kind(trans_id)
574
530
# ensure that all children are registered with the transaction
575
531
list(self.iter_tree_children(parent_id))
577
@deprecated_method(deprecated_in((2, 3, 0)))
578
533
def has_named_child(self, by_parent, parent_id, name):
579
return self._has_named_child(
580
name, parent_id, known_children=by_parent.get(parent_id, []))
582
def _has_named_child(self, name, parent_id, known_children):
583
"""Does a parent already have a name child.
585
:param name: The searched for name.
587
:param parent_id: The parent for which the check is made.
589
:param known_children: The already known children. This should have
590
been recently obtained from `self.by_parent.get(parent_id)`
591
(or will be if None is passed).
593
if known_children is None:
594
known_children = self.by_parent().get(parent_id, [])
595
for child in known_children:
535
children = by_parent[parent_id]
538
for child in children:
596
539
if self.final_name(child) == name:
598
parent_path = self._tree_id_paths.get(parent_id, None)
599
if parent_path is None:
600
# No parent... no children
542
path = self._tree_id_paths[parent_id]
602
child_path = joinpath(parent_path, name)
603
child_id = self._tree_path_ids.get(child_path, None)
545
childpath = joinpath(path, name)
546
child_id = self._tree_path_ids.get(childpath)
604
547
if child_id is None:
605
# Not known by the tree transform yet, check the filesystem
606
return osutils.lexists(self._tree.abspath(child_path))
548
return lexists(self._tree.abspath(childpath))
608
raise AssertionError('child_id is missing: %s, %s, %s'
609
% (name, parent_id, child_id))
611
def _available_backup_name(self, name, target_id):
612
"""Find an available backup name.
614
:param name: The basename of the file.
616
:param target_id: The directory trans_id where the backup should
619
known_children = self.by_parent().get(target_id, [])
620
return osutils.available_backup_name(
622
lambda base: self._has_named_child(
623
base, target_id, known_children))
550
if self.final_parent(child_id) != parent_id:
552
if child_id in self._removed_contents:
553
# XXX What about dangling file-ids?
625
558
def _parent_loops(self):
626
559
"""No entry should be its own ancestor"""
703
643
if (self._new_name, self._new_parent) == ({}, {}):
705
645
for children in by_parent.itervalues():
707
for child_tid in children:
708
name = self.final_name(child_tid)
710
# Keep children only if they still exist in the end
711
if not self._case_sensitive_target:
713
name_ids.append((name, child_tid))
646
name_ids = [(self.final_name(t), t) for t in children]
647
if not self._case_sensitive_target:
648
name_ids = [(n.lower(), t) for n, t in name_ids]
716
651
last_trans_id = None
717
652
for name, trans_id in name_ids:
718
kind = self.final_kind(trans_id)
654
kind = self.final_kind(trans_id)
719
657
file_id = self.final_file_id(trans_id)
720
658
if kind is None and file_id is None:
742
680
def _parent_type_conflicts(self, by_parent):
743
"""Children must have a directory parent"""
681
"""parents must have directory 'contents'."""
745
683
for parent_id, children in by_parent.iteritems():
746
if parent_id == ROOT_PARENT:
749
for child_id in children:
750
if self.final_kind(child_id) is not None:
755
# There is at least a child, so we need an existing directory to
757
kind = self.final_kind(parent_id)
684
if parent_id is ROOT_PARENT:
686
if not self._any_contents(children):
688
for child in children:
690
self.final_kind(child)
694
kind = self.final_kind(parent_id)
759
# The directory will be deleted
760
698
conflicts.append(('missing parent', parent_id))
761
699
elif kind != "directory":
762
# Meh, we need a *directory* to put something in it
763
700
conflicts.append(('non-directory parent', parent_id))
703
def _any_contents(self, trans_ids):
704
"""Return true if any of the trans_ids, will have contents."""
705
for trans_id in trans_ids:
707
kind = self.final_kind(trans_id)
766
713
def _set_executability(self, path, trans_id):
767
714
"""Set the executability of versioned files """
768
if self._tree._supports_executable():
715
if supports_executable():
769
716
new_executability = self._new_executability[trans_id]
770
717
abspath = self._tree.abspath(path)
771
718
current_mode = os.stat(abspath).st_mode
832
779
self.create_symlink(target, trans_id)
835
def new_orphan(self, trans_id, parent_id):
836
"""Schedule an item to be orphaned.
838
When a directory is about to be removed, its children, if they are not
839
versioned are moved out of the way: they don't have a parent anymore.
841
:param trans_id: The trans_id of the existing item.
842
:param parent_id: The parent trans_id of the item.
844
raise NotImplementedError(self.new_orphan)
846
def _get_potential_orphans(self, dir_id):
847
"""Find the potential orphans in a directory.
849
A directory can't be safely deleted if there are versioned files in it.
850
If all the contained files are unversioned then they can be orphaned.
852
The 'None' return value means that the directory contains at least one
853
versioned file and should not be deleted.
855
:param dir_id: The directory trans id.
857
:return: A list of the orphan trans ids or None if at least one
858
versioned file is present.
861
# Find the potential orphans, stop if one item should be kept
862
for child_tid in self.by_parent()[dir_id]:
863
if child_tid in self._removed_contents:
864
# The child is removed as part of the transform. Since it was
865
# versioned before, it's not an orphan
867
elif self.final_file_id(child_tid) is None:
868
# The child is not versioned
869
orphans.append(child_tid)
871
# We have a versioned file here, searching for orphans is
877
782
def _affected_ids(self):
878
783
"""Return the set of transform ids affected by the transform"""
879
784
trans_ids = set(self._removed_id)
1019
927
return _PreviewTree(self)
1021
def commit(self, branch, message, merge_parents=None, strict=False,
1022
timestamp=None, timezone=None, committer=None, authors=None,
1023
revprops=None, revision_id=None):
929
def commit(self, branch, message, merge_parents=None, strict=False):
1024
930
"""Commit the result of this TreeTransform to a branch.
1026
932
:param branch: The branch to commit to.
1027
933
:param message: The message to attach to the commit.
1028
:param merge_parents: Additional parent revision-ids specified by
1030
:param strict: If True, abort the commit if there are unversioned
1032
:param timestamp: if not None, seconds-since-epoch for the time and
1033
date. (May be a float.)
1034
:param timezone: Optional timezone for timestamp, as an offset in
1036
:param committer: Optional committer in email-id format.
1037
(e.g. "J Random Hacker <jrandom@example.com>")
1038
:param authors: Optional list of authors in email-id format.
1039
:param revprops: Optional dictionary of revision properties.
1040
:param revision_id: Optional revision id. (Specifying a revision-id
1041
may reduce performance for some non-native formats.)
934
:param merge_parents: Additional parents specified by pending merges.
1042
935
:return: The revision_id of the revision committed.
1044
937
self._check_malformed()
1301
1172
descendants.update(self._limbo_descendants(descendant))
1302
1173
return descendants
1304
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1175
def create_file(self, contents, trans_id, mode_id=None):
1305
1176
"""Schedule creation of a new file.
1309
:param contents: an iterator of strings, all of which will be written
1310
to the target destination.
1311
:param trans_id: TreeTransform handle
1312
:param mode_id: If not None, force the mode of the target file to match
1313
the mode of the object referenced by mode_id.
1314
Otherwise, we will try to preserve mode bits of an existing file.
1315
:param sha1: If the sha1 of this content is already known, pass it in.
1316
We can use it to prevent future sha1 computations.
1180
Contents is an iterator of strings, all of which will be written
1181
to the target destination.
1183
New file takes the permissions of any existing file with that id,
1184
unless mode_id is specified.
1318
1186
name = self._limbo_name(trans_id)
1319
1187
f = open(name, 'wb')
1321
unique_add(self._new_contents, trans_id, 'file')
1190
unique_add(self._new_contents, trans_id, 'file')
1192
# Clean up the file, it never got registered so
1193
# TreeTransform.finalize() won't clean it up.
1322
1198
f.writelines(contents)
1325
1201
self._set_mtime(name)
1326
1202
self._set_mode(trans_id, mode_id, S_ISREG)
1327
# It is unfortunate we have to use lstat instead of fstat, but we just
1328
# used utime and chmod on the file, so we need the accurate final
1330
if sha1 is not None:
1331
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1333
1204
def _read_file_chunks(self, trans_id):
1334
1205
cur_file = open(self._limbo_name(trans_id), 'rb')
1404
1273
del self._limbo_children_names[trans_id]
1405
1274
delete_any(self._limbo_name(trans_id))
1407
def new_orphan(self, trans_id, parent_id):
1408
# FIXME: There is no tree config, so we use the branch one (it's weird
1409
# to define it this way as orphaning can only occur in a working tree,
1410
# but that's all we have (for now). It will find the option in
1411
# locations.conf or bazaar.conf though) -- vila 20100916
1412
conf = self._tree.branch.get_config()
1413
conf_var_name = 'bzr.transform.orphan_policy'
1414
orphan_policy = conf.get_user_option(conf_var_name)
1415
default_policy = orphaning_registry.default_key
1416
if orphan_policy is None:
1417
orphan_policy = default_policy
1418
if orphan_policy not in orphaning_registry:
1419
trace.warning('%s (from %s) is not a known policy, defaulting '
1420
'to %s' % (orphan_policy, conf_var_name, default_policy))
1421
orphan_policy = default_policy
1422
handle_orphan = orphaning_registry.get(orphan_policy)
1423
handle_orphan(self, trans_id, parent_id)
1426
class OrphaningError(errors.BzrError):
1428
# Only bugs could lead to such exception being seen by the user
1429
internal_error = True
1430
_fmt = "Error while orphaning %s in %s directory"
1432
def __init__(self, orphan, parent):
1433
errors.BzrError.__init__(self)
1434
self.orphan = orphan
1435
self.parent = parent
1438
class OrphaningForbidden(OrphaningError):
1440
_fmt = "Policy: %s doesn't allow creating orphans."
1442
def __init__(self, policy):
1443
errors.BzrError.__init__(self)
1444
self.policy = policy
1447
def move_orphan(tt, orphan_id, parent_id):
1448
"""See TreeTransformBase.new_orphan.
1450
This creates a new orphan in the `bzr-orphans` dir at the root of the
1453
:param tt: The TreeTransform orphaning `trans_id`.
1455
:param orphan_id: The trans id that should be orphaned.
1457
:param parent_id: The orphan parent trans id.
1459
# Add the orphan dir if it doesn't exist
1460
orphan_dir_basename = 'bzr-orphans'
1461
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1462
if tt.final_kind(od_id) is None:
1463
tt.create_directory(od_id)
1464
parent_path = tt._tree_id_paths[parent_id]
1465
# Find a name that doesn't exist yet in the orphan dir
1466
actual_name = tt.final_name(orphan_id)
1467
new_name = tt._available_backup_name(actual_name, od_id)
1468
tt.adjust_path(new_name, od_id, orphan_id)
1469
trace.warning('%s has been orphaned in %s'
1470
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1473
def refuse_orphan(tt, orphan_id, parent_id):
1474
"""See TreeTransformBase.new_orphan.
1476
This refuses to create orphan, letting the caller handle the conflict.
1478
raise OrphaningForbidden('never')
1481
orphaning_registry = registry.Registry()
1482
orphaning_registry.register(
1483
'conflict', refuse_orphan,
1484
'Leave orphans in place and create a conflict on the directory.')
1485
orphaning_registry.register(
1486
'move', move_orphan,
1487
'Move orphans into the bzr-orphans directory.')
1488
orphaning_registry._set_default_key('conflict')
1491
1277
class TreeTransform(DiskTreeTransform):
1492
1278
"""Represent a tree transformation.
1833
1622
tree_paths = list(self._tree_path_ids.iteritems())
1834
1623
tree_paths.sort(reverse=True)
1835
child_pb = ui.ui_factory.nested_progress_bar()
1624
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1837
for num, (path, trans_id) in enumerate(tree_paths):
1838
# do not attempt to move root into a subdirectory of itself.
1841
child_pb.update(gettext('removing file'), num, len(tree_paths))
1626
for num, data in enumerate(tree_paths):
1627
path, trans_id = data
1628
child_pb.update('removing file', num, len(tree_paths))
1842
1629
full_path = self._tree.abspath(path)
1843
1630
if trans_id in self._removed_contents:
1844
1631
delete_path = os.path.join(self._deletiondir, trans_id)
1869
1656
modified_paths = []
1870
1657
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1872
child_pb = ui.ui_factory.nested_progress_bar()
1659
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1874
1661
for num, (path, trans_id) in enumerate(new_paths):
1875
1662
if (num % 10) == 0:
1876
child_pb.update(gettext('adding file'), num, len(new_paths))
1663
child_pb.update('adding file', num, len(new_paths))
1877
1664
full_path = self._tree.abspath(path)
1878
1665
if trans_id in self._needs_rename:
1880
1667
mover.rename(self._limbo_name(trans_id), full_path)
1881
except errors.TransformRenameFailed, e:
1882
1669
# We may be renaming a dangling inventory id
1883
1670
if e.errno != errno.ENOENT:
1886
1673
self.rename_count += 1
1887
# TODO: if trans_id in self._observed_sha1s, we should
1888
# re-stat the final target, since ctime will be
1889
# updated by the change.
1890
1674
if (trans_id in self._new_contents or
1891
1675
self.path_changed(trans_id)):
1892
1676
if trans_id in self._new_contents:
1893
1677
modified_paths.append(full_path)
1894
1678
if trans_id in self._new_executability:
1895
1679
self._set_executability(path, trans_id)
1896
if trans_id in self._observed_sha1s:
1897
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1898
st = osutils.lstat(full_path)
1899
self._observed_sha1s[trans_id] = (o_sha1, st)
1901
1681
child_pb.finished()
1902
for path, trans_id in new_paths:
1903
# new_paths includes stuff like workingtree conflicts. Only the
1904
# stuff in new_contents actually comes from limbo.
1905
if trans_id in self._limbo_files:
1906
del self._limbo_files[trans_id]
1907
1682
self._new_contents.clear()
1908
1683
return modified_paths
1910
def _apply_observed_sha1s(self):
1911
"""After we have finished renaming everything, update observed sha1s
1913
This has to be done after self._tree.apply_inventory_delta, otherwise
1914
it doesn't know anything about the files we are updating. Also, we want
1915
to do this as late as possible, so that most entries end up cached.
1917
# TODO: this doesn't update the stat information for directories. So
1918
# the first 'bzr status' will still need to rewrite
1919
# .bzr/checkout/dirstate. However, we at least don't need to
1920
# re-read all of the files.
1921
# TODO: If the operation took a while, we could do a time.sleep(3) here
1922
# to allow the clock to tick over and ensure we won't have any
1923
# problems. (we could observe start time, and finish time, and if
1924
# it is less than eg 10% overhead, add a sleep call.)
1925
paths = FinalPaths(self)
1926
for trans_id, observed in self._observed_sha1s.iteritems():
1927
path = paths.get_path(trans_id)
1928
# We could get the file_id, but dirstate prefers to use the path
1929
# anyway, and it is 'cheaper' to determine.
1930
# file_id = self._new_id[trans_id]
1931
self._tree._observed_sha1(None, path, observed)
1934
1686
class TransformPreview(DiskTreeTransform):
1935
1687
"""A TreeTransform for generating preview trees.
2019
1766
yield self._get_repository().revision_tree(revision_id)
2021
1768
def _get_file_revision(self, file_id, vf, tree_revision):
2022
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1769
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2023
1770
self._iter_parent_trees()]
2024
1771
vf.add_lines((file_id, tree_revision), parent_keys,
2025
self.get_file_lines(file_id))
1772
self.get_file(file_id).readlines())
2026
1773
repo = self._get_repository()
2027
1774
base_vf = repo.texts
2028
1775
if base_vf not in vf.fallback_versionedfiles:
2029
1776
vf.fallback_versionedfiles.append(base_vf)
2030
1777
return tree_revision
2032
def _stat_limbo_file(self, file_id=None, trans_id=None):
2033
if trans_id is None:
2034
trans_id = self._transform.trans_id_file_id(file_id)
1779
def _stat_limbo_file(self, file_id):
1780
trans_id = self._transform.trans_id_file_id(file_id)
2035
1781
name = self._transform._limbo_name(trans_id)
2036
1782
return os.lstat(name)
2253
1997
def get_file_size(self, file_id):
2254
1998
"""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
2261
1999
if self.kind(file_id) == 'file':
2262
2000
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))
2278
2004
def get_file_sha1(self, file_id, path=None, stat_value=None):
2279
2005
trans_id = self._transform.trans_id_file_id(file_id)
2280
2006
kind = self._transform._new_contents.get(trans_id)
2568
2288
pp.next_phase()
2569
2289
file_trans_id[wt.get_root_id()] = \
2570
2290
tt.trans_id_tree_file_id(wt.get_root_id())
2571
pb = ui.ui_factory.nested_progress_bar()
2291
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2573
2293
deferred_contents = []
2575
total = len(tree.all_file_ids())
2295
total = len(tree.inventory)
2576
2296
if delta_from_tree:
2577
2297
precomputed_delta = []
2579
2299
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)
2589
2300
for num, (tree_path, entry) in \
2590
enumerate(tree.iter_entries_by_dir()):
2591
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2301
enumerate(tree.inventory.iter_entries_by_dir()):
2302
pb.update("Building tree", num - len(deferred_contents), total)
2592
2303
if entry.parent_id is None:
2594
2305
reparent = False
2672
2383
unchanged = dict(unchanged)
2673
2384
new_desired_files = []
2675
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2386
for file_id, (trans_id, tree_path) in desired_files:
2676
2387
accelerator_path = unchanged.get(file_id)
2677
2388
if accelerator_path is None:
2678
new_desired_files.append((file_id,
2679
(trans_id, tree_path, text_sha1)))
2389
new_desired_files.append((file_id, (trans_id, tree_path)))
2681
pb.update(gettext('Adding file contents'), count + offset, total)
2391
pb.update('Adding file contents', count + offset, total)
2683
2393
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2700
2410
offset += count
2701
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2411
for count, ((trans_id, tree_path), contents) in enumerate(
2702
2412
tree.iter_files_bytes(new_desired_files)):
2703
2413
if wt.supports_content_filtering():
2704
2414
filters = wt._content_filter_stack(tree_path)
2705
2415
contents = filtered_output_bytes(contents, filters,
2706
2416
ContentFilterContext(tree_path, tree))
2707
tt.create_file(contents, trans_id, sha1=text_sha1)
2708
pb.update(gettext('Adding file contents'), count + offset, total)
2417
tt.create_file(contents, trans_id)
2418
pb.update('Adding file contents', count + offset, total)
2711
2421
def _reparent_children(tt, old_parent, new_parent):
2712
2422
for child in tt.iter_tree_children(old_parent):
2713
2423
tt.adjust_path(tt.final_name(child), new_parent, child)
2716
2425
def _reparent_transform_children(tt, old_parent, new_parent):
2717
2426
by_parent = tt.by_parent()
2718
2427
for child in by_parent[old_parent]:
2719
2428
tt.adjust_path(tt.final_name(child), new_parent, child)
2720
2429
return by_parent[old_parent]
2723
2431
def _content_match(tree, entry, file_id, kind, target_path):
2724
2432
if entry.kind != kind:
2726
2434
if entry.kind == "directory":
2728
2436
if entry.kind == "file":
2729
f = file(target_path, 'rb')
2731
if tree.get_file_text(file_id) == f.read():
2437
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2735
2439
elif entry.kind == "symlink":
2736
2440
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2789
2493
raise errors.BadFileKindError(name, kind)
2496
@deprecated_function(deprecated_in((1, 9, 0)))
2497
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2498
"""Create new file contents according to an inventory entry.
2500
DEPRECATED. Use create_from_tree instead.
2502
if entry.kind == "file":
2504
lines = tree.get_file(entry.file_id).readlines()
2505
tt.create_file(lines, trans_id, mode_id=mode_id)
2506
elif entry.kind == "symlink":
2507
tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2508
elif entry.kind == "directory":
2509
tt.create_directory(trans_id)
2792
2512
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2793
2513
filter_tree_path=None):
2794
2514
"""Create new file contents according to tree contents.
2843
2561
return new_name
2564
def _entry_changes(file_id, entry, working_tree):
2565
"""Determine in which ways the inventory entry has changed.
2567
Returns booleans: has_contents, content_mod, meta_mod
2568
has_contents means there are currently contents, but they differ
2569
contents_mod means contents need to be modified
2570
meta_mod means the metadata needs to be modified
2572
cur_entry = working_tree.inventory[file_id]
2574
working_kind = working_tree.kind(file_id)
2577
has_contents = False
2580
if has_contents is True:
2581
if entry.kind != working_kind:
2582
contents_mod, meta_mod = True, False
2584
cur_entry._read_tree_state(working_tree.id2path(file_id),
2586
contents_mod, meta_mod = entry.detect_changes(cur_entry)
2587
cur_entry._forget_tree_state()
2588
return has_contents, contents_mod, meta_mod
2846
2591
def revert(working_tree, target_tree, filenames, backups=False,
2847
pb=None, change_reporter=None):
2592
pb=DummyProgress(), change_reporter=None):
2848
2593
"""Revert a working tree's contents to those of a target tree."""
2849
2594
target_tree.lock_read()
2850
pb = ui.ui_factory.nested_progress_bar()
2851
2595
tt = TreeTransform(working_tree, pb)
2853
2597
pp = ProgressPhase("Revert phase", 3, pb)
2909
2651
deferred_files = []
2910
2652
for id_num, (file_id, path, changed_content, versioned, parent, name,
2911
2653
kind, executable) in enumerate(change_list):
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:
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2920
2656
trans_id = tt.trans_id_file_id(file_id)
2922
2658
if changed_content:
2923
2659
keep_content = False
2924
if wt_kind == 'file' and (backups or target_kind is None):
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2925
2661
wt_sha1 = working_tree.get_file_sha1(file_id)
2926
2662
if merge_modified.get(file_id) != wt_sha1:
2927
2663
# acquire the basis tree lazily to prevent the
2930
2666
if basis_tree is None:
2931
2667
basis_tree = working_tree.basis_tree()
2932
2668
basis_tree.lock_read()
2933
if basis_tree.has_id(file_id):
2669
if file_id in basis_tree:
2934
2670
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2935
2671
keep_content = True
2936
elif target_kind is None and not target_versioned:
2672
elif kind[1] is None and not versioned[1]:
2937
2673
keep_content = True
2938
if wt_kind is not None:
2674
if kind[0] is not None:
2939
2675
if not keep_content:
2940
2676
tt.delete_contents(trans_id)
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)
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)
2945
2682
tt.adjust_path(backup_name, parent_trans_id, trans_id)
2946
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2947
if wt_versioned and target_versioned:
2683
new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
if versioned == (True, True):
2948
2685
tt.unversion_file(trans_id)
2949
2686
tt.version_file(file_id, new_trans_id)
2950
2687
# New contents should have the same unix perms as old
2952
2689
mode_id = trans_id
2953
2690
trans_id = new_trans_id
2954
if target_kind in ('directory', 'tree-reference'):
2691
if kind[1] in ('directory', 'tree-reference'):
2955
2692
tt.create_directory(trans_id)
2956
if target_kind == 'tree-reference':
2693
if kind[1] == 'tree-reference':
2957
2694
revision = target_tree.get_reference_revision(file_id,
2959
2696
tt.set_tree_reference(revision, trans_id)
2960
elif target_kind == 'symlink':
2697
elif kind[1] == 'symlink':
2961
2698
tt.create_symlink(target_tree.get_symlink_target(file_id),
2963
elif target_kind == 'file':
2700
elif kind[1] == 'file':
2964
2701
deferred_files.append((file_id, (trans_id, mode_id)))
2965
2702
if basis_tree is None:
2966
2703
basis_tree = working_tree.basis_tree()
2967
2704
basis_tree.lock_read()
2968
2705
new_sha1 = target_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)):
2706
if (file_id in basis_tree and new_sha1 ==
2707
basis_tree.get_file_sha1(file_id)):
2971
2708
if file_id in merge_modified:
2972
2709
del merge_modified[file_id]
2974
2711
merge_modified[file_id] = new_sha1
2976
2713
# preserve the execute bit when backing up
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:
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):
2982
2719
tt.version_file(file_id, trans_id)
2983
if wt_versioned and not target_versioned:
2720
if versioned == (True, False):
2984
2721
tt.unversion_file(trans_id)
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:
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:
2988
2725
parent_trans = ROOT_PARENT
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)
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)
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)
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)
2997
2734
if working_tree.supports_content_filtering():
2998
2735
for index, ((trans_id, mode_id), bytes) in enumerate(
2999
2736
target_tree.iter_files_bytes(deferred_files)):
3017
2754
return merge_modified
3020
def resolve_conflicts(tt, pb=None, pass_func=None):
2757
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
3021
2758
"""Make many conflict-resolution attempts, but die if they fail"""
3022
2759
if pass_func is None:
3023
2760
pass_func = conflict_pass
3024
2761
new_conflicts = set()
3025
pb = ui.ui_factory.nested_progress_bar()
3027
2763
for n in range(10):
3028
pb.update(gettext('Resolution pass'), n+1, 10)
2764
pb.update('Resolution pass', n+1, 10)
3029
2765
conflicts = tt.find_conflicts()
3030
2766
if len(conflicts) == 0:
3031
2767
return new_conflicts
3032
2768
new_conflicts.update(pass_func(tt, conflicts))
3033
2769
raise MalformedTransform(conflicts=conflicts)
3038
2774
def conflict_pass(tt, conflicts, path_tree=None):
3071
2807
elif c_type == 'missing parent':
3072
2808
trans_id = conflict[1]
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',
2810
tt.cancel_deletion(trans_id)
2811
new_conflicts.add(('deleting parent', 'Not deleting',
3099
2816
tt.final_name(trans_id)
3160
2877
modified_path = fp.get_path(conflict[2])
3161
2878
modified_id = tt.final_file_id(conflict[2])
3162
2879
if len(conflict) == 3:
3163
yield conflicts.Conflict.factory(
3164
c_type, action=action, path=modified_path, file_id=modified_id)
2880
yield Conflict.factory(c_type, action=action, path=modified_path,
2881
file_id=modified_id)
3167
2884
conflicting_path = fp.get_path(conflict[3])
3168
2885
conflicting_id = tt.final_file_id(conflict[3])
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)
2886
yield Conflict.factory(c_type, action=action, path=modified_path,
2887
file_id=modified_id,
2888
conflict_path=conflicting_path,
2889
conflict_file_id=conflicting_id)
3176
2892
class _FileMover(object):
3181
2897
self.pending_deletions = []
3183
2899
def rename(self, from_, to):
3184
"""Rename a file from one path to another."""
2900
"""Rename a file from one path to another. Functions like os.rename"""
3186
2902
os.rename(from_, to)
3187
2903
except OSError, e:
3188
2904
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3189
2905
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)
3193
2907
self.past_renames.append((from_, to))
3195
2909
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
