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