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