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