/brz/remove-bazaar

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