~bzr-pqm/bzr/bzr.dev

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