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