/brz/remove-bazaar

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