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
36
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
37
ReusingTransform, NotVersionedError, CantMoveRoot,
38
ExistingLimbo, ImmortalLimbo, NoFinalPath,
49
from bzrlib.errors import (DuplicateKey, MalformedTransform,
50
ReusingTransform, CantMoveRoot,
51
ImmortalLimbo, NoFinalPath,
39
52
UnableCreateSymlink)
40
53
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
41
from bzrlib.inventory import InventoryEntry
54
from bzrlib.mutabletree import MutableTree
42
55
from bzrlib.osutils import (
52
from bzrlib.progress import DummyProgress, ProgressPhase
63
from bzrlib.progress import ProgressPhase
53
64
from bzrlib.symbol_versioning import (
57
from bzrlib.trace import mutter, warning
58
from bzrlib import tree
60
import bzrlib.urlutils as urlutils
63
71
ROOT_PARENT = "root-parent"
66
73
def unique_add(map, key, value):
68
75
raise DuplicateKey(key=key)
72
80
class _TransformResults(object):
73
81
def __init__(self, modified_paths, rename_count):
74
82
object.__init__(self)
379
398
return sorted(FinalPaths(self).get_paths(new_ids))
381
400
def _inventory_altered(self):
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,
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,
385
419
self._new_executability]:
386
new_ids.update(id_set)
420
changed_ids.update(id_set)
421
# removing implies a kind change
387
422
changed_kind = set(self._removed_contents)
388
424
changed_kind.intersection_update(self._new_contents)
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))
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))
395
440
def final_kind(self, trans_id):
396
441
"""Determine the final file kind, after any changes applied.
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)
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)
402
447
if trans_id in self._new_contents:
403
448
return self._new_contents[trans_id]
404
449
elif trans_id in self._removed_contents:
405
raise NoSuchFile(None)
407
452
return self.tree_kind(trans_id)
530
575
# ensure that all children are registered with the transaction
531
576
list(self.iter_tree_children(parent_id))
533
def has_named_child(self, by_parent, parent_id, name):
535
children = by_parent[parent_id]
538
for child in children:
578
def _has_named_child(self, name, parent_id, known_children):
579
"""Does a parent already have a name child.
581
:param name: The searched for name.
583
:param parent_id: The parent for which the check is made.
585
:param known_children: The already known children. This should have
586
been recently obtained from `self.by_parent.get(parent_id)`
587
(or will be if None is passed).
589
if known_children is None:
590
known_children = self.by_parent().get(parent_id, [])
591
for child in known_children:
539
592
if self.final_name(child) == name:
542
path = self._tree_id_paths[parent_id]
594
parent_path = self._tree_id_paths.get(parent_id, None)
595
if parent_path is None:
596
# No parent... no children
545
childpath = joinpath(path, name)
546
child_id = self._tree_path_ids.get(childpath)
598
child_path = joinpath(parent_path, name)
599
child_id = self._tree_path_ids.get(child_path, None)
547
600
if child_id is None:
548
return lexists(self._tree.abspath(childpath))
601
# Not known by the tree transform yet, check the filesystem
602
return osutils.lexists(self._tree.abspath(child_path))
550
if self.final_parent(child_id) != parent_id:
552
if child_id in self._removed_contents:
553
# XXX What about dangling file-ids?
604
raise AssertionError('child_id is missing: %s, %s, %s'
605
% (name, parent_id, child_id))
607
def _available_backup_name(self, name, target_id):
608
"""Find an available backup name.
610
:param name: The basename of the file.
612
:param target_id: The directory trans_id where the backup should
615
known_children = self.by_parent().get(target_id, [])
616
return osutils.available_backup_name(
618
lambda base: self._has_named_child(
619
base, target_id, known_children))
558
621
def _parent_loops(self):
559
622
"""No entry should be its own ancestor"""
643
699
if (self._new_name, self._new_parent) == ({}, {}):
645
701
for children in by_parent.itervalues():
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]
703
for child_tid in children:
704
name = self.final_name(child_tid)
706
# Keep children only if they still exist in the end
707
if not self._case_sensitive_target:
709
name_ids.append((name, child_tid))
651
712
last_trans_id = None
652
713
for name, trans_id in name_ids:
654
kind = self.final_kind(trans_id)
714
kind = self.final_kind(trans_id)
657
715
file_id = self.final_file_id(trans_id)
658
716
if kind is None and file_id is None:
680
738
def _parent_type_conflicts(self, by_parent):
681
"""parents must have directory 'contents'."""
739
"""Children must have a directory parent"""
683
741
for parent_id, children in by_parent.iteritems():
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)
742
if parent_id == ROOT_PARENT:
745
for child_id in children:
746
if self.final_kind(child_id) is not None:
751
# There is at least a child, so we need an existing directory to
753
kind = self.final_kind(parent_id)
755
# The directory will be deleted
698
756
conflicts.append(('missing parent', parent_id))
699
757
elif kind != "directory":
758
# Meh, we need a *directory* to put something in it
700
759
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)
713
762
def _set_executability(self, path, trans_id):
714
763
"""Set the executability of versioned files """
715
if supports_executable():
764
if self._tree._supports_executable():
716
765
new_executability = self._new_executability[trans_id]
717
766
abspath = self._tree.abspath(path)
718
767
current_mode = os.stat(abspath).st_mode
779
828
self.create_symlink(target, trans_id)
831
def new_orphan(self, trans_id, parent_id):
832
"""Schedule an item to be orphaned.
834
When a directory is about to be removed, its children, if they are not
835
versioned are moved out of the way: they don't have a parent anymore.
837
:param trans_id: The trans_id of the existing item.
838
:param parent_id: The parent trans_id of the item.
840
raise NotImplementedError(self.new_orphan)
842
def _get_potential_orphans(self, dir_id):
843
"""Find the potential orphans in a directory.
845
A directory can't be safely deleted if there are versioned files in it.
846
If all the contained files are unversioned then they can be orphaned.
848
The 'None' return value means that the directory contains at least one
849
versioned file and should not be deleted.
851
:param dir_id: The directory trans id.
853
:return: A list of the orphan trans ids or None if at least one
854
versioned file is present.
857
# Find the potential orphans, stop if one item should be kept
858
for child_tid in self.by_parent()[dir_id]:
859
if child_tid in self._removed_contents:
860
# The child is removed as part of the transform. Since it was
861
# versioned before, it's not an orphan
863
elif self.final_file_id(child_tid) is None:
864
# The child is not versioned
865
orphans.append(child_tid)
867
# We have a versioned file here, searching for orphans is
782
873
def _affected_ids(self):
783
874
"""Return the set of transform ids affected by the transform"""
784
875
trans_ids = set(self._removed_id)
927
1015
return _PreviewTree(self)
929
def commit(self, branch, message, merge_parents=None, strict=False):
1017
def commit(self, branch, message, merge_parents=None, strict=False,
1018
timestamp=None, timezone=None, committer=None, authors=None,
1019
revprops=None, revision_id=None):
930
1020
"""Commit the result of this TreeTransform to a branch.
932
1022
:param branch: The branch to commit to.
933
1023
:param message: The message to attach to the commit.
934
:param merge_parents: Additional parents specified by pending merges.
1024
:param merge_parents: Additional parent revision-ids specified by
1026
:param strict: If True, abort the commit if there are unversioned
1028
:param timestamp: if not None, seconds-since-epoch for the time and
1029
date. (May be a float.)
1030
:param timezone: Optional timezone for timestamp, as an offset in
1032
:param committer: Optional committer in email-id format.
1033
(e.g. "J Random Hacker <jrandom@example.com>")
1034
:param authors: Optional list of authors in email-id format.
1035
:param revprops: Optional dictionary of revision properties.
1036
:param revision_id: Optional revision id. (Specifying a revision-id
1037
may reduce performance for some non-native formats.)
935
1038
:return: The revision_id of the revision committed.
937
1040
self._check_malformed()
1172
1297
descendants.update(self._limbo_descendants(descendant))
1173
1298
return descendants
1175
def create_file(self, contents, trans_id, mode_id=None):
1300
def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1176
1301
"""Schedule creation of a new file.
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.
1305
:param contents: an iterator of strings, all of which will be written
1306
to the target destination.
1307
:param trans_id: TreeTransform handle
1308
:param mode_id: If not None, force the mode of the target file to match
1309
the mode of the object referenced by mode_id.
1310
Otherwise, we will try to preserve mode bits of an existing file.
1311
:param sha1: If the sha1 of this content is already known, pass it in.
1312
We can use it to prevent future sha1 computations.
1186
1314
name = self._limbo_name(trans_id)
1187
1315
f = open(name, 'wb')
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.
1317
unique_add(self._new_contents, trans_id, 'file')
1198
1318
f.writelines(contents)
1201
1321
self._set_mtime(name)
1202
1322
self._set_mode(trans_id, mode_id, S_ISREG)
1323
# It is unfortunate we have to use lstat instead of fstat, but we just
1324
# used utime and chmod on the file, so we need the accurate final
1326
if sha1 is not None:
1327
self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1204
1329
def _read_file_chunks(self, trans_id):
1205
1330
cur_file = open(self._limbo_name(trans_id), 'rb')
1273
1400
del self._limbo_children_names[trans_id]
1274
1401
delete_any(self._limbo_name(trans_id))
1403
def new_orphan(self, trans_id, parent_id):
1404
conf = self._tree.get_config_stack()
1405
handle_orphan = conf.get('bzr.transform.orphan_policy')
1406
handle_orphan(self, trans_id, parent_id)
1409
class OrphaningError(errors.BzrError):
1411
# Only bugs could lead to such exception being seen by the user
1412
internal_error = True
1413
_fmt = "Error while orphaning %s in %s directory"
1415
def __init__(self, orphan, parent):
1416
errors.BzrError.__init__(self)
1417
self.orphan = orphan
1418
self.parent = parent
1421
class OrphaningForbidden(OrphaningError):
1423
_fmt = "Policy: %s doesn't allow creating orphans."
1425
def __init__(self, policy):
1426
errors.BzrError.__init__(self)
1427
self.policy = policy
1430
def move_orphan(tt, orphan_id, parent_id):
1431
"""See TreeTransformBase.new_orphan.
1433
This creates a new orphan in the `bzr-orphans` dir at the root of the
1436
:param tt: The TreeTransform orphaning `trans_id`.
1438
:param orphan_id: The trans id that should be orphaned.
1440
:param parent_id: The orphan parent trans id.
1442
# Add the orphan dir if it doesn't exist
1443
orphan_dir_basename = 'bzr-orphans'
1444
od_id = tt.trans_id_tree_path(orphan_dir_basename)
1445
if tt.final_kind(od_id) is None:
1446
tt.create_directory(od_id)
1447
parent_path = tt._tree_id_paths[parent_id]
1448
# Find a name that doesn't exist yet in the orphan dir
1449
actual_name = tt.final_name(orphan_id)
1450
new_name = tt._available_backup_name(actual_name, od_id)
1451
tt.adjust_path(new_name, od_id, orphan_id)
1452
trace.warning('%s has been orphaned in %s'
1453
% (joinpath(parent_path, actual_name), orphan_dir_basename))
1456
def refuse_orphan(tt, orphan_id, parent_id):
1457
"""See TreeTransformBase.new_orphan.
1459
This refuses to create orphan, letting the caller handle the conflict.
1461
raise OrphaningForbidden('never')
1464
orphaning_registry = registry.Registry()
1465
orphaning_registry.register(
1466
'conflict', refuse_orphan,
1467
'Leave orphans in place and create a conflict on the directory.')
1468
orphaning_registry.register(
1469
'move', move_orphan,
1470
'Move orphans into the bzr-orphans directory.')
1471
orphaning_registry._set_default_key('conflict')
1474
opt_transform_orphan = _mod_config.RegistryOption(
1475
'bzr.transform.orphan_policy', orphaning_registry,
1476
help='Policy for orphaned files during transform operations.',
1277
1480
class TreeTransform(DiskTreeTransform):
1278
1481
"""Represent a tree transformation.
1622
1822
tree_paths = list(self._tree_path_ids.iteritems())
1623
1823
tree_paths.sort(reverse=True)
1624
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1824
child_pb = ui.ui_factory.nested_progress_bar()
1626
for num, data in enumerate(tree_paths):
1627
path, trans_id = data
1628
child_pb.update('removing file', num, len(tree_paths))
1826
for num, (path, trans_id) in enumerate(tree_paths):
1827
# do not attempt to move root into a subdirectory of itself.
1830
child_pb.update(gettext('removing file'), num, len(tree_paths))
1629
1831
full_path = self._tree.abspath(path)
1630
1832
if trans_id in self._removed_contents:
1631
1833
delete_path = os.path.join(self._deletiondir, trans_id)
1656
1858
modified_paths = []
1657
1859
new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1659
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1861
child_pb = ui.ui_factory.nested_progress_bar()
1661
1863
for num, (path, trans_id) in enumerate(new_paths):
1662
1864
if (num % 10) == 0:
1663
child_pb.update('adding file', num, len(new_paths))
1865
child_pb.update(gettext('adding file'), num, len(new_paths))
1664
1866
full_path = self._tree.abspath(path)
1665
1867
if trans_id in self._needs_rename:
1667
1869
mover.rename(self._limbo_name(trans_id), full_path)
1870
except errors.TransformRenameFailed, e:
1669
1871
# We may be renaming a dangling inventory id
1670
1872
if e.errno != errno.ENOENT:
1673
1875
self.rename_count += 1
1876
# TODO: if trans_id in self._observed_sha1s, we should
1877
# re-stat the final target, since ctime will be
1878
# updated by the change.
1674
1879
if (trans_id in self._new_contents or
1675
1880
self.path_changed(trans_id)):
1676
1881
if trans_id in self._new_contents:
1677
1882
modified_paths.append(full_path)
1678
1883
if trans_id in self._new_executability:
1679
1884
self._set_executability(path, trans_id)
1885
if trans_id in self._observed_sha1s:
1886
o_sha1, o_st_val = self._observed_sha1s[trans_id]
1887
st = osutils.lstat(full_path)
1888
self._observed_sha1s[trans_id] = (o_sha1, st)
1681
1890
child_pb.finished()
1891
for path, trans_id in new_paths:
1892
# new_paths includes stuff like workingtree conflicts. Only the
1893
# stuff in new_contents actually comes from limbo.
1894
if trans_id in self._limbo_files:
1895
del self._limbo_files[trans_id]
1682
1896
self._new_contents.clear()
1683
1897
return modified_paths
1899
def _apply_observed_sha1s(self):
1900
"""After we have finished renaming everything, update observed sha1s
1902
This has to be done after self._tree.apply_inventory_delta, otherwise
1903
it doesn't know anything about the files we are updating. Also, we want
1904
to do this as late as possible, so that most entries end up cached.
1906
# TODO: this doesn't update the stat information for directories. So
1907
# the first 'bzr status' will still need to rewrite
1908
# .bzr/checkout/dirstate. However, we at least don't need to
1909
# re-read all of the files.
1910
# TODO: If the operation took a while, we could do a time.sleep(3) here
1911
# to allow the clock to tick over and ensure we won't have any
1912
# problems. (we could observe start time, and finish time, and if
1913
# it is less than eg 10% overhead, add a sleep call.)
1914
paths = FinalPaths(self)
1915
for trans_id, observed in self._observed_sha1s.iteritems():
1916
path = paths.get_path(trans_id)
1917
# We could get the file_id, but dirstate prefers to use the path
1918
# anyway, and it is 'cheaper' to determine.
1919
# file_id = self._new_id[trans_id]
1920
self._tree._observed_sha1(None, path, observed)
1686
1923
class TransformPreview(DiskTreeTransform):
1687
1924
"""A TreeTransform for generating preview trees.
1766
2008
yield self._get_repository().revision_tree(revision_id)
1768
2010
def _get_file_revision(self, file_id, vf, tree_revision):
1769
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
2011
parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1770
2012
self._iter_parent_trees()]
1771
2013
vf.add_lines((file_id, tree_revision), parent_keys,
1772
self.get_file(file_id).readlines())
2014
self.get_file_lines(file_id))
1773
2015
repo = self._get_repository()
1774
2016
base_vf = repo.texts
1775
2017
if base_vf not in vf.fallback_versionedfiles:
1776
2018
vf.fallback_versionedfiles.append(base_vf)
1777
2019
return tree_revision
1779
def _stat_limbo_file(self, file_id):
1780
trans_id = self._transform.trans_id_file_id(file_id)
2021
def _stat_limbo_file(self, file_id=None, trans_id=None):
2022
if trans_id is None:
2023
trans_id = self._transform.trans_id_file_id(file_id)
1781
2024
name = self._transform._limbo_name(trans_id)
1782
2025
return os.lstat(name)
1997
2260
def get_file_size(self, file_id):
1998
2261
"""See Tree.get_file_size"""
2262
trans_id = self._transform.trans_id_file_id(file_id)
2263
kind = self._transform.final_kind(trans_id)
2266
if trans_id in self._transform._new_contents:
2267
return self._stat_limbo_file(trans_id=trans_id).st_size
1999
2268
if self.kind(file_id) == 'file':
2000
2269
return self._transform._tree.get_file_size(file_id)
2273
def get_file_verifier(self, file_id, path=None, stat_value=None):
2274
trans_id = self._transform.trans_id_file_id(file_id)
2275
kind = self._transform._new_contents.get(trans_id)
2277
return self._transform._tree.get_file_verifier(file_id)
2279
fileobj = self.get_file(file_id)
2281
return ("SHA1", sha_file(fileobj))
2004
2285
def get_file_sha1(self, file_id, path=None, stat_value=None):
2005
2286
trans_id = self._transform.trans_id_file_id(file_id)
2006
2287
kind = self._transform._new_contents.get(trans_id)
2288
2575
pp.next_phase()
2289
2576
file_trans_id[wt.get_root_id()] = \
2290
2577
tt.trans_id_tree_file_id(wt.get_root_id())
2291
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2578
pb = ui.ui_factory.nested_progress_bar()
2293
2580
deferred_contents = []
2295
total = len(tree.inventory)
2582
total = len(tree.all_file_ids())
2296
2583
if delta_from_tree:
2297
2584
precomputed_delta = []
2299
2586
precomputed_delta = None
2587
# Check if tree inventory has content. If so, we populate
2588
# existing_files with the directory content. If there are no
2589
# entries we skip populating existing_files as its not used.
2590
# This improves performance and unncessary work on large
2591
# directory trees. (#501307)
2593
existing_files = set()
2594
for dir, files in wt.walkdirs():
2595
existing_files.update(f[0] for f in files)
2300
2596
for num, (tree_path, entry) in \
2301
enumerate(tree.inventory.iter_entries_by_dir()):
2302
pb.update("Building tree", num - len(deferred_contents), total)
2597
enumerate(tree.iter_entries_by_dir()):
2598
pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2303
2599
if entry.parent_id is None:
2305
2601
reparent = False
2383
2679
unchanged = dict(unchanged)
2384
2680
new_desired_files = []
2386
for file_id, (trans_id, tree_path) in desired_files:
2682
for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2387
2683
accelerator_path = unchanged.get(file_id)
2388
2684
if accelerator_path is None:
2389
new_desired_files.append((file_id, (trans_id, tree_path)))
2685
new_desired_files.append((file_id,
2686
(trans_id, tree_path, text_sha1)))
2391
pb.update('Adding file contents', count + offset, total)
2688
pb.update(gettext('Adding file contents'), count + offset, total)
2393
2690
tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2410
2707
offset += count
2411
for count, ((trans_id, tree_path), contents) in enumerate(
2708
for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2412
2709
tree.iter_files_bytes(new_desired_files)):
2413
2710
if wt.supports_content_filtering():
2414
2711
filters = wt._content_filter_stack(tree_path)
2415
2712
contents = filtered_output_bytes(contents, filters,
2416
2713
ContentFilterContext(tree_path, tree))
2417
tt.create_file(contents, trans_id)
2418
pb.update('Adding file contents', count + offset, total)
2714
tt.create_file(contents, trans_id, sha1=text_sha1)
2715
pb.update(gettext('Adding file contents'), count + offset, total)
2421
2718
def _reparent_children(tt, old_parent, new_parent):
2422
2719
for child in tt.iter_tree_children(old_parent):
2423
2720
tt.adjust_path(tt.final_name(child), new_parent, child)
2425
2723
def _reparent_transform_children(tt, old_parent, new_parent):
2426
2724
by_parent = tt.by_parent()
2427
2725
for child in by_parent[old_parent]:
2428
2726
tt.adjust_path(tt.final_name(child), new_parent, child)
2429
2727
return by_parent[old_parent]
2431
2730
def _content_match(tree, entry, file_id, kind, target_path):
2432
2731
if entry.kind != kind:
2434
2733
if entry.kind == "directory":
2436
2735
if entry.kind == "file":
2437
if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2736
f = file(target_path, 'rb')
2738
if tree.get_file_text(file_id) == f.read():
2439
2742
elif entry.kind == "symlink":
2440
2743
if tree.get_symlink_target(file_id) == os.readlink(target_path):
2493
2796
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)
2512
2799
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2513
2800
filter_tree_path=None):
2514
2801
"""Create new file contents according to tree contents.
2545
2832
tt.set_executability(entry.executable, trans_id)
2548
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2549
return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2552
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2553
"""Produce a backup-style name that appears to be available"""
2557
yield "%s.~%d~" % (name, counter)
2559
for new_name in name_gen():
2560
if not tt.has_named_child(by_parent, parent_trans_id, 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
2591
2835
def revert(working_tree, target_tree, filenames, backups=False,
2592
pb=DummyProgress(), change_reporter=None):
2836
pb=None, change_reporter=None):
2593
2837
"""Revert a working tree's contents to those of a target tree."""
2594
2838
target_tree.lock_read()
2839
pb = ui.ui_factory.nested_progress_bar()
2595
2840
tt = TreeTransform(working_tree, pb)
2597
2842
pp = ProgressPhase("Revert phase", 3, pb)
2651
2898
deferred_files = []
2652
2899
for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2900
kind, executable) in enumerate(change_list):
2654
if skip_root and file_id[0] is not None and parent[0] is None:
2901
target_path, wt_path = path
2902
target_versioned, wt_versioned = versioned
2903
target_parent, wt_parent = parent
2904
target_name, wt_name = name
2905
target_kind, wt_kind = kind
2906
target_executable, wt_executable = executable
2907
if skip_root and wt_parent is None:
2656
2909
trans_id = tt.trans_id_file_id(file_id)
2658
2911
if changed_content:
2659
2912
keep_content = False
2660
if kind[0] == 'file' and (backups or kind[1] is None):
2913
if wt_kind == 'file' and (backups or target_kind is None):
2661
2914
wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2915
if merge_modified.get(file_id) != wt_sha1:
2663
2916
# acquire the basis tree lazily to prevent the
2666
2919
if basis_tree is None:
2667
2920
basis_tree = working_tree.basis_tree()
2668
2921
basis_tree.lock_read()
2669
if file_id in basis_tree:
2922
if basis_tree.has_id(file_id):
2670
2923
if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2924
keep_content = True
2672
elif kind[1] is None and not versioned[1]:
2925
elif target_kind is None and not target_versioned:
2673
2926
keep_content = True
2674
if kind[0] is not None:
2927
if wt_kind is not None:
2675
2928
if not keep_content:
2676
2929
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)
2930
elif target_kind is not None:
2931
parent_trans_id = tt.trans_id_file_id(wt_parent)
2932
backup_name = tt._available_backup_name(
2933
wt_name, parent_trans_id)
2682
2934
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):
2935
new_trans_id = tt.create_path(wt_name, parent_trans_id)
2936
if wt_versioned and target_versioned:
2685
2937
tt.unversion_file(trans_id)
2686
2938
tt.version_file(file_id, new_trans_id)
2687
2939
# New contents should have the same unix perms as old
2689
2941
mode_id = trans_id
2690
2942
trans_id = new_trans_id
2691
if kind[1] in ('directory', 'tree-reference'):
2943
if target_kind in ('directory', 'tree-reference'):
2692
2944
tt.create_directory(trans_id)
2693
if kind[1] == 'tree-reference':
2945
if target_kind == 'tree-reference':
2694
2946
revision = target_tree.get_reference_revision(file_id,
2696
2948
tt.set_tree_reference(revision, trans_id)
2697
elif kind[1] == 'symlink':
2949
elif target_kind == 'symlink':
2698
2950
tt.create_symlink(target_tree.get_symlink_target(file_id),
2700
elif kind[1] == 'file':
2952
elif target_kind == 'file':
2701
2953
deferred_files.append((file_id, (trans_id, mode_id)))
2702
2954
if basis_tree is None:
2703
2955
basis_tree = working_tree.basis_tree()
2704
2956
basis_tree.lock_read()
2705
2957
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)):
2958
if (basis_tree.has_id(file_id) and
2959
new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2960
if file_id in merge_modified:
2709
2961
del merge_modified[file_id]
2711
2963
merge_modified[file_id] = new_sha1
2713
2965
# 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):
2966
if keep_content and wt_executable == target_executable:
2967
tt.set_executability(target_executable, trans_id)
2968
elif target_kind is not None:
2969
raise AssertionError(target_kind)
2970
if not wt_versioned and target_versioned:
2719
2971
tt.version_file(file_id, trans_id)
2720
if versioned == (True, False):
2972
if wt_versioned and not target_versioned:
2721
2973
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:
2974
if (target_name is not None and
2975
(wt_name != target_name or wt_parent != target_parent)):
2976
if target_name == '' and target_parent is None:
2725
2977
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)
2979
parent_trans = tt.trans_id_file_id(target_parent)
2980
if wt_parent is None and wt_versioned:
2981
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)
2983
tt.adjust_path(target_name, parent_trans, trans_id)
2984
if wt_executable != target_executable and target_kind == "file":
2985
tt.set_executability(target_executable, trans_id)
2734
2986
if working_tree.supports_content_filtering():
2735
2987
for index, ((trans_id, mode_id), bytes) in enumerate(
2736
2988
target_tree.iter_files_bytes(deferred_files)):
2754
3006
return merge_modified
2757
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
3009
def resolve_conflicts(tt, pb=None, pass_func=None):
2758
3010
"""Make many conflict-resolution attempts, but die if they fail"""
2759
3011
if pass_func is None:
2760
3012
pass_func = conflict_pass
2761
3013
new_conflicts = set()
3014
pb = ui.ui_factory.nested_progress_bar()
2763
3016
for n in range(10):
2764
pb.update('Resolution pass', n+1, 10)
3017
pb.update(gettext('Resolution pass'), n+1, 10)
2765
3018
conflicts = tt.find_conflicts()
2766
3019
if len(conflicts) == 0:
2767
3020
return new_conflicts
2768
3021
new_conflicts.update(pass_func(tt, conflicts))
2769
3022
raise MalformedTransform(conflicts=conflicts)
2774
3027
def conflict_pass(tt, conflicts, path_tree=None):
2807
3060
elif c_type == 'missing parent':
2808
3061
trans_id = conflict[1]
2810
tt.cancel_deletion(trans_id)
2811
new_conflicts.add(('deleting parent', 'Not deleting',
3062
if trans_id in tt._removed_contents:
3063
cancel_deletion = True
3064
orphans = tt._get_potential_orphans(trans_id)
3066
cancel_deletion = False
3067
# All children are orphans
3070
tt.new_orphan(o, trans_id)
3071
except OrphaningError:
3072
# Something bad happened so we cancel the directory
3073
# deletion which will leave it in place with a
3074
# conflict. The user can deal with it from there.
3075
# Note that this also catch the case where we don't
3076
# want to create orphans and leave the directory in
3078
cancel_deletion = True
3081
# Cancel the directory deletion
3082
tt.cancel_deletion(trans_id)
3083
new_conflicts.add(('deleting parent', 'Not deleting',
2816
3088
tt.final_name(trans_id)
2877
3149
modified_path = fp.get_path(conflict[2])
2878
3150
modified_id = tt.final_file_id(conflict[2])
2879
3151
if len(conflict) == 3:
2880
yield Conflict.factory(c_type, action=action, path=modified_path,
2881
file_id=modified_id)
3152
yield conflicts.Conflict.factory(
3153
c_type, action=action, path=modified_path, file_id=modified_id)
2884
3156
conflicting_path = fp.get_path(conflict[3])
2885
3157
conflicting_id = tt.final_file_id(conflict[3])
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)
3158
yield conflicts.Conflict.factory(
3159
c_type, action=action, path=modified_path,
3160
file_id=modified_id,
3161
conflict_path=conflicting_path,
3162
conflict_file_id=conflicting_id)
2892
3165
class _FileMover(object):
2897
3170
self.pending_deletions = []
2899
3172
def rename(self, from_, to):
2900
"""Rename a file from one path to another. Functions like os.rename"""
3173
"""Rename a file from one path to another."""
2902
3175
os.rename(from_, to)
2903
3176
except OSError, e:
2904
3177
if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2905
3178
raise errors.FileExists(to, str(e))
3179
# normal OSError doesn't include filenames so it's hard to see where
3180
# the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3181
raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2907
3182
self.past_renames.append((from_, to))
2909
3184
def pre_delete(self, from_, to):
added
removed
bzrlib/transform.py
