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