/brz/remove-bazaar

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