/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tree classes, representing directory at point in time.
18
"""
19
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
20
import os
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
21
from collections import deque
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
22
from cStringIO import StringIO
800 by Martin Pool
Merge John's import-speedup branch:
23
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
import bzrlib
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
25
from bzrlib import (
26
    delta,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
27
    osutils,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
28
    symbol_versioning,
29
    )
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
30
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
31
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
32
from bzrlib import errors
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
33
from bzrlib.inventory import Inventory, InventoryFile
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
34
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
35
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
36
import bzrlib.revision
37
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
38
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
39
558 by Martin Pool
- All top-level classes inherit from object
40
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
41
    """Abstract file tree.
42
43
    There are several subclasses:
44
    
45
    * `WorkingTree` exists as files on disk editable by the user.
46
47
    * `RevisionTree` is a tree as recorded at some point in the past.
48
49
    Trees contain an `Inventory` object, and also know how to retrieve
50
    file texts mentioned in the inventory, either from a working
51
    directory or from a store.
52
53
    It is possible for trees to contain files that are not described
54
    in their inventory or vice versa; for this use `filenames()`.
55
56
    Trees can be compared, etc, regardless of whether they are working
57
    trees or versioned trees.
58
    """
59
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
60
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
61
        extra_trees=None, require_versioned=False, include_root=False,
62
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
63
        """Return a TreeDelta of the changes from other to this tree.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
64
65
        :param other: A tree to compare with.
66
        :param specific_files: An optional list of file paths to restrict the
67
            comparison to. When mapping filenames to ids, all matches in all
68
            trees (including optional extra_trees) are used, and all children of
69
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
70
        :param want_unchanged: An optional boolean requesting the inclusion of
71
            unchanged entries in the result.
72
        :param extra_trees: An optional list of additional trees to use when
73
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
74
        :param require_versioned: An optional boolean (defaults to False). When
75
            supplied and True all the 'specific_files' must be versioned, or
76
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
77
        :param want_unversioned: Scan for unversioned paths.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
78
1852.8.4 by Robert Collins
Hook InterTree into Tree.
79
        The comparison will be performed by an InterTree object looked up on 
80
        self and other.
81
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
82
        # Martin observes that Tree.changes_from returns a TreeDelta and this
83
        # may confuse people, because the class name of the returned object is
84
        # a synonym of the object referenced in the method name.
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
85
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
86
            want_unchanged=want_unchanged,
87
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
88
            extra_trees=extra_trees,
89
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
90
            include_root=include_root,
91
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
92
            )
2012.1.1 by Aaron Bentley
Implement change iterator
93
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
94
    def _iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
95
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
96
                     require_versioned=True, want_unversioned=False):
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
97
        intertree = InterTree.get(from_tree, self)
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
98
        return intertree._iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
99
            extra_trees, require_versioned, want_unversioned=want_unversioned)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
100
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
101
    def conflicts(self):
102
        """Get a list of the conflicts in the tree.
103
104
        Each conflict is an instance of bzrlib.conflicts.Conflict.
105
        """
106
        return []
107
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
108
    def extras(self):
109
        """For trees that can have unversioned files, return all such paths."""
110
        return []
111
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
112
    def get_parent_ids(self):
113
        """Get the parent ids for this tree. 
114
115
        :return: a list of parent ids. [] is returned to indicate
116
        a tree with no parents.
117
        :raises: BzrError if the parents are not known.
118
        """
119
        raise NotImplementedError(self.get_parent_ids)
120
    
1 by mbp at sourcefrog
import from baz patch-364
121
    def has_filename(self, filename):
122
        """True if the tree has given filename."""
123
        raise NotImplementedError()
124
1185.12.39 by abentley
Propogated has_or_had_id to Tree
125
    def has_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
126
        file_id = osutils.safe_file_id(file_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
127
        return self.inventory.has_id(file_id)
128
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
129
    __contains__ = has_id
130
1185.12.39 by abentley
Propogated has_or_had_id to Tree
131
    def has_or_had_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
132
        file_id = osutils.safe_file_id(file_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
133
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
134
            return True
1 by mbp at sourcefrog
import from baz patch-364
135
        return self.inventory.has_id(file_id)
136
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
137
    def __iter__(self):
138
        return iter(self.inventory)
139
1 by mbp at sourcefrog
import from baz patch-364
140
    def id2path(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
141
        file_id = osutils.safe_file_id(file_id)
1 by mbp at sourcefrog
import from baz patch-364
142
        return self.inventory.id2path(file_id)
143
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
144
    def is_control_filename(self, filename):
145
        """True if filename is the name of a control file in this tree.
146
        
147
        :param filename: A filename within the tree. This is a relative path
148
        from the root of this tree.
149
150
        This is true IF and ONLY IF the filename is part of the meta data
151
        that bzr controls in this tree. I.E. a random .bzr directory placed
152
        on disk will not be a control file for this tree.
153
        """
154
        return self.bzrdir.is_control_filename(filename)
155
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
156
    @needs_read_lock
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
157
    def iter_entries_by_dir(self, specific_file_ids=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
158
        """Walk the tree in 'by_dir' order.
159
160
        This will yield each entry in the tree as a (path, entry) tuple. The
161
        order that they are yielded is: the contents of a directory are 
162
        preceeded by the parent of a directory, and all the contents of a 
163
        directory are grouped together.
164
        """
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
165
        return self.inventory.iter_entries_by_dir(
166
            specific_file_ids=specific_file_ids)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
167
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
168
    def kind(self, file_id):
169
        raise NotImplementedError("subclasses must implement kind")
170
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
171
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
172
        """Return a tuple of kind, executable, stat_value for a file.
173
174
        entry may be None if there is no inventory entry for the file, but
175
        path must always be supplied.
176
177
        kind is None if there is no file present (even if an inventory id is
178
        present).  executable is False for non-file entries.
179
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
180
        raise NotImplementedError(self._comparison_data)
181
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
182
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
183
        raise NotImplementedError(self._file_size)
184
1 by mbp at sourcefrog
import from baz patch-364
185
    def _get_inventory(self):
186
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
187
    
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
188
    def get_file(self, file_id):
189
        """Return a file object for the file file_id in the tree."""
190
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
191
192
    def get_file_mtime(self, file_id, path=None):
193
        """Return the modification time for a file.
194
195
        :param file_id: The handle for this file.
196
        :param path: The path that this file can be found at.
197
            These must point to the same object.
198
        """
199
        raise NotImplementedError(self.get_file_mtime)
200
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
201
    def get_file_by_path(self, path):
202
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
203
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
204
    def get_symlink_target(self, file_id):
205
        """Get the target for a given file_id.
206
207
        It is assumed that the caller already knows that file_id is referencing
208
        a symlink.
209
        :param file_id: Handle for the symlink entry.
210
        :return: The path the symlink points to.
211
        """
212
        raise NotImplementedError(self.get_symlink_target)
213
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
214
    def annotate_iter(self, file_id):
1551.9.18 by Aaron Bentley
Updates from review comments
215
        """Return an iterator of revision_id, line tuples
216
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
217
        For working trees (and mutable trees in general), the special
218
        revision_id 'current:' will be used for lines that are new in this
219
        tree, e.g. uncommitted changes.
220
        :param file_id: The file to produce an annotated version from
221
        """
222
        raise NotImplementedError(self.annotate_iter)
223
1 by mbp at sourcefrog
import from baz patch-364
224
    inventory = property(_get_inventory,
225
                         doc="Inventory of this Tree")
226
227
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
228
        if not __debug__:
229
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
230
        fp = fingerprint_file(f)
231
        f.seek(0)
232
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
233
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
234
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
235
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
236
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
237
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
238
                         "store is probably damaged/corrupt"])
239
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
240
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
241
            raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
242
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
243
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
244
                     "store is probably damaged/corrupt"])
245
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
246
    def path2id(self, path):
247
        """Return the id for path in this tree."""
248
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
249
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
250
    def paths2ids(self, paths, trees=[], require_versioned=True):
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
251
        """Return all the ids that can be reached by walking from paths.
252
        
253
        Each path is looked up in each this tree and any extras provided in
254
        trees, and this is repeated recursively: the children in an extra tree
255
        of a directory that has been renamed under a provided path in this tree
256
        are all returned, even if none exist until a provided path in this
257
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
258
259
        :param paths: An iterable of paths to start converting to ids from.
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
260
            Alternatively, if paths is None, no ids should be calculated and None
261
            will be returned. This is offered to make calling the api unconditional
262
            for code that *might* take a list of files.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
263
        :param trees: Additional trees to consider.
264
        :param require_versioned: If False, do not raise NotVersionedError if
265
            an element of paths is not versioned in this tree and all of trees.
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
266
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
267
        return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
268
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
269
    def print_file(self, file_id):
270
        """Print file with id `file_id` to stdout."""
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
271
        file_id = osutils.safe_file_id(file_id)
176 by mbp at sourcefrog
New cat command contributed by janmar.
272
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
273
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
274
275
    def lock_read(self):
276
        pass
277
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
278
    def revision_tree(self, revision_id):
279
        """Obtain a revision tree for the revision revision_id.
280
281
        The intention of this method is to allow access to possibly cached
282
        tree data. Implementors of this method should raise NoSuchRevision if
283
        the tree is not locally available, even if they could obtain the 
284
        tree via a repository or some other means. Callers are responsible 
285
        for finding the ultimate source for a revision tree.
286
287
        :param revision_id: The revision_id of the requested tree.
288
        :return: A Tree.
289
        :raises: NoSuchRevision if the tree cannot be obtained.
290
        """
291
        raise errors.NoSuchRevisionInTree(self, revision_id)
292
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
293
    def unknowns(self):
294
        """What files are present in this tree and unknown.
295
        
296
        :return: an iterator over the unknown files.
297
        """
298
        return iter([])
299
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
300
    def unlock(self):
301
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
302
303
    def filter_unversioned_files(self, paths):
2255.7.62 by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
304
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
305
306
        :return: set of paths.
307
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
308
        # NB: we specifically *don't* call self.has_filename, because for
309
        # WorkingTrees that can indicate files that exist on disk but that 
310
        # are not versioned.
311
        pred = self.inventory.has_filename
312
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
313
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
314
    def walkdirs(self, prefix=""):
315
        """Walk the contents of this tree from path down.
316
317
        This yields all the data about the contents of a directory at a time.
318
        After each directory has been yielded, if the caller has mutated the
319
        list to exclude some directories, they are then not descended into.
320
        
321
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
322
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
323
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
324
          versioned_kind), ...]),
325
         - directory-relpath is the containing dirs relpath from prefix
326
         - directory-path-from-root is the containing dirs path from /
327
         - directory-fileid is the id of the directory if it is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
328
         - relpath is the relative path within the subtree being walked.
329
         - basename is the basename
330
         - kind is the kind of the file now. If unknonwn then the file is not
331
           present within the tree - but it may be recorded as versioned. See
332
           versioned_kind.
333
         - lstat is the stat data *if* the file was statted.
334
         - path_from_tree_root is the path from the root of the tree.
335
         - file_id is the file_id is the entry is versioned.
336
         - versioned_kind is the kind of the file as last recorded in the 
337
           versioning system. If 'unknown' the file is not versioned.
338
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
339
340
        :param prefix: Start walking from prefix within the tree rather than
341
        at the root. This allows one to walk a subtree but get paths that are
342
        relative to a tree rooted higher up.
343
        :return: an iterator over the directory data.
344
        """
345
        raise NotImplementedError(self.walkdirs)
346
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
347
1 by mbp at sourcefrog
import from baz patch-364
348
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
349
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
350
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
351
        self._inventory = Inventory(root_id=None)
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
352
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
353
                               ' use repository.revision_tree instead.',
354
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
355
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
356
    def get_parent_ids(self):
357
        return []
358
1092.2.6 by Robert Collins
symlink support updated to work
359
    def get_symlink_target(self, file_id):
360
        return None
361
1 by mbp at sourcefrog
import from baz patch-364
362
    def has_filename(self, filename):
363
        return False
364
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
365
    def kind(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
366
        file_id = osutils.safe_file_id(file_id)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
367
        assert self._inventory[file_id].kind == "directory"
368
        return "directory"
369
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
370
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
371
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
372
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
373
    def __contains__(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
374
        file_id = osutils.safe_file_id(file_id)
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
375
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
376
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
377
    def get_file_sha1(self, file_id, path=None, stat_value=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
378
        return None
379
380
1 by mbp at sourcefrog
import from baz patch-364
381
######################################################################
382
# diff
383
384
# TODO: Merge these two functions into a single one that can operate
385
# on either a whole tree or a set of files.
386
387
# TODO: Return the diff in order by filename, not by category or in
388
# random order.  Can probably be done by lock-stepping through the
389
# filenames from both trees.
390
391
392
def file_status(filename, old_tree, new_tree):
393
    """Return single-letter status, old and new names for a file.
394
395
    The complexity here is in deciding how to represent renames;
396
    many complex cases are possible.
397
    """
398
    old_inv = old_tree.inventory
399
    new_inv = new_tree.inventory
400
    new_id = new_inv.path2id(filename)
401
    old_id = old_inv.path2id(filename)
402
403
    if not new_id and not old_id:
404
        # easy: doesn't exist in either; not versioned at all
405
        if new_tree.is_ignored(filename):
406
            return 'I', None, None
407
        else:
408
            return '?', None, None
409
    elif new_id:
410
        # There is now a file of this name, great.
411
        pass
412
    else:
413
        # There is no longer a file of this name, but we can describe
414
        # what happened to the file that used to have
415
        # this name.  There are two possibilities: either it was
416
        # deleted entirely, or renamed.
417
        assert old_id
418
        if new_inv.has_id(old_id):
419
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
420
        else:
421
            return 'D', old_inv.id2path(old_id), None
422
423
    # if the file_id is new in this revision, it is added
424
    if new_id and not old_inv.has_id(new_id):
425
        return 'A'
426
427
    # if there used to be a file of this name, but that ID has now
428
    # disappeared, it is deleted
429
    if old_id and not new_inv.has_id(old_id):
430
        return 'D'
431
432
    return 'wtf?'
433
434
    
435
164 by mbp at sourcefrog
new 'renames' command
436
def find_renames(old_inv, new_inv):
437
    for file_id in old_inv:
438
        if file_id not in new_inv:
439
            continue
440
        old_name = old_inv.id2path(file_id)
441
        new_name = new_inv.id2path(file_id)
442
        if old_name != new_name:
443
            yield (old_name, new_name)
444
            
678 by Martin Pool
- export to tarballs
445
1551.7.22 by Aaron Bentley
Changes from review
446
def find_ids_across_trees(filenames, trees, require_versioned=True):
447
    """Find the ids corresponding to specified filenames.
448
    
449
    All matches in all trees will be used, and all children of matched
450
    directories will be used.
451
1551.10.7 by Aaron Bentley
Use new-style output for status
452
    :param filenames: The filenames to find file_ids for (if None, returns
453
        None)
1551.7.22 by Aaron Bentley
Changes from review
454
    :param trees: The trees to find file_ids within
455
    :param require_versioned: if true, all specified filenames must occur in
456
    at least one tree.
457
    :return: a set of file ids for the specified filenames and their children.
458
    """
459
    if not filenames:
460
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
461
    specified_path_ids = _find_ids_across_trees(filenames, trees,
462
        require_versioned)
463
    return _find_children_across_trees(specified_path_ids, trees)
464
465
466
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
467
    """Find the ids corresponding to specified filenames.
468
    
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
469
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
470
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
471
    :param filenames: The filenames to find file_ids for
472
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
473
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
474
        at least one tree.
475
    :return: a set of (path, file ids) for the specified filenames
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
476
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
477
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
478
    interesting_ids = set()
479
    for tree_path in filenames:
480
        not_found = True
481
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
482
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
483
            if file_id is not None:
484
                interesting_ids.add(file_id)
485
                not_found = False
486
        if not_found:
487
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
488
    if len(not_versioned) > 0 and require_versioned:
489
        raise errors.PathsNotVersionedError(not_versioned)
490
    return interesting_ids
491
492
493
def _find_children_across_trees(specified_ids, trees):
494
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
495
    
1551.7.22 by Aaron Bentley
Changes from review
496
    All matches in all trees will be used.
497
498
    :param trees: The trees to find file_ids within
499
    :return: a set containing all specified ids and their children 
500
    """
501
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
502
    pending = interesting_ids
503
    # now handle children of interesting ids
504
    # we loop so that we handle all children of each id in both trees
505
    while len(pending) > 0:
506
        new_pending = set()
507
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
508
            for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
509
                if not tree.has_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
510
                    continue
511
                entry = tree.inventory[file_id]
512
                for child in getattr(entry, 'children', {}).itervalues():
513
                    if child.file_id not in interesting_ids:
514
                        new_pending.add(child.file_id)
515
        interesting_ids.update(new_pending)
516
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
517
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
518
519
520
class InterTree(InterObject):
521
    """This class represents operations taking place between two Trees.
522
523
    Its instances have methods like 'compare' and contain references to the
524
    source and target trees these operations are to be carried out on.
525
526
    clients of bzrlib should not need to use InterTree directly, rather they
527
    should use the convenience methods on Tree such as 'Tree.compare()' which
528
    will pass through to InterTree as appropriate.
529
    """
530
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
531
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
532
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
533
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
534
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
535
        extra_trees=None, require_versioned=False, include_root=False,
536
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
537
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
538
539
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
540
        :param specific_files: An optional list of file paths to restrict the
541
            comparison to. When mapping filenames to ids, all matches in all
542
            trees (including optional extra_trees) are used, and all children of
543
            matched directories are included.
544
        :param want_unchanged: An optional boolean requesting the inclusion of
545
            unchanged entries in the result.
546
        :param extra_trees: An optional list of additional trees to use when
547
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
548
        :param require_versioned: An optional boolean (defaults to False). When
549
            supplied and True all the 'specific_files' must be versioned, or
550
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
551
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
552
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
553
        # NB: show_status depends on being able to pass in non-versioned files
554
        # and report them as unknown
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
555
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
556
        if extra_trees is not None:
557
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
558
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
559
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
560
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
561
        if specific_files and not specific_file_ids:
562
            # All files are unversioned, so just return an empty delta
563
            # _compare_trees would think we want a complete delta
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
564
            result = delta.TreeDelta()
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
565
            fake_entry = InventoryFile('unused', 'unused', 'unused')
566
            result.unversioned = [(path, None,
567
                self.target._comparison_data(fake_entry, path)[0]) for path in
568
                specific_files]
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
569
            return result
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
570
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
571
            specific_files, include_root, extra_trees=extra_trees,
572
            want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
573
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
574
    def _iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
575
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
576
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
577
        """Generate an iterator of changes between trees.
578
579
        A tuple is returned:
580
        (file_id, path, changed_content, versioned, parent, name, kind,
581
         executable)
582
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
583
        Path is relative to the target tree.  changed_content is True if the
584
        file's content has changed.  This includes changes to its kind, and to
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
585
        a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
586
2012.1.15 by Aaron Bentley
Minor tweaks
587
        versioned, parent, name, kind, executable are tuples of (from, to).
588
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
589
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
590
        Iteration is done in parent-to-child order, relative to the target
591
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
592
593
        There is no guarantee that all paths are in sorted order: the
594
        requirement to expand the search due to renames may result in children
595
        that should be found early being found late in the search, after
596
        lexically later results have been returned.
597
        :param require_versioned: Raise errors.PathsNotVersionedError if a
598
            path in the specific_files list is not versioned in one of
599
            source, target or extra_trees.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
600
        :param want_unversioned: Should unversioned files be returned in the
601
            output. An unversioned file is defined as one with (False, False)
602
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
603
        """
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
604
        lookup_trees = [self.source]
605
        if extra_trees:
606
             lookup_trees.extend(extra_trees)
607
        specific_file_ids = self.target.paths2ids(specific_files,
608
            lookup_trees, require_versioned=require_versioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
609
        if want_unversioned:
610
            all_unversioned = sorted([(p.split('/'), p) for p in self.target.extras()
611
                if not specific_files or
612
                    osutils.is_inside_any(specific_files, p)])
613
            all_unversioned = deque(all_unversioned)
614
        else:
615
            all_unversioned = deque()
2012.1.1 by Aaron Bentley
Implement change iterator
616
        to_paths = {}
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
617
        from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
618
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
619
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
620
        to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
621
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
622
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
623
        entry_count = 0
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
624
        # the unversioned path lookup only occurs on real trees - where there 
625
        # can be extras. So the fake_entry is solely used to look up
626
        # executable it values when execute is not supported.
627
        fake_entry = InventoryFile('unused', 'unused', 'unused')
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
628
        for to_path, to_entry in to_entries_by_dir:
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
629
            while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
630
                unversioned_path = all_unversioned.popleft()
631
                to_kind, to_executable, to_stat = \
632
                    self.target._comparison_data(fake_entry, unversioned_path[1])
633
                yield (None, unversioned_path[1], True, (False, False),
634
                    (None, None),
635
                    (None, unversioned_path[0][-1]),
636
                    (None, to_kind),
637
                    (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
638
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
639
            to_paths[file_id] = to_path
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
640
            entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
641
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
642
            from_path, from_entry = from_data.get(file_id, (None, None))
643
            from_versioned = (from_entry is not None)
644
            if from_entry is not None:
645
                from_versioned = True
646
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
647
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
648
                from_kind, from_executable, from_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
649
                    self.source._comparison_data(from_entry, from_path)
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
650
                entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
651
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
652
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
653
                from_kind = None
654
                from_parent = None
655
                from_name = None
656
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
657
            versioned = (from_versioned, True)
658
            to_kind, to_executable, to_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
659
                self.target._comparison_data(to_entry, to_path)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
660
            kind = (from_kind, to_kind)
661
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
662
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
663
            elif from_kind == 'file':
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
664
                from_size = self.source._file_size(from_entry, from_stat)
665
                to_size = self.target._file_size(to_entry, to_stat)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
666
                if from_size != to_size:
667
                    changed_content = True
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
668
                elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
669
                    self.target.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
670
                    changed_content = True
671
            elif from_kind == 'symlink':
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
672
                if (self.source.get_symlink_target(file_id) !=
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
673
                    self.target.get_symlink_target(file_id)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
674
                    changed_content = True
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
675
            parent = (from_parent, to_entry.parent_id)
676
            name = (from_name, to_entry.name)
677
            executable = (from_executable, to_executable)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
678
            if pb is not None:
679
                pb.update('comparing files', entry_count, num_entries)
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
680
            if (changed_content is not False or versioned[0] != versioned[1]
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
681
                or parent[0] != parent[1] or name[0] != name[1] or 
682
                executable[0] != executable[1] or include_unchanged):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
683
                yield (file_id, to_path, changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
684
                       name, kind, executable)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
685
        while all_unversioned:
686
            # yield any trailing unversioned paths
687
            unversioned_path = all_unversioned.popleft()
688
            to_kind, to_executable, to_stat = \
689
                self.target._comparison_data(fake_entry, unversioned_path[1])
690
            yield (None, unversioned_path[1], True, (False, False),
691
                (None, None),
692
                (None, unversioned_path[0][-1]),
693
                (None, to_kind),
694
                (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
695
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
696
        def get_to_path(from_entry):
697
            if from_entry.parent_id is None:
698
                to_path = ''
699
            else:
700
                if from_entry.parent_id not in to_paths:
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
701
                    get_to_path(self.source.inventory[from_entry.parent_id])
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
702
                to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
703
                                           from_entry.name)
704
            to_paths[from_entry.file_id] = to_path
705
            return to_path
706
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
707
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
708
            file_id = from_entry.file_id
709
            if file_id in to_paths:
710
                continue
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
711
            to_path = get_to_path(from_entry)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
712
            entry_count += 1
713
            if pb is not None:
714
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
715
            versioned = (True, False)
716
            parent = (from_entry.parent_id, None)
717
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
718
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
719
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
720
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
721
            executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
722
            changed_content = True
723
            # the parent's path is necessarily known at this point.
724
            yield(file_id, to_path, changed_content, versioned, parent,
725
                  name, kind, executable)
2012.1.8 by Aaron Bentley
Merge from bzr.dev
726
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
727
728
# This was deprecated before 0.12, but did not have an official warning
729
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
730
def RevisionTree(*args, **kwargs):
731
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
732
733
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
734
    bzr 0.12.
735
    """
736
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
737
    return _RevisionTree(*args, **kwargs)
738
 
739