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