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