/brz/remove-bazaar

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