/brz/remove-bazaar

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