~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 (
26
    delta,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
27
    osutils,
1551.15.46 by Aaron Bentley
Move plan merge to tree
28
    revision as _mod_revision,
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
29
    conflicts as _mod_conflicts,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
30
    symbol_versioning,
31
    )
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
32
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
33
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
34
from bzrlib import errors
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
35
from bzrlib.inventory import Inventory, InventoryFile
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
36
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
37
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
38
import bzrlib.revision
39
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
40
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
41
558 by Martin Pool
- All top-level classes inherit from object
42
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
43
    """Abstract file tree.
44
45
    There are several subclasses:
46
    
47
    * `WorkingTree` exists as files on disk editable by the user.
48
49
    * `RevisionTree` is a tree as recorded at some point in the past.
50
51
    Trees contain an `Inventory` object, and also know how to retrieve
52
    file texts mentioned in the inventory, either from a working
53
    directory or from a store.
54
55
    It is possible for trees to contain files that are not described
56
    in their inventory or vice versa; for this use `filenames()`.
57
58
    Trees can be compared, etc, regardless of whether they are working
59
    trees or versioned trees.
60
    """
61
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
62
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
63
        extra_trees=None, require_versioned=False, include_root=False,
64
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
65
        """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.
66
67
        :param other: A tree to compare with.
68
        :param specific_files: An optional list of file paths to restrict the
69
            comparison to. When mapping filenames to ids, all matches in all
70
            trees (including optional extra_trees) are used, and all children of
71
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
72
        :param want_unchanged: An optional boolean requesting the inclusion of
73
            unchanged entries in the result.
74
        :param extra_trees: An optional list of additional trees to use when
75
            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.
76
        :param require_versioned: An optional boolean (defaults to False). When
77
            supplied and True all the 'specific_files' must be versioned, or
78
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
79
        :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.
80
1852.8.4 by Robert Collins
Hook InterTree into Tree.
81
        The comparison will be performed by an InterTree object looked up on 
82
        self and other.
83
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
84
        # Martin observes that Tree.changes_from returns a TreeDelta and this
85
        # may confuse people, because the class name of the returned object is
86
        # 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.
87
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
88
            want_unchanged=want_unchanged,
89
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
90
            extra_trees=extra_trees,
91
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
92
            include_root=include_root,
93
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
94
            )
2012.1.1 by Aaron Bentley
Implement change iterator
95
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
96
    def _iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
97
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
98
                     require_versioned=True, want_unversioned=False):
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
99
        intertree = InterTree.get(from_tree, self)
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
100
        return intertree._iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
101
            extra_trees, require_versioned, want_unversioned=want_unversioned)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
102
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
103
    def conflicts(self):
104
        """Get a list of the conflicts in the tree.
105
106
        Each conflict is an instance of bzrlib.conflicts.Conflict.
107
        """
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
108
        return _mod_conflicts.ConflictList()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
109
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
110
    def extras(self):
111
        """For trees that can have unversioned files, return all such paths."""
112
        return []
113
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
114
    def get_parent_ids(self):
115
        """Get the parent ids for this tree. 
116
117
        :return: a list of parent ids. [] is returned to indicate
118
        a tree with no parents.
119
        :raises: BzrError if the parents are not known.
120
        """
121
        raise NotImplementedError(self.get_parent_ids)
122
    
1 by mbp at sourcefrog
import from baz patch-364
123
    def has_filename(self, filename):
124
        """True if the tree has given filename."""
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
125
        raise NotImplementedError(self.has_filename)
1 by mbp at sourcefrog
import from baz patch-364
126
1185.12.39 by abentley
Propogated has_or_had_id to Tree
127
    def has_id(self, file_id):
128
        return self.inventory.has_id(file_id)
129
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
130
    __contains__ = has_id
131
1185.12.39 by abentley
Propogated has_or_had_id to Tree
132
    def has_or_had_id(self, file_id):
133
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
134
            return True
1 by mbp at sourcefrog
import from baz patch-364
135
        return self.inventory.has_id(file_id)
136
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
137
    def is_ignored(self, filename):
138
        """Check whether the filename is ignored by this tree.
139
140
        :param filename: The relative filename within the tree.
141
        :return: True if the filename is ignored.
142
        """
143
        return False
144
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
145
    def __iter__(self):
146
        return iter(self.inventory)
147
1 by mbp at sourcefrog
import from baz patch-364
148
    def id2path(self, file_id):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
149
        """Return the path for a file id.
150
151
        :raises NoSuchId:
152
        """
1 by mbp at sourcefrog
import from baz patch-364
153
        return self.inventory.id2path(file_id)
154
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
155
    def is_control_filename(self, filename):
156
        """True if filename is the name of a control file in this tree.
157
        
158
        :param filename: A filename within the tree. This is a relative path
159
        from the root of this tree.
160
161
        This is true IF and ONLY IF the filename is part of the meta data
162
        that bzr controls in this tree. I.E. a random .bzr directory placed
163
        on disk will not be a control file for this tree.
164
        """
165
        return self.bzrdir.is_control_filename(filename)
166
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
167
    @needs_read_lock
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
168
    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.
169
        """Walk the tree in 'by_dir' order.
170
171
        This will yield each entry in the tree as a (path, entry) tuple. The
172
        order that they are yielded is: the contents of a directory are 
173
        preceeded by the parent of a directory, and all the contents of a 
174
        directory are grouped together.
175
        """
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
176
        return self.inventory.iter_entries_by_dir(
177
            specific_file_ids=specific_file_ids)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
178
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.
179
    def iter_references(self):
2100.3.27 by Aaron Bentley
Enable nested commits
180
        for path, entry in self.iter_entries_by_dir():
181
            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.
182
                yield path, entry.file_id
2100.3.27 by Aaron Bentley
Enable nested commits
183
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
184
    def kind(self, file_id):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
185
        raise NotImplementedError("Tree subclass %s must implement kind"
186
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
187
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
188
    def path_content_summary(self, path):
189
        """Get a summary of the information about path.
190
        
191
        :param path: A relative path within the tree.
192
        :return: A tuple containing kind, size, exec, sha1-or-link.
193
            Kind is always present (see tree.kind()).
194
            size is present if kind is file, None otherwise.
195
            exec is None unless kind is file and the platform supports the 'x'
196
                bit.
197
            sha1-or-link is the link target if kind is symlink, or the sha1 if
198
                it can be obtained without reading the file.
199
        """
200
        raise NotImplementedError(self.path_content_summary)
201
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
202
    def get_reference_revision(self, file_id, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
203
        raise NotImplementedError("Tree subclass %s must implement "
204
                                  "get_reference_revision"
205
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
206
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
207
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
208
        """Return a tuple of kind, executable, stat_value for a file.
209
210
        entry may be None if there is no inventory entry for the file, but
211
        path must always be supplied.
212
213
        kind is None if there is no file present (even if an inventory id is
214
        present).  executable is False for non-file entries.
215
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
216
        raise NotImplementedError(self._comparison_data)
217
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
218
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
219
        raise NotImplementedError(self._file_size)
220
1 by mbp at sourcefrog
import from baz patch-364
221
    def _get_inventory(self):
222
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
223
    
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
224
    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
225
        """Return a file object for the file file_id in the tree.
226
        
227
        If both file_id and path are defined, it is implementation defined as
228
        to which one is used.
229
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
230
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
231
232
    def get_file_mtime(self, file_id, path=None):
233
        """Return the modification time for a file.
234
235
        :param file_id: The handle for this file.
236
        :param path: The path that this file can be found at.
237
            These must point to the same object.
238
        """
239
        raise NotImplementedError(self.get_file_mtime)
240
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
241
    def get_file_by_path(self, path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
242
        return self.get_file(self._inventory.path2id(path), path)
1 by mbp at sourcefrog
import from baz patch-364
243
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
244
    def iter_files_bytes(self, desired_files):
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
245
        """Iterate through file contents.
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
246
2708.1.10 by Aaron Bentley
Update docstrings
247
        Files will not necessarily be returned in the order they occur in
248
        desired_files.  No specific order is guaranteed.
249
250
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
251
        value supplied by the caller as part of desired_files.  It should
252
        uniquely identify the file version in the caller's context.  (Examples:
253
        an index number or a TreeTransform trans_id.)
254
255
        bytes_iterator is an iterable of bytestrings for the file.  The
256
        kind of iterable and length of the bytestrings are unspecified, but for
257
        this implementation, it is a tuple containing a single bytestring with
258
        the complete text of the file.
259
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
260
        :param desired_files: a list of (file_id, identifier) pairs
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
261
        """
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
262
        for file_id, identifier in desired_files:
2708.1.10 by Aaron Bentley
Update docstrings
263
            # We wrap the string in a tuple so that we can return an iterable
264
            # of bytestrings.  (Technically, a bytestring is also an iterable
265
            # of bytestrings, but iterating through each character is not
266
            # performant.)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
267
            cur_file = (self.get_file_text(file_id),)
268
            yield identifier, cur_file
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
269
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
270
    def get_symlink_target(self, file_id):
271
        """Get the target for a given file_id.
272
273
        It is assumed that the caller already knows that file_id is referencing
274
        a symlink.
275
        :param file_id: Handle for the symlink entry.
276
        :return: The path the symlink points to.
277
        """
278
        raise NotImplementedError(self.get_symlink_target)
279
2946.3.2 by John Arbash Meinel
Add tree implementation tests for Tree.get_root_id()
280
    def get_root_id(self):
281
        """Return the file_id for the root of this tree."""
282
        raise NotImplementedError(self.get_root_id)
283
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
284
    def annotate_iter(self, file_id):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
285
        """Return an iterator of revision_id, line tuples.
1551.9.18 by Aaron Bentley
Updates from review comments
286
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
287
        For working trees (and mutable trees in general), the special
288
        revision_id 'current:' will be used for lines that are new in this
289
        tree, e.g. uncommitted changes.
290
        :param file_id: The file to produce an annotated version from
291
        """
292
        raise NotImplementedError(self.annotate_iter)
293
1551.15.52 by Aaron Bentley
Tweak from review comments
294
    def plan_file_merge(self, file_id, other):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
295
        """Generate a merge plan based on annotations.
1551.15.46 by Aaron Bentley
Move plan merge to tree
296
297
        If the file contains uncommitted changes in this tree, they will be
298
        attributed to the 'current:' pseudo-revision.  If the file contains
299
        uncommitted changes in the other tree, they will be assigned to the
300
        'other:' pseudo-revision.
301
        """
302
        from bzrlib import merge
303
        annotated_a = list(self.annotate_iter(file_id,
304
                                              _mod_revision.CURRENT_REVISION))
305
        annotated_b = list(other.annotate_iter(file_id, 'other:'))
306
        ancestors_a = self._get_ancestors(_mod_revision.CURRENT_REVISION)
307
        ancestors_b = other._get_ancestors('other:')
308
        return merge._plan_annotate_merge(annotated_a, annotated_b,
309
                                          ancestors_a, ancestors_b)
310
1 by mbp at sourcefrog
import from baz patch-364
311
    inventory = property(_get_inventory,
312
                         doc="Inventory of this Tree")
313
314
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
315
        if not __debug__:
316
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
317
        fp = fingerprint_file(f)
318
        f.seek(0)
319
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
320
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
321
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
322
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
323
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
324
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
325
                         "store is probably damaged/corrupt"])
326
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
327
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
328
            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
329
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
330
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
331
                     "store is probably damaged/corrupt"])
332
2334.1.1 by John Arbash Meinel
Lazily read working inventory in workingtree.py,
333
    @needs_read_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
334
    def path2id(self, path):
335
        """Return the id for path in this tree."""
336
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
337
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
338
    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.
339
        """Return all the ids that can be reached by walking from paths.
340
        
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
341
        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.
342
        trees, and this is repeated recursively: the children in an extra tree
343
        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
344
        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.
345
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
346
347
        :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.
348
            Alternatively, if paths is None, no ids should be calculated and None
349
            will be returned. This is offered to make calling the api unconditional
350
            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.
351
        :param trees: Additional trees to consider.
352
        :param require_versioned: If False, do not raise NotVersionedError if
353
            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.
354
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
355
        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.
356
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
357
    def print_file(self, file_id):
358
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
359
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
360
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
361
362
    def lock_read(self):
363
        pass
364
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
365
    def revision_tree(self, revision_id):
366
        """Obtain a revision tree for the revision revision_id.
367
368
        The intention of this method is to allow access to possibly cached
369
        tree data. Implementors of this method should raise NoSuchRevision if
370
        the tree is not locally available, even if they could obtain the 
371
        tree via a repository or some other means. Callers are responsible 
372
        for finding the ultimate source for a revision tree.
373
374
        :param revision_id: The revision_id of the requested tree.
375
        :return: A Tree.
376
        :raises: NoSuchRevision if the tree cannot be obtained.
377
        """
378
        raise errors.NoSuchRevisionInTree(self, revision_id)
379
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
380
    def unknowns(self):
381
        """What files are present in this tree and unknown.
382
        
383
        :return: an iterator over the unknown files.
384
        """
385
        return iter([])
386
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
387
    def unlock(self):
388
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
389
390
    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.
391
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
392
393
        :return: set of paths.
394
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
395
        # NB: we specifically *don't* call self.has_filename, because for
396
        # WorkingTrees that can indicate files that exist on disk but that 
397
        # are not versioned.
398
        pred = self.inventory.has_filename
399
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
400
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
401
    def walkdirs(self, prefix=""):
402
        """Walk the contents of this tree from path down.
403
404
        This yields all the data about the contents of a directory at a time.
405
        After each directory has been yielded, if the caller has mutated the
406
        list to exclude some directories, they are then not descended into.
407
        
408
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
409
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
410
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
411
          versioned_kind), ...]),
412
         - directory-relpath is the containing dirs relpath from prefix
413
         - directory-path-from-root is the containing dirs path from /
414
         - 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.
415
         - relpath is the relative path within the subtree being walked.
416
         - basename is the basename
417
         - kind is the kind of the file now. If unknonwn then the file is not
418
           present within the tree - but it may be recorded as versioned. See
419
           versioned_kind.
420
         - lstat is the stat data *if* the file was statted.
421
         - path_from_tree_root is the path from the root of the tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
422
         - file_id is the file_id if the entry is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
423
         - versioned_kind is the kind of the file as last recorded in the 
424
           versioning system. If 'unknown' the file is not versioned.
425
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
426
427
        :param prefix: Start walking from prefix within the tree rather than
428
        at the root. This allows one to walk a subtree but get paths that are
429
        relative to a tree rooted higher up.
430
        :return: an iterator over the directory data.
431
        """
432
        raise NotImplementedError(self.walkdirs)
433
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
434
1 by mbp at sourcefrog
import from baz patch-364
435
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
436
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
437
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
438
        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()
439
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
440
                               ' use repository.revision_tree instead.',
441
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
442
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
443
    def get_parent_ids(self):
444
        return []
445
1092.2.6 by Robert Collins
symlink support updated to work
446
    def get_symlink_target(self, file_id):
447
        return None
448
1 by mbp at sourcefrog
import from baz patch-364
449
    def has_filename(self, filename):
450
        return False
451
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
452
    def kind(self, file_id):
453
        assert self._inventory[file_id].kind == "directory"
454
        return "directory"
455
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
456
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
457
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
458
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
459
    def __contains__(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
460
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
461
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
462
    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
463
        return None
464
465
1 by mbp at sourcefrog
import from baz patch-364
466
######################################################################
467
# diff
468
469
# TODO: Merge these two functions into a single one that can operate
470
# on either a whole tree or a set of files.
471
472
# TODO: Return the diff in order by filename, not by category or in
473
# random order.  Can probably be done by lock-stepping through the
474
# filenames from both trees.
475
476
477
def file_status(filename, old_tree, new_tree):
478
    """Return single-letter status, old and new names for a file.
479
480
    The complexity here is in deciding how to represent renames;
481
    many complex cases are possible.
482
    """
483
    old_inv = old_tree.inventory
484
    new_inv = new_tree.inventory
485
    new_id = new_inv.path2id(filename)
486
    old_id = old_inv.path2id(filename)
487
488
    if not new_id and not old_id:
489
        # easy: doesn't exist in either; not versioned at all
490
        if new_tree.is_ignored(filename):
491
            return 'I', None, None
492
        else:
493
            return '?', None, None
494
    elif new_id:
495
        # There is now a file of this name, great.
496
        pass
497
    else:
498
        # There is no longer a file of this name, but we can describe
499
        # what happened to the file that used to have
500
        # this name.  There are two possibilities: either it was
501
        # deleted entirely, or renamed.
502
        assert old_id
503
        if new_inv.has_id(old_id):
504
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
505
        else:
506
            return 'D', old_inv.id2path(old_id), None
507
508
    # if the file_id is new in this revision, it is added
509
    if new_id and not old_inv.has_id(new_id):
510
        return 'A'
511
512
    # if there used to be a file of this name, but that ID has now
513
    # disappeared, it is deleted
514
    if old_id and not new_inv.has_id(old_id):
515
        return 'D'
516
517
    return 'wtf?'
518
519
    
520
164 by mbp at sourcefrog
new 'renames' command
521
def find_renames(old_inv, new_inv):
522
    for file_id in old_inv:
523
        if file_id not in new_inv:
524
            continue
525
        old_name = old_inv.id2path(file_id)
526
        new_name = new_inv.id2path(file_id)
527
        if old_name != new_name:
528
            yield (old_name, new_name)
529
            
678 by Martin Pool
- export to tarballs
530
1551.7.22 by Aaron Bentley
Changes from review
531
def find_ids_across_trees(filenames, trees, require_versioned=True):
532
    """Find the ids corresponding to specified filenames.
533
    
534
    All matches in all trees will be used, and all children of matched
535
    directories will be used.
536
1551.10.7 by Aaron Bentley
Use new-style output for status
537
    :param filenames: The filenames to find file_ids for (if None, returns
538
        None)
1551.7.22 by Aaron Bentley
Changes from review
539
    :param trees: The trees to find file_ids within
540
    :param require_versioned: if true, all specified filenames must occur in
541
    at least one tree.
542
    :return: a set of file ids for the specified filenames and their children.
543
    """
544
    if not filenames:
545
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
546
    specified_path_ids = _find_ids_across_trees(filenames, trees,
547
        require_versioned)
548
    return _find_children_across_trees(specified_path_ids, trees)
549
550
551
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
552
    """Find the ids corresponding to specified filenames.
553
    
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
554
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
555
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
556
    :param filenames: The filenames to find file_ids for
557
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
558
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
559
        at least one tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
560
    :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
561
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
562
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
563
    interesting_ids = set()
564
    for tree_path in filenames:
565
        not_found = True
566
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
567
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
568
            if file_id is not None:
569
                interesting_ids.add(file_id)
570
                not_found = False
571
        if not_found:
572
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
573
    if len(not_versioned) > 0 and require_versioned:
574
        raise errors.PathsNotVersionedError(not_versioned)
575
    return interesting_ids
576
577
578
def _find_children_across_trees(specified_ids, trees):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
579
    """Return a set including specified ids and their children.
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
580
    
1551.7.22 by Aaron Bentley
Changes from review
581
    All matches in all trees will be used.
582
583
    :param trees: The trees to find file_ids within
584
    :return: a set containing all specified ids and their children 
585
    """
586
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
587
    pending = interesting_ids
588
    # now handle children of interesting ids
589
    # we loop so that we handle all children of each id in both trees
590
    while len(pending) > 0:
591
        new_pending = set()
592
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
593
            for tree in trees:
2292.1.21 by Marius Kruger
undo tree.has_id fake-bugfix, which seems to not be needed anymore..
594
                if not tree.has_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
595
                    continue
596
                entry = tree.inventory[file_id]
597
                for child in getattr(entry, 'children', {}).itervalues():
598
                    if child.file_id not in interesting_ids:
599
                        new_pending.add(child.file_id)
600
        interesting_ids.update(new_pending)
601
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
602
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
603
604
605
class InterTree(InterObject):
606
    """This class represents operations taking place between two Trees.
607
608
    Its instances have methods like 'compare' and contain references to the
609
    source and target trees these operations are to be carried out on.
610
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
611
    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.
612
    should use the convenience methods on Tree such as 'Tree.compare()' which
613
    will pass through to InterTree as appropriate.
614
    """
615
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
616
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
617
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
618
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
619
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
620
        extra_trees=None, require_versioned=False, include_root=False,
621
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
622
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
623
624
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
625
        :param specific_files: An optional list of file paths to restrict the
626
            comparison to. When mapping filenames to ids, all matches in all
627
            trees (including optional extra_trees) are used, and all children of
628
            matched directories are included.
629
        :param want_unchanged: An optional boolean requesting the inclusion of
630
            unchanged entries in the result.
631
        :param extra_trees: An optional list of additional trees to use when
632
            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.
633
        :param require_versioned: An optional boolean (defaults to False). When
634
            supplied and True all the 'specific_files' must be versioned, or
635
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
636
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
637
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
638
        # NB: show_status depends on being able to pass in non-versioned files
639
        # and report them as unknown
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
640
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
641
        if extra_trees is not None:
642
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
643
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
644
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
645
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
646
        if specific_files and not specific_file_ids:
647
            # All files are unversioned, so just return an empty delta
648
            # _compare_trees would think we want a complete delta
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
649
            result = delta.TreeDelta()
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
650
            fake_entry = InventoryFile('unused', 'unused', 'unused')
651
            result.unversioned = [(path, None,
652
                self.target._comparison_data(fake_entry, path)[0]) for path in
653
                specific_files]
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
654
            return result
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
655
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
656
            specific_files, include_root, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
657
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
658
            want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
659
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
660
    def _iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
661
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
662
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
663
        """Generate an iterator of changes between trees.
664
665
        A tuple is returned:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
666
        (file_id, (path_in_source, path_in_target),
667
         changed_content, versioned, parent, name, kind,
2012.1.1 by Aaron Bentley
Implement change iterator
668
         executable)
669
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
670
        Changed_content is True if the file's content has changed.  This
671
        includes changes to its kind, and to a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
672
2012.1.15 by Aaron Bentley
Minor tweaks
673
        versioned, parent, name, kind, executable are tuples of (from, to).
674
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
675
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
676
        Iteration is done in parent-to-child order, relative to the target
677
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
678
679
        There is no guarantee that all paths are in sorted order: the
680
        requirement to expand the search due to renames may result in children
681
        that should be found early being found late in the search, after
682
        lexically later results have been returned.
683
        :param require_versioned: Raise errors.PathsNotVersionedError if a
684
            path in the specific_files list is not versioned in one of
685
            source, target or extra_trees.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
686
        :param want_unversioned: Should unversioned files be returned in the
687
            output. An unversioned file is defined as one with (False, False)
688
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
689
        """
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
690
        result = []
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
691
        lookup_trees = [self.source]
692
        if extra_trees:
693
             lookup_trees.extend(extra_trees)
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
694
        if specific_files == []:
695
            specific_file_ids = []
696
        else:
697
            specific_file_ids = self.target.paths2ids(specific_files,
698
                lookup_trees, require_versioned=require_versioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
699
        if want_unversioned:
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
700
            all_unversioned = sorted([(p.split('/'), p) for p in
701
                                     self.target.extras()
702
                if specific_files is None or
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
703
                    osutils.is_inside_any(specific_files, p)])
704
            all_unversioned = deque(all_unversioned)
705
        else:
706
            all_unversioned = deque()
2012.1.1 by Aaron Bentley
Implement change iterator
707
        to_paths = {}
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
708
        from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
709
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
710
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
711
        to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
712
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
713
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
714
        entry_count = 0
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
715
        # the unversioned path lookup only occurs on real trees - where there 
716
        # can be extras. So the fake_entry is solely used to look up
717
        # executable it values when execute is not supported.
718
        fake_entry = InventoryFile('unused', 'unused', 'unused')
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
719
        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.
720
            while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
721
                unversioned_path = all_unversioned.popleft()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
722
                to_kind, to_executable, to_stat = \
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
723
                    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.
724
                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.
725
                    (None, None),
726
                    (None, unversioned_path[0][-1]),
727
                    (None, to_kind),
728
                    (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
729
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
730
            to_paths[file_id] = to_path
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
731
            entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
732
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
733
            from_path, from_entry = from_data.get(file_id, (None, None))
734
            from_versioned = (from_entry is not None)
735
            if from_entry is not None:
736
                from_versioned = True
737
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
738
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
739
                from_kind, from_executable, from_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
740
                    self.source._comparison_data(from_entry, from_path)
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
741
                entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
742
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
743
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
744
                from_kind = None
745
                from_parent = None
746
                from_name = None
747
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
748
            versioned = (from_versioned, True)
749
            to_kind, to_executable, to_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
750
                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)
751
            kind = (from_kind, to_kind)
752
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
753
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
754
            elif from_kind == 'file':
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
755
                from_size = self.source._file_size(from_entry, from_stat)
756
                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
757
                if from_size != to_size:
758
                    changed_content = True
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
759
                elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
760
                    self.target.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
761
                    changed_content = True
762
            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.
763
                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.
764
                    self.target.get_symlink_target(file_id)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
765
                    changed_content = True
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
766
                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.
767
                    if (self.source.get_reference_revision(file_id, from_path)
768
                        != self.target.get_reference_revision(file_id, to_path)):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
769
                        changed_content = True 
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
770
            parent = (from_parent, to_entry.parent_id)
771
            name = (from_name, to_entry.name)
772
            executable = (from_executable, to_executable)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
773
            if pb is not None:
774
                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.
775
            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)
776
                or parent[0] != parent[1] or name[0] != name[1] or 
777
                executable[0] != executable[1] or include_unchanged):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
778
                yield (file_id, (from_path, to_path), changed_content,
779
                    versioned, parent, name, kind, executable)
780
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
781
        while all_unversioned:
782
            # yield any trailing unversioned paths
783
            unversioned_path = all_unversioned.popleft()
784
            to_kind, to_executable, to_stat = \
785
                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.
786
            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.
787
                (None, None),
788
                (None, unversioned_path[0][-1]),
789
                (None, to_kind),
790
                (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
791
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
792
        def get_to_path(to_entry):
793
            if to_entry.parent_id is None:
794
                to_path = '' # the root
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
795
            else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
796
                if to_entry.parent_id not in to_paths:
797
                    # recurse up
798
                    return get_to_path(self.target.inventory[to_entry.parent_id])
799
                to_path = osutils.pathjoin(to_paths[to_entry.parent_id],
800
                                           to_entry.name)
801
            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
802
            return to_path
803
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
804
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
805
            file_id = from_entry.file_id
806
            if file_id in to_paths:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
807
                # already returned
2012.1.1 by Aaron Bentley
Implement change iterator
808
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
809
            if not file_id in self.target.inventory:
810
                # common case - paths we have not emitted are not present in
811
                # target.
812
                to_path = None
813
            else:
814
                to_path = get_to_path(self.target.inventory[file_id])
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
815
            entry_count += 1
816
            if pb is not None:
817
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
818
            versioned = (True, False)
819
            parent = (from_entry.parent_id, None)
820
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
821
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
822
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
823
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
824
            executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
825
            changed_content = True
826
            # 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.
827
            yield(file_id, (path, to_path), changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
828
                  name, kind, executable)
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
829
2012.1.8 by Aaron Bentley
Merge from bzr.dev
830
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
831
# This was deprecated before 0.12, but did not have an official warning
832
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
833
def RevisionTree(*args, **kwargs):
834
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
835
836
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
837
    bzr 0.12.
838
    """
839
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
840
    return _RevisionTree(*args, **kwargs)
841
 
842