/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
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
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
21
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
24
import collections
800 by Martin Pool
Merge John's import-speedup branch:
25
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
26
from bzrlib import (
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
27
    conflicts as _mod_conflicts,
3368.2.30 by Ian Clatworthy
add -Dfilters support
28
    debug,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
29
    delta,
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
30
    errors,
3368.2.16 by Ian Clatworthy
add real implementation of Tree.get_filter_stack
31
    filters,
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
32
    inventory,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
33
    osutils,
1551.15.46 by Aaron Bentley
Move plan merge to tree
34
    revision as _mod_revision,
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
35
    rules,
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
36
    trace,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
37
    )
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
38
""")
39
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
40
from bzrlib.decorators import needs_read_lock
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
41
from bzrlib.inter import InterObject
1 by mbp at sourcefrog
import from baz patch-364
42
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
43
558 by Martin Pool
- All top-level classes inherit from object
44
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
45
    """Abstract file tree.
46
47
    There are several subclasses:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
48
1 by mbp at sourcefrog
import from baz patch-364
49
    * `WorkingTree` exists as files on disk editable by the user.
50
51
    * `RevisionTree` is a tree as recorded at some point in the past.
52
53
    Trees can be compared, etc, regardless of whether they are working
54
    trees or versioned trees.
55
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
56
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
57
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
58
        extra_trees=None, require_versioned=False, include_root=False,
59
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
60
        """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.
61
62
        :param other: A tree to compare with.
63
        :param specific_files: An optional list of file paths to restrict the
64
            comparison to. When mapping filenames to ids, all matches in all
65
            trees (including optional extra_trees) are used, and all children of
66
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
67
        :param want_unchanged: An optional boolean requesting the inclusion of
68
            unchanged entries in the result.
69
        :param extra_trees: An optional list of additional trees to use when
70
            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.
71
        :param require_versioned: An optional boolean (defaults to False). When
72
            supplied and True all the 'specific_files' must be versioned, or
73
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
74
        :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.
75
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
76
        The comparison will be performed by an InterTree object looked up on
1852.8.4 by Robert Collins
Hook InterTree into Tree.
77
        self and other.
78
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
79
        # Martin observes that Tree.changes_from returns a TreeDelta and this
80
        # may confuse people, because the class name of the returned object is
81
        # 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.
82
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
83
            want_unchanged=want_unchanged,
84
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
85
            extra_trees=extra_trees,
86
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
87
            include_root=include_root,
88
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
89
            )
2012.1.1 by Aaron Bentley
Implement change iterator
90
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
91
    def iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
92
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
93
                     require_versioned=True, want_unversioned=False):
4988.10.6 by John Arbash Meinel
Fix bug #304182 by adding a trivial docstring to Tree.iter_changes
94
        """See InterTree.iter_changes"""
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
95
        intertree = InterTree.get(from_tree, self)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
96
        return intertree.iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
97
            extra_trees, require_versioned, want_unversioned=want_unversioned)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
98
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
99
    def conflicts(self):
100
        """Get a list of the conflicts in the tree.
101
102
        Each conflict is an instance of bzrlib.conflicts.Conflict.
103
        """
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
104
        return _mod_conflicts.ConflictList()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
105
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
106
    def extras(self):
107
        """For trees that can have unversioned files, return all such paths."""
108
        return []
109
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
110
    def get_parent_ids(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
111
        """Get the parent ids for this tree.
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
112
113
        :return: a list of parent ids. [] is returned to indicate
114
        a tree with no parents.
115
        :raises: BzrError if the parents are not known.
116
        """
117
        raise NotImplementedError(self.get_parent_ids)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
118
1 by mbp at sourcefrog
import from baz patch-364
119
    def has_filename(self, filename):
120
        """True if the tree has given filename."""
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
121
        raise NotImplementedError(self.has_filename)
1 by mbp at sourcefrog
import from baz patch-364
122
1185.12.39 by abentley
Propogated has_or_had_id to Tree
123
    def has_id(self, file_id):
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
124
        raise NotImplementedError(self.has_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
125
3363.15.3 by Aaron Bentley
Change Tree.__contains__ to tolerate subclasssing
126
    def __contains__(self, file_id):
127
        return self.has_id(file_id)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
128
1185.12.39 by abentley
Propogated has_or_had_id to Tree
129
    def has_or_had_id(self, file_id):
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
130
        raise NotImplementedError(self.has_or_had_id)
1 by mbp at sourcefrog
import from baz patch-364
131
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
132
    def is_ignored(self, filename):
133
        """Check whether the filename is ignored by this tree.
134
135
        :param filename: The relative filename within the tree.
136
        :return: True if the filename is ignored.
137
        """
138
        return False
139
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
140
    def __iter__(self):
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
141
        """Yield all file ids in this tree."""
142
        raise NotImplementedError(self.__iter__)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
143
3146.8.16 by Aaron Bentley
Updates from review
144
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
145
        """Iterate through all file ids, including ids for missing files."""
3146.8.16 by Aaron Bentley
Updates from review
146
        return set(self.inventory)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
147
1 by mbp at sourcefrog
import from baz patch-364
148
    def id2path(self, file_id):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
149
        """Return the path for a file id.
150
151
        :raises NoSuchId:
152
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
153
        raise NotImplementedError(self.id2path)
1 by mbp at sourcefrog
import from baz patch-364
154
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
155
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
156
        """Walk the tree in 'by_dir' order.
157
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
158
        This will yield each entry in the tree as a (path, entry) tuple.
159
        The order that they are yielded is:
160
161
        Directories are walked in a depth-first lexicographical order,
162
        however, whenever a directory is reached, all of its direct child
163
        nodes are yielded in  lexicographical order before yielding the
164
        grandchildren.
165
166
        For example, in the tree::
167
168
           a/
169
             b/
170
               c
171
             d/
172
               e
173
           f/
174
             g
175
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
176
        The yield order (ignoring root) would be::
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
177
          a, f, a/b, a/d, a/b/c, a/d/e, f/g
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
178
179
        :param yield_parents: If True, yield the parents from the root leading
180
            down to specific_file_ids that have been requested. This has no
181
            impact if specific_file_ids is None.
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
182
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
183
        raise NotImplementedError(self.iter_entries_by_dir)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
184
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
185
    def iter_references(self):
4370.3.2 by Ian Clatworthy
apply jam's review feedback
186
        if self.supports_tree_reference():
187
            for path, entry in self.iter_entries_by_dir():
188
                if entry.kind == 'tree-reference':
189
                    yield path, entry.file_id
2100.3.27 by Aaron Bentley
Enable nested commits
190
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
191
    def kind(self, file_id):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
192
        raise NotImplementedError("Tree subclass %s must implement kind"
193
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
194
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
195
    def stored_kind(self, file_id):
196
        """File kind stored for this file_id.
197
3146.8.15 by Aaron Bentley
Cleanup and docs
198
        May not match kind on disk for working trees.  Always available
199
        for versioned files, even when the file itself is missing.
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
200
        """
201
        return self.kind(file_id)
202
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
203
    def path_content_summary(self, path):
204
        """Get a summary of the information about path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
205
4595.11.2 by Martin Pool
Clarify contract of path_content_summary
206
        All the attributes returned are for the canonical form, not the
207
        convenient form (if content filters are in use.)
208
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
209
        :param path: A relative path within the tree.
210
        :return: A tuple containing kind, size, exec, sha1-or-link.
211
            Kind is always present (see tree.kind()).
4595.11.13 by Martin Pool
Remove get_kind_and_executable_by_path; go back to using plain path_content_summary
212
            size is present if kind is file and the size of the 
213
                canonical form can be cheaply determined, None otherwise.
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
214
            exec is None unless kind is file and the platform supports the 'x'
215
                bit.
216
            sha1-or-link is the link target if kind is symlink, or the sha1 if
217
                it can be obtained without reading the file.
218
        """
219
        raise NotImplementedError(self.path_content_summary)
220
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
221
    def get_reference_revision(self, file_id, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
222
        raise NotImplementedError("Tree subclass %s must implement "
223
                                  "get_reference_revision"
224
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
225
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
226
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
227
        """Return a tuple of kind, executable, stat_value for a file.
228
229
        entry may be None if there is no inventory entry for the file, but
230
        path must always be supplied.
231
232
        kind is None if there is no file present (even if an inventory id is
233
        present).  executable is False for non-file entries.
234
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
235
        raise NotImplementedError(self._comparison_data)
236
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
237
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
238
        raise NotImplementedError(self._file_size)
239
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
240
    def get_file(self, file_id, path=None):
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
241
        """Return a file object for the file file_id in the tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
242
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
243
        If both file_id and path are defined, it is implementation defined as
244
        to which one is used.
245
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
246
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
247
4354.4.5 by Aaron Bentley
Ensure Tree.get_file_with_stat is provided.
248
    def get_file_with_stat(self, file_id, path=None):
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
249
        """Get a file handle and stat object for file_id.
250
251
        The default implementation returns (self.get_file, None) for backwards
252
        compatibility.
253
254
        :param file_id: The file id to read.
255
        :param path: The path of the file, if it is known.
256
        :return: A tuple (file_handle, stat_value_or_None). If the tree has
257
            no stat facility, or need for a stat cache feedback during commit,
258
            it may return None for the second element of the tuple.
259
        """
260
        return (self.get_file(file_id, path), None)
4354.4.5 by Aaron Bentley
Ensure Tree.get_file_with_stat is provided.
261
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
262
    def get_file_text(self, file_id, path=None):
263
        """Return the byte content of a file.
264
265
        :param file_id: The file_id of the file.
266
        :param path: The path of the file.
267
        If both file_id and path are supplied, an implementation may use
268
        either one.
269
        """
270
        my_file = self.get_file(file_id, path)
271
        try:
272
            return my_file.read()
273
        finally:
274
            my_file.close()
275
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
276
    def get_file_lines(self, file_id, path=None):
277
        """Return the content of a file, as lines.
278
279
        :param file_id: The file_id of the file.
280
        :param path: The path of the file.
281
        If both file_id and path are supplied, an implementation may use
282
        either one.
283
        """
284
        return osutils.split_lines(self.get_file_text(file_id, path))
285
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
286
    def get_file_mtime(self, file_id, path=None):
287
        """Return the modification time for a file.
288
289
        :param file_id: The handle for this file.
290
        :param path: The path that this file can be found at.
291
            These must point to the same object.
292
        """
293
        raise NotImplementedError(self.get_file_mtime)
294
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
295
    def get_file_size(self, file_id):
296
        """Return the size of a file in bytes.
297
298
        This applies only to regular files.  If invoked on directories or
299
        symlinks, it will return None.
300
        :param file_id: The file-id of the file
301
        """
302
        raise NotImplementedError(self.get_file_size)
303
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
304
    def get_file_by_path(self, path):
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
305
        raise NotImplementedError(self.get_file_by_path)
1 by mbp at sourcefrog
import from baz patch-364
306
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
307
    def iter_files_bytes(self, desired_files):
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
308
        """Iterate through file contents.
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
309
2708.1.10 by Aaron Bentley
Update docstrings
310
        Files will not necessarily be returned in the order they occur in
311
        desired_files.  No specific order is guaranteed.
312
313
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
314
        value supplied by the caller as part of desired_files.  It should
315
        uniquely identify the file version in the caller's context.  (Examples:
316
        an index number or a TreeTransform trans_id.)
317
318
        bytes_iterator is an iterable of bytestrings for the file.  The
319
        kind of iterable and length of the bytestrings are unspecified, but for
320
        this implementation, it is a tuple containing a single bytestring with
321
        the complete text of the file.
322
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
323
        :param desired_files: a list of (file_id, identifier) pairs
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
324
        """
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
325
        for file_id, identifier in desired_files:
2708.1.10 by Aaron Bentley
Update docstrings
326
            # We wrap the string in a tuple so that we can return an iterable
327
            # of bytestrings.  (Technically, a bytestring is also an iterable
328
            # of bytestrings, but iterating through each character is not
329
            # performant.)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
330
            cur_file = (self.get_file_text(file_id),)
331
            yield identifier, cur_file
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
332
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
333
    def get_symlink_target(self, file_id):
334
        """Get the target for a given file_id.
335
336
        It is assumed that the caller already knows that file_id is referencing
337
        a symlink.
338
        :param file_id: Handle for the symlink entry.
339
        :return: The path the symlink points to.
340
        """
341
        raise NotImplementedError(self.get_symlink_target)
342
3794.5.5 by Mark Hammond
Add get_canonical_path method to the Tree class, plus tests.
343
2946.3.2 by John Arbash Meinel
Add tree implementation tests for Tree.get_root_id()
344
    def get_root_id(self):
345
        """Return the file_id for the root of this tree."""
346
        raise NotImplementedError(self.get_root_id)
347
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
348
    def annotate_iter(self, file_id,
349
                      default_revision=_mod_revision.CURRENT_REVISION):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
350
        """Return an iterator of revision_id, line tuples.
1551.9.18 by Aaron Bentley
Updates from review comments
351
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
352
        For working trees (and mutable trees in general), the special
353
        revision_id 'current:' will be used for lines that are new in this
354
        tree, e.g. uncommitted changes.
355
        :param file_id: The file to produce an annotated version from
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
356
        :param default_revision: For lines that don't match a basis, mark them
357
            with this revision id. Not all implementations will make use of
358
            this value.
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
359
        """
360
        raise NotImplementedError(self.annotate_iter)
361
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
362
    def _get_plan_merge_data(self, file_id, other, base):
4496.3.15 by Andrew Bennetts
Remove unused imports.
363
        from bzrlib import versionedfile
3062.1.11 by Aaron Bentley
Update references
364
        vf = versionedfile._PlanMergeVersionedFile(file_id)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
365
        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
366
        last_revision_b = other._get_file_revision(file_id, vf, 'other:')
3062.2.4 by Aaron Bentley
Start supporting merge-with-base
367
        if base is None:
368
            last_revision_base = None
369
        else:
3062.2.6 by Aaron Bentley
Get cherrypick-on-weave working
370
            last_revision_base = base._get_file_revision(file_id, vf, 'base:')
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
371
        return vf, last_revision_a, last_revision_b, last_revision_base
372
373
    def plan_file_merge(self, file_id, other, base=None):
374
        """Generate a merge plan based on annotations.
375
376
        If the file contains uncommitted changes in this tree, they will be
377
        attributed to the 'current:' pseudo-revision.  If the file contains
378
        uncommitted changes in the other tree, they will be assigned to the
379
        'other:' pseudo-revision.
380
        """
381
        data = self._get_plan_merge_data(file_id, other, base)
382
        vf, last_revision_a, last_revision_b, last_revision_base = data
3062.2.4 by Aaron Bentley
Start supporting merge-with-base
383
        return vf.plan_merge(last_revision_a, last_revision_b,
384
                             last_revision_base)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
385
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
386
    def plan_file_lca_merge(self, file_id, other, base=None):
387
        """Generate a merge plan based lca-newness.
388
389
        If the file contains uncommitted changes in this tree, they will be
390
        attributed to the 'current:' pseudo-revision.  If the file contains
391
        uncommitted changes in the other tree, they will be assigned to the
392
        'other:' pseudo-revision.
393
        """
394
        data = self._get_plan_merge_data(file_id, other, base)
395
        vf, last_revision_a, last_revision_b, last_revision_base = data
396
        return vf.plan_lca_merge(last_revision_a, last_revision_b,
397
                                 last_revision_base)
398
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
399
    def _iter_parent_trees(self):
400
        """Iterate through parent trees, defaulting to Tree.revision_tree."""
401
        for revision_id in self.get_parent_ids():
402
            try:
403
                yield self.revision_tree(revision_id)
404
            except errors.NoSuchRevisionInTree:
405
                yield self.repository.revision_tree(revision_id)
406
407
    @staticmethod
408
    def _file_revision(revision_tree, file_id):
409
        """Determine the revision associated with a file in a given tree."""
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
410
        # FIXME: Shouldn't this be a RevisionTree method?
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
411
        revision_tree.lock_read()
412
        try:
413
            return revision_tree.inventory[file_id].revision
414
        finally:
415
            revision_tree.unlock()
416
3062.1.3 by Aaron Bentley
Correctly determine file revisions
417
    def _get_file_revision(self, file_id, vf, tree_revision):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
418
        """Ensure that file_id, tree_revision is in vf to plan the merge."""
3062.1.3 by Aaron Bentley
Correctly determine file revisions
419
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
420
        if getattr(self, '_repository', None) is None:
3062.1.3 by Aaron Bentley
Correctly determine file revisions
421
            last_revision = tree_revision
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
422
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
423
                self._iter_parent_trees()]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
424
            vf.add_lines((file_id, last_revision), parent_keys,
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
425
                         self.get_file_lines(file_id))
3062.1.6 by Aaron Bentley
PlanMergeVersionedfile now has multiple Versionedfile fallbacks
426
            repo = self.branch.repository
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
427
            base_vf = repo.texts
3062.1.3 by Aaron Bentley
Correctly determine file revisions
428
        else:
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
429
            last_revision = self._file_revision(self, file_id)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
430
            base_vf = self._repository.texts
431
        if base_vf not in vf.fallback_versionedfiles:
432
            vf.fallback_versionedfiles.append(base_vf)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
433
        return last_revision
1551.15.46 by Aaron Bentley
Move plan merge to tree
434
1 by mbp at sourcefrog
import from baz patch-364
435
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
436
        if not __debug__:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
437
            return
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
438
        fp = osutils.fingerprint_file(f)
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
439
        f.seek(0)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
440
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
441
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
442
            if ie.text_size != fp['size']:
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
443
                raise errors.BzrError(
444
                        "mismatched size for file %r in %r" %
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
445
                        (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
446
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
447
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
448
                         "store is probably damaged/corrupt"])
449
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
450
        if ie.text_sha1 != fp['sha1']:
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
451
            raise errors.BzrError("wrong SHA-1 for file %r in %r" %
452
                    (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
453
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
454
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
455
                     "store is probably damaged/corrupt"])
456
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
457
    def path2id(self, path):
458
        """Return the id for path in this tree."""
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
459
        raise NotImplementedError(self.path2id)
1 by mbp at sourcefrog
import from baz patch-364
460
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
461
    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.
462
        """Return all the ids that can be reached by walking from paths.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
463
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
464
        Each path is looked up in this tree and any extras provided in
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
465
        trees, and this is repeated recursively: the children in an extra tree
466
        of a directory that has been renamed under a provided path in this tree
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
467
        are all returned, even if none exist under a provided path in this
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
468
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
469
470
        :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.
471
            Alternatively, if paths is None, no ids should be calculated and None
472
            will be returned. This is offered to make calling the api unconditional
473
            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.
474
        :param trees: Additional trees to consider.
475
        :param require_versioned: If False, do not raise NotVersionedError if
476
            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.
477
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
478
        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.
479
3363.12.2 by Aaron Bentley
Implement tree.iter_children to instead of adjusting InventoryEntry handling
480
    def iter_children(self, file_id):
481
        entry = self.iter_entries_by_dir([file_id]).next()[1]
482
        for child in getattr(entry, 'children', {}).itervalues():
483
            yield child.file_id
484
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
485
    def lock_read(self):
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
486
        """Lock this tree for multiple read only operations.
487
        
488
        :return: A bzrlib.lock.LogicalLockResult.
489
        """
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
490
        pass
491
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
492
    def revision_tree(self, revision_id):
493
        """Obtain a revision tree for the revision revision_id.
494
495
        The intention of this method is to allow access to possibly cached
496
        tree data. Implementors of this method should raise NoSuchRevision if
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
497
        the tree is not locally available, even if they could obtain the
498
        tree via a repository or some other means. Callers are responsible
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
499
        for finding the ultimate source for a revision tree.
500
501
        :param revision_id: The revision_id of the requested tree.
502
        :return: A Tree.
503
        :raises: NoSuchRevision if the tree cannot be obtained.
504
        """
505
        raise errors.NoSuchRevisionInTree(self, revision_id)
506
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
507
    def unknowns(self):
508
        """What files are present in this tree and unknown.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
509
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
510
        :return: an iterator over the unknown files.
511
        """
512
        return iter([])
513
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
514
    def unlock(self):
515
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
516
517
    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.
518
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
519
520
        :return: set of paths.
521
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
522
        raise NotImplementedError(self.filter_unversioned_files)
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
523
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
524
    def walkdirs(self, prefix=""):
525
        """Walk the contents of this tree from path down.
526
527
        This yields all the data about the contents of a directory at a time.
528
        After each directory has been yielded, if the caller has mutated the
529
        list to exclude some directories, they are then not descended into.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
530
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
531
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
532
        ((directory-relpath, directory-path-from-root, directory-fileid),
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
533
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id,
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
534
          versioned_kind), ...]),
535
         - directory-relpath is the containing dirs relpath from prefix
536
         - directory-path-from-root is the containing dirs path from /
537
         - 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.
538
         - relpath is the relative path within the subtree being walked.
539
         - basename is the basename
540
         - kind is the kind of the file now. If unknonwn then the file is not
541
           present within the tree - but it may be recorded as versioned. See
542
           versioned_kind.
543
         - lstat is the stat data *if* the file was statted.
544
         - path_from_tree_root is the path from the root of the tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
545
         - file_id is the file_id if the entry is versioned.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
546
         - versioned_kind is the kind of the file as last recorded in the
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
547
           versioning system. If 'unknown' the file is not versioned.
548
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
549
550
        :param prefix: Start walking from prefix within the tree rather than
551
        at the root. This allows one to walk a subtree but get paths that are
552
        relative to a tree rooted higher up.
553
        :return: an iterator over the directory data.
554
        """
555
        raise NotImplementedError(self.walkdirs)
556
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
557
    def supports_content_filtering(self):
558
        return False
559
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
560
    def _content_filter_stack(self, path=None, file_id=None):
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
561
        """The stack of content filters for a path if filtering is supported.
3368.2.47 by Ian Clatworthy
merge bzr.dev r4042
562
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
563
        Readers will be applied in first-to-last order.
564
        Writers will be applied in last-to-first order.
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
565
        Either the path or the file-id needs to be provided.
566
567
        :param path: path relative to the root of the tree
568
            or None if unknown
569
        :param file_id: file_id or None if unknown
570
        :return: the list of filters - [] if there are none
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
571
        """
3368.2.16 by Ian Clatworthy
add real implementation of Tree.get_filter_stack
572
        filter_pref_names = filters._get_registered_names()
573
        if len(filter_pref_names) == 0:
574
            return []
575
        if path is None:
576
            path = self.id2path(file_id)
3368.2.29 by Ian Clatworthy
access rules via get_special_file to fix recursion bug
577
        prefs = self.iter_search_rules([path], filter_pref_names).next()
3368.2.30 by Ian Clatworthy
add -Dfilters support
578
        stk = filters._get_filter_stack_for(prefs)
579
        if 'filters' in debug.debug_flags:
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
580
            trace.note("*** %s content-filter: %s => %r" % (path,prefs,stk))
3368.2.30 by Ian Clatworthy
add -Dfilters support
581
        return stk
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
582
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
583
    def _content_filter_stack_provider(self):
584
        """A function that returns a stack of ContentFilters.
585
586
        The function takes a path (relative to the top of the tree) and a
587
        file-id as parameters.
588
589
        :return: None if content filtering is not supported by this tree.
590
        """
591
        if self.supports_content_filtering():
592
            return lambda path, file_id: \
593
                    self._content_filter_stack(path, file_id)
594
        else:
595
            return None
596
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
597
    def iter_search_rules(self, path_names, pref_names=None,
4324.4.1 by Marius Kruger
Make it possible to blackboxtest rules
598
        _default_searcher=None):
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
599
        """Find the preferences for filenames in a tree.
600
601
        :param path_names: an iterable of paths to find attributes for.
602
          Paths are given relative to the root of the tree.
603
        :param pref_names: the list of preferences to lookup - None for all
604
        :param _default_searcher: private parameter to assist testing - don't use
605
        :return: an iterator of tuple sequences, one per path-name.
606
          See _RulesSearcher.get_items for details on the tuple sequence.
607
        """
4324.4.1 by Marius Kruger
Make it possible to blackboxtest rules
608
        if _default_searcher is None:
609
            _default_searcher = rules._per_user_searcher
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
610
        searcher = self._get_rules_searcher(_default_searcher)
611
        if searcher is not None:
3398.1.34 by Ian Clatworthy
changed API design as requested by jam during review
612
            if pref_names is not None:
613
                for path in path_names:
614
                    yield searcher.get_selected_items(path, pref_names)
615
            else:
616
                for path in path_names:
617
                    yield searcher.get_items(path)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
618
619
    def _get_rules_searcher(self, default_searcher):
620
        """Get the RulesSearcher for this tree given the default one."""
621
        searcher = default_searcher
622
        return searcher
623
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
624
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
625
class InventoryTree(Tree):
626
    """A tree that relies on an inventory for its metadata.
627
628
    Trees contain an `Inventory` object, and also know how to retrieve
629
    file texts mentioned in the inventory, either from a working
630
    directory or from a store.
631
632
    It is possible for trees to contain files that are not described
633
    in their inventory or vice versa; for this use `filenames()`.
634
    """
635
636
    def get_canonical_inventory_paths(self, paths):
637
        """Like get_canonical_inventory_path() but works on multiple items.
638
639
        :param paths: A sequence of paths relative to the root of the tree.
640
        :return: A list of paths, with each item the corresponding input path
641
        adjusted to account for existing elements that match case
642
        insensitively.
643
        """
644
        return list(self._yield_canonical_inventory_paths(paths))
645
646
    def get_canonical_inventory_path(self, path):
647
        """Returns the first inventory item that case-insensitively matches path.
648
649
        If a path matches exactly, it is returned. If no path matches exactly
650
        but more than one path matches case-insensitively, it is implementation
651
        defined which is returned.
652
653
        If no path matches case-insensitively, the input path is returned, but
654
        with as many path entries that do exist changed to their canonical
655
        form.
656
657
        If you need to resolve many names from the same tree, you should
658
        use get_canonical_inventory_paths() to avoid O(N) behaviour.
659
660
        :param path: A paths relative to the root of the tree.
661
        :return: The input path adjusted to account for existing elements
662
        that match case insensitively.
663
        """
664
        return self._yield_canonical_inventory_paths([path]).next()
665
666
    def _yield_canonical_inventory_paths(self, paths):
667
        for path in paths:
668
            # First, if the path as specified exists exactly, just use it.
669
            if self.path2id(path) is not None:
670
                yield path
671
                continue
672
            # go walkin...
673
            cur_id = self.get_root_id()
674
            cur_path = ''
675
            bit_iter = iter(path.split("/"))
676
            for elt in bit_iter:
677
                lelt = elt.lower()
678
                new_path = None
679
                for child in self.iter_children(cur_id):
680
                    try:
681
                        # XXX: it seem like if the child is known to be in the
682
                        # tree, we shouldn't need to go from its id back to
683
                        # its path -- mbp 2010-02-11
684
                        #
685
                        # XXX: it seems like we could be more efficient
686
                        # by just directly looking up the original name and
687
                        # only then searching all children; also by not
688
                        # chopping paths so much. -- mbp 2010-02-11
689
                        child_base = os.path.basename(self.id2path(child))
690
                        if (child_base == elt):
691
                            # if we found an exact match, we can stop now; if
692
                            # we found an approximate match we need to keep
693
                            # searching because there might be an exact match
694
                            # later.  
695
                            cur_id = child
696
                            new_path = osutils.pathjoin(cur_path, child_base)
697
                            break
698
                        elif child_base.lower() == lelt:
699
                            cur_id = child
700
                            new_path = osutils.pathjoin(cur_path, child_base)
701
                    except errors.NoSuchId:
702
                        # before a change is committed we can see this error...
703
                        continue
704
                if new_path:
705
                    cur_path = new_path
706
                else:
707
                    # got to the end of this directory and no entries matched.
708
                    # Return what matched so far, plus the rest as specified.
709
                    cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
710
                    break
711
            yield cur_path
712
        # all done.
713
714
    def _get_inventory(self):
715
        return self._inventory
716
717
    inventory = property(_get_inventory,
718
                         doc="Inventory of this Tree")
719
720
    @needs_read_lock
721
    def path2id(self, path):
722
        """Return the id for path in this tree."""
723
        return self._inventory.path2id(path)
724
725
    def id2path(self, file_id):
726
        """Return the path for a file id.
727
728
        :raises NoSuchId:
729
        """
730
        return self.inventory.id2path(file_id)
731
732
    def has_id(self, file_id):
733
        return self.inventory.has_id(file_id)
734
735
    def has_or_had_id(self, file_id):
736
        return self.inventory.has_id(file_id)
737
738
    def __iter__(self):
739
        return iter(self.inventory)
740
741
    def filter_unversioned_files(self, paths):
742
        """Filter out paths that are versioned.
743
744
        :return: set of paths.
745
        """
746
        # NB: we specifically *don't* call self.has_filename, because for
747
        # WorkingTrees that can indicate files that exist on disk but that
748
        # are not versioned.
749
        pred = self.inventory.has_filename
750
        return set((p for p in paths if not pred(p)))
751
752
    @needs_read_lock
753
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
754
        """Walk the tree in 'by_dir' order.
755
756
        This will yield each entry in the tree as a (path, entry) tuple.
757
        The order that they are yielded is:
758
759
        See Tree.iter_entries_by_dir for details.
760
761
        :param yield_parents: If True, yield the parents from the root leading
762
            down to specific_file_ids that have been requested. This has no
763
            impact if specific_file_ids is None.
764
        """
765
        return self.inventory.iter_entries_by_dir(
766
            specific_file_ids=specific_file_ids, yield_parents=yield_parents)
767
768
    def get_file_by_path(self, path):
769
        return self.get_file(self._inventory.path2id(path), path)
770
771
1 by mbp at sourcefrog
import from baz patch-364
772
######################################################################
773
# diff
774
775
# TODO: Merge these two functions into a single one that can operate
776
# on either a whole tree or a set of files.
777
778
# TODO: Return the diff in order by filename, not by category or in
779
# random order.  Can probably be done by lock-stepping through the
780
# filenames from both trees.
781
782
783
def file_status(filename, old_tree, new_tree):
784
    """Return single-letter status, old and new names for a file.
785
786
    The complexity here is in deciding how to represent renames;
787
    many complex cases are possible.
788
    """
789
    old_inv = old_tree.inventory
790
    new_inv = new_tree.inventory
791
    new_id = new_inv.path2id(filename)
792
    old_id = old_inv.path2id(filename)
793
794
    if not new_id and not old_id:
795
        # easy: doesn't exist in either; not versioned at all
796
        if new_tree.is_ignored(filename):
797
            return 'I', None, None
798
        else:
799
            return '?', None, None
800
    elif new_id:
801
        # There is now a file of this name, great.
802
        pass
803
    else:
804
        # There is no longer a file of this name, but we can describe
805
        # what happened to the file that used to have
806
        # this name.  There are two possibilities: either it was
807
        # deleted entirely, or renamed.
808
        if new_inv.has_id(old_id):
809
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
810
        else:
811
            return 'D', old_inv.id2path(old_id), None
812
813
    # if the file_id is new in this revision, it is added
814
    if new_id and not old_inv.has_id(new_id):
815
        return 'A'
816
817
    # if there used to be a file of this name, but that ID has now
818
    # disappeared, it is deleted
819
    if old_id and not new_inv.has_id(old_id):
820
        return 'D'
821
822
    return 'wtf?'
823
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
824
1551.7.22 by Aaron Bentley
Changes from review
825
def find_ids_across_trees(filenames, trees, require_versioned=True):
826
    """Find the ids corresponding to specified filenames.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
827
1551.7.22 by Aaron Bentley
Changes from review
828
    All matches in all trees will be used, and all children of matched
829
    directories will be used.
830
1551.10.7 by Aaron Bentley
Use new-style output for status
831
    :param filenames: The filenames to find file_ids for (if None, returns
832
        None)
1551.7.22 by Aaron Bentley
Changes from review
833
    :param trees: The trees to find file_ids within
834
    :param require_versioned: if true, all specified filenames must occur in
835
    at least one tree.
836
    :return: a set of file ids for the specified filenames and their children.
837
    """
3363.12.9 by Aaron Bentley
Revert changed select-all test
838
    if not filenames:
1551.7.22 by Aaron Bentley
Changes from review
839
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
840
    specified_path_ids = _find_ids_across_trees(filenames, trees,
841
        require_versioned)
842
    return _find_children_across_trees(specified_path_ids, trees)
843
844
845
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
846
    """Find the ids corresponding to specified filenames.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
847
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
848
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
849
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
850
    :param filenames: The filenames to find file_ids for
851
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
852
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
853
        at least one tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
854
    :return: a set of file ids for the specified filenames
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
855
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
856
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
857
    interesting_ids = set()
858
    for tree_path in filenames:
859
        not_found = True
860
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
861
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
862
            if file_id is not None:
863
                interesting_ids.add(file_id)
864
                not_found = False
865
        if not_found:
866
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
867
    if len(not_versioned) > 0 and require_versioned:
868
        raise errors.PathsNotVersionedError(not_versioned)
869
    return interesting_ids
870
871
872
def _find_children_across_trees(specified_ids, trees):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
873
    """Return a set including specified ids and their children.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
874
1551.7.22 by Aaron Bentley
Changes from review
875
    All matches in all trees will be used.
876
877
    :param trees: The trees to find file_ids within
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
878
    :return: a set containing all specified ids and their children
1551.7.22 by Aaron Bentley
Changes from review
879
    """
880
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
881
    pending = interesting_ids
882
    # now handle children of interesting ids
883
    # we loop so that we handle all children of each id in both trees
884
    while len(pending) > 0:
885
        new_pending = set()
886
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
887
            for tree in trees:
4544.2.1 by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned.
888
                if not tree.has_or_had_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
889
                    continue
3363.12.2 by Aaron Bentley
Implement tree.iter_children to instead of adjusting InventoryEntry handling
890
                for child_id in tree.iter_children(file_id):
891
                    if child_id not in interesting_ids:
892
                        new_pending.add(child_id)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
893
        interesting_ids.update(new_pending)
894
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
895
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
896
897
898
class InterTree(InterObject):
899
    """This class represents operations taking place between two Trees.
900
901
    Its instances have methods like 'compare' and contain references to the
902
    source and target trees these operations are to be carried out on.
903
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
904
    Clients of bzrlib should not need to use InterTree directly, rather they
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
905
    should use the convenience methods on Tree such as 'Tree.compare()' which
906
    will pass through to InterTree as appropriate.
907
    """
908
4585.1.18 by Jelmer Vernooij
Add note saying that InterTree will not be tested if the from and to formats are not set.
909
    # Formats that will be used to test this InterTree. If both are
910
    # None, this InterTree will not be tested (e.g. because a complex
911
    # setup is required)
912
    _matching_from_tree_format = None
913
    _matching_to_tree_format = None
914
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
915
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
916
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
917
    def _changes_from_entries(self, source_entry, target_entry,
918
        source_path=None, target_path=None):
919
        """Generate a iter_changes tuple between source_entry and target_entry.
920
921
        :param source_entry: An inventory entry from self.source, or None.
922
        :param target_entry: An inventory entry from self.target, or None.
923
        :param source_path: The path of source_entry, if known. If not known
924
            it will be looked up.
925
        :param target_path: The path of target_entry, if known. If not known
926
            it will be looked up.
927
        :return: A tuple, item 0 of which is an iter_changes result tuple, and
928
            item 1 is True if there are any changes in the result tuple.
929
        """
930
        if source_entry is None:
931
            if target_entry is None:
932
                return None
933
            file_id = target_entry.file_id
934
        else:
935
            file_id = source_entry.file_id
936
        if source_entry is not None:
937
            source_versioned = True
938
            source_name = source_entry.name
939
            source_parent = source_entry.parent_id
940
            if source_path is None:
941
                source_path = self.source.id2path(file_id)
942
            source_kind, source_executable, source_stat = \
943
                self.source._comparison_data(source_entry, source_path)
944
        else:
945
            source_versioned = False
946
            source_name = None
947
            source_parent = None
948
            source_kind = None
949
            source_executable = None
950
        if target_entry is not None:
951
            target_versioned = True
952
            target_name = target_entry.name
953
            target_parent = target_entry.parent_id
954
            if target_path is None:
955
                target_path = self.target.id2path(file_id)
956
            target_kind, target_executable, target_stat = \
957
                self.target._comparison_data(target_entry, target_path)
958
        else:
959
            target_versioned = False
960
            target_name = None
961
            target_parent = None
962
            target_kind = None
963
            target_executable = None
964
        versioned = (source_versioned, target_versioned)
965
        kind = (source_kind, target_kind)
966
        changed_content = False
967
        if source_kind != target_kind:
968
            changed_content = True
969
        elif source_kind == 'file':
970
            if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
971
                self.target.get_file_sha1(file_id, target_path, target_stat)):
972
                changed_content = True
973
        elif source_kind == 'symlink':
974
            if (self.source.get_symlink_target(file_id) !=
975
                self.target.get_symlink_target(file_id)):
976
                changed_content = True
977
            # XXX: Yes, the indentation below is wrong. But fixing it broke
978
            # test_merge.TestMergerEntriesLCAOnDisk.
979
            # test_nested_tree_subtree_renamed_and_modified. We'll wait for
980
            # the fix from bzr.dev -- vila 2009026
981
            elif source_kind == 'tree-reference':
982
                if (self.source.get_reference_revision(file_id, source_path)
983
                    != self.target.get_reference_revision(file_id, target_path)):
984
                    changed_content = True
985
        parent = (source_parent, target_parent)
986
        name = (source_name, target_name)
987
        executable = (source_executable, target_executable)
988
        if (changed_content is not False or versioned[0] != versioned[1]
989
            or parent[0] != parent[1] or name[0] != name[1] or
990
            executable[0] != executable[1]):
991
            changes = True
992
        else:
993
            changes = False
994
        return (file_id, (source_path, target_path), changed_content,
995
                versioned, parent, name, kind, executable), changes
996
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
997
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
998
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
999
        extra_trees=None, require_versioned=False, include_root=False,
1000
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
1001
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
1002
1003
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
1004
        :param specific_files: An optional list of file paths to restrict the
1005
            comparison to. When mapping filenames to ids, all matches in all
1006
            trees (including optional extra_trees) are used, and all children of
1007
            matched directories are included.
1008
        :param want_unchanged: An optional boolean requesting the inclusion of
1009
            unchanged entries in the result.
1010
        :param extra_trees: An optional list of additional trees to use when
1011
            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.
1012
        :param require_versioned: An optional boolean (defaults to False). When
1013
            supplied and True all the 'specific_files' must be versioned, or
1014
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
1015
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
1016
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
1017
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
1018
        if extra_trees is not None:
1019
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
1020
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
1021
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
1022
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
1023
        if specific_files and not specific_file_ids:
1024
            # All files are unversioned, so just return an empty delta
1025
            # _compare_trees would think we want a complete delta
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
1026
            result = delta.TreeDelta()
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
1027
            fake_entry = inventory.InventoryFile('unused', 'unused', 'unused')
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
1028
            result.unversioned = [(path, None,
1029
                self.target._comparison_data(fake_entry, path)[0]) for path in
1030
                specific_files]
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
1031
            return result
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
1032
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
1033
            specific_files, include_root, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
1034
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
1035
            want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
1036
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1037
    def iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1038
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1039
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
1040
        """Generate an iterator of changes between trees.
1041
1042
        A tuple is returned:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1043
        (file_id, (path_in_source, path_in_target),
1044
         changed_content, versioned, parent, name, kind,
2012.1.1 by Aaron Bentley
Implement change iterator
1045
         executable)
1046
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1047
        Changed_content is True if the file's content has changed.  This
1048
        includes changes to its kind, and to a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
1049
2012.1.15 by Aaron Bentley
Minor tweaks
1050
        versioned, parent, name, kind, executable are tuples of (from, to).
1051
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
1052
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
1053
        Iteration is done in parent-to-child order, relative to the target
1054
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1055
1056
        There is no guarantee that all paths are in sorted order: the
1057
        requirement to expand the search due to renames may result in children
1058
        that should be found early being found late in the search, after
1059
        lexically later results have been returned.
1060
        :param require_versioned: Raise errors.PathsNotVersionedError if a
1061
            path in the specific_files list is not versioned in one of
1062
            source, target or extra_trees.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1063
        :param specific_files: An optional list of file paths to restrict the
1064
            comparison to. When mapping filenames to ids, all matches in all
1065
            trees (including optional extra_trees) are used, and all children
1066
            of matched directories are included. The parents in the target tree
1067
            of the specific files up to and including the root of the tree are
1068
            always evaluated for changes too.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1069
        :param want_unversioned: Should unversioned files be returned in the
1070
            output. An unversioned file is defined as one with (False, False)
1071
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
1072
        """
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1073
        lookup_trees = [self.source]
1074
        if extra_trees:
1075
             lookup_trees.extend(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1076
        # The ids of items we need to examine to insure delta consistency.
1077
        precise_file_ids = set()
1078
        changed_file_ids = []
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
1079
        if specific_files == []:
1080
            specific_file_ids = []
1081
        else:
1082
            specific_file_ids = self.target.paths2ids(specific_files,
1083
                lookup_trees, require_versioned=require_versioned)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1084
        if specific_files is not None:
1085
            # reparented or added entries must have their parents included
1086
            # so that valid deltas can be created. The seen_parents set
1087
            # tracks the parents that we need to have.
1088
            # The seen_dirs set tracks directory entries we've yielded.
1089
            # After outputting version object in to_entries we set difference
1090
            # the two seen sets and start checking parents.
1091
            seen_parents = set()
1092
            seen_dirs = set()
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1093
        if want_unversioned:
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
1094
            all_unversioned = sorted([(p.split('/'), p) for p in
1095
                                     self.target.extras()
1096
                if specific_files is None or
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1097
                    osutils.is_inside_any(specific_files, p)])
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
1098
            all_unversioned = collections.deque(all_unversioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1099
        else:
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
1100
            all_unversioned = collections.deque()
2012.1.1 by Aaron Bentley
Implement change iterator
1101
        to_paths = {}
3363.14.2 by Aaron Bentley
Get iter_changes running to completion
1102
        from_entries_by_dir = list(self.source.iter_entries_by_dir(
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1103
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
1104
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
3363.14.2 by Aaron Bentley
Get iter_changes running to completion
1105
        to_entries_by_dir = list(self.target.iter_entries_by_dir(
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
1106
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1107
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
1108
        entry_count = 0
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1109
        # the unversioned path lookup only occurs on real trees - where there
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1110
        # can be extras. So the fake_entry is solely used to look up
1111
        # executable it values when execute is not supported.
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
1112
        fake_entry = inventory.InventoryFile('unused', 'unused', 'unused')
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1113
        for target_path, target_entry in to_entries_by_dir:
1114
            while (all_unversioned and
1115
                all_unversioned[0][0] < target_path.split('/')):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1116
                unversioned_path = all_unversioned.popleft()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1117
                target_kind, target_executable, target_stat = \
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1118
                    self.target._comparison_data(fake_entry, unversioned_path[1])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1119
                yield (None, (None, unversioned_path[1]), True, (False, False),
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1120
                    (None, None),
1121
                    (None, unversioned_path[0][-1]),
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1122
                    (None, target_kind),
1123
                    (None, target_executable))
1124
            source_path, source_entry = from_data.get(target_entry.file_id,
1125
                (None, None))
1126
            result, changes = self._changes_from_entries(source_entry,
1127
                target_entry, source_path=source_path, target_path=target_path)
1128
            to_paths[result[0]] = result[1][1]
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
1129
            entry_count += 1
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1130
            if result[3][0]:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
1131
                entry_count += 1
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
1132
            if pb is not None:
1133
                pb.update('comparing files', entry_count, num_entries)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1134
            if changes or include_unchanged:
1135
                if specific_file_ids is not None:
1136
                    new_parent_id = result[4][1]
1137
                    precise_file_ids.add(new_parent_id)
1138
                    changed_file_ids.append(result[0])
1139
                yield result
1140
            # Ensure correct behaviour for reparented/added specific files.
1141
            if specific_files is not None:
1142
                # Record output dirs
1143
                if result[6][1] == 'directory':
1144
                    seen_dirs.add(result[0])
1145
                # Record parents of reparented/added entries.
1146
                versioned = result[3]
1147
                parents = result[4]
1148
                if not versioned[0] or parents[0] != parents[1]:
1149
                    seen_parents.add(parents[1])
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1150
        while all_unversioned:
1151
            # yield any trailing unversioned paths
1152
            unversioned_path = all_unversioned.popleft()
1153
            to_kind, to_executable, to_stat = \
1154
                self.target._comparison_data(fake_entry, unversioned_path[1])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1155
            yield (None, (None, unversioned_path[1]), True, (False, False),
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1156
                (None, None),
1157
                (None, unversioned_path[0][-1]),
1158
                (None, to_kind),
1159
                (None, to_executable))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1160
        # Yield all remaining source paths
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1161
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
1162
            file_id = from_entry.file_id
1163
            if file_id in to_paths:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1164
                # already returned
2012.1.1 by Aaron Bentley
Implement change iterator
1165
                continue
5390.3.3 by Andrew Bennetts
Use has_id rather than __contains__; expand NEWS entry; add What's New entry.
1166
            if not self.target.has_id(file_id):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1167
                # common case - paths we have not emitted are not present in
1168
                # target.
1169
                to_path = None
1170
            else:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1171
                to_path = self.target.id2path(file_id)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
1172
            entry_count += 1
1173
            if pb is not None:
1174
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
1175
            versioned = (True, False)
1176
            parent = (from_entry.parent_id, None)
1177
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1178
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
1179
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1180
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
1181
            executable = (from_executable, None)
3619.4.1 by Robert Collins
Improve tests for the behaviour of Tree.iter_changes for missing paths that are only present in one tree, and fix found bugs. (Robert Collins)
1182
            changed_content = from_kind is not None
2012.1.1 by Aaron Bentley
Implement change iterator
1183
            # the parent's path is necessarily known at this point.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1184
            changed_file_ids.append(file_id)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1185
            yield(file_id, (path, to_path), changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
1186
                  name, kind, executable)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1187
        changed_file_ids = set(changed_file_ids)
1188
        if specific_file_ids is not None:
1189
            for result in self._handle_precise_ids(precise_file_ids,
1190
                changed_file_ids):
1191
                yield result
1192
1193
    def _get_entry(self, tree, file_id):
1194
        """Get an inventory entry from a tree, with missing entries as None.
1195
1196
        If the tree raises NotImplementedError on accessing .inventory, then
1197
        this is worked around using iter_entries_by_dir on just the file id
1198
        desired.
1199
1200
        :param tree: The tree to lookup the entry in.
1201
        :param file_id: The file_id to lookup.
1202
        """
1203
        try:
1204
            inventory = tree.inventory
1205
        except NotImplementedError:
1206
            # No inventory available.
1207
            try:
1208
                iterator = tree.iter_entries_by_dir(specific_file_ids=[file_id])
1209
                return iterator.next()[1]
1210
            except StopIteration:
1211
                return None
1212
        else:
1213
            try:
1214
                return inventory[file_id]
1215
            except errors.NoSuchId:
1216
                return None
1217
1218
    def _handle_precise_ids(self, precise_file_ids, changed_file_ids,
1219
        discarded_changes=None):
1220
        """Fill out a partial iter_changes to be consistent.
1221
1222
        :param precise_file_ids: The file ids of parents that were seen during
1223
            the iter_changes.
1224
        :param changed_file_ids: The file ids of already emitted items.
1225
        :param discarded_changes: An optional dict of precalculated
1226
            iter_changes items which the partial iter_changes had not output
1227
            but had calculated.
1228
        :return: A generator of iter_changes items to output.
1229
        """
1230
        # process parents of things that had changed under the users
1231
        # requested paths to prevent incorrect paths or parent ids which
1232
        # aren't in the tree.
1233
        while precise_file_ids:
1234
            precise_file_ids.discard(None)
1235
            # Don't emit file_ids twice
1236
            precise_file_ids.difference_update(changed_file_ids)
1237
            if not precise_file_ids:
1238
                break
1239
            # If the there was something at a given output path in source, we
1240
            # have to include the entry from source in the delta, or we would
1241
            # be putting this entry into a used path.
1242
            paths = []
1243
            for parent_id in precise_file_ids:
1244
                try:
1245
                    paths.append(self.target.id2path(parent_id))
1246
                except errors.NoSuchId:
1247
                    # This id has been dragged in from the source by delta
1248
                    # expansion and isn't present in target at all: we don't
1249
                    # need to check for path collisions on it.
1250
                    pass
1251
            for path in paths:
1252
                old_id = self.source.path2id(path)
1253
                precise_file_ids.add(old_id)
1254
            precise_file_ids.discard(None)
1255
            current_ids = precise_file_ids
1256
            precise_file_ids = set()
1257
            # We have to emit all of precise_file_ids that have been altered.
1258
            # We may have to output the children of some of those ids if any
1259
            # directories have stopped being directories.
1260
            for file_id in current_ids:
1261
                # Examine file_id
1262
                if discarded_changes:
1263
                    result = discarded_changes.get(file_id)
1264
                    old_entry = None
1265
                else:
1266
                    result = None
1267
                if result is None:
1268
                    old_entry = self._get_entry(self.source, file_id)
1269
                    new_entry = self._get_entry(self.target, file_id)
1270
                    result, changes = self._changes_from_entries(
1271
                        old_entry, new_entry)
1272
                else:
1273
                    changes = True
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1274
                # Get this parents parent to examine.
1275
                new_parent_id = result[4][1]
1276
                precise_file_ids.add(new_parent_id)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1277
                if changes:
1278
                    if (result[6][0] == 'directory' and
1279
                        result[6][1] != 'directory'):
1280
                        # This stopped being a directory, the old children have
1281
                        # to be included.
1282
                        if old_entry is None:
1283
                            # Reusing a discarded change.
1284
                            old_entry = self._get_entry(self.source, file_id)
1285
                        for child in old_entry.children.values():
1286
                            precise_file_ids.add(child.file_id)
1287
                    changed_file_ids.add(result[0])
1288
                    yield result
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1289
1290
1291
class MultiWalker(object):
1292
    """Walk multiple trees simultaneously, getting combined results."""
1293
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1294
    # Note: This could be written to not assume you can do out-of-order
1295
    #       lookups. Instead any nodes that don't match in all trees could be
1296
    #       marked as 'deferred', and then returned in the final cleanup loop.
1297
    #       For now, I think it is "nicer" to return things as close to the
1298
    #       "master_tree" order as we can.
1299
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1300
    def __init__(self, master_tree, other_trees):
1301
        """Create a new MultiWalker.
1302
1303
        All trees being walked must implement "iter_entries_by_dir()", such
1304
        that they yield (path, object) tuples, where that object will have a
1305
        '.file_id' member, that can be used to check equality.
1306
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1307
        :param master_tree: All trees will be 'slaved' to the master_tree such
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1308
            that nodes in master_tree will be used as 'first-pass' sync points.
1309
            Any nodes that aren't in master_tree will be merged in a second
1310
            pass.
1311
        :param other_trees: A list of other trees to walk simultaneously.
1312
        """
1313
        self._master_tree = master_tree
1314
        self._other_trees = other_trees
1315
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1316
        # Keep track of any nodes that were properly processed just out of
1317
        # order, that way we don't return them at the end, we don't have to
1318
        # track *all* processed file_ids, just the out-of-order ones
1319
        self._out_of_order_processed = set()
1320
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1321
    @staticmethod
1322
    def _step_one(iterator):
1323
        """Step an iter_entries_by_dir iterator.
1324
1325
        :return: (has_more, path, ie)
1326
            If has_more is False, path and ie will be None.
1327
        """
1328
        try:
1329
            path, ie = iterator.next()
1330
        except StopIteration:
1331
            return False, None, None
1332
        else:
1333
            return True, path, ie
1334
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1335
    @staticmethod
1336
    def _cmp_path_by_dirblock(path1, path2):
1337
        """Compare two paths based on what directory they are in.
1338
1339
        This generates a sort order, such that all children of a directory are
1340
        sorted together, and grandchildren are in the same order as the
1341
        children appear. But all grandchildren come after all children.
1342
1343
        :param path1: first path
1344
        :param path2: the second path
1345
        :return: negative number if ``path1`` comes first,
1346
            0 if paths are equal
1347
            and a positive number if ``path2`` sorts first
1348
        """
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1349
        # Shortcut this special case
1350
        if path1 == path2:
1351
            return 0
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1352
        # This is stolen from _dirstate_helpers_py.py, only switching it to
1353
        # Unicode objects. Consider using encode_utf8() and then using the
1354
        # optimized versions, or maybe writing optimized unicode versions.
1355
        if not isinstance(path1, unicode):
1356
            raise TypeError("'path1' must be a unicode string, not %s: %r"
1357
                            % (type(path1), path1))
1358
        if not isinstance(path2, unicode):
1359
            raise TypeError("'path2' must be a unicode string, not %s: %r"
1360
                            % (type(path2), path2))
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1361
        return cmp(MultiWalker._path_to_key(path1),
1362
                   MultiWalker._path_to_key(path2))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1363
1364
    @staticmethod
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1365
    def _path_to_key(path):
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1366
        dirname, basename = osutils.split(path)
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1367
        return (dirname.split(u'/'), basename)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1368
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1369
    def _lookup_by_file_id(self, extra_entries, other_tree, file_id):
1370
        """Lookup an inventory entry by file_id.
1371
1372
        This is called when an entry is missing in the normal order.
1373
        Generally this is because a file was either renamed, or it was
1374
        deleted/added. If the entry was found in the inventory and not in
1375
        extra_entries, it will be added to self._out_of_order_processed
1376
1377
        :param extra_entries: A dictionary of {file_id: (path, ie)}.  This
1378
            should be filled with entries that were found before they were
1379
            used. If file_id is present, it will be removed from the
1380
            dictionary.
1381
        :param other_tree: The Tree to search, in case we didn't find the entry
1382
            yet.
1383
        :param file_id: The file_id to look for
1384
        :return: (path, ie) if found or (None, None) if not present.
1385
        """
1386
        if file_id in extra_entries:
1387
            return extra_entries.pop(file_id)
1388
        # TODO: Is id2path better as the first call, or is
1389
        #       inventory[file_id] better as a first check?
1390
        try:
1391
            cur_path = other_tree.id2path(file_id)
1392
        except errors.NoSuchId:
1393
            cur_path = None
1394
        if cur_path is None:
1395
            return (None, None)
1396
        else:
1397
            self._out_of_order_processed.add(file_id)
1398
            cur_ie = other_tree.inventory[file_id]
1399
            return (cur_path, cur_ie)
1400
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1401
    def iter_all(self):
1402
        """Match up the values in the different trees."""
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1403
        for result in self._walk_master_tree():
1404
            yield result
1405
        self._finish_others()
1406
        for result in self._walk_others():
1407
            yield result
1408
1409
    def _walk_master_tree(self):
1410
        """First pass, walk all trees in lock-step.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1411
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1412
        When we are done, all nodes in the master_tree will have been
1413
        processed. _other_walkers, _other_entries, and _others_extra will be
1414
        set on 'self' for future processing.
1415
        """
1416
        # This iterator has the most "inlining" done, because it tends to touch
1417
        # every file in the tree, while the others only hit nodes that don't
1418
        # match.
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1419
        master_iterator = self._master_tree.iter_entries_by_dir()
1420
1421
        other_walkers = [other.iter_entries_by_dir()
1422
                         for other in self._other_trees]
1423
        other_entries = [self._step_one(walker) for walker in other_walkers]
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1424
        # Track extra nodes in the other trees
1425
        others_extra = [{} for i in xrange(len(self._other_trees))]
1426
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1427
        master_has_more = True
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1428
        step_one = self._step_one
1429
        lookup_by_file_id = self._lookup_by_file_id
1430
        out_of_order_processed = self._out_of_order_processed
1431
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1432
        while master_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1433
            (master_has_more, path, master_ie) = step_one(master_iterator)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1434
            if not master_has_more:
1435
                break
1436
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1437
            file_id = master_ie.file_id
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1438
            other_values = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1439
            other_values_append = other_values.append
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1440
            next_other_entries = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1441
            next_other_entries_append = next_other_entries.append
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1442
            for idx, (other_has_more, other_path, other_ie) in enumerate(other_entries):
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1443
                if not other_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1444
                    other_values_append(lookup_by_file_id(
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1445
                        others_extra[idx], self._other_trees[idx], file_id))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1446
                    next_other_entries_append((False, None, None))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1447
                elif file_id == other_ie.file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1448
                    # This is the critical code path, as most of the entries
1449
                    # should match between most trees.
1450
                    other_values_append((other_path, other_ie))
1451
                    next_other_entries_append(step_one(other_walkers[idx]))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1452
                else:
1453
                    # This walker did not match, step it until it either
1454
                    # matches, or we know we are past the current walker.
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1455
                    other_walker = other_walkers[idx]
1456
                    other_extra = others_extra[idx]
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1457
                    while (other_has_more and
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1458
                           self._cmp_path_by_dirblock(other_path, path) < 0):
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1459
                        other_file_id = other_ie.file_id
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1460
                        if other_file_id not in out_of_order_processed:
1461
                            other_extra[other_file_id] = (other_path, other_ie)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1462
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1463
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1464
                    if other_has_more and other_ie.file_id == file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1465
                        # We ended up walking to this point, match and step
1466
                        # again
1467
                        other_values_append((other_path, other_ie))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1468
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1469
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1470
                    else:
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1471
                        # This record isn't in the normal order, see if it
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1472
                        # exists at all.
1473
                        other_values_append(lookup_by_file_id(
1474
                            other_extra, self._other_trees[idx], file_id))
1475
                    next_other_entries_append((other_has_more, other_path,
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1476
                                               other_ie))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1477
            other_entries = next_other_entries
1478
1479
            # We've matched all the walkers, yield this datapoint
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1480
            yield path, file_id, master_ie, other_values
1481
        self._other_walkers = other_walkers
1482
        self._other_entries = other_entries
1483
        self._others_extra = others_extra
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1484
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1485
    def _finish_others(self):
1486
        """Finish walking the other iterators, so we get all entries."""
1487
        for idx, info in enumerate(self._other_entries):
1488
            other_extra = self._others_extra[idx]
1489
            (other_has_more, other_path, other_ie) = info
3514.3.4 by John Arbash Meinel
Handle more cases when the other tree has extra nodes.
1490
            while other_has_more:
1491
                other_file_id = other_ie.file_id
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1492
                if other_file_id not in self._out_of_order_processed:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1493
                    other_extra[other_file_id] = (other_path, other_ie)
3514.3.4 by John Arbash Meinel
Handle more cases when the other tree has extra nodes.
1494
                other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1495
                    self._step_one(self._other_walkers[idx])
1496
        del self._other_entries
1497
1498
    def _walk_others(self):
1499
        """Finish up by walking all the 'deferred' nodes."""
1500
        # TODO: One alternative would be to grab all possible unprocessed
1501
        #       file_ids, and then sort by path, and then yield them. That
1502
        #       might ensure better ordering, in case a caller strictly
1503
        #       requires parents before children.
1504
        for idx, other_extra in enumerate(self._others_extra):
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1505
            others = sorted(other_extra.itervalues(),
1506
                            key=lambda x: self._path_to_key(x[0]))
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1507
            for other_path, other_ie in others:
1508
                file_id = other_ie.file_id
3514.3.7 by John Arbash Meinel
comment
1509
                # We don't need to check out_of_order_processed here, because
1510
                # the lookup_by_file_id will be removing anything processed
1511
                # from the extras cache
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1512
                other_extra.pop(file_id)
3514.3.5 by John Arbash Meinel
Handle some edge cases when we have multiple other trees.
1513
                other_values = [(None, None) for i in xrange(idx)]
1514
                other_values.append((other_path, other_ie))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1515
                for alt_idx, alt_extra in enumerate(self._others_extra[idx+1:]):
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1516
                    alt_idx = alt_idx + idx + 1
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1517
                    alt_extra = self._others_extra[alt_idx]
1518
                    alt_tree = self._other_trees[alt_idx]
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1519
                    other_values.append(self._lookup_by_file_id(
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1520
                                            alt_extra, alt_tree, file_id))
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1521
                yield other_path, file_id, None, other_values