~bzr-pqm/bzr/bzr.dev

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