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