/brz/remove-bazaar

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