~bzr-pqm/bzr/bzr.dev

70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tree classes, representing directory at point in time.
18
"""
19
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
20
import os
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
21
from collections import deque
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
22
from cStringIO import StringIO
800 by Martin Pool
Merge John's import-speedup branch:
23
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
import bzrlib
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
25
from bzrlib import (
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
26
    conflicts as _mod_conflicts,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
27
    delta,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
28
    osutils,
1551.15.46 by Aaron Bentley
Move plan merge to tree
29
    revision as _mod_revision,
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
30
    rules,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
31
    symbol_versioning,
32
    )
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
33
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
34
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
35
from bzrlib import errors
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
36
from bzrlib.inventory import Inventory, InventoryFile
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
37
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
38
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
39
import bzrlib.revision
40
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
41
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
42
558 by Martin Pool
- All top-level classes inherit from object
43
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
44
    """Abstract file tree.
45
46
    There are several subclasses:
47
    
48
    * `WorkingTree` exists as files on disk editable by the user.
49
50
    * `RevisionTree` is a tree as recorded at some point in the past.
51
52
    Trees contain an `Inventory` object, and also know how to retrieve
53
    file texts mentioned in the inventory, either from a working
54
    directory or from a store.
55
56
    It is possible for trees to contain files that are not described
57
    in their inventory or vice versa; for this use `filenames()`.
58
59
    Trees can be compared, etc, regardless of whether they are working
60
    trees or versioned trees.
61
    """
62
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
63
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
64
        extra_trees=None, require_versioned=False, include_root=False,
65
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
66
        """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.
67
68
        :param other: A tree to compare with.
69
        :param specific_files: An optional list of file paths to restrict the
70
            comparison to. When mapping filenames to ids, all matches in all
71
            trees (including optional extra_trees) are used, and all children of
72
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
73
        :param want_unchanged: An optional boolean requesting the inclusion of
74
            unchanged entries in the result.
75
        :param extra_trees: An optional list of additional trees to use when
76
            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.
77
        :param require_versioned: An optional boolean (defaults to False). When
78
            supplied and True all the 'specific_files' must be versioned, or
79
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
80
        :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.
81
1852.8.4 by Robert Collins
Hook InterTree into Tree.
82
        The comparison will be performed by an InterTree object looked up on 
83
        self and other.
84
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
85
        # Martin observes that Tree.changes_from returns a TreeDelta and this
86
        # may confuse people, because the class name of the returned object is
87
        # 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.
88
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
89
            want_unchanged=want_unchanged,
90
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
91
            extra_trees=extra_trees,
92
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
93
            include_root=include_root,
94
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
95
            )
2012.1.1 by Aaron Bentley
Implement change iterator
96
3254.1.4 by Aaron Bentley
Update NEWS, add deprecated Tree._iter_changes thunk
97
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
98
    def _iter_changes(self, *args, **kwargs):
99
        return self.iter_changes(*args, **kwargs)
100
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
101
    def iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
102
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
103
                     require_versioned=True, want_unversioned=False):
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
104
        intertree = InterTree.get(from_tree, self)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
105
        return intertree.iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
106
            extra_trees, require_versioned, want_unversioned=want_unversioned)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
107
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
108
    def conflicts(self):
109
        """Get a list of the conflicts in the tree.
110
111
        Each conflict is an instance of bzrlib.conflicts.Conflict.
112
        """
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
113
        return _mod_conflicts.ConflictList()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
114
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
115
    def extras(self):
116
        """For trees that can have unversioned files, return all such paths."""
117
        return []
118
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
119
    def get_parent_ids(self):
120
        """Get the parent ids for this tree. 
121
122
        :return: a list of parent ids. [] is returned to indicate
123
        a tree with no parents.
124
        :raises: BzrError if the parents are not known.
125
        """
126
        raise NotImplementedError(self.get_parent_ids)
127
    
1 by mbp at sourcefrog
import from baz patch-364
128
    def has_filename(self, filename):
129
        """True if the tree has given filename."""
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
130
        raise NotImplementedError(self.has_filename)
1 by mbp at sourcefrog
import from baz patch-364
131
1185.12.39 by abentley
Propogated has_or_had_id to Tree
132
    def has_id(self, file_id):
133
        return self.inventory.has_id(file_id)
134
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
135
    __contains__ = has_id
136
1185.12.39 by abentley
Propogated has_or_had_id to Tree
137
    def has_or_had_id(self, file_id):
138
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
139
            return True
1 by mbp at sourcefrog
import from baz patch-364
140
        return self.inventory.has_id(file_id)
141
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
142
    def is_ignored(self, filename):
143
        """Check whether the filename is ignored by this tree.
144
145
        :param filename: The relative filename within the tree.
146
        :return: True if the filename is ignored.
147
        """
148
        return False
149
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
150
    def __iter__(self):
151
        return iter(self.inventory)
152
3146.8.16 by Aaron Bentley
Updates from review
153
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
154
        """Iterate through all file ids, including ids for missing files."""
3146.8.16 by Aaron Bentley
Updates from review
155
        return set(self.inventory)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
156
1 by mbp at sourcefrog
import from baz patch-364
157
    def id2path(self, file_id):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
158
        """Return the path for a file id.
159
160
        :raises NoSuchId:
161
        """
1 by mbp at sourcefrog
import from baz patch-364
162
        return self.inventory.id2path(file_id)
163
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
164
    def is_control_filename(self, filename):
165
        """True if filename is the name of a control file in this tree.
166
        
167
        :param filename: A filename within the tree. This is a relative path
168
        from the root of this tree.
169
170
        This is true IF and ONLY IF the filename is part of the meta data
171
        that bzr controls in this tree. I.E. a random .bzr directory placed
172
        on disk will not be a control file for this tree.
173
        """
174
        return self.bzrdir.is_control_filename(filename)
175
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
176
    @needs_read_lock
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
177
    def iter_entries_by_dir(self, specific_file_ids=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
178
        """Walk the tree in 'by_dir' order.
179
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
180
        This will yield each entry in the tree as a (path, entry) tuple.
181
        The order that they are yielded is:
182
183
        Directories are walked in a depth-first lexicographical order,
184
        however, whenever a directory is reached, all of its direct child
185
        nodes are yielded in  lexicographical order before yielding the
186
        grandchildren.
187
188
        For example, in the tree::
189
190
           a/
191
             b/
192
               c
193
             d/
194
               e
195
           f/
196
             g
197
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
198
        The yield order (ignoring root) would be::
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
199
          a, f, a/b, a/d, a/b/c, a/d/e, f/g
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
200
        """
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
201
        return self.inventory.iter_entries_by_dir(
202
            specific_file_ids=specific_file_ids)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
203
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.
204
    def iter_references(self):
2100.3.27 by Aaron Bentley
Enable nested commits
205
        for path, entry in self.iter_entries_by_dir():
206
            if entry.kind == 'tree-reference':
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.
207
                yield path, entry.file_id
2100.3.27 by Aaron Bentley
Enable nested commits
208
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
209
    def kind(self, file_id):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
210
        raise NotImplementedError("Tree subclass %s must implement kind"
211
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
212
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
213
    def stored_kind(self, file_id):
214
        """File kind stored for this file_id.
215
3146.8.15 by Aaron Bentley
Cleanup and docs
216
        May not match kind on disk for working trees.  Always available
217
        for versioned files, even when the file itself is missing.
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
218
        """
219
        return self.kind(file_id)
220
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
221
    def path_content_summary(self, path):
222
        """Get a summary of the information about path.
223
        
224
        :param path: A relative path within the tree.
225
        :return: A tuple containing kind, size, exec, sha1-or-link.
226
            Kind is always present (see tree.kind()).
227
            size is present if kind is file, None otherwise.
228
            exec is None unless kind is file and the platform supports the 'x'
229
                bit.
230
            sha1-or-link is the link target if kind is symlink, or the sha1 if
231
                it can be obtained without reading the file.
232
        """
233
        raise NotImplementedError(self.path_content_summary)
234
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.
235
    def get_reference_revision(self, file_id, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
236
        raise NotImplementedError("Tree subclass %s must implement "
237
                                  "get_reference_revision"
238
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
239
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
240
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
241
        """Return a tuple of kind, executable, stat_value for a file.
242
243
        entry may be None if there is no inventory entry for the file, but
244
        path must always be supplied.
245
246
        kind is None if there is no file present (even if an inventory id is
247
        present).  executable is False for non-file entries.
248
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
249
        raise NotImplementedError(self._comparison_data)
250
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
251
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
252
        raise NotImplementedError(self._file_size)
253
1 by mbp at sourcefrog
import from baz patch-364
254
    def _get_inventory(self):
255
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
256
    
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
257
    def get_file(self, file_id, path=None):
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
258
        """Return a file object for the file file_id in the tree.
259
        
260
        If both file_id and path are defined, it is implementation defined as
261
        to which one is used.
262
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
263
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
264
265
    def get_file_mtime(self, file_id, path=None):
266
        """Return the modification time for a file.
267
268
        :param file_id: The handle for this file.
269
        :param path: The path that this file can be found at.
270
            These must point to the same object.
271
        """
272
        raise NotImplementedError(self.get_file_mtime)
273
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
274
    def get_file_size(self, file_id):
275
        """Return the size of a file in bytes.
276
277
        This applies only to regular files.  If invoked on directories or
278
        symlinks, it will return None.
279
        :param file_id: The file-id of the file
280
        """
281
        raise NotImplementedError(self.get_file_size)
282
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
283
    def get_file_by_path(self, path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
284
        return self.get_file(self._inventory.path2id(path), path)
1 by mbp at sourcefrog
import from baz patch-364
285
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
286
    def iter_files_bytes(self, desired_files):
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
287
        """Iterate through file contents.
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
288
2708.1.10 by Aaron Bentley
Update docstrings
289
        Files will not necessarily be returned in the order they occur in
290
        desired_files.  No specific order is guaranteed.
291
292
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
293
        value supplied by the caller as part of desired_files.  It should
294
        uniquely identify the file version in the caller's context.  (Examples:
295
        an index number or a TreeTransform trans_id.)
296
297
        bytes_iterator is an iterable of bytestrings for the file.  The
298
        kind of iterable and length of the bytestrings are unspecified, but for
299
        this implementation, it is a tuple containing a single bytestring with
300
        the complete text of the file.
301
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
302
        :param desired_files: a list of (file_id, identifier) pairs
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
303
        """
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
304
        for file_id, identifier in desired_files:
2708.1.10 by Aaron Bentley
Update docstrings
305
            # We wrap the string in a tuple so that we can return an iterable
306
            # of bytestrings.  (Technically, a bytestring is also an iterable
307
            # of bytestrings, but iterating through each character is not
308
            # performant.)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
309
            cur_file = (self.get_file_text(file_id),)
310
            yield identifier, cur_file
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
311
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
312
    def get_symlink_target(self, file_id):
313
        """Get the target for a given file_id.
314
315
        It is assumed that the caller already knows that file_id is referencing
316
        a symlink.
317
        :param file_id: Handle for the symlink entry.
318
        :return: The path the symlink points to.
319
        """
320
        raise NotImplementedError(self.get_symlink_target)
321
2946.3.2 by John Arbash Meinel
Add tree implementation tests for Tree.get_root_id()
322
    def get_root_id(self):
323
        """Return the file_id for the root of this tree."""
324
        raise NotImplementedError(self.get_root_id)
325
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
326
    def annotate_iter(self, file_id,
327
                      default_revision=_mod_revision.CURRENT_REVISION):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
328
        """Return an iterator of revision_id, line tuples.
1551.9.18 by Aaron Bentley
Updates from review comments
329
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
330
        For working trees (and mutable trees in general), the special
331
        revision_id 'current:' will be used for lines that are new in this
332
        tree, e.g. uncommitted changes.
333
        :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.
334
        :param default_revision: For lines that don't match a basis, mark them
335
            with this revision id. Not all implementations will make use of
336
            this value.
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
337
        """
338
        raise NotImplementedError(self.annotate_iter)
339
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
340
    def _get_plan_merge_data(self, file_id, other, base):
3062.1.11 by Aaron Bentley
Update references
341
        from bzrlib import merge, versionedfile
342
        vf = versionedfile._PlanMergeVersionedFile(file_id)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
343
        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
344
        last_revision_b = other._get_file_revision(file_id, vf, 'other:')
3062.2.4 by Aaron Bentley
Start supporting merge-with-base
345
        if base is None:
346
            last_revision_base = None
347
        else:
3062.2.6 by Aaron Bentley
Get cherrypick-on-weave working
348
            last_revision_base = base._get_file_revision(file_id, vf, 'base:')
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
349
        return vf, last_revision_a, last_revision_b, last_revision_base
350
351
    def plan_file_merge(self, file_id, other, base=None):
352
        """Generate a merge plan based on annotations.
353
354
        If the file contains uncommitted changes in this tree, they will be
355
        attributed to the 'current:' pseudo-revision.  If the file contains
356
        uncommitted changes in the other tree, they will be assigned to the
357
        'other:' pseudo-revision.
358
        """
359
        data = self._get_plan_merge_data(file_id, other, base)
360
        vf, last_revision_a, last_revision_b, last_revision_base = data
3062.2.4 by Aaron Bentley
Start supporting merge-with-base
361
        return vf.plan_merge(last_revision_a, last_revision_b,
362
                             last_revision_base)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
363
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
364
    def plan_file_lca_merge(self, file_id, other, base=None):
365
        """Generate a merge plan based lca-newness.
366
367
        If the file contains uncommitted changes in this tree, they will be
368
        attributed to the 'current:' pseudo-revision.  If the file contains
369
        uncommitted changes in the other tree, they will be assigned to the
370
        'other:' pseudo-revision.
371
        """
372
        data = self._get_plan_merge_data(file_id, other, base)
373
        vf, last_revision_a, last_revision_b, last_revision_base = data
374
        return vf.plan_lca_merge(last_revision_a, last_revision_b,
375
                                 last_revision_base)
376
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
377
    def _iter_parent_trees(self):
378
        """Iterate through parent trees, defaulting to Tree.revision_tree."""
379
        for revision_id in self.get_parent_ids():
380
            try:
381
                yield self.revision_tree(revision_id)
382
            except errors.NoSuchRevisionInTree:
383
                yield self.repository.revision_tree(revision_id)
384
385
    @staticmethod
386
    def _file_revision(revision_tree, file_id):
387
        """Determine the revision associated with a file in a given tree."""
388
        revision_tree.lock_read()
389
        try:
390
            return revision_tree.inventory[file_id].revision
391
        finally:
392
            revision_tree.unlock()
393
3062.1.3 by Aaron Bentley
Correctly determine file revisions
394
    def _get_file_revision(self, file_id, vf, tree_revision):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
395
        """Ensure that file_id, tree_revision is in vf to plan the merge."""
3062.1.3 by Aaron Bentley
Correctly determine file revisions
396
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
397
        if getattr(self, '_repository', None) is None:
3062.1.3 by Aaron Bentley
Correctly determine file revisions
398
            last_revision = tree_revision
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
399
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
400
                self._iter_parent_trees()]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
401
            vf.add_lines((file_id, last_revision), parent_keys,
3062.1.3 by Aaron Bentley
Correctly determine file revisions
402
                         self.get_file(file_id).readlines())
3062.1.6 by Aaron Bentley
PlanMergeVersionedfile now has multiple Versionedfile fallbacks
403
            repo = self.branch.repository
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
404
            base_vf = repo.texts
3062.1.3 by Aaron Bentley
Correctly determine file revisions
405
        else:
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
406
            last_revision = self._file_revision(self, file_id)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
407
            base_vf = self._repository.texts
408
        if base_vf not in vf.fallback_versionedfiles:
409
            vf.fallback_versionedfiles.append(base_vf)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
410
        return last_revision
1551.15.46 by Aaron Bentley
Move plan merge to tree
411
1 by mbp at sourcefrog
import from baz patch-364
412
    inventory = property(_get_inventory,
413
                         doc="Inventory of this Tree")
414
415
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
416
        if not __debug__:
417
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
418
        fp = fingerprint_file(f)
419
        f.seek(0)
420
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
421
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
422
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
423
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
424
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
425
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
426
                         "store is probably damaged/corrupt"])
427
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
428
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
429
            raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
430
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
431
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
432
                     "store is probably damaged/corrupt"])
433
2334.1.1 by John Arbash Meinel
Lazily read working inventory in workingtree.py,
434
    @needs_read_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
435
    def path2id(self, path):
436
        """Return the id for path in this tree."""
437
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
438
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
439
    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.
440
        """Return all the ids that can be reached by walking from paths.
441
        
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
442
        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.
443
        trees, and this is repeated recursively: the children in an extra tree
444
        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
445
        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.
446
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
447
448
        :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.
449
            Alternatively, if paths is None, no ids should be calculated and None
450
            will be returned. This is offered to make calling the api unconditional
451
            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.
452
        :param trees: Additional trees to consider.
453
        :param require_versioned: If False, do not raise NotVersionedError if
454
            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.
455
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
456
        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.
457
3511.1.2 by Aaron Bentley
Update text and deprecation symbols.
458
    @symbol_versioning.deprecated_method(symbol_versioning.one_six)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
459
    def print_file(self, file_id):
460
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
461
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
462
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
463
464
    def lock_read(self):
465
        pass
466
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
467
    def revision_tree(self, revision_id):
468
        """Obtain a revision tree for the revision revision_id.
469
470
        The intention of this method is to allow access to possibly cached
471
        tree data. Implementors of this method should raise NoSuchRevision if
472
        the tree is not locally available, even if they could obtain the 
473
        tree via a repository or some other means. Callers are responsible 
474
        for finding the ultimate source for a revision tree.
475
476
        :param revision_id: The revision_id of the requested tree.
477
        :return: A Tree.
478
        :raises: NoSuchRevision if the tree cannot be obtained.
479
        """
480
        raise errors.NoSuchRevisionInTree(self, revision_id)
481
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
482
    def unknowns(self):
483
        """What files are present in this tree and unknown.
484
        
485
        :return: an iterator over the unknown files.
486
        """
487
        return iter([])
488
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
489
    def unlock(self):
490
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
491
492
    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.
493
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
494
495
        :return: set of paths.
496
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
497
        # NB: we specifically *don't* call self.has_filename, because for
498
        # WorkingTrees that can indicate files that exist on disk but that 
499
        # are not versioned.
500
        pred = self.inventory.has_filename
501
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
502
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
503
    def walkdirs(self, prefix=""):
504
        """Walk the contents of this tree from path down.
505
506
        This yields all the data about the contents of a directory at a time.
507
        After each directory has been yielded, if the caller has mutated the
508
        list to exclude some directories, they are then not descended into.
509
        
510
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
511
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
512
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
513
          versioned_kind), ...]),
514
         - directory-relpath is the containing dirs relpath from prefix
515
         - directory-path-from-root is the containing dirs path from /
516
         - 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.
517
         - relpath is the relative path within the subtree being walked.
518
         - basename is the basename
519
         - kind is the kind of the file now. If unknonwn then the file is not
520
           present within the tree - but it may be recorded as versioned. See
521
           versioned_kind.
522
         - lstat is the stat data *if* the file was statted.
523
         - path_from_tree_root is the path from the root of the tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
524
         - file_id is the file_id if the entry is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
525
         - versioned_kind is the kind of the file as last recorded in the 
526
           versioning system. If 'unknown' the file is not versioned.
527
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
528
529
        :param prefix: Start walking from prefix within the tree rather than
530
        at the root. This allows one to walk a subtree but get paths that are
531
        relative to a tree rooted higher up.
532
        :return: an iterator over the directory data.
533
        """
534
        raise NotImplementedError(self.walkdirs)
535
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
536
    def iter_search_rules(self, path_names, pref_names=None,
537
        _default_searcher=rules._per_user_searcher):
538
        """Find the preferences for filenames in a tree.
539
540
        :param path_names: an iterable of paths to find attributes for.
541
          Paths are given relative to the root of the tree.
542
        :param pref_names: the list of preferences to lookup - None for all
543
        :param _default_searcher: private parameter to assist testing - don't use
544
        :return: an iterator of tuple sequences, one per path-name.
545
          See _RulesSearcher.get_items for details on the tuple sequence.
546
        """
547
        searcher = self._get_rules_searcher(_default_searcher)
548
        if searcher is not None:
3398.1.34 by Ian Clatworthy
changed API design as requested by jam during review
549
            if pref_names is not None:
550
                for path in path_names:
551
                    yield searcher.get_selected_items(path, pref_names)
552
            else:
553
                for path in path_names:
554
                    yield searcher.get_items(path)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
555
556
    @needs_read_lock
557
    def _get_rules_searcher(self, default_searcher):
558
        """Get the RulesSearcher for this tree given the default one."""
559
        searcher = default_searcher
560
        return searcher
561
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
562
1 by mbp at sourcefrog
import from baz patch-364
563
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
564
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
565
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
566
        self._inventory = Inventory(root_id=None)
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
567
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
568
                               ' use repository.revision_tree instead.',
569
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
570
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
571
    def get_parent_ids(self):
572
        return []
573
1092.2.6 by Robert Collins
symlink support updated to work
574
    def get_symlink_target(self, file_id):
575
        return None
576
1 by mbp at sourcefrog
import from baz patch-364
577
    def has_filename(self, filename):
578
        return False
579
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
580
    def kind(self, file_id):
581
        return "directory"
582
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
583
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
584
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
585
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
586
    def __contains__(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
587
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
588
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
589
    def get_file_sha1(self, file_id, path=None, stat_value=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
590
        return None
591
592
1 by mbp at sourcefrog
import from baz patch-364
593
######################################################################
594
# diff
595
596
# TODO: Merge these two functions into a single one that can operate
597
# on either a whole tree or a set of files.
598
599
# TODO: Return the diff in order by filename, not by category or in
600
# random order.  Can probably be done by lock-stepping through the
601
# filenames from both trees.
602
603
604
def file_status(filename, old_tree, new_tree):
605
    """Return single-letter status, old and new names for a file.
606
607
    The complexity here is in deciding how to represent renames;
608
    many complex cases are possible.
609
    """
610
    old_inv = old_tree.inventory
611
    new_inv = new_tree.inventory
612
    new_id = new_inv.path2id(filename)
613
    old_id = old_inv.path2id(filename)
614
615
    if not new_id and not old_id:
616
        # easy: doesn't exist in either; not versioned at all
617
        if new_tree.is_ignored(filename):
618
            return 'I', None, None
619
        else:
620
            return '?', None, None
621
    elif new_id:
622
        # There is now a file of this name, great.
623
        pass
624
    else:
625
        # There is no longer a file of this name, but we can describe
626
        # what happened to the file that used to have
627
        # this name.  There are two possibilities: either it was
628
        # deleted entirely, or renamed.
629
        if new_inv.has_id(old_id):
630
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
631
        else:
632
            return 'D', old_inv.id2path(old_id), None
633
634
    # if the file_id is new in this revision, it is added
635
    if new_id and not old_inv.has_id(new_id):
636
        return 'A'
637
638
    # if there used to be a file of this name, but that ID has now
639
    # disappeared, it is deleted
640
    if old_id and not new_inv.has_id(old_id):
641
        return 'D'
642
643
    return 'wtf?'
644
645
    
646
164 by mbp at sourcefrog
new 'renames' command
647
def find_renames(old_inv, new_inv):
648
    for file_id in old_inv:
649
        if file_id not in new_inv:
650
            continue
651
        old_name = old_inv.id2path(file_id)
652
        new_name = new_inv.id2path(file_id)
653
        if old_name != new_name:
654
            yield (old_name, new_name)
655
            
678 by Martin Pool
- export to tarballs
656
1551.7.22 by Aaron Bentley
Changes from review
657
def find_ids_across_trees(filenames, trees, require_versioned=True):
658
    """Find the ids corresponding to specified filenames.
659
    
660
    All matches in all trees will be used, and all children of matched
661
    directories will be used.
662
1551.10.7 by Aaron Bentley
Use new-style output for status
663
    :param filenames: The filenames to find file_ids for (if None, returns
664
        None)
1551.7.22 by Aaron Bentley
Changes from review
665
    :param trees: The trees to find file_ids within
666
    :param require_versioned: if true, all specified filenames must occur in
667
    at least one tree.
668
    :return: a set of file ids for the specified filenames and their children.
669
    """
670
    if not filenames:
671
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
672
    specified_path_ids = _find_ids_across_trees(filenames, trees,
673
        require_versioned)
674
    return _find_children_across_trees(specified_path_ids, trees)
675
676
677
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
678
    """Find the ids corresponding to specified filenames.
679
    
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
680
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
681
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
682
    :param filenames: The filenames to find file_ids for
683
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
684
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
685
        at least one tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
686
    :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
687
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
688
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
689
    interesting_ids = set()
690
    for tree_path in filenames:
691
        not_found = True
692
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
693
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
694
            if file_id is not None:
695
                interesting_ids.add(file_id)
696
                not_found = False
697
        if not_found:
698
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
699
    if len(not_versioned) > 0 and require_versioned:
700
        raise errors.PathsNotVersionedError(not_versioned)
701
    return interesting_ids
702
703
704
def _find_children_across_trees(specified_ids, trees):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
705
    """Return a set including specified ids and their children.
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
706
    
1551.7.22 by Aaron Bentley
Changes from review
707
    All matches in all trees will be used.
708
709
    :param trees: The trees to find file_ids within
710
    :return: a set containing all specified ids and their children 
711
    """
712
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
713
    pending = interesting_ids
714
    # now handle children of interesting ids
715
    # we loop so that we handle all children of each id in both trees
716
    while len(pending) > 0:
717
        new_pending = set()
718
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
719
            for tree in trees:
2292.1.21 by Marius Kruger
undo tree.has_id fake-bugfix, which seems to not be needed anymore..
720
                if not tree.has_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
721
                    continue
722
                entry = tree.inventory[file_id]
723
                for child in getattr(entry, 'children', {}).itervalues():
724
                    if child.file_id not in interesting_ids:
725
                        new_pending.add(child.file_id)
726
        interesting_ids.update(new_pending)
727
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
728
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
729
730
731
class InterTree(InterObject):
732
    """This class represents operations taking place between two Trees.
733
734
    Its instances have methods like 'compare' and contain references to the
735
    source and target trees these operations are to be carried out on.
736
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
737
    Clients of bzrlib should not need to use InterTree directly, rather they
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
738
    should use the convenience methods on Tree such as 'Tree.compare()' which
739
    will pass through to InterTree as appropriate.
740
    """
741
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
742
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
743
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
744
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
745
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
746
        extra_trees=None, require_versioned=False, include_root=False,
747
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
748
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
749
750
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
751
        :param specific_files: An optional list of file paths to restrict the
752
            comparison to. When mapping filenames to ids, all matches in all
753
            trees (including optional extra_trees) are used, and all children of
754
            matched directories are included.
755
        :param want_unchanged: An optional boolean requesting the inclusion of
756
            unchanged entries in the result.
757
        :param extra_trees: An optional list of additional trees to use when
758
            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.
759
        :param require_versioned: An optional boolean (defaults to False). When
760
            supplied and True all the 'specific_files' must be versioned, or
761
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
762
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
763
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
764
        # NB: show_status depends on being able to pass in non-versioned files
765
        # and report them as unknown
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
766
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
767
        if extra_trees is not None:
768
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
769
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
770
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
771
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
772
        if specific_files and not specific_file_ids:
773
            # All files are unversioned, so just return an empty delta
774
            # _compare_trees would think we want a complete delta
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
775
            result = delta.TreeDelta()
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
776
            fake_entry = InventoryFile('unused', 'unused', 'unused')
777
            result.unversioned = [(path, None,
778
                self.target._comparison_data(fake_entry, path)[0]) for path in
779
                specific_files]
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
780
            return result
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
781
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
782
            specific_files, include_root, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
783
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
784
            want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
785
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
786
    def iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
787
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
788
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
789
        """Generate an iterator of changes between trees.
790
791
        A tuple is returned:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
792
        (file_id, (path_in_source, path_in_target),
793
         changed_content, versioned, parent, name, kind,
2012.1.1 by Aaron Bentley
Implement change iterator
794
         executable)
795
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
796
        Changed_content is True if the file's content has changed.  This
797
        includes changes to its kind, and to a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
798
2012.1.15 by Aaron Bentley
Minor tweaks
799
        versioned, parent, name, kind, executable are tuples of (from, to).
800
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
801
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
802
        Iteration is done in parent-to-child order, relative to the target
803
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
804
805
        There is no guarantee that all paths are in sorted order: the
806
        requirement to expand the search due to renames may result in children
807
        that should be found early being found late in the search, after
808
        lexically later results have been returned.
809
        :param require_versioned: Raise errors.PathsNotVersionedError if a
810
            path in the specific_files list is not versioned in one of
811
            source, target or extra_trees.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
812
        :param want_unversioned: Should unversioned files be returned in the
813
            output. An unversioned file is defined as one with (False, False)
814
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
815
        """
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
816
        result = []
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
817
        lookup_trees = [self.source]
818
        if extra_trees:
819
             lookup_trees.extend(extra_trees)
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
820
        if specific_files == []:
821
            specific_file_ids = []
822
        else:
823
            specific_file_ids = self.target.paths2ids(specific_files,
824
                lookup_trees, require_versioned=require_versioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
825
        if want_unversioned:
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
826
            all_unversioned = sorted([(p.split('/'), p) for p in
827
                                     self.target.extras()
828
                if specific_files is None or
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
829
                    osutils.is_inside_any(specific_files, p)])
830
            all_unversioned = deque(all_unversioned)
831
        else:
832
            all_unversioned = deque()
2012.1.1 by Aaron Bentley
Implement change iterator
833
        to_paths = {}
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
834
        from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
835
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
836
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
837
        to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
838
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
839
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
840
        entry_count = 0
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
841
        # the unversioned path lookup only occurs on real trees - where there 
842
        # can be extras. So the fake_entry is solely used to look up
843
        # executable it values when execute is not supported.
844
        fake_entry = InventoryFile('unused', 'unused', 'unused')
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
845
        for to_path, to_entry in to_entries_by_dir:
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
846
            while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
847
                unversioned_path = all_unversioned.popleft()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
848
                to_kind, to_executable, to_stat = \
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
849
                    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.
850
                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.
851
                    (None, None),
852
                    (None, unversioned_path[0][-1]),
853
                    (None, to_kind),
854
                    (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
855
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
856
            to_paths[file_id] = to_path
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
857
            entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
858
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
859
            from_path, from_entry = from_data.get(file_id, (None, None))
860
            from_versioned = (from_entry is not None)
861
            if from_entry is not None:
862
                from_versioned = True
863
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
864
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
865
                from_kind, from_executable, from_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
866
                    self.source._comparison_data(from_entry, from_path)
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
867
                entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
868
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
869
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
870
                from_kind = None
871
                from_parent = None
872
                from_name = None
873
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
874
            versioned = (from_versioned, True)
875
            to_kind, to_executable, to_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
876
                self.target._comparison_data(to_entry, to_path)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
877
            kind = (from_kind, to_kind)
878
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
879
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
880
            elif from_kind == 'file':
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
881
                from_size = self.source._file_size(from_entry, from_stat)
882
                to_size = self.target._file_size(to_entry, to_stat)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
883
                if from_size != to_size:
884
                    changed_content = True
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
885
                elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
886
                    self.target.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
887
                    changed_content = True
888
            elif from_kind == 'symlink':
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
889
                if (self.source.get_symlink_target(file_id) !=
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
890
                    self.target.get_symlink_target(file_id)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
891
                    changed_content = True
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
892
                elif from_kind == 'tree-reference':
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.
893
                    if (self.source.get_reference_revision(file_id, from_path)
894
                        != self.target.get_reference_revision(file_id, to_path)):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
895
                        changed_content = True 
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
896
            parent = (from_parent, to_entry.parent_id)
897
            name = (from_name, to_entry.name)
898
            executable = (from_executable, to_executable)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
899
            if pb is not None:
900
                pb.update('comparing files', entry_count, num_entries)
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
901
            if (changed_content is not False or versioned[0] != versioned[1]
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
902
                or parent[0] != parent[1] or name[0] != name[1] or 
903
                executable[0] != executable[1] or include_unchanged):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
904
                yield (file_id, (from_path, to_path), changed_content,
905
                    versioned, parent, name, kind, executable)
906
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
907
        while all_unversioned:
908
            # yield any trailing unversioned paths
909
            unversioned_path = all_unversioned.popleft()
910
            to_kind, to_executable, to_stat = \
911
                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.
912
            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.
913
                (None, None),
914
                (None, unversioned_path[0][-1]),
915
                (None, to_kind),
916
                (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
917
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
918
        def get_to_path(to_entry):
919
            if to_entry.parent_id is None:
920
                to_path = '' # the root
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
921
            else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
922
                if to_entry.parent_id not in to_paths:
923
                    # recurse up
924
                    return get_to_path(self.target.inventory[to_entry.parent_id])
925
                to_path = osutils.pathjoin(to_paths[to_entry.parent_id],
926
                                           to_entry.name)
927
            to_paths[to_entry.file_id] = to_path
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
928
            return to_path
929
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
930
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
931
            file_id = from_entry.file_id
932
            if file_id in to_paths:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
933
                # already returned
2012.1.1 by Aaron Bentley
Implement change iterator
934
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
935
            if not file_id in self.target.inventory:
936
                # common case - paths we have not emitted are not present in
937
                # target.
938
                to_path = None
939
            else:
940
                to_path = get_to_path(self.target.inventory[file_id])
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
941
            entry_count += 1
942
            if pb is not None:
943
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
944
            versioned = (True, False)
945
            parent = (from_entry.parent_id, None)
946
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
947
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
948
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
949
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
950
            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)
951
            changed_content = from_kind is not None
2012.1.1 by Aaron Bentley
Implement change iterator
952
            # the parent's path is necessarily known at this point.
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
953
            yield(file_id, (path, to_path), changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
954
                  name, kind, executable)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
955
956
957
class MultiWalker(object):
958
    """Walk multiple trees simultaneously, getting combined results."""
959
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
960
    # Note: This could be written to not assume you can do out-of-order
961
    #       lookups. Instead any nodes that don't match in all trees could be
962
    #       marked as 'deferred', and then returned in the final cleanup loop.
963
    #       For now, I think it is "nicer" to return things as close to the
964
    #       "master_tree" order as we can.
965
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
966
    def __init__(self, master_tree, other_trees):
967
        """Create a new MultiWalker.
968
969
        All trees being walked must implement "iter_entries_by_dir()", such
970
        that they yield (path, object) tuples, where that object will have a
971
        '.file_id' member, that can be used to check equality.
972
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
973
        :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.
974
            that nodes in master_tree will be used as 'first-pass' sync points.
975
            Any nodes that aren't in master_tree will be merged in a second
976
            pass.
977
        :param other_trees: A list of other trees to walk simultaneously.
978
        """
979
        self._master_tree = master_tree
980
        self._other_trees = other_trees
981
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
982
        # Keep track of any nodes that were properly processed just out of
983
        # order, that way we don't return them at the end, we don't have to
984
        # track *all* processed file_ids, just the out-of-order ones
985
        self._out_of_order_processed = set()
986
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
987
    @staticmethod
988
    def _step_one(iterator):
989
        """Step an iter_entries_by_dir iterator.
990
991
        :return: (has_more, path, ie)
992
            If has_more is False, path and ie will be None.
993
        """
994
        try:
995
            path, ie = iterator.next()
996
        except StopIteration:
997
            return False, None, None
998
        else:
999
            return True, path, ie
1000
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1001
    @staticmethod
1002
    def _cmp_path_by_dirblock(path1, path2):
1003
        """Compare two paths based on what directory they are in.
1004
1005
        This generates a sort order, such that all children of a directory are
1006
        sorted together, and grandchildren are in the same order as the
1007
        children appear. But all grandchildren come after all children.
1008
1009
        :param path1: first path
1010
        :param path2: the second path
1011
        :return: negative number if ``path1`` comes first,
1012
            0 if paths are equal
1013
            and a positive number if ``path2`` sorts first
1014
        """
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1015
        # Shortcut this special case
1016
        if path1 == path2:
1017
            return 0
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1018
        # This is stolen from _dirstate_helpers_py.py, only switching it to
1019
        # Unicode objects. Consider using encode_utf8() and then using the
1020
        # optimized versions, or maybe writing optimized unicode versions.
1021
        if not isinstance(path1, unicode):
1022
            raise TypeError("'path1' must be a unicode string, not %s: %r"
1023
                            % (type(path1), path1))
1024
        if not isinstance(path2, unicode):
1025
            raise TypeError("'path2' must be a unicode string, not %s: %r"
1026
                            % (type(path2), path2))
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1027
        return cmp(MultiWalker._path_to_key(path1),
1028
                   MultiWalker._path_to_key(path2))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1029
1030
    @staticmethod
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1031
    def _path_to_key(path):
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1032
        dirname, basename = osutils.split(path)
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1033
        return (dirname.split(u'/'), basename)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1034
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1035
    def _lookup_by_file_id(self, extra_entries, other_tree, file_id):
1036
        """Lookup an inventory entry by file_id.
1037
1038
        This is called when an entry is missing in the normal order.
1039
        Generally this is because a file was either renamed, or it was
1040
        deleted/added. If the entry was found in the inventory and not in
1041
        extra_entries, it will be added to self._out_of_order_processed
1042
1043
        :param extra_entries: A dictionary of {file_id: (path, ie)}.  This
1044
            should be filled with entries that were found before they were
1045
            used. If file_id is present, it will be removed from the
1046
            dictionary.
1047
        :param other_tree: The Tree to search, in case we didn't find the entry
1048
            yet.
1049
        :param file_id: The file_id to look for
1050
        :return: (path, ie) if found or (None, None) if not present.
1051
        """
1052
        if file_id in extra_entries:
1053
            return extra_entries.pop(file_id)
1054
        # TODO: Is id2path better as the first call, or is
1055
        #       inventory[file_id] better as a first check?
1056
        try:
1057
            cur_path = other_tree.id2path(file_id)
1058
        except errors.NoSuchId:
1059
            cur_path = None
1060
        if cur_path is None:
1061
            return (None, None)
1062
        else:
1063
            self._out_of_order_processed.add(file_id)
1064
            cur_ie = other_tree.inventory[file_id]
1065
            return (cur_path, cur_ie)
1066
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1067
    def iter_all(self):
1068
        """Match up the values in the different trees."""
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1069
        for result in self._walk_master_tree():
1070
            yield result
1071
        self._finish_others()
1072
        for result in self._walk_others():
1073
            yield result
1074
1075
    def _walk_master_tree(self):
1076
        """First pass, walk all trees in lock-step.
1077
        
1078
        When we are done, all nodes in the master_tree will have been
1079
        processed. _other_walkers, _other_entries, and _others_extra will be
1080
        set on 'self' for future processing.
1081
        """
1082
        # This iterator has the most "inlining" done, because it tends to touch
1083
        # every file in the tree, while the others only hit nodes that don't
1084
        # match.
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1085
        master_iterator = self._master_tree.iter_entries_by_dir()
1086
1087
        other_walkers = [other.iter_entries_by_dir()
1088
                         for other in self._other_trees]
1089
        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.
1090
        # Track extra nodes in the other trees
1091
        others_extra = [{} for i in xrange(len(self._other_trees))]
1092
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1093
        master_has_more = True
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1094
        step_one = self._step_one
1095
        lookup_by_file_id = self._lookup_by_file_id
1096
        out_of_order_processed = self._out_of_order_processed
1097
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1098
        while master_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1099
            (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.
1100
            if not master_has_more:
1101
                break
1102
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1103
            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.
1104
            other_values = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1105
            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.
1106
            next_other_entries = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1107
            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.
1108
            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.
1109
                if not other_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1110
                    other_values_append(lookup_by_file_id(
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1111
                        others_extra[idx], self._other_trees[idx], file_id))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1112
                    next_other_entries_append((False, None, None))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1113
                elif file_id == other_ie.file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1114
                    # This is the critical code path, as most of the entries
1115
                    # should match between most trees.
1116
                    other_values_append((other_path, other_ie))
1117
                    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.
1118
                else:
1119
                    # This walker did not match, step it until it either
1120
                    # 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.
1121
                    other_walker = other_walkers[idx]
1122
                    other_extra = others_extra[idx]
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1123
                    while (other_has_more and
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1124
                           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.
1125
                        other_file_id = other_ie.file_id
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1126
                        if other_file_id not in out_of_order_processed:
1127
                            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
1128
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1129
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1130
                    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.
1131
                        # We ended up walking to this point, match and step
1132
                        # again
1133
                        other_values_append((other_path, other_ie))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1134
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1135
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1136
                    else:
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1137
                        # 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.
1138
                        # exists at all.
1139
                        other_values_append(lookup_by_file_id(
1140
                            other_extra, self._other_trees[idx], file_id))
1141
                    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
1142
                                               other_ie))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1143
            other_entries = next_other_entries
1144
1145
            # We've matched all the walkers, yield this datapoint
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1146
            yield path, file_id, master_ie, other_values
1147
        self._other_walkers = other_walkers
1148
        self._other_entries = other_entries
1149
        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.
1150
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1151
    def _finish_others(self):
1152
        """Finish walking the other iterators, so we get all entries."""
1153
        for idx, info in enumerate(self._other_entries):
1154
            other_extra = self._others_extra[idx]
1155
            (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.
1156
            while other_has_more:
1157
                other_file_id = other_ie.file_id
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1158
                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.
1159
                    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.
1160
                other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1161
                    self._step_one(self._other_walkers[idx])
1162
        del self._other_entries
1163
1164
    def _walk_others(self):
1165
        """Finish up by walking all the 'deferred' nodes."""
1166
        # TODO: One alternative would be to grab all possible unprocessed
1167
        #       file_ids, and then sort by path, and then yield them. That
1168
        #       might ensure better ordering, in case a caller strictly
1169
        #       requires parents before children.
1170
        for idx, other_extra in enumerate(self._others_extra):
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1171
            others = sorted(other_extra.itervalues(),
1172
                            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.
1173
            for other_path, other_ie in others:
1174
                file_id = other_ie.file_id
3514.3.7 by John Arbash Meinel
comment
1175
                # We don't need to check out_of_order_processed here, because
1176
                # the lookup_by_file_id will be removing anything processed
1177
                # 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.
1178
                other_extra.pop(file_id)
3514.3.5 by John Arbash Meinel
Handle some edge cases when we have multiple other trees.
1179
                other_values = [(None, None) for i in xrange(idx)]
1180
                other_values.append((other_path, other_ie))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1181
                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.
1182
                    alt_idx = alt_idx + idx + 1
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1183
                    alt_extra = self._others_extra[alt_idx]
1184
                    alt_tree = self._other_trees[alt_idx]
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1185
                    other_values.append(self._lookup_by_file_id(
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1186
                                            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.
1187
                yield other_path, file_id, None, other_values