~bzr-pqm/bzr/bzr.dev

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