~bzr-pqm/bzr/bzr.dev

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