/brz/remove-bazaar

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