~bzr-pqm/bzr/bzr.dev

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