/brz/remove-bazaar

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