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