/brz/remove-bazaar

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