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