/brz/remove-bazaar

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