/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2009-07-14 21:07:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4538.
  • Revision ID: aaron@aaronbentley.com-20090714210736-1m81n4nls5fe4pxy
Updates from review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
import os
18
18
import errno
19
19
from stat import S_ISREG, S_IEXEC
20
 
import time
21
20
 
22
21
from bzrlib.lazy_import import lazy_import
23
22
lazy_import(globals(), """
31
30
    multiparent,
32
31
    osutils,
33
32
    revision as _mod_revision,
34
 
    ui,
35
33
    )
36
34
""")
37
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
 
                           ReusingTransform, CantMoveRoot,
 
36
                           ReusingTransform, NotVersionedError, CantMoveRoot,
39
37
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
38
                           UnableCreateSymlink)
41
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
50
48
    splitpath,
51
49
    supports_executable,
52
50
)
53
 
from bzrlib.progress import ProgressPhase
 
51
from bzrlib.progress import DummyProgress, ProgressPhase
54
52
from bzrlib.symbol_versioning import (
55
53
        deprecated_function,
56
54
        deprecated_in,
80
78
class TreeTransformBase(object):
81
79
    """The base class for TreeTransform and its kin."""
82
80
 
83
 
    def __init__(self, tree, pb=None,
 
81
    def __init__(self, tree, pb=DummyProgress(),
84
82
                 case_sensitive=True):
85
83
        """Constructor.
86
84
 
87
85
        :param tree: The tree that will be transformed, but not necessarily
88
86
            the output tree.
89
 
        :param pb: ignored
 
87
        :param pb: A ProgressBar indicating how much progress is being made
90
88
        :param case_sensitive: If True, the target of the transform is
91
89
            case sensitive, not just case preserving.
92
90
        """
163
161
 
164
162
    def adjust_path(self, name, parent, trans_id):
165
163
        """Change the path that is assigned to a transaction id."""
166
 
        if parent is None:
167
 
            raise ValueError("Parent trans-id may not be None")
168
164
        if trans_id == self._new_root:
169
165
            raise CantMoveRoot
170
166
        self._new_name[trans_id] = name
171
167
        self._new_parent[trans_id] = parent
 
168
        if parent == ROOT_PARENT:
 
169
            if self._new_root is not None:
 
170
                raise ValueError("Cannot have multiple roots.")
 
171
            self._new_root = trans_id
172
172
 
173
173
    def adjust_root_path(self, name, parent):
174
174
        """Emulate moving the root by moving all children, instead.
202
202
        self.version_file(old_root_file_id, old_root)
203
203
        self.unversion_file(self._new_root)
204
204
 
205
 
    def fixup_new_roots(self):
206
 
        """Reinterpret requests to change the root directory
207
 
 
208
 
        Instead of creating a root directory, or moving an existing directory,
209
 
        all the attributes and children of the new root are applied to the
210
 
        existing root directory.
211
 
 
212
 
        This means that the old root trans-id becomes obsolete, so it is
213
 
        recommended only to invoke this after the root trans-id has become
214
 
        irrelevant.
215
 
        """
216
 
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
217
 
                     ROOT_PARENT]
218
 
        if len(new_roots) < 1:
219
 
            return
220
 
        if len(new_roots) != 1:
221
 
            raise ValueError('A tree cannot have two roots!')
222
 
        if self._new_root is None:
223
 
            self._new_root = new_roots[0]
224
 
            return
225
 
        old_new_root = new_roots[0]
226
 
        # TODO: What to do if a old_new_root is present, but self._new_root is
227
 
        #       not listed as being removed? This code explicitly unversions
228
 
        #       the old root and versions it with the new file_id. Though that
229
 
        #       seems like an incomplete delta
230
 
 
231
 
        # unversion the new root's directory.
232
 
        file_id = self.final_file_id(old_new_root)
233
 
        if old_new_root in self._new_id:
234
 
            self.cancel_versioning(old_new_root)
235
 
        else:
236
 
            self.unversion_file(old_new_root)
237
 
        # if, at this stage, root still has an old file_id, zap it so we can
238
 
        # stick a new one in.
239
 
        if (self.tree_file_id(self._new_root) is not None and
240
 
            self._new_root not in self._removed_id):
241
 
            self.unversion_file(self._new_root)
242
 
        self.version_file(file_id, self._new_root)
243
 
 
244
 
        # Now move children of new root into old root directory.
245
 
        # Ensure all children are registered with the transaction, but don't
246
 
        # use directly-- some tree children have new parents
247
 
        list(self.iter_tree_children(old_new_root))
248
 
        # Move all children of new root into old root directory.
249
 
        for child in self.by_parent().get(old_new_root, []):
250
 
            self.adjust_path(self.final_name(child), self._new_root, child)
251
 
 
252
 
        # Ensure old_new_root has no directory.
253
 
        if old_new_root in self._new_contents:
254
 
            self.cancel_creation(old_new_root)
255
 
        else:
256
 
            self.delete_contents(old_new_root)
257
 
 
258
 
        # prevent deletion of root directory.
259
 
        if self._new_root in self._removed_contents:
260
 
            self.cancel_deletion(self._new_root)
261
 
 
262
 
        # destroy path info for old_new_root.
263
 
        del self._new_parent[old_new_root]
264
 
        del self._new_name[old_new_root]
265
 
 
266
205
    def trans_id_tree_file_id(self, inventory_id):
267
206
        """Determine the transaction id of a working tree file.
268
207
 
314
253
 
315
254
    def delete_contents(self, trans_id):
316
255
        """Schedule the contents of a path entry for deletion"""
317
 
        # Ensure that the object exists in the WorkingTree, this will raise an
318
 
        # exception if there is a problem
319
256
        self.tree_kind(trans_id)
320
257
        self._removed_contents.add(trans_id)
321
258
 
505
442
        conflicts.extend(self._overwrite_conflicts())
506
443
        return conflicts
507
444
 
508
 
    def _check_malformed(self):
509
 
        conflicts = self.find_conflicts()
510
 
        if len(conflicts) != 0:
511
 
            raise MalformedTransform(conflicts=conflicts)
512
 
 
513
445
    def _add_tree_children(self):
514
446
        """Add all the children of all active parents to the known paths.
515
447
 
922
854
    def get_preview_tree(self):
923
855
        """Return a tree representing the result of the transform.
924
856
 
925
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
926
 
        it.
 
857
        This tree only supports the subset of Tree functionality required
 
858
        by show_diff_trees.  It must only be compared to tt._tree.
927
859
        """
928
860
        return _PreviewTree(self)
929
861
 
935
867
        :param merge_parents: Additional parents specified by pending merges.
936
868
        :return: The revision_id of the revision committed.
937
869
        """
938
 
        self._check_malformed()
939
870
        if strict:
940
871
            unversioned = set(self._new_contents).difference(set(self._new_id))
941
872
            for trans_id in unversioned:
1063
994
class DiskTreeTransform(TreeTransformBase):
1064
995
    """Tree transform storing its contents on disk."""
1065
996
 
1066
 
    def __init__(self, tree, limbodir, pb=None,
 
997
    def __init__(self, tree, limbodir, pb=DummyProgress(),
1067
998
                 case_sensitive=True):
1068
999
        """Constructor.
1069
1000
        :param tree: The tree that will be transformed, but not necessarily
1070
1001
            the output tree.
1071
1002
        :param limbodir: A directory where new files can be stored until
1072
1003
            they are installed in their proper places
1073
 
        :param pb: ignored
 
1004
        :param pb: A ProgressBar indicating how much progress is being made
1074
1005
        :param case_sensitive: If True, the target of the transform is
1075
1006
            case sensitive, not just case preserving.
1076
1007
        """
1086
1017
        self._limbo_children_names = {}
1087
1018
        # List of transform ids that need to be renamed from limbo into place
1088
1019
        self._needs_rename = set()
1089
 
        self._creation_mtime = None
1090
1020
 
1091
1021
    def finalize(self):
1092
1022
        """Release the working tree lock, if held, clean up limbo dir.
1118
1048
    def _limbo_name(self, trans_id):
1119
1049
        """Generate the limbo name of a file"""
1120
1050
        limbo_name = self._limbo_files.get(trans_id)
1121
 
        if limbo_name is None:
1122
 
            limbo_name = self._generate_limbo_path(trans_id)
1123
 
            self._limbo_files[trans_id] = limbo_name
 
1051
        if limbo_name is not None:
 
1052
            return limbo_name
 
1053
        parent = self._new_parent.get(trans_id)
 
1054
        # if the parent directory is already in limbo (e.g. when building a
 
1055
        # tree), choose a limbo name inside the parent, to reduce further
 
1056
        # renames.
 
1057
        use_direct_path = False
 
1058
        if self._new_contents.get(parent) == 'directory':
 
1059
            filename = self._new_name.get(trans_id)
 
1060
            if filename is not None:
 
1061
                if parent not in self._limbo_children:
 
1062
                    self._limbo_children[parent] = set()
 
1063
                    self._limbo_children_names[parent] = {}
 
1064
                    use_direct_path = True
 
1065
                # the direct path can only be used if no other file has
 
1066
                # already taken this pathname, i.e. if the name is unused, or
 
1067
                # if it is already associated with this trans_id.
 
1068
                elif self._case_sensitive_target:
 
1069
                    if (self._limbo_children_names[parent].get(filename)
 
1070
                        in (trans_id, None)):
 
1071
                        use_direct_path = True
 
1072
                else:
 
1073
                    for l_filename, l_trans_id in\
 
1074
                        self._limbo_children_names[parent].iteritems():
 
1075
                        if l_trans_id == trans_id:
 
1076
                            continue
 
1077
                        if l_filename.lower() == filename.lower():
 
1078
                            break
 
1079
                    else:
 
1080
                        use_direct_path = True
 
1081
 
 
1082
        if use_direct_path:
 
1083
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
1084
            self._limbo_children[parent].add(trans_id)
 
1085
            self._limbo_children_names[parent][filename] = trans_id
 
1086
        else:
 
1087
            limbo_name = pathjoin(self._limbodir, trans_id)
 
1088
            self._needs_rename.add(trans_id)
 
1089
        self._limbo_files[trans_id] = limbo_name
1124
1090
        return limbo_name
1125
1091
 
1126
 
    def _generate_limbo_path(self, trans_id):
1127
 
        """Generate a limbo path using the trans_id as the relative path.
1128
 
 
1129
 
        This is suitable as a fallback, and when the transform should not be
1130
 
        sensitive to the path encoding of the limbo directory.
1131
 
        """
1132
 
        self._needs_rename.add(trans_id)
1133
 
        return pathjoin(self._limbodir, trans_id)
1134
 
 
1135
1092
    def adjust_path(self, name, parent, trans_id):
1136
1093
        previous_parent = self._new_parent.get(trans_id)
1137
1094
        previous_name = self._new_name.get(trans_id)
1139
1096
        if (trans_id in self._limbo_files and
1140
1097
            trans_id not in self._needs_rename):
1141
1098
            self._rename_in_limbo([trans_id])
1142
 
            if previous_parent != parent:
1143
 
                self._limbo_children[previous_parent].remove(trans_id)
1144
 
            if previous_parent != parent or previous_name != name:
1145
 
                del self._limbo_children_names[previous_parent][previous_name]
 
1099
            self._limbo_children[previous_parent].remove(trans_id)
 
1100
            del self._limbo_children_names[previous_parent][previous_name]
1146
1101
 
1147
1102
    def _rename_in_limbo(self, trans_ids):
1148
1103
        """Fix limbo names so that the right final path is produced.
1160
1115
            if trans_id not in self._new_contents:
1161
1116
                continue
1162
1117
            new_path = self._limbo_name(trans_id)
1163
 
            osutils.rename(old_path, new_path)
1164
 
            for descendant in self._limbo_descendants(trans_id):
1165
 
                desc_path = self._limbo_files[descendant]
1166
 
                desc_path = new_path + desc_path[len(old_path):]
1167
 
                self._limbo_files[descendant] = desc_path
1168
 
 
1169
 
    def _limbo_descendants(self, trans_id):
1170
 
        """Return the set of trans_ids whose limbo paths descend from this."""
1171
 
        descendants = set(self._limbo_children.get(trans_id, []))
1172
 
        for descendant in list(descendants):
1173
 
            descendants.update(self._limbo_descendants(descendant))
1174
 
        return descendants
 
1118
            os.rename(old_path, new_path)
1175
1119
 
1176
1120
    def create_file(self, contents, trans_id, mode_id=None):
1177
1121
        """Schedule creation of a new file.
1199
1143
            f.writelines(contents)
1200
1144
        finally:
1201
1145
            f.close()
1202
 
        self._set_mtime(name)
1203
1146
        self._set_mode(trans_id, mode_id, S_ISREG)
1204
1147
 
1205
1148
    def _read_file_chunks(self, trans_id):
1212
1155
    def _read_symlink_target(self, trans_id):
1213
1156
        return os.readlink(self._limbo_name(trans_id))
1214
1157
 
1215
 
    def _set_mtime(self, path):
1216
 
        """All files that are created get the same mtime.
1217
 
 
1218
 
        This time is set by the first object to be created.
1219
 
        """
1220
 
        if self._creation_mtime is None:
1221
 
            self._creation_mtime = time.time()
1222
 
        os.utime(path, (self._creation_mtime, self._creation_mtime))
1223
 
 
1224
1158
    def create_hardlink(self, path, trans_id):
1225
1159
        """Schedule creation of a hard link"""
1226
1160
        name = self._limbo_name(trans_id)
1340
1274
    FileMover does not delete files until it is sure that a rollback will not
1341
1275
    happen.
1342
1276
    """
1343
 
    def __init__(self, tree, pb=None):
 
1277
    def __init__(self, tree, pb=DummyProgress()):
1344
1278
        """Note: a tree_write lock is taken on the tree.
1345
1279
 
1346
1280
        Use TreeTransform.finalize() to release the lock (can be omitted if
1456
1390
                continue
1457
1391
            yield self.trans_id_tree_path(childpath)
1458
1392
 
1459
 
    def _generate_limbo_path(self, trans_id):
1460
 
        """Generate a limbo path using the final path if possible.
1461
 
 
1462
 
        This optimizes the performance of applying the tree transform by
1463
 
        avoiding renames.  These renames can be avoided only when the parent
1464
 
        directory is already scheduled for creation.
1465
 
 
1466
 
        If the final path cannot be used, falls back to using the trans_id as
1467
 
        the relpath.
1468
 
        """
1469
 
        parent = self._new_parent.get(trans_id)
1470
 
        # if the parent directory is already in limbo (e.g. when building a
1471
 
        # tree), choose a limbo name inside the parent, to reduce further
1472
 
        # renames.
1473
 
        use_direct_path = False
1474
 
        if self._new_contents.get(parent) == 'directory':
1475
 
            filename = self._new_name.get(trans_id)
1476
 
            if filename is not None:
1477
 
                if parent not in self._limbo_children:
1478
 
                    self._limbo_children[parent] = set()
1479
 
                    self._limbo_children_names[parent] = {}
1480
 
                    use_direct_path = True
1481
 
                # the direct path can only be used if no other file has
1482
 
                # already taken this pathname, i.e. if the name is unused, or
1483
 
                # if it is already associated with this trans_id.
1484
 
                elif self._case_sensitive_target:
1485
 
                    if (self._limbo_children_names[parent].get(filename)
1486
 
                        in (trans_id, None)):
1487
 
                        use_direct_path = True
1488
 
                else:
1489
 
                    for l_filename, l_trans_id in\
1490
 
                        self._limbo_children_names[parent].iteritems():
1491
 
                        if l_trans_id == trans_id:
1492
 
                            continue
1493
 
                        if l_filename.lower() == filename.lower():
1494
 
                            break
1495
 
                    else:
1496
 
                        use_direct_path = True
1497
 
 
1498
 
        if not use_direct_path:
1499
 
            return DiskTreeTransform._generate_limbo_path(self, trans_id)
1500
 
 
1501
 
        limbo_name = pathjoin(self._limbo_files[parent], filename)
1502
 
        self._limbo_children[parent].add(trans_id)
1503
 
        self._limbo_children_names[parent][filename] = trans_id
1504
 
        return limbo_name
1505
 
 
1506
1393
 
1507
1394
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1508
1395
        """Apply all changes to the inventory and filesystem.
1519
1406
        :param _mover: Supply an alternate FileMover, for testing
1520
1407
        """
1521
1408
        if not no_conflicts:
1522
 
            self._check_malformed()
 
1409
            conflicts = self.find_conflicts()
 
1410
            if len(conflicts) != 0:
 
1411
                raise MalformedTransform(conflicts=conflicts)
1523
1412
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1524
1413
        try:
1525
1414
            if precomputed_delta is None:
1629
1518
                child_pb.update('removing file', num, len(tree_paths))
1630
1519
                full_path = self._tree.abspath(path)
1631
1520
                if trans_id in self._removed_contents:
1632
 
                    delete_path = os.path.join(self._deletiondir, trans_id)
1633
 
                    mover.pre_delete(full_path, delete_path)
1634
 
                elif (trans_id in self._new_name
1635
 
                      or trans_id in self._new_parent):
 
1521
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1522
                                     trans_id))
 
1523
                elif trans_id in self._new_name or trans_id in \
 
1524
                    self._new_parent:
1636
1525
                    try:
1637
1526
                        mover.rename(full_path, self._limbo_name(trans_id))
1638
1527
                    except OSError, e:
1692
1581
    unversioned files in the input tree.
1693
1582
    """
1694
1583
 
1695
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1584
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1696
1585
        tree.lock_read()
1697
1586
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1698
1587
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
1743
1632
        self._all_children_cache = {}
1744
1633
        self._path2trans_id_cache = {}
1745
1634
        self._final_name_cache = {}
1746
 
        self._iter_changes_cache = dict((c[0], c) for c in
1747
 
                                        self._transform.iter_changes())
 
1635
 
 
1636
    def _changes(self, file_id):
 
1637
        for changes in self._transform.iter_changes():
 
1638
            if changes[0] == file_id:
 
1639
                return changes
1748
1640
 
1749
1641
    def _content_change(self, file_id):
1750
1642
        """Return True if the content of this file changed"""
1751
 
        changes = self._iter_changes_cache.get(file_id)
 
1643
        changes = self._changes(file_id)
1752
1644
        # changes[2] is true if the file content changed.  See
1753
1645
        # InterTree.iter_changes.
1754
1646
        return (changes is not None and changes[2])
1823
1715
    def __iter__(self):
1824
1716
        return iter(self.all_file_ids())
1825
1717
 
1826
 
    def _has_id(self, file_id, fallback_check):
 
1718
    def has_id(self, file_id):
1827
1719
        if file_id in self._transform._r_new_id:
1828
1720
            return True
1829
1721
        elif file_id in set([self._transform.tree_file_id(trans_id) for
1830
1722
            trans_id in self._transform._removed_id]):
1831
1723
            return False
1832
1724
        else:
1833
 
            return fallback_check(file_id)
1834
 
 
1835
 
    def has_id(self, file_id):
1836
 
        return self._has_id(file_id, self._transform._tree.has_id)
1837
 
 
1838
 
    def has_or_had_id(self, file_id):
1839
 
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
 
1725
            return self._transform._tree.has_id(file_id)
1840
1726
 
1841
1727
    def _path2trans_id(self, path):
1842
1728
        # We must not use None here, because that is a valid value to store.
1895
1781
            if self._transform.final_file_id(trans_id) is None:
1896
1782
                yield self._final_paths._determine_path(trans_id)
1897
1783
 
1898
 
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1899
 
        yield_parents=False):
 
1784
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None):
1900
1785
        for trans_id, parent_file_id in ordered_entries:
1901
1786
            file_id = self._transform.final_file_id(trans_id)
1902
1787
            if file_id is None:
1928
1813
                ordered_ids.append((trans_id, parent_file_id))
1929
1814
        return ordered_ids
1930
1815
 
1931
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
1816
    def iter_entries_by_dir(self, specific_file_ids=None):
1932
1817
        # This may not be a maximally efficient implementation, but it is
1933
1818
        # reasonably straightforward.  An implementation that grafts the
1934
1819
        # TreeTransform changes onto the tree's iter_entries_by_dir results
1936
1821
        # position.
1937
1822
        ordered_ids = self._list_files_by_dir()
1938
1823
        for entry, trans_id in self._make_inv_entries(ordered_ids,
1939
 
            specific_file_ids, yield_parents=yield_parents):
 
1824
                                                      specific_file_ids):
1940
1825
            yield unicode(self._final_paths.get_path(trans_id)), entry
1941
1826
 
1942
1827
    def _iter_entries_for_dir(self, dir_path):
1989
1874
    def get_file_mtime(self, file_id, path=None):
1990
1875
        """See Tree.get_file_mtime"""
1991
1876
        if not self._content_change(file_id):
1992
 
            return self._transform._tree.get_file_mtime(file_id)
 
1877
            return self._transform._tree.get_file_mtime(file_id, path)
1993
1878
        return self._stat_limbo_file(file_id).st_mtime
1994
1879
 
1995
1880
    def _file_size(self, entry, stat_value):
2049
1934
                statval = os.lstat(limbo_name)
2050
1935
                size = statval.st_size
2051
1936
                if not supports_executable():
2052
 
                    executable = False
 
1937
                    executable = None
2053
1938
                else:
2054
1939
                    executable = statval.st_mode & S_IEXEC
2055
1940
            else:
2057
1942
                executable = None
2058
1943
            if kind == 'symlink':
2059
1944
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2060
 
        executable = tt._new_executability.get(trans_id, executable)
 
1945
        if supports_executable():
 
1946
            executable = tt._new_executability.get(trans_id, executable)
2061
1947
        return kind, size, executable, link_or_sha1
2062
1948
 
2063
1949
    def iter_changes(self, from_tree, include_unchanged=False,
2094
1980
 
2095
1981
    def annotate_iter(self, file_id,
2096
1982
                      default_revision=_mod_revision.CURRENT_REVISION):
2097
 
        changes = self._iter_changes_cache.get(file_id)
 
1983
        changes = self._changes(file_id)
2098
1984
        if changes is None:
2099
1985
            get_old = True
2100
1986
        else:
2190
2076
        self.transform = transform
2191
2077
 
2192
2078
    def _determine_path(self, trans_id):
2193
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
2079
        if trans_id == self.transform.root:
2194
2080
            return ""
2195
2081
        name = self.transform.final_name(trans_id)
2196
2082
        parent_id = self.transform.final_parent(trans_id)
2376
2262
        new_desired_files = desired_files
2377
2263
    else:
2378
2264
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
 
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2380
 
                     in iter if not (c or e[0] != e[1])]
2381
 
        if accelerator_tree.supports_content_filtering():
2382
 
            unchanged = [(f, p) for (f, p) in unchanged
2383
 
                         if not accelerator_tree.iter_search_rules([p]).next()]
2384
 
        unchanged = dict(unchanged)
 
2265
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
2266
                         in iter if not (c or e[0] != e[1]))
2385
2267
        new_desired_files = []
2386
2268
        count = 0
2387
2269
        for file_id, (trans_id, tree_path) in desired_files:
2510
2392
        tt.create_directory(trans_id)
2511
2393
 
2512
2394
 
2513
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
 
    filter_tree_path=None):
2515
 
    """Create new file contents according to tree contents.
2516
 
    
2517
 
    :param filter_tree_path: the tree path to use to lookup
2518
 
      content filters to apply to the bytes output in the working tree.
2519
 
      This only applies if the working tree supports content filtering.
2520
 
    """
 
2395
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
 
2396
    """Create new file contents according to tree contents."""
2521
2397
    kind = tree.kind(file_id)
2522
2398
    if kind == 'directory':
2523
2399
        tt.create_directory(trans_id)
2528
2404
                bytes = tree_file.readlines()
2529
2405
            finally:
2530
2406
                tree_file.close()
2531
 
        wt = tt._tree
2532
 
        if wt.supports_content_filtering() and filter_tree_path is not None:
2533
 
            filters = wt._content_filter_stack(filter_tree_path)
2534
 
            bytes = filtered_output_bytes(bytes, filters,
2535
 
                ContentFilterContext(filter_tree_path, tree))
2536
2407
        tt.create_file(bytes, trans_id)
2537
2408
    elif kind == "symlink":
2538
2409
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2590
2461
 
2591
2462
 
2592
2463
def revert(working_tree, target_tree, filenames, backups=False,
2593
 
           pb=None, change_reporter=None):
 
2464
           pb=DummyProgress(), change_reporter=None):
2594
2465
    """Revert a working tree's contents to those of a target tree."""
2595
2466
    target_tree.lock_read()
2596
 
    pb = ui.ui_factory.nested_progress_bar()
2597
2467
    tt = TreeTransform(working_tree, pb)
2598
2468
    try:
2599
2469
        pp = ProgressPhase("Revert phase", 3, pb)
2618
2488
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2489
                              backups, pp, basis_tree=None,
2620
2490
                              merge_modified=None):
 
2491
    pp.next_phase()
2621
2492
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2622
2493
    try:
2623
2494
        if merge_modified is None:
2627
2498
                                      merge_modified, basis_tree)
2628
2499
    finally:
2629
2500
        child_pb.finished()
 
2501
    pp.next_phase()
2630
2502
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2631
2503
    try:
2632
2504
        raw_conflicts = resolve_conflicts(tt, child_pb,
2725
2597
                    parent_trans = ROOT_PARENT
2726
2598
                else:
2727
2599
                    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)
2730
 
                else:
2731
 
                    tt.adjust_path(name[1], parent_trans, trans_id)
 
2600
                tt.adjust_path(name[1], parent_trans, trans_id)
2732
2601
            if executable[0] != executable[1] and kind[1] == "file":
2733
2602
                tt.set_executability(executable[1], trans_id)
2734
 
        if working_tree.supports_content_filtering():
2735
 
            for index, ((trans_id, mode_id), bytes) in enumerate(
2736
 
                target_tree.iter_files_bytes(deferred_files)):
2737
 
                file_id = deferred_files[index][0]
2738
 
                # We're reverting a tree to the target tree so using the
2739
 
                # target tree to find the file path seems the best choice
2740
 
                # here IMO - Ian C 27/Oct/2009
2741
 
                filter_tree_path = target_tree.id2path(file_id)
2742
 
                filters = working_tree._content_filter_stack(filter_tree_path)
2743
 
                bytes = filtered_output_bytes(bytes, filters,
2744
 
                    ContentFilterContext(filter_tree_path, working_tree))
2745
 
                tt.create_file(bytes, trans_id, mode_id)
2746
 
        else:
2747
 
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2748
 
                deferred_files):
2749
 
                tt.create_file(bytes, trans_id, mode_id)
2750
 
        tt.fixup_new_roots()
 
2603
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2604
            deferred_files):
 
2605
            tt.create_file(bytes, trans_id, mode_id)
2751
2606
    finally:
2752
2607
        if basis_tree is not None:
2753
2608
            basis_tree.unlock()
2754
2609
    return merge_modified
2755
2610
 
2756
2611
 
2757
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2612
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2758
2613
    """Make many conflict-resolution attempts, but die if they fail"""
2759
2614
    if pass_func is None:
2760
2615
        pass_func = conflict_pass
2761
2616
    new_conflicts = set()
2762
 
    pb = ui.ui_factory.nested_progress_bar()
2763
2617
    try:
2764
2618
        for n in range(10):
2765
2619
            pb.update('Resolution pass', n+1, 10)
2769
2623
            new_conflicts.update(pass_func(tt, conflicts))
2770
2624
        raise MalformedTransform(conflicts=conflicts)
2771
2625
    finally:
2772
 
        pb.finished()
 
2626
        pb.clear()
2773
2627
 
2774
2628
 
2775
2629
def conflict_pass(tt, conflicts, path_tree=None):
2824
2678
                        # special-case the other tree root (move its
2825
2679
                        # children to current root)
2826
2680
                        if entry.parent_id is None:
2827
 
                            create = False
 
2681
                            create=False
2828
2682
                            moved = _reparent_transform_children(
2829
2683
                                tt, trans_id, tt.root)
2830
2684
                            for child in moved:
2898
2752
        self.pending_deletions = []
2899
2753
 
2900
2754
    def rename(self, from_, to):
2901
 
        """Rename a file from one path to another."""
 
2755
        """Rename a file from one path to another.  Functions like os.rename"""
2902
2756
        try:
2903
 
            osutils.rename(from_, to)
 
2757
            os.rename(from_, to)
2904
2758
        except OSError, e:
2905
2759
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
2760
                raise errors.FileExists(to, str(e))
2920
2774
    def rollback(self):
2921
2775
        """Reverse all renames that have been performed"""
2922
2776
        for from_, to in reversed(self.past_renames):
2923
 
            osutils.rename(to, from_)
 
2777
            os.rename(to, from_)
2924
2778
        # after rollback, don't reuse _FileMover
2925
2779
        past_renames = None
2926
2780
        pending_deletions = None