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