~bzr-pqm/bzr/bzr.dev

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