/brz/remove-bazaar

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