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