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