~bzr-pqm/bzr/bzr.dev

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