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