/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
2012.1.10 by Aaron Bentley
Make iter_changes private, so it can be changed freely
90
    def _iter_changes(self, from_tree, include_unchanged=False, 
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
91
                     specific_file_ids=None):
92
        intertree = InterTree.get(from_tree, self)
2012.1.10 by Aaron Bentley
Make iter_changes private, so it can be changed freely
93
        return intertree._iter_changes(from_tree, self, include_unchanged, 
94
                                       specific_file_ids)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
95
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
96
    def conflicts(self):
97
        """Get a list of the conflicts in the tree.
98
99
        Each conflict is an instance of bzrlib.conflicts.Conflict.
100
        """
101
        return []
102
103
    def get_parent_ids(self):
104
        """Get the parent ids for this tree. 
105
106
        :return: a list of parent ids. [] is returned to indicate
107
        a tree with no parents.
108
        :raises: BzrError if the parents are not known.
109
        """
110
        raise NotImplementedError(self.get_parent_ids)
111
    
1 by mbp at sourcefrog
import from baz patch-364
112
    def has_filename(self, filename):
113
        """True if the tree has given filename."""
114
        raise NotImplementedError()
115
1185.12.39 by abentley
Propogated has_or_had_id to Tree
116
    def has_id(self, file_id):
117
        return self.inventory.has_id(file_id)
118
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
119
    __contains__ = has_id
120
1185.12.39 by abentley
Propogated has_or_had_id to Tree
121
    def has_or_had_id(self, file_id):
122
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
123
            return True
1 by mbp at sourcefrog
import from baz patch-364
124
        return self.inventory.has_id(file_id)
125
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
126
    def __iter__(self):
127
        return iter(self.inventory)
128
1 by mbp at sourcefrog
import from baz patch-364
129
    def id2path(self, file_id):
130
        return self.inventory.id2path(file_id)
131
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
132
    def is_control_filename(self, filename):
133
        """True if filename is the name of a control file in this tree.
134
        
135
        :param filename: A filename within the tree. This is a relative path
136
        from the root of this tree.
137
138
        This is true IF and ONLY IF the filename is part of the meta data
139
        that bzr controls in this tree. I.E. a random .bzr directory placed
140
        on disk will not be a control file for this tree.
141
        """
142
        return self.bzrdir.is_control_filename(filename)
143
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
144
    def iter_entries_by_dir(self):
145
        """Walk the tree in 'by_dir' order.
146
147
        This will yield each entry in the tree as a (path, entry) tuple. The
148
        order that they are yielded is: the contents of a directory are 
149
        preceeded by the parent of a directory, and all the contents of a 
150
        directory are grouped together.
151
        """
152
        return self.inventory.iter_entries_by_dir()
153
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
154
    def kind(self, file_id):
155
        raise NotImplementedError("subclasses must implement kind")
156
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
157
    def _comparison_data(self, entry, path):
158
        raise NotImplementedError(self._comparison_data)
159
160
    def _file_size(entry, stat_value):
161
        raise NotImplementedError(self._file_size)
162
1 by mbp at sourcefrog
import from baz patch-364
163
    def _get_inventory(self):
164
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
165
    
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
166
    def get_file(self, file_id):
167
        """Return a file object for the file file_id in the tree."""
168
        raise NotImplementedError(self.get_file)
169
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
170
    def get_file_by_path(self, path):
171
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
172
173
    inventory = property(_get_inventory,
174
                         doc="Inventory of this Tree")
175
176
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
177
        if not __debug__:
178
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
179
        fp = fingerprint_file(f)
180
        f.seek(0)
181
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
182
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
183
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
184
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
185
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
186
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
187
                         "store is probably damaged/corrupt"])
188
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
189
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
190
            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
191
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
192
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
193
                     "store is probably damaged/corrupt"])
194
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
195
    def path2id(self, path):
196
        """Return the id for path in this tree."""
197
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
198
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
199
    def print_file(self, file_id):
200
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
201
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
202
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
203
204
    def lock_read(self):
205
        pass
206
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
207
    def unknowns(self):
208
        """What files are present in this tree and unknown.
209
        
210
        :return: an iterator over the unknown files.
211
        """
212
        return iter([])
213
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
214
    def unlock(self):
215
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
216
217
    def filter_unversioned_files(self, paths):
218
        """Filter out paths that are not versioned.
219
220
        :return: set of paths.
221
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
222
        # NB: we specifically *don't* call self.has_filename, because for
223
        # WorkingTrees that can indicate files that exist on disk but that 
224
        # are not versioned.
225
        pred = self.inventory.has_filename
226
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
227
228
1 by mbp at sourcefrog
import from baz patch-364
229
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
230
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
231
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
232
        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()
233
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
234
                               ' use repository.revision_tree instead.',
235
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
236
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
237
    def get_parent_ids(self):
238
        return []
239
1092.2.6 by Robert Collins
symlink support updated to work
240
    def get_symlink_target(self, file_id):
241
        return None
242
1 by mbp at sourcefrog
import from baz patch-364
243
    def has_filename(self, filename):
244
        return False
245
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
246
    def kind(self, file_id):
247
        assert self._inventory[file_id].kind == "directory"
248
        return "directory"
249
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
250
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
251
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
252
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
253
    def __contains__(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
254
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
255
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
256
    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
257
        return None
258
259
1 by mbp at sourcefrog
import from baz patch-364
260
######################################################################
261
# diff
262
263
# TODO: Merge these two functions into a single one that can operate
264
# on either a whole tree or a set of files.
265
266
# TODO: Return the diff in order by filename, not by category or in
267
# random order.  Can probably be done by lock-stepping through the
268
# filenames from both trees.
269
270
271
def file_status(filename, old_tree, new_tree):
272
    """Return single-letter status, old and new names for a file.
273
274
    The complexity here is in deciding how to represent renames;
275
    many complex cases are possible.
276
    """
277
    old_inv = old_tree.inventory
278
    new_inv = new_tree.inventory
279
    new_id = new_inv.path2id(filename)
280
    old_id = old_inv.path2id(filename)
281
282
    if not new_id and not old_id:
283
        # easy: doesn't exist in either; not versioned at all
284
        if new_tree.is_ignored(filename):
285
            return 'I', None, None
286
        else:
287
            return '?', None, None
288
    elif new_id:
289
        # There is now a file of this name, great.
290
        pass
291
    else:
292
        # There is no longer a file of this name, but we can describe
293
        # what happened to the file that used to have
294
        # this name.  There are two possibilities: either it was
295
        # deleted entirely, or renamed.
296
        assert old_id
297
        if new_inv.has_id(old_id):
298
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
299
        else:
300
            return 'D', old_inv.id2path(old_id), None
301
302
    # if the file_id is new in this revision, it is added
303
    if new_id and not old_inv.has_id(new_id):
304
        return 'A'
305
306
    # if there used to be a file of this name, but that ID has now
307
    # disappeared, it is deleted
308
    if old_id and not new_inv.has_id(old_id):
309
        return 'D'
310
311
    return 'wtf?'
312
313
    
314
164 by mbp at sourcefrog
new 'renames' command
315
def find_renames(old_inv, new_inv):
316
    for file_id in old_inv:
317
        if file_id not in new_inv:
318
            continue
319
        old_name = old_inv.id2path(file_id)
320
        new_name = new_inv.id2path(file_id)
321
        if old_name != new_name:
322
            yield (old_name, new_name)
323
            
678 by Martin Pool
- export to tarballs
324
1551.7.22 by Aaron Bentley
Changes from review
325
def find_ids_across_trees(filenames, trees, require_versioned=True):
326
    """Find the ids corresponding to specified filenames.
327
    
328
    All matches in all trees will be used, and all children of matched
329
    directories will be used.
330
331
    :param filenames: The filenames to find file_ids for
332
    :param trees: The trees to find file_ids within
333
    :param require_versioned: if true, all specified filenames must occur in
334
    at least one tree.
335
    :return: a set of file ids for the specified filenames and their children.
336
    """
337
    if not filenames:
338
        return None
339
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
340
                                                    require_versioned)
341
    return _find_children_across_trees(specified_ids, trees)
342
343
344
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
345
    """Find the ids corresponding to specified filenames.
346
    
347
    All matches in all trees will be used.
348
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
349
    :param filenames: The filenames to find file_ids for
350
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
351
    :param require_versioned: if true, all specified filenames must occur in
352
    at least one tree.
353
    :return: a set of file ids for the specified filenames
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
354
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
355
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
356
    interesting_ids = set()
357
    for tree_path in filenames:
358
        not_found = True
359
        for tree in trees:
360
            file_id = tree.inventory.path2id(tree_path)
361
            if file_id is not None:
362
                interesting_ids.add(file_id)
363
                not_found = False
364
        if not_found:
365
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
366
    if len(not_versioned) > 0 and require_versioned:
367
        raise errors.PathsNotVersionedError(not_versioned)
368
    return interesting_ids
369
370
371
def _find_children_across_trees(specified_ids, trees):
372
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
373
    
1551.7.22 by Aaron Bentley
Changes from review
374
    All matches in all trees will be used.
375
376
    :param trees: The trees to find file_ids within
377
    :return: a set containing all specified ids and their children 
378
    """
379
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
380
    pending = interesting_ids
381
    # now handle children of interesting ids
382
    # we loop so that we handle all children of each id in both trees
383
    while len(pending) > 0:
384
        new_pending = set()
385
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
386
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
387
                if file_id not in tree:
388
                    continue
389
                entry = tree.inventory[file_id]
390
                for child in getattr(entry, 'children', {}).itervalues():
391
                    if child.file_id not in interesting_ids:
392
                        new_pending.add(child.file_id)
393
        interesting_ids.update(new_pending)
394
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
395
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
396
397
398
class InterTree(InterObject):
399
    """This class represents operations taking place between two Trees.
400
401
    Its instances have methods like 'compare' and contain references to the
402
    source and target trees these operations are to be carried out on.
403
404
    clients of bzrlib should not need to use InterTree directly, rather they
405
    should use the convenience methods on Tree such as 'Tree.compare()' which
406
    will pass through to InterTree as appropriate.
407
    """
408
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
409
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
410
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
411
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
412
    def compare(self, want_unchanged=False, specific_files=None,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
413
        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.
414
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
415
416
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
417
        :param specific_files: An optional list of file paths to restrict the
418
            comparison to. When mapping filenames to ids, all matches in all
419
            trees (including optional extra_trees) are used, and all children of
420
            matched directories are included.
421
        :param want_unchanged: An optional boolean requesting the inclusion of
422
            unchanged entries in the result.
423
        :param extra_trees: An optional list of additional trees to use when
424
            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.
425
        :param require_versioned: An optional boolean (defaults to False). When
426
            supplied and True all the 'specific_files' must be versioned, or
427
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
428
        """
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
429
        # NB: show_status depends on being able to pass in non-versioned files and
430
        # report them as unknown
431
        trees = (self.source, self.target)
432
        if extra_trees is not None:
433
            trees = trees + tuple(extra_trees)
434
        specific_file_ids = find_ids_across_trees(specific_files,
435
            trees, require_versioned=require_versioned)
436
        if specific_files and not specific_file_ids:
437
            # All files are unversioned, so just return an empty delta
438
            # _compare_trees would think we want a complete delta
439
            return delta.TreeDelta()
440
        return delta._compare_trees(self.source, self.target, want_unchanged,
1910.2.56 by Aaron Bentley
More work on bundles
441
            specific_file_ids, include_root)
2012.1.1 by Aaron Bentley
Implement change iterator
442
2012.1.10 by Aaron Bentley
Make iter_changes private, so it can be changed freely
443
    def _iter_changes(self, from_tree, to_tree, include_unchanged, 
444
                      specific_file_ids):
2012.1.1 by Aaron Bentley
Implement change iterator
445
        """Generate an iterator of changes between trees.
446
447
        A tuple is returned:
448
        (file_id, path, changed_content, versioned, parent, name, kind,
449
         executable)
450
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
451
        Path is relative to the to_tree.  changed_content is True if the file's
452
        content has changed.  This includes changes to its kind, and to
453
        a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
454
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
455
        versioned, parent, name, kind, executable are tuples of (from, to) if
456
        changed.  If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
457
458
        Iteration is done in parent-to-child order, relative to the to_tree.
459
        """
460
        def get_versioned_kind(tree, file_id):
461
            try:
462
                return tree.kind(file_id)
463
            except errors.NoSuchFile:
464
                return None
465
466
        to_paths = {}
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
467
        if specific_file_ids is not None:
468
            specific_file_ids = set(specific_file_ids)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
469
        from_entries_by_dir = list(from_tree.iter_entries_by_dir())
470
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
471
        for to_path, to_entry in to_tree.iter_entries_by_dir():
2012.1.1 by Aaron Bentley
Implement change iterator
472
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
473
            to_paths[file_id] = to_path
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
474
            if (specific_file_ids is not None and 
475
                file_id not in specific_file_ids):
476
                continue
2012.1.1 by Aaron Bentley
Implement change iterator
477
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
478
            from_path, from_entry = from_data.get(file_id, (None, None))
479
            from_versioned = (from_entry is not None)
480
            if from_entry is not None:
481
                from_versioned = True
482
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
483
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
484
                from_kind, from_executable, from_stat = \
485
                    from_tree._comparison_data(from_entry, from_path)
2012.1.1 by Aaron Bentley
Implement change iterator
486
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
487
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
488
                from_kind = None
489
                from_parent = None
490
                from_name = None
491
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
492
            versioned = (from_versioned, True)
493
            to_kind, to_executable, to_stat = \
494
                to_tree._comparison_data(to_entry, to_path)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
495
            kind = (from_kind, to_kind)
496
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
497
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
498
            elif from_kind == 'file':
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
499
                from_size = from_tree._file_size(from_entry, from_stat)
500
                to_size = to_tree._file_size(to_entry, to_stat)
501
                if from_size != to_size:
502
                    changed_content = True
503
                elif (from_tree.get_file_sha1(file_id, from_path, from_stat) !=
504
                    to_tree.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
505
                    changed_content = True
506
            elif from_kind == 'symlink':
507
                if (from_tree.get_symlink_target(file_id) != 
508
                    to_tree.get_symlink_target(file_id)):
509
                    changed_content = True
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
510
            parent = (from_parent, to_entry.parent_id)
511
            name = (from_name, to_entry.name)
512
            executable = (from_executable, to_executable)
513
            if (changed_content is not False or versioned[0] != versioned[1] 
514
                or parent[0] != parent[1] or name[0] != name[1] or 
515
                executable[0] != executable[1] or include_unchanged):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
516
                yield (file_id, to_path, changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
517
                       name, kind, executable)
518
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
519
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
520
            file_id = from_entry.file_id
521
            if file_id in to_paths:
522
                continue
2012.1.8 by Aaron Bentley
Merge from bzr.dev
523
            if from_entry.parent_id is None:
524
                to_path = ''
525
            else:
526
                to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
527
                                           from_entry.name)
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
528
            to_paths[file_id] = to_path
529
            if (specific_file_ids is not None and 
530
                file_id not in specific_file_ids):
531
                continue
2012.1.1 by Aaron Bentley
Implement change iterator
532
            versioned = (True, False)
533
            parent = (from_entry.parent_id, None)
534
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
535
            from_kind, from_executable, stat_value = \
536
                from_tree._comparison_data(from_entry, path)
537
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
538
            executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
539
            changed_content = True
540
            # the parent's path is necessarily known at this point.
541
            yield(file_id, to_path, changed_content, versioned, parent,
542
                  name, kind, executable)
2012.1.8 by Aaron Bentley
Merge from bzr.dev
543
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
544
545
# This was deprecated before 0.12, but did not have an official warning
546
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
547
def RevisionTree(*args, **kwargs):
548
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
549
550
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
551
    bzr 0.12.
552
    """
553
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
554
    return _RevisionTree(*args, **kwargs)
555
 
556