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