/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
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
22
from warnings import warn
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
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
25
from bzrlib import delta
26
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
27
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
28
from bzrlib import errors
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
29
from bzrlib.inventory import Inventory
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
30
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
31
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
32
import bzrlib.revision
33
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
34
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
35
558 by Martin Pool
- All top-level classes inherit from object
36
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
37
    """Abstract file tree.
38
39
    There are several subclasses:
40
    
41
    * `WorkingTree` exists as files on disk editable by the user.
42
43
    * `RevisionTree` is a tree as recorded at some point in the past.
44
45
    Trees contain an `Inventory` object, and also know how to retrieve
46
    file texts mentioned in the inventory, either from a working
47
    directory or from a store.
48
49
    It is possible for trees to contain files that are not described
50
    in their inventory or vice versa; for this use `filenames()`.
51
52
    Trees can be compared, etc, regardless of whether they are working
53
    trees or versioned trees.
54
    """
55
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
56
    def changes_from(self, other, want_unchanged=False, specific_files=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
57
        extra_trees=None, require_versioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
58
        """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.
59
60
        :param other: A tree to compare with.
61
        :param specific_files: An optional list of file paths to restrict the
62
            comparison to. When mapping filenames to ids, all matches in all
63
            trees (including optional extra_trees) are used, and all children of
64
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
65
        :param want_unchanged: An optional boolean requesting the inclusion of
66
            unchanged entries in the result.
67
        :param extra_trees: An optional list of additional trees to use when
68
            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.
69
        :param require_versioned: An optional boolean (defaults to False). When
70
            supplied and True all the 'specific_files' must be versioned, or
71
            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.
72
1852.8.4 by Robert Collins
Hook InterTree into Tree.
73
        The comparison will be performed by an InterTree object looked up on 
74
        self and other.
75
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
76
        # Martin observes that Tree.changes_from returns a TreeDelta and this
77
        # may confuse people, because the class name of the returned object is
78
        # 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.
79
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
80
            want_unchanged=want_unchanged,
81
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
82
            extra_trees=extra_trees,
83
            require_versioned=require_versioned,
84
            )
1852.8.4 by Robert Collins
Hook InterTree into Tree.
85
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
86
    def conflicts(self):
87
        """Get a list of the conflicts in the tree.
88
89
        Each conflict is an instance of bzrlib.conflicts.Conflict.
90
        """
91
        return []
92
93
    def get_parent_ids(self):
94
        """Get the parent ids for this tree. 
95
96
        :return: a list of parent ids. [] is returned to indicate
97
        a tree with no parents.
98
        :raises: BzrError if the parents are not known.
99
        """
100
        raise NotImplementedError(self.get_parent_ids)
101
    
1 by mbp at sourcefrog
import from baz patch-364
102
    def has_filename(self, filename):
103
        """True if the tree has given filename."""
104
        raise NotImplementedError()
105
1185.12.39 by abentley
Propogated has_or_had_id to Tree
106
    def has_id(self, file_id):
107
        return self.inventory.has_id(file_id)
108
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
109
    __contains__ = has_id
110
1185.12.39 by abentley
Propogated has_or_had_id to Tree
111
    def has_or_had_id(self, file_id):
112
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
113
            return True
1 by mbp at sourcefrog
import from baz patch-364
114
        return self.inventory.has_id(file_id)
115
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
116
    def __iter__(self):
117
        return iter(self.inventory)
118
1 by mbp at sourcefrog
import from baz patch-364
119
    def id2path(self, file_id):
120
        return self.inventory.id2path(file_id)
121
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
122
    def iter_entries_by_dir(self):
123
        """Walk the tree in 'by_dir' order.
124
125
        This will yield each entry in the tree as a (path, entry) tuple. The
126
        order that they are yielded is: the contents of a directory are 
127
        preceeded by the parent of a directory, and all the contents of a 
128
        directory are grouped together.
129
        """
130
        return self.inventory.iter_entries_by_dir()
131
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
132
    def kind(self, file_id):
133
        raise NotImplementedError("subclasses must implement kind")
134
1 by mbp at sourcefrog
import from baz patch-364
135
    def _get_inventory(self):
136
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
137
    
138
    def get_file_by_path(self, path):
139
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
140
141
    inventory = property(_get_inventory,
142
                         doc="Inventory of this Tree")
143
144
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
145
        if not __debug__:
146
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
147
        fp = fingerprint_file(f)
148
        f.seek(0)
149
        
184 by mbp at sourcefrog
pychecker fixups
150
        if ie.text_size != None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
151
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
152
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
153
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
154
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
155
                         "store is probably damaged/corrupt"])
156
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
157
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
158
            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
159
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
160
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
161
                     "store is probably damaged/corrupt"])
162
163
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
164
    def print_file(self, file_id):
165
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
166
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
167
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
168
169
    def lock_read(self):
170
        pass
171
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
172
    def revision_tree(self, revision_id):
173
        """Obtain a revision tree for the revision revision_id.
174
175
        The intention of this method is to allow access to possibly cached
176
        tree data. Implementors of this method should raise NoSuchRevision if
177
        the tree is not locally available, even if they could obtain the 
178
        tree via a repository or some other means. Callers are responsible 
179
        for finding the ultimate source for a revision tree.
180
181
        :param revision_id: The revision_id of the requested tree.
182
        :return: A Tree.
183
        :raises: NoSuchRevision if the tree cannot be obtained.
184
        """
185
        raise errors.NoSuchRevisionInTree(self, revision_id)
186
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
187
    def unknowns(self):
188
        """What files are present in this tree and unknown.
189
        
190
        :return: an iterator over the unknown files.
191
        """
192
        return iter([])
193
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
194
    def unlock(self):
195
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
196
197
    def filter_unversioned_files(self, paths):
198
        """Filter out paths that are not versioned.
199
200
        :return: set of paths.
201
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
202
        # NB: we specifically *don't* call self.has_filename, because for
203
        # WorkingTrees that can indicate files that exist on disk but that 
204
        # are not versioned.
205
        pred = self.inventory.has_filename
206
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
207
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
208
    def walkdirs(self, prefix=""):
209
        """Walk the contents of this tree from path down.
210
211
        This yields all the data about the contents of a directory at a time.
212
        After each directory has been yielded, if the caller has mutated the
213
        list to exclude some directories, they are then not descended into.
214
        
215
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
216
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
217
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
218
          versioned_kind), ...]),
219
         - directory-relpath is the containing dirs relpath from prefix
220
         - directory-path-from-root is the containing dirs path from /
221
         - 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.
222
         - relpath is the relative path within the subtree being walked.
223
         - basename is the basename
224
         - kind is the kind of the file now. If unknonwn then the file is not
225
           present within the tree - but it may be recorded as versioned. See
226
           versioned_kind.
227
         - lstat is the stat data *if* the file was statted.
228
         - path_from_tree_root is the path from the root of the tree.
229
         - file_id is the file_id is the entry is versioned.
230
         - versioned_kind is the kind of the file as last recorded in the 
231
           versioning system. If 'unknown' the file is not versioned.
232
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
233
234
        :param prefix: Start walking from prefix within the tree rather than
235
        at the root. This allows one to walk a subtree but get paths that are
236
        relative to a tree rooted higher up.
237
        :return: an iterator over the directory data.
238
        """
239
        raise NotImplementedError(self.walkdirs)
240
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
241
242
# for compatibility
243
from bzrlib.revisiontree import RevisionTree
244
 
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
245
1 by mbp at sourcefrog
import from baz patch-364
246
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
247
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
248
    def __init__(self):
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
249
        self._inventory = Inventory()
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
250
        warn('EmptyTree is deprecated as of bzr 0.9 please use '
251
            'repository.revision_tree instead.',
252
            DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
253
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
254
    def get_parent_ids(self):
255
        return []
256
1092.2.6 by Robert Collins
symlink support updated to work
257
    def get_symlink_target(self, file_id):
258
        return None
259
1 by mbp at sourcefrog
import from baz patch-364
260
    def has_filename(self, filename):
261
        return False
262
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
263
    def kind(self, file_id):
264
        assert self._inventory[file_id].kind == "directory"
265
        return "directory"
266
1907.1.5 by Aaron Bentley
Remove include_root parameter from list_files
267
    def list_files(self):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
268
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
269
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
270
    def __contains__(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
271
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
272
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
273
    def get_file_sha1(self, file_id, path=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
274
        return None
275
276
1 by mbp at sourcefrog
import from baz patch-364
277
######################################################################
278
# diff
279
280
# TODO: Merge these two functions into a single one that can operate
281
# on either a whole tree or a set of files.
282
283
# TODO: Return the diff in order by filename, not by category or in
284
# random order.  Can probably be done by lock-stepping through the
285
# filenames from both trees.
286
287
288
def file_status(filename, old_tree, new_tree):
289
    """Return single-letter status, old and new names for a file.
290
291
    The complexity here is in deciding how to represent renames;
292
    many complex cases are possible.
293
    """
294
    old_inv = old_tree.inventory
295
    new_inv = new_tree.inventory
296
    new_id = new_inv.path2id(filename)
297
    old_id = old_inv.path2id(filename)
298
299
    if not new_id and not old_id:
300
        # easy: doesn't exist in either; not versioned at all
301
        if new_tree.is_ignored(filename):
302
            return 'I', None, None
303
        else:
304
            return '?', None, None
305
    elif new_id:
306
        # There is now a file of this name, great.
307
        pass
308
    else:
309
        # There is no longer a file of this name, but we can describe
310
        # what happened to the file that used to have
311
        # this name.  There are two possibilities: either it was
312
        # deleted entirely, or renamed.
313
        assert old_id
314
        if new_inv.has_id(old_id):
315
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
316
        else:
317
            return 'D', old_inv.id2path(old_id), None
318
319
    # if the file_id is new in this revision, it is added
320
    if new_id and not old_inv.has_id(new_id):
321
        return 'A'
322
323
    # if there used to be a file of this name, but that ID has now
324
    # disappeared, it is deleted
325
    if old_id and not new_inv.has_id(old_id):
326
        return 'D'
327
328
    return 'wtf?'
329
330
    
331
164 by mbp at sourcefrog
new 'renames' command
332
def find_renames(old_inv, new_inv):
333
    for file_id in old_inv:
334
        if file_id not in new_inv:
335
            continue
336
        old_name = old_inv.id2path(file_id)
337
        new_name = new_inv.id2path(file_id)
338
        if old_name != new_name:
339
            yield (old_name, new_name)
340
            
678 by Martin Pool
- export to tarballs
341
1551.7.22 by Aaron Bentley
Changes from review
342
def find_ids_across_trees(filenames, trees, require_versioned=True):
343
    """Find the ids corresponding to specified filenames.
344
    
345
    All matches in all trees will be used, and all children of matched
346
    directories will be used.
347
348
    :param filenames: The filenames to find file_ids for
349
    :param trees: The trees to find file_ids within
350
    :param require_versioned: if true, all specified filenames must occur in
351
    at least one tree.
352
    :return: a set of file ids for the specified filenames and their children.
353
    """
354
    if not filenames:
355
        return None
356
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
357
                                                    require_versioned)
358
    return _find_children_across_trees(specified_ids, trees)
359
360
361
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
362
    """Find the ids corresponding to specified filenames.
363
    
364
    All matches in all trees will be used.
365
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
366
    :param filenames: The filenames to find file_ids for
367
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
368
    :param require_versioned: if true, all specified filenames must occur in
369
    at least one tree.
370
    :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
371
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
372
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
373
    interesting_ids = set()
374
    for tree_path in filenames:
375
        not_found = True
376
        for tree in trees:
377
            file_id = tree.inventory.path2id(tree_path)
378
            if file_id is not None:
379
                interesting_ids.add(file_id)
380
                not_found = False
381
        if not_found:
382
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
383
    if len(not_versioned) > 0 and require_versioned:
384
        raise errors.PathsNotVersionedError(not_versioned)
385
    return interesting_ids
386
387
388
def _find_children_across_trees(specified_ids, trees):
389
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
390
    
1551.7.22 by Aaron Bentley
Changes from review
391
    All matches in all trees will be used.
392
393
    :param trees: The trees to find file_ids within
394
    :return: a set containing all specified ids and their children 
395
    """
396
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
397
    pending = interesting_ids
398
    # now handle children of interesting ids
399
    # we loop so that we handle all children of each id in both trees
400
    while len(pending) > 0:
401
        new_pending = set()
402
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
403
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
404
                if file_id not in tree:
405
                    continue
406
                entry = tree.inventory[file_id]
407
                for child in getattr(entry, 'children', {}).itervalues():
408
                    if child.file_id not in interesting_ids:
409
                        new_pending.add(child.file_id)
410
        interesting_ids.update(new_pending)
411
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
412
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
413
414
415
class InterTree(InterObject):
416
    """This class represents operations taking place between two Trees.
417
418
    Its instances have methods like 'compare' and contain references to the
419
    source and target trees these operations are to be carried out on.
420
421
    clients of bzrlib should not need to use InterTree directly, rather they
422
    should use the convenience methods on Tree such as 'Tree.compare()' which
423
    will pass through to InterTree as appropriate.
424
    """
425
426
    _optimisers = set()
427
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
428
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
429
    def compare(self, want_unchanged=False, specific_files=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
430
        extra_trees=None, require_versioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
431
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
432
433
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
434
        :param specific_files: An optional list of file paths to restrict the
435
            comparison to. When mapping filenames to ids, all matches in all
436
            trees (including optional extra_trees) are used, and all children of
437
            matched directories are included.
438
        :param want_unchanged: An optional boolean requesting the inclusion of
439
            unchanged entries in the result.
440
        :param extra_trees: An optional list of additional trees to use when
441
            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.
442
        :param require_versioned: An optional boolean (defaults to False). When
443
            supplied and True all the 'specific_files' must be versioned, or
444
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
445
        """
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
446
        # NB: show_status depends on being able to pass in non-versioned files and
447
        # report them as unknown
448
        trees = (self.source, self.target)
449
        if extra_trees is not None:
450
            trees = trees + tuple(extra_trees)
451
        specific_file_ids = find_ids_across_trees(specific_files,
452
            trees, require_versioned=require_versioned)
453
        if specific_files and not specific_file_ids:
454
            # All files are unversioned, so just return an empty delta
455
            # _compare_trees would think we want a complete delta
456
            return delta.TreeDelta()
457
        return delta._compare_trees(self.source, self.target, want_unchanged,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
458
            specific_file_ids)