~bzr-pqm/bzr/bzr.dev

70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tree classes, representing directory at point in time.
18
"""
19
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
20
import os
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
21
from cStringIO import StringIO
800 by Martin Pool
Merge John's import-speedup branch:
22
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
23
import bzrlib
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
24
from bzrlib import (
25
    delta,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
26
    osutils,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
27
    symbol_versioning,
28
    )
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
29
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
30
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
31
from bzrlib import errors
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
32
from bzrlib.inventory import Inventory
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
33
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
34
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
35
import bzrlib.revision
36
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
37
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
38
558 by Martin Pool
- All top-level classes inherit from object
39
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
40
    """Abstract file tree.
41
42
    There are several subclasses:
43
    
44
    * `WorkingTree` exists as files on disk editable by the user.
45
46
    * `RevisionTree` is a tree as recorded at some point in the past.
47
48
    Trees contain an `Inventory` object, and also know how to retrieve
49
    file texts mentioned in the inventory, either from a working
50
    directory or from a store.
51
52
    It is possible for trees to contain files that are not described
53
    in their inventory or vice versa; for this use `filenames()`.
54
55
    Trees can be compared, etc, regardless of whether they are working
56
    trees or versioned trees.
57
    """
58
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
59
    def changes_from(self, other, want_unchanged=False, specific_files=None,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
60
        extra_trees=None, require_versioned=False, include_root=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
61
        """Return a TreeDelta of the changes from other to this tree.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
62
63
        :param other: A tree to compare with.
64
        :param specific_files: An optional list of file paths to restrict the
65
            comparison to. When mapping filenames to ids, all matches in all
66
            trees (including optional extra_trees) are used, and all children of
67
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
68
        :param want_unchanged: An optional boolean requesting the inclusion of
69
            unchanged entries in the result.
70
        :param extra_trees: An optional list of additional trees to use when
71
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
72
        :param require_versioned: An optional boolean (defaults to False). When
73
            supplied and True all the 'specific_files' must be versioned, or
74
            a PathsNotVersionedError will be thrown.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
75
1852.8.4 by Robert Collins
Hook InterTree into Tree.
76
        The comparison will be performed by an InterTree object looked up on 
77
        self and other.
78
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
79
        # Martin observes that Tree.changes_from returns a TreeDelta and this
80
        # may confuse people, because the class name of the returned object is
81
        # a synonym of the object referenced in the method name.
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
82
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
83
            want_unchanged=want_unchanged,
84
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
85
            extra_trees=extra_trees,
86
            require_versioned=require_versioned,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
87
            include_root=include_root
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
88
            )
2012.1.1 by Aaron Bentley
Implement change iterator
89
2012.1.10 by Aaron Bentley
Make iter_changes private, so it can be changed freely
90
    def _iter_changes(self, from_tree, include_unchanged=False, 
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
91
                     specific_file_ids=None, pb=None):
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
92
        intertree = InterTree.get(from_tree, self)
2012.1.10 by Aaron Bentley
Make iter_changes private, so it can be changed freely
93
        return intertree._iter_changes(from_tree, self, include_unchanged, 
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
94
                                       specific_file_ids, pb)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
95
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
96
    def conflicts(self):
97
        """Get a list of the conflicts in the tree.
98
99
        Each conflict is an instance of bzrlib.conflicts.Conflict.
100
        """
101
        return []
102
103
    def get_parent_ids(self):
104
        """Get the parent ids for this tree. 
105
106
        :return: a list of parent ids. [] is returned to indicate
107
        a tree with no parents.
108
        :raises: BzrError if the parents are not known.
109
        """
110
        raise NotImplementedError(self.get_parent_ids)
111
    
1 by mbp at sourcefrog
import from baz patch-364
112
    def has_filename(self, filename):
113
        """True if the tree has given filename."""
114
        raise NotImplementedError()
115
1185.12.39 by abentley
Propogated has_or_had_id to Tree
116
    def has_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
117
        file_id = osutils.safe_file_id(file_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
118
        return self.inventory.has_id(file_id)
119
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
120
    __contains__ = has_id
121
1185.12.39 by abentley
Propogated has_or_had_id to Tree
122
    def has_or_had_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
123
        file_id = osutils.safe_file_id(file_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
124
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
125
            return True
1 by mbp at sourcefrog
import from baz patch-364
126
        return self.inventory.has_id(file_id)
127
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
128
    def __iter__(self):
129
        return iter(self.inventory)
130
1 by mbp at sourcefrog
import from baz patch-364
131
    def id2path(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
132
        file_id = osutils.safe_file_id(file_id)
1 by mbp at sourcefrog
import from baz patch-364
133
        return self.inventory.id2path(file_id)
134
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
135
    def is_control_filename(self, filename):
136
        """True if filename is the name of a control file in this tree.
137
        
138
        :param filename: A filename within the tree. This is a relative path
139
        from the root of this tree.
140
141
        This is true IF and ONLY IF the filename is part of the meta data
142
        that bzr controls in this tree. I.E. a random .bzr directory placed
143
        on disk will not be a control file for this tree.
144
        """
145
        return self.bzrdir.is_control_filename(filename)
146
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
147
    def iter_entries_by_dir(self, specific_file_ids=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
148
        """Walk the tree in 'by_dir' order.
149
150
        This will yield each entry in the tree as a (path, entry) tuple. The
151
        order that they are yielded is: the contents of a directory are 
152
        preceeded by the parent of a directory, and all the contents of a 
153
        directory are grouped together.
154
        """
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
155
        return self.inventory.iter_entries_by_dir(
156
            specific_file_ids=specific_file_ids)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
157
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
158
    def kind(self, file_id):
159
        raise NotImplementedError("subclasses must implement kind")
160
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
161
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
162
        """Return a tuple of kind, executable, stat_value for a file.
163
164
        entry may be None if there is no inventory entry for the file, but
165
        path must always be supplied.
166
167
        kind is None if there is no file present (even if an inventory id is
168
        present).  executable is False for non-file entries.
169
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
170
        raise NotImplementedError(self._comparison_data)
171
172
    def _file_size(entry, stat_value):
173
        raise NotImplementedError(self._file_size)
174
1 by mbp at sourcefrog
import from baz patch-364
175
    def _get_inventory(self):
176
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
177
    
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
178
    def get_file(self, file_id):
179
        """Return a file object for the file file_id in the tree."""
180
        raise NotImplementedError(self.get_file)
181
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
182
    def get_file_by_path(self, path):
183
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
184
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
185
    def annotate_iter(self, file_id):
1551.9.18 by Aaron Bentley
Updates from review comments
186
        """Return an iterator of revision_id, line tuples
187
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
188
        For working trees (and mutable trees in general), the special
189
        revision_id 'current:' will be used for lines that are new in this
190
        tree, e.g. uncommitted changes.
191
        :param file_id: The file to produce an annotated version from
192
        """
193
        raise NotImplementedError(self.annotate_iter)
194
1 by mbp at sourcefrog
import from baz patch-364
195
    inventory = property(_get_inventory,
196
                         doc="Inventory of this Tree")
197
198
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
199
        if not __debug__:
200
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
201
        fp = fingerprint_file(f)
202
        f.seek(0)
203
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
204
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
205
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
206
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
207
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
208
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
209
                         "store is probably damaged/corrupt"])
210
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
211
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
212
            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
213
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
214
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
215
                     "store is probably damaged/corrupt"])
216
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
217
    def path2id(self, path):
218
        """Return the id for path in this tree."""
219
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
220
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
221
    def print_file(self, file_id):
222
        """Print file with id `file_id` to stdout."""
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
223
        file_id = osutils.safe_file_id(file_id)
176 by mbp at sourcefrog
New cat command contributed by janmar.
224
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
225
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
226
227
    def lock_read(self):
228
        pass
229
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
230
    def unknowns(self):
231
        """What files are present in this tree and unknown.
232
        
233
        :return: an iterator over the unknown files.
234
        """
235
        return iter([])
236
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
237
    def unlock(self):
238
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
239
240
    def filter_unversioned_files(self, paths):
241
        """Filter out paths that are not versioned.
242
243
        :return: set of paths.
244
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
245
        # NB: we specifically *don't* call self.has_filename, because for
246
        # WorkingTrees that can indicate files that exist on disk but that 
247
        # are not versioned.
248
        pred = self.inventory.has_filename
249
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
250
251
1 by mbp at sourcefrog
import from baz patch-364
252
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
253
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
254
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
255
        self._inventory = Inventory(root_id=None)
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
256
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
257
                               ' use repository.revision_tree instead.',
258
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
259
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
260
    def get_parent_ids(self):
261
        return []
262
1092.2.6 by Robert Collins
symlink support updated to work
263
    def get_symlink_target(self, file_id):
264
        return None
265
1 by mbp at sourcefrog
import from baz patch-364
266
    def has_filename(self, filename):
267
        return False
268
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
269
    def kind(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
270
        file_id = osutils.safe_file_id(file_id)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
271
        assert self._inventory[file_id].kind == "directory"
272
        return "directory"
273
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
274
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
275
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
276
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
277
    def __contains__(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
278
        file_id = osutils.safe_file_id(file_id)
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
279
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
280
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
281
    def get_file_sha1(self, file_id, path=None, stat_value=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
282
        return None
283
284
1 by mbp at sourcefrog
import from baz patch-364
285
######################################################################
286
# diff
287
288
# TODO: Merge these two functions into a single one that can operate
289
# on either a whole tree or a set of files.
290
291
# TODO: Return the diff in order by filename, not by category or in
292
# random order.  Can probably be done by lock-stepping through the
293
# filenames from both trees.
294
295
296
def file_status(filename, old_tree, new_tree):
297
    """Return single-letter status, old and new names for a file.
298
299
    The complexity here is in deciding how to represent renames;
300
    many complex cases are possible.
301
    """
302
    old_inv = old_tree.inventory
303
    new_inv = new_tree.inventory
304
    new_id = new_inv.path2id(filename)
305
    old_id = old_inv.path2id(filename)
306
307
    if not new_id and not old_id:
308
        # easy: doesn't exist in either; not versioned at all
309
        if new_tree.is_ignored(filename):
310
            return 'I', None, None
311
        else:
312
            return '?', None, None
313
    elif new_id:
314
        # There is now a file of this name, great.
315
        pass
316
    else:
317
        # There is no longer a file of this name, but we can describe
318
        # what happened to the file that used to have
319
        # this name.  There are two possibilities: either it was
320
        # deleted entirely, or renamed.
321
        assert old_id
322
        if new_inv.has_id(old_id):
323
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
324
        else:
325
            return 'D', old_inv.id2path(old_id), None
326
327
    # if the file_id is new in this revision, it is added
328
    if new_id and not old_inv.has_id(new_id):
329
        return 'A'
330
331
    # if there used to be a file of this name, but that ID has now
332
    # disappeared, it is deleted
333
    if old_id and not new_inv.has_id(old_id):
334
        return 'D'
335
336
    return 'wtf?'
337
338
    
339
164 by mbp at sourcefrog
new 'renames' command
340
def find_renames(old_inv, new_inv):
341
    for file_id in old_inv:
342
        if file_id not in new_inv:
343
            continue
344
        old_name = old_inv.id2path(file_id)
345
        new_name = new_inv.id2path(file_id)
346
        if old_name != new_name:
347
            yield (old_name, new_name)
348
            
678 by Martin Pool
- export to tarballs
349
1551.7.22 by Aaron Bentley
Changes from review
350
def find_ids_across_trees(filenames, trees, require_versioned=True):
351
    """Find the ids corresponding to specified filenames.
352
    
353
    All matches in all trees will be used, and all children of matched
354
    directories will be used.
355
1551.10.7 by Aaron Bentley
Use new-style output for status
356
    :param filenames: The filenames to find file_ids for (if None, returns
357
        None)
1551.7.22 by Aaron Bentley
Changes from review
358
    :param trees: The trees to find file_ids within
359
    :param require_versioned: if true, all specified filenames must occur in
360
    at least one tree.
361
    :return: a set of file ids for the specified filenames and their children.
362
    """
363
    if not filenames:
364
        return None
365
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
366
                                                    require_versioned)
367
    return _find_children_across_trees(specified_ids, trees)
368
369
370
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
371
    """Find the ids corresponding to specified filenames.
372
    
373
    All matches in all trees will be used.
374
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
375
    :param filenames: The filenames to find file_ids for
376
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
377
    :param require_versioned: if true, all specified filenames must occur in
378
    at least one tree.
379
    :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
380
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
381
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
382
    interesting_ids = set()
383
    for tree_path in filenames:
384
        not_found = True
385
        for tree in trees:
386
            file_id = tree.inventory.path2id(tree_path)
387
            if file_id is not None:
388
                interesting_ids.add(file_id)
389
                not_found = False
390
        if not_found:
391
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
392
    if len(not_versioned) > 0 and require_versioned:
393
        raise errors.PathsNotVersionedError(not_versioned)
394
    return interesting_ids
395
396
397
def _find_children_across_trees(specified_ids, trees):
398
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
399
    
1551.7.22 by Aaron Bentley
Changes from review
400
    All matches in all trees will be used.
401
402
    :param trees: The trees to find file_ids within
403
    :return: a set containing all specified ids and their children 
404
    """
405
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
406
    pending = interesting_ids
407
    # now handle children of interesting ids
408
    # we loop so that we handle all children of each id in both trees
409
    while len(pending) > 0:
410
        new_pending = set()
411
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
412
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
413
                if file_id not in tree:
414
                    continue
415
                entry = tree.inventory[file_id]
416
                for child in getattr(entry, 'children', {}).itervalues():
417
                    if child.file_id not in interesting_ids:
418
                        new_pending.add(child.file_id)
419
        interesting_ids.update(new_pending)
420
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
421
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
422
423
424
class InterTree(InterObject):
425
    """This class represents operations taking place between two Trees.
426
427
    Its instances have methods like 'compare' and contain references to the
428
    source and target trees these operations are to be carried out on.
429
430
    clients of bzrlib should not need to use InterTree directly, rather they
431
    should use the convenience methods on Tree such as 'Tree.compare()' which
432
    will pass through to InterTree as appropriate.
433
    """
434
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
435
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
436
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
437
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
438
    def compare(self, want_unchanged=False, specific_files=None,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
439
        extra_trees=None, require_versioned=False, include_root=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
440
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
441
442
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
443
        :param specific_files: An optional list of file paths to restrict the
444
            comparison to. When mapping filenames to ids, all matches in all
445
            trees (including optional extra_trees) are used, and all children of
446
            matched directories are included.
447
        :param want_unchanged: An optional boolean requesting the inclusion of
448
            unchanged entries in the result.
449
        :param extra_trees: An optional list of additional trees to use when
450
            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.
451
        :param require_versioned: An optional boolean (defaults to False). When
452
            supplied and True all the 'specific_files' must be versioned, or
453
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
454
        """
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
455
        # NB: show_status depends on being able to pass in non-versioned files and
456
        # report them as unknown
457
        trees = (self.source, self.target)
458
        if extra_trees is not None:
459
            trees = trees + tuple(extra_trees)
460
        specific_file_ids = find_ids_across_trees(specific_files,
461
            trees, require_versioned=require_versioned)
462
        if specific_files and not specific_file_ids:
463
            # All files are unversioned, so just return an empty delta
464
            # _compare_trees would think we want a complete delta
465
            return delta.TreeDelta()
466
        return delta._compare_trees(self.source, self.target, want_unchanged,
1910.2.56 by Aaron Bentley
More work on bundles
467
            specific_file_ids, include_root)
2012.1.1 by Aaron Bentley
Implement change iterator
468
2012.1.10 by Aaron Bentley
Make iter_changes private, so it can be changed freely
469
    def _iter_changes(self, from_tree, to_tree, include_unchanged, 
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
470
                      specific_file_ids, pb):
2012.1.1 by Aaron Bentley
Implement change iterator
471
        """Generate an iterator of changes between trees.
472
473
        A tuple is returned:
474
        (file_id, path, changed_content, versioned, parent, name, kind,
475
         executable)
476
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
477
        Path is relative to the to_tree.  changed_content is True if the file's
478
        content has changed.  This includes changes to its kind, and to
479
        a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
480
2012.1.15 by Aaron Bentley
Minor tweaks
481
        versioned, parent, name, kind, executable are tuples of (from, to).
482
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
483
484
        Iteration is done in parent-to-child order, relative to the to_tree.
485
        """
486
        to_paths = {}
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
487
        from_entries_by_dir = list(from_tree.inventory.iter_entries_by_dir(
488
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
489
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
490
        to_entries_by_dir = list(to_tree.inventory.iter_entries_by_dir(
491
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
492
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
493
        entry_count = 0
494
        for to_path, to_entry in to_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
495
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
496
            to_paths[file_id] = to_path
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
497
            entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
498
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
499
            from_path, from_entry = from_data.get(file_id, (None, None))
500
            from_versioned = (from_entry is not None)
501
            if from_entry is not None:
502
                from_versioned = True
503
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
504
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
505
                from_kind, from_executable, from_stat = \
506
                    from_tree._comparison_data(from_entry, from_path)
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
507
                entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
508
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
509
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
510
                from_kind = None
511
                from_parent = None
512
                from_name = None
513
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
514
            versioned = (from_versioned, True)
515
            to_kind, to_executable, to_stat = \
516
                to_tree._comparison_data(to_entry, to_path)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
517
            kind = (from_kind, to_kind)
518
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
519
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
520
            elif from_kind == 'file':
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
521
                from_size = from_tree._file_size(from_entry, from_stat)
522
                to_size = to_tree._file_size(to_entry, to_stat)
523
                if from_size != to_size:
524
                    changed_content = True
525
                elif (from_tree.get_file_sha1(file_id, from_path, from_stat) !=
526
                    to_tree.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
527
                    changed_content = True
528
            elif from_kind == 'symlink':
529
                if (from_tree.get_symlink_target(file_id) != 
530
                    to_tree.get_symlink_target(file_id)):
531
                    changed_content = True
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
532
            parent = (from_parent, to_entry.parent_id)
533
            name = (from_name, to_entry.name)
534
            executable = (from_executable, to_executable)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
535
            if pb is not None:
536
                pb.update('comparing files', entry_count, num_entries)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
537
            if (changed_content is not False or versioned[0] != versioned[1] 
538
                or parent[0] != parent[1] or name[0] != name[1] or 
539
                executable[0] != executable[1] or include_unchanged):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
540
                yield (file_id, to_path, changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
541
                       name, kind, executable)
542
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
543
        def get_to_path(from_entry):
544
            if from_entry.parent_id is None:
545
                to_path = ''
546
            else:
547
                if from_entry.parent_id not in to_paths:
548
                    get_to_path(from_tree.inventory[from_entry.parent_id])
549
                to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
550
                                           from_entry.name)
551
            to_paths[from_entry.file_id] = to_path
552
            return to_path
553
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
554
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
555
            file_id = from_entry.file_id
556
            if file_id in to_paths:
557
                continue
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
558
            to_path = get_to_path(from_entry)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
559
            entry_count += 1
560
            if pb is not None:
561
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
562
            versioned = (True, False)
563
            parent = (from_entry.parent_id, None)
564
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
565
            from_kind, from_executable, stat_value = \
566
                from_tree._comparison_data(from_entry, path)
567
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
568
            executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
569
            changed_content = True
570
            # the parent's path is necessarily known at this point.
571
            yield(file_id, to_path, changed_content, versioned, parent,
572
                  name, kind, executable)
2012.1.8 by Aaron Bentley
Merge from bzr.dev
573
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
574
575
# This was deprecated before 0.12, but did not have an official warning
576
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
577
def RevisionTree(*args, **kwargs):
578
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
579
580
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
581
    bzr 0.12.
582
    """
583
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
584
    return _RevisionTree(*args, **kwargs)
585
 
586