/brz/remove-bazaar

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