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