/brz/remove-bazaar

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