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