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