/brz/remove-bazaar

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