/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
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
21
from collections import deque
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
22
from cStringIO import StringIO
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
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
25
from bzrlib import (
26
    delta,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
27
    osutils,
1551.15.46 by Aaron Bentley
Move plan merge to tree
28
    revision as _mod_revision,
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
29
    conflicts as _mod_conflicts,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
30
    symbol_versioning,
31
    )
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
32
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
33
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
34
from bzrlib import errors
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
35
from bzrlib.inventory import Inventory, InventoryFile
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
36
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
37
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
38
import bzrlib.revision
39
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
40
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
41
558 by Martin Pool
- All top-level classes inherit from object
42
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
43
    """Abstract file tree.
44
45
    There are several subclasses:
46
    
47
    * `WorkingTree` exists as files on disk editable by the user.
48
49
    * `RevisionTree` is a tree as recorded at some point in the past.
50
51
    Trees contain an `Inventory` object, and also know how to retrieve
52
    file texts mentioned in the inventory, either from a working
53
    directory or from a store.
54
55
    It is possible for trees to contain files that are not described
56
    in their inventory or vice versa; for this use `filenames()`.
57
58
    Trees can be compared, etc, regardless of whether they are working
59
    trees or versioned trees.
60
    """
61
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
62
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
63
        extra_trees=None, require_versioned=False, include_root=False,
64
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
65
        """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.
66
67
        :param other: A tree to compare with.
68
        :param specific_files: An optional list of file paths to restrict the
69
            comparison to. When mapping filenames to ids, all matches in all
70
            trees (including optional extra_trees) are used, and all children of
71
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
72
        :param want_unchanged: An optional boolean requesting the inclusion of
73
            unchanged entries in the result.
74
        :param extra_trees: An optional list of additional trees to use when
75
            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.
76
        :param require_versioned: An optional boolean (defaults to False). When
77
            supplied and True all the 'specific_files' must be versioned, or
78
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
79
        :param want_unversioned: Scan for unversioned paths.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
80
1852.8.4 by Robert Collins
Hook InterTree into Tree.
81
        The comparison will be performed by an InterTree object looked up on 
82
        self and other.
83
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
84
        # Martin observes that Tree.changes_from returns a TreeDelta and this
85
        # may confuse people, because the class name of the returned object is
86
        # 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.
87
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
88
            want_unchanged=want_unchanged,
89
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
90
            extra_trees=extra_trees,
91
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
92
            include_root=include_root,
93
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
94
            )
2012.1.1 by Aaron Bentley
Implement change iterator
95
3254.1.4 by Aaron Bentley
Update NEWS, add deprecated Tree._iter_changes thunk
96
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
97
    def _iter_changes(self, *args, **kwargs):
98
        return self.iter_changes(*args, **kwargs)
99
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
100
    def iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
101
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
102
                     require_versioned=True, want_unversioned=False):
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
103
        intertree = InterTree.get(from_tree, self)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
104
        return intertree.iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
105
            extra_trees, require_versioned, want_unversioned=want_unversioned)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
106
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
107
    def conflicts(self):
108
        """Get a list of the conflicts in the tree.
109
110
        Each conflict is an instance of bzrlib.conflicts.Conflict.
111
        """
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
112
        return _mod_conflicts.ConflictList()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
113
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
114
    def extras(self):
115
        """For trees that can have unversioned files, return all such paths."""
116
        return []
117
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
118
    def get_parent_ids(self):
119
        """Get the parent ids for this tree. 
120
121
        :return: a list of parent ids. [] is returned to indicate
122
        a tree with no parents.
123
        :raises: BzrError if the parents are not known.
124
        """
125
        raise NotImplementedError(self.get_parent_ids)
126
    
1 by mbp at sourcefrog
import from baz patch-364
127
    def has_filename(self, filename):
128
        """True if the tree has given filename."""
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
129
        raise NotImplementedError(self.has_filename)
1 by mbp at sourcefrog
import from baz patch-364
130
1185.12.39 by abentley
Propogated has_or_had_id to Tree
131
    def has_id(self, file_id):
132
        return self.inventory.has_id(file_id)
133
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
134
    __contains__ = has_id
135
1185.12.39 by abentley
Propogated has_or_had_id to Tree
136
    def has_or_had_id(self, file_id):
137
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
138
            return True
1 by mbp at sourcefrog
import from baz patch-364
139
        return self.inventory.has_id(file_id)
140
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
141
    def is_ignored(self, filename):
142
        """Check whether the filename is ignored by this tree.
143
144
        :param filename: The relative filename within the tree.
145
        :return: True if the filename is ignored.
146
        """
147
        return False
148
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
149
    def __iter__(self):
150
        return iter(self.inventory)
151
3146.8.16 by Aaron Bentley
Updates from review
152
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
153
        """Iterate through all file ids, including ids for missing files."""
3146.8.16 by Aaron Bentley
Updates from review
154
        return set(self.inventory)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
155
1 by mbp at sourcefrog
import from baz patch-364
156
    def id2path(self, file_id):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
157
        """Return the path for a file id.
158
159
        :raises NoSuchId:
160
        """
1 by mbp at sourcefrog
import from baz patch-364
161
        return self.inventory.id2path(file_id)
162
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
163
    def is_control_filename(self, filename):
164
        """True if filename is the name of a control file in this tree.
165
        
166
        :param filename: A filename within the tree. This is a relative path
167
        from the root of this tree.
168
169
        This is true IF and ONLY IF the filename is part of the meta data
170
        that bzr controls in this tree. I.E. a random .bzr directory placed
171
        on disk will not be a control file for this tree.
172
        """
173
        return self.bzrdir.is_control_filename(filename)
174
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
175
    @needs_read_lock
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
176
    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.
177
        """Walk the tree in 'by_dir' order.
178
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
179
        This will yield each entry in the tree as a (path, entry) tuple.
180
        The order that they are yielded is:
181
182
        Directories are walked in a depth-first lexicographical order,
183
        however, whenever a directory is reached, all of its direct child
184
        nodes are yielded in  lexicographical order before yielding the
185
        grandchildren.
186
187
        For example, in the tree::
188
189
           a/
190
             b/
191
               c
192
             d/
193
               e
194
           f/
195
             g
196
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
197
        The yield order (ignoring root) would be::
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
198
          a, f, a/b, a/d, a/b/c, a/d/e, f/g
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
199
        """
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
200
        return self.inventory.iter_entries_by_dir(
201
            specific_file_ids=specific_file_ids)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
202
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
203
    def iter_references(self):
2100.3.27 by Aaron Bentley
Enable nested commits
204
        for path, entry in self.iter_entries_by_dir():
205
            if entry.kind == 'tree-reference':
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
206
                yield path, entry.file_id
2100.3.27 by Aaron Bentley
Enable nested commits
207
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
208
    def kind(self, file_id):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
209
        raise NotImplementedError("Tree subclass %s must implement kind"
210
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
211
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
212
    def stored_kind(self, file_id):
213
        """File kind stored for this file_id.
214
3146.8.15 by Aaron Bentley
Cleanup and docs
215
        May not match kind on disk for working trees.  Always available
216
        for versioned files, even when the file itself is missing.
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
217
        """
218
        return self.kind(file_id)
219
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
220
    def path_content_summary(self, path):
221
        """Get a summary of the information about path.
222
        
223
        :param path: A relative path within the tree.
224
        :return: A tuple containing kind, size, exec, sha1-or-link.
225
            Kind is always present (see tree.kind()).
226
            size is present if kind is file, None otherwise.
227
            exec is None unless kind is file and the platform supports the 'x'
228
                bit.
229
            sha1-or-link is the link target if kind is symlink, or the sha1 if
230
                it can be obtained without reading the file.
231
        """
232
        raise NotImplementedError(self.path_content_summary)
233
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
234
    def get_reference_revision(self, file_id, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
235
        raise NotImplementedError("Tree subclass %s must implement "
236
                                  "get_reference_revision"
237
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
238
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
239
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
240
        """Return a tuple of kind, executable, stat_value for a file.
241
242
        entry may be None if there is no inventory entry for the file, but
243
        path must always be supplied.
244
245
        kind is None if there is no file present (even if an inventory id is
246
        present).  executable is False for non-file entries.
247
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
248
        raise NotImplementedError(self._comparison_data)
249
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
250
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
251
        raise NotImplementedError(self._file_size)
252
1 by mbp at sourcefrog
import from baz patch-364
253
    def _get_inventory(self):
254
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
255
    
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
256
    def get_file(self, file_id, path=None):
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
257
        """Return a file object for the file file_id in the tree.
258
        
259
        If both file_id and path are defined, it is implementation defined as
260
        to which one is used.
261
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
262
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
263
264
    def get_file_mtime(self, file_id, path=None):
265
        """Return the modification time for a file.
266
267
        :param file_id: The handle for this file.
268
        :param path: The path that this file can be found at.
269
            These must point to the same object.
270
        """
271
        raise NotImplementedError(self.get_file_mtime)
272
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
273
    def get_file_size(self, file_id):
274
        """Return the size of a file in bytes.
275
276
        This applies only to regular files.  If invoked on directories or
277
        symlinks, it will return None.
278
        :param file_id: The file-id of the file
279
        """
280
        raise NotImplementedError(self.get_file_size)
281
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
282
    def get_file_by_path(self, path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
283
        return self.get_file(self._inventory.path2id(path), path)
1 by mbp at sourcefrog
import from baz patch-364
284
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
285
    def iter_files_bytes(self, desired_files):
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
286
        """Iterate through file contents.
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
287
2708.1.10 by Aaron Bentley
Update docstrings
288
        Files will not necessarily be returned in the order they occur in
289
        desired_files.  No specific order is guaranteed.
290
291
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
292
        value supplied by the caller as part of desired_files.  It should
293
        uniquely identify the file version in the caller's context.  (Examples:
294
        an index number or a TreeTransform trans_id.)
295
296
        bytes_iterator is an iterable of bytestrings for the file.  The
297
        kind of iterable and length of the bytestrings are unspecified, but for
298
        this implementation, it is a tuple containing a single bytestring with
299
        the complete text of the file.
300
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
301
        :param desired_files: a list of (file_id, identifier) pairs
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
302
        """
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
303
        for file_id, identifier in desired_files:
2708.1.10 by Aaron Bentley
Update docstrings
304
            # We wrap the string in a tuple so that we can return an iterable
305
            # of bytestrings.  (Technically, a bytestring is also an iterable
306
            # of bytestrings, but iterating through each character is not
307
            # performant.)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
308
            cur_file = (self.get_file_text(file_id),)
309
            yield identifier, cur_file
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
310
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
311
    def get_symlink_target(self, file_id):
312
        """Get the target for a given file_id.
313
314
        It is assumed that the caller already knows that file_id is referencing
315
        a symlink.
316
        :param file_id: Handle for the symlink entry.
317
        :return: The path the symlink points to.
318
        """
319
        raise NotImplementedError(self.get_symlink_target)
320
2946.3.2 by John Arbash Meinel
Add tree implementation tests for Tree.get_root_id()
321
    def get_root_id(self):
322
        """Return the file_id for the root of this tree."""
323
        raise NotImplementedError(self.get_root_id)
324
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
325
    def annotate_iter(self, file_id,
326
                      default_revision=_mod_revision.CURRENT_REVISION):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
327
        """Return an iterator of revision_id, line tuples.
1551.9.18 by Aaron Bentley
Updates from review comments
328
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
329
        For working trees (and mutable trees in general), the special
330
        revision_id 'current:' will be used for lines that are new in this
331
        tree, e.g. uncommitted changes.
332
        :param file_id: The file to produce an annotated version from
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
333
        :param default_revision: For lines that don't match a basis, mark them
334
            with this revision id. Not all implementations will make use of
335
            this value.
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
336
        """
337
        raise NotImplementedError(self.annotate_iter)
338
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
339
    def _get_plan_merge_data(self, file_id, other, base):
3062.1.11 by Aaron Bentley
Update references
340
        from bzrlib import merge, versionedfile
341
        vf = versionedfile._PlanMergeVersionedFile(file_id)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
342
        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
343
        last_revision_b = other._get_file_revision(file_id, vf, 'other:')
3062.2.4 by Aaron Bentley
Start supporting merge-with-base
344
        if base is None:
345
            last_revision_base = None
346
        else:
3062.2.6 by Aaron Bentley
Get cherrypick-on-weave working
347
            last_revision_base = base._get_file_revision(file_id, vf, 'base:')
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
348
        return vf, last_revision_a, last_revision_b, last_revision_base
349
350
    def plan_file_merge(self, file_id, other, base=None):
351
        """Generate a merge plan based on annotations.
352
353
        If the file contains uncommitted changes in this tree, they will be
354
        attributed to the 'current:' pseudo-revision.  If the file contains
355
        uncommitted changes in the other tree, they will be assigned to the
356
        'other:' pseudo-revision.
357
        """
358
        data = self._get_plan_merge_data(file_id, other, base)
359
        vf, last_revision_a, last_revision_b, last_revision_base = data
3062.2.4 by Aaron Bentley
Start supporting merge-with-base
360
        return vf.plan_merge(last_revision_a, last_revision_b,
361
                             last_revision_base)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
362
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
363
    def plan_file_lca_merge(self, file_id, other, base=None):
364
        """Generate a merge plan based lca-newness.
365
366
        If the file contains uncommitted changes in this tree, they will be
367
        attributed to the 'current:' pseudo-revision.  If the file contains
368
        uncommitted changes in the other tree, they will be assigned to the
369
        'other:' pseudo-revision.
370
        """
371
        data = self._get_plan_merge_data(file_id, other, base)
372
        vf, last_revision_a, last_revision_b, last_revision_base = data
373
        return vf.plan_lca_merge(last_revision_a, last_revision_b,
374
                                 last_revision_base)
375
3062.1.3 by Aaron Bentley
Correctly determine file revisions
376
    def _get_file_revision(self, file_id, vf, tree_revision):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
377
        """Ensure that file_id, tree_revision is in vf to plan the merge."""
3062.1.3 by Aaron Bentley
Correctly determine file revisions
378
        def file_revision(revision_tree):
379
            revision_tree.lock_read()
380
            try:
381
                return revision_tree.inventory[file_id].revision
382
            finally:
383
                revision_tree.unlock()
384
385
        def iter_parent_trees():
386
            for revision_id in self.get_parent_ids():
387
                try:
388
                    yield self.revision_tree(revision_id)
389
                except:
390
                    yield self.repository.revision_tree(revision_id)
391
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
392
        if getattr(self, '_repository', None) is None:
3062.1.3 by Aaron Bentley
Correctly determine file revisions
393
            last_revision = tree_revision
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
394
            parent_keys = [(file_id, file_revision(t)) for t in
395
                iter_parent_trees()]
396
            vf.add_lines((file_id, last_revision), parent_keys,
3062.1.3 by Aaron Bentley
Correctly determine file revisions
397
                         self.get_file(file_id).readlines())
3062.1.6 by Aaron Bentley
PlanMergeVersionedfile now has multiple Versionedfile fallbacks
398
            repo = self.branch.repository
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
399
            base_vf = repo.texts
3062.1.3 by Aaron Bentley
Correctly determine file revisions
400
        else:
401
            last_revision = file_revision(self)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
402
            base_vf = self._repository.texts
403
        if base_vf not in vf.fallback_versionedfiles:
404
            vf.fallback_versionedfiles.append(base_vf)
3062.1.3 by Aaron Bentley
Correctly determine file revisions
405
        return last_revision
1551.15.46 by Aaron Bentley
Move plan merge to tree
406
1 by mbp at sourcefrog
import from baz patch-364
407
    inventory = property(_get_inventory,
408
                         doc="Inventory of this Tree")
409
410
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
411
        if not __debug__:
412
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
413
        fp = fingerprint_file(f)
414
        f.seek(0)
415
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
416
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
417
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
418
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
419
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
420
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
421
                         "store is probably damaged/corrupt"])
422
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
423
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
424
            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
425
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
426
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
427
                     "store is probably damaged/corrupt"])
428
2334.1.1 by John Arbash Meinel
Lazily read working inventory in workingtree.py,
429
    @needs_read_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
430
    def path2id(self, path):
431
        """Return the id for path in this tree."""
432
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
433
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
434
    def paths2ids(self, paths, trees=[], require_versioned=True):
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
435
        """Return all the ids that can be reached by walking from paths.
436
        
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
437
        Each path is looked up in this tree and any extras provided in
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
438
        trees, and this is repeated recursively: the children in an extra tree
439
        of a directory that has been renamed under a provided path in this tree
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
440
        are all returned, even if none exist under a provided path in this
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
441
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
442
443
        :param paths: An iterable of paths to start converting to ids from.
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
444
            Alternatively, if paths is None, no ids should be calculated and None
445
            will be returned. This is offered to make calling the api unconditional
446
            for code that *might* take a list of files.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
447
        :param trees: Additional trees to consider.
448
        :param require_versioned: If False, do not raise NotVersionedError if
449
            an element of paths is not versioned in this tree and all of trees.
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
450
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
451
        return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
452
3511.1.2 by Aaron Bentley
Update text and deprecation symbols.
453
    @symbol_versioning.deprecated_method(symbol_versioning.one_six)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
454
    def print_file(self, file_id):
455
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
456
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
457
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
458
459
    def lock_read(self):
460
        pass
461
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
462
    def revision_tree(self, revision_id):
463
        """Obtain a revision tree for the revision revision_id.
464
465
        The intention of this method is to allow access to possibly cached
466
        tree data. Implementors of this method should raise NoSuchRevision if
467
        the tree is not locally available, even if they could obtain the 
468
        tree via a repository or some other means. Callers are responsible 
469
        for finding the ultimate source for a revision tree.
470
471
        :param revision_id: The revision_id of the requested tree.
472
        :return: A Tree.
473
        :raises: NoSuchRevision if the tree cannot be obtained.
474
        """
475
        raise errors.NoSuchRevisionInTree(self, revision_id)
476
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
477
    def unknowns(self):
478
        """What files are present in this tree and unknown.
479
        
480
        :return: an iterator over the unknown files.
481
        """
482
        return iter([])
483
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
484
    def unlock(self):
485
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
486
487
    def filter_unversioned_files(self, paths):
2255.7.62 by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
488
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
489
490
        :return: set of paths.
491
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
492
        # NB: we specifically *don't* call self.has_filename, because for
493
        # WorkingTrees that can indicate files that exist on disk but that 
494
        # are not versioned.
495
        pred = self.inventory.has_filename
496
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
497
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
498
    def walkdirs(self, prefix=""):
499
        """Walk the contents of this tree from path down.
500
501
        This yields all the data about the contents of a directory at a time.
502
        After each directory has been yielded, if the caller has mutated the
503
        list to exclude some directories, they are then not descended into.
504
        
505
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
506
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
507
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
508
          versioned_kind), ...]),
509
         - directory-relpath is the containing dirs relpath from prefix
510
         - directory-path-from-root is the containing dirs path from /
511
         - directory-fileid is the id of the directory if it is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
512
         - relpath is the relative path within the subtree being walked.
513
         - basename is the basename
514
         - kind is the kind of the file now. If unknonwn then the file is not
515
           present within the tree - but it may be recorded as versioned. See
516
           versioned_kind.
517
         - lstat is the stat data *if* the file was statted.
518
         - path_from_tree_root is the path from the root of the tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
519
         - file_id is the file_id if the entry is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
520
         - versioned_kind is the kind of the file as last recorded in the 
521
           versioning system. If 'unknown' the file is not versioned.
522
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
523
524
        :param prefix: Start walking from prefix within the tree rather than
525
        at the root. This allows one to walk a subtree but get paths that are
526
        relative to a tree rooted higher up.
527
        :return: an iterator over the directory data.
528
        """
529
        raise NotImplementedError(self.walkdirs)
530
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
531
1 by mbp at sourcefrog
import from baz patch-364
532
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
533
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
534
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
535
        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()
536
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
537
                               ' use repository.revision_tree instead.',
538
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
539
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
540
    def get_parent_ids(self):
541
        return []
542
1092.2.6 by Robert Collins
symlink support updated to work
543
    def get_symlink_target(self, file_id):
544
        return None
545
1 by mbp at sourcefrog
import from baz patch-364
546
    def has_filename(self, filename):
547
        return False
548
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
549
    def kind(self, file_id):
550
        return "directory"
551
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
552
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
553
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
554
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
555
    def __contains__(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
556
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
557
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
558
    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
559
        return None
560
561
1 by mbp at sourcefrog
import from baz patch-364
562
######################################################################
563
# diff
564
565
# TODO: Merge these two functions into a single one that can operate
566
# on either a whole tree or a set of files.
567
568
# TODO: Return the diff in order by filename, not by category or in
569
# random order.  Can probably be done by lock-stepping through the
570
# filenames from both trees.
571
572
573
def file_status(filename, old_tree, new_tree):
574
    """Return single-letter status, old and new names for a file.
575
576
    The complexity here is in deciding how to represent renames;
577
    many complex cases are possible.
578
    """
579
    old_inv = old_tree.inventory
580
    new_inv = new_tree.inventory
581
    new_id = new_inv.path2id(filename)
582
    old_id = old_inv.path2id(filename)
583
584
    if not new_id and not old_id:
585
        # easy: doesn't exist in either; not versioned at all
586
        if new_tree.is_ignored(filename):
587
            return 'I', None, None
588
        else:
589
            return '?', None, None
590
    elif new_id:
591
        # There is now a file of this name, great.
592
        pass
593
    else:
594
        # There is no longer a file of this name, but we can describe
595
        # what happened to the file that used to have
596
        # this name.  There are two possibilities: either it was
597
        # deleted entirely, or renamed.
598
        if new_inv.has_id(old_id):
599
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
600
        else:
601
            return 'D', old_inv.id2path(old_id), None
602
603
    # if the file_id is new in this revision, it is added
604
    if new_id and not old_inv.has_id(new_id):
605
        return 'A'
606
607
    # if there used to be a file of this name, but that ID has now
608
    # disappeared, it is deleted
609
    if old_id and not new_inv.has_id(old_id):
610
        return 'D'
611
612
    return 'wtf?'
613
614
    
615
164 by mbp at sourcefrog
new 'renames' command
616
def find_renames(old_inv, new_inv):
617
    for file_id in old_inv:
618
        if file_id not in new_inv:
619
            continue
620
        old_name = old_inv.id2path(file_id)
621
        new_name = new_inv.id2path(file_id)
622
        if old_name != new_name:
623
            yield (old_name, new_name)
624
            
678 by Martin Pool
- export to tarballs
625
1551.7.22 by Aaron Bentley
Changes from review
626
def find_ids_across_trees(filenames, trees, require_versioned=True):
627
    """Find the ids corresponding to specified filenames.
628
    
629
    All matches in all trees will be used, and all children of matched
630
    directories will be used.
631
1551.10.7 by Aaron Bentley
Use new-style output for status
632
    :param filenames: The filenames to find file_ids for (if None, returns
633
        None)
1551.7.22 by Aaron Bentley
Changes from review
634
    :param trees: The trees to find file_ids within
635
    :param require_versioned: if true, all specified filenames must occur in
636
    at least one tree.
637
    :return: a set of file ids for the specified filenames and their children.
638
    """
639
    if not filenames:
640
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
641
    specified_path_ids = _find_ids_across_trees(filenames, trees,
642
        require_versioned)
643
    return _find_children_across_trees(specified_path_ids, trees)
644
645
646
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
647
    """Find the ids corresponding to specified filenames.
648
    
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
649
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
650
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
651
    :param filenames: The filenames to find file_ids for
652
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
653
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
654
        at least one tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
655
    :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
656
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
657
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
658
    interesting_ids = set()
659
    for tree_path in filenames:
660
        not_found = True
661
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
662
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
663
            if file_id is not None:
664
                interesting_ids.add(file_id)
665
                not_found = False
666
        if not_found:
667
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
668
    if len(not_versioned) > 0 and require_versioned:
669
        raise errors.PathsNotVersionedError(not_versioned)
670
    return interesting_ids
671
672
673
def _find_children_across_trees(specified_ids, trees):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
674
    """Return a set including specified ids and their children.
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
675
    
1551.7.22 by Aaron Bentley
Changes from review
676
    All matches in all trees will be used.
677
678
    :param trees: The trees to find file_ids within
679
    :return: a set containing all specified ids and their children 
680
    """
681
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
682
    pending = interesting_ids
683
    # now handle children of interesting ids
684
    # we loop so that we handle all children of each id in both trees
685
    while len(pending) > 0:
686
        new_pending = set()
687
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
688
            for tree in trees:
2292.1.21 by Marius Kruger
undo tree.has_id fake-bugfix, which seems to not be needed anymore..
689
                if not tree.has_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
690
                    continue
691
                entry = tree.inventory[file_id]
692
                for child in getattr(entry, 'children', {}).itervalues():
693
                    if child.file_id not in interesting_ids:
694
                        new_pending.add(child.file_id)
695
        interesting_ids.update(new_pending)
696
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
697
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
698
699
700
class InterTree(InterObject):
701
    """This class represents operations taking place between two Trees.
702
703
    Its instances have methods like 'compare' and contain references to the
704
    source and target trees these operations are to be carried out on.
705
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
706
    Clients of bzrlib should not need to use InterTree directly, rather they
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
707
    should use the convenience methods on Tree such as 'Tree.compare()' which
708
    will pass through to InterTree as appropriate.
709
    """
710
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
711
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
712
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
713
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
714
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
715
        extra_trees=None, require_versioned=False, include_root=False,
716
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
717
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
718
719
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
720
        :param specific_files: An optional list of file paths to restrict the
721
            comparison to. When mapping filenames to ids, all matches in all
722
            trees (including optional extra_trees) are used, and all children of
723
            matched directories are included.
724
        :param want_unchanged: An optional boolean requesting the inclusion of
725
            unchanged entries in the result.
726
        :param extra_trees: An optional list of additional trees to use when
727
            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.
728
        :param require_versioned: An optional boolean (defaults to False). When
729
            supplied and True all the 'specific_files' must be versioned, or
730
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
731
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
732
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
733
        # NB: show_status depends on being able to pass in non-versioned files
734
        # and report them as unknown
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
735
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
736
        if extra_trees is not None:
737
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
738
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
739
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
740
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
741
        if specific_files and not specific_file_ids:
742
            # All files are unversioned, so just return an empty delta
743
            # _compare_trees would think we want a complete delta
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
744
            result = delta.TreeDelta()
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
745
            fake_entry = InventoryFile('unused', 'unused', 'unused')
746
            result.unversioned = [(path, None,
747
                self.target._comparison_data(fake_entry, path)[0]) for path in
748
                specific_files]
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
749
            return result
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
750
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
751
            specific_files, include_root, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
752
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
753
            want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
754
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
755
    def iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
756
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
757
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
758
        """Generate an iterator of changes between trees.
759
760
        A tuple is returned:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
761
        (file_id, (path_in_source, path_in_target),
762
         changed_content, versioned, parent, name, kind,
2012.1.1 by Aaron Bentley
Implement change iterator
763
         executable)
764
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
765
        Changed_content is True if the file's content has changed.  This
766
        includes changes to its kind, and to a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
767
2012.1.15 by Aaron Bentley
Minor tweaks
768
        versioned, parent, name, kind, executable are tuples of (from, to).
769
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
770
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
771
        Iteration is done in parent-to-child order, relative to the target
772
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
773
774
        There is no guarantee that all paths are in sorted order: the
775
        requirement to expand the search due to renames may result in children
776
        that should be found early being found late in the search, after
777
        lexically later results have been returned.
778
        :param require_versioned: Raise errors.PathsNotVersionedError if a
779
            path in the specific_files list is not versioned in one of
780
            source, target or extra_trees.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
781
        :param want_unversioned: Should unversioned files be returned in the
782
            output. An unversioned file is defined as one with (False, False)
783
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
784
        """
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
785
        result = []
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
786
        lookup_trees = [self.source]
787
        if extra_trees:
788
             lookup_trees.extend(extra_trees)
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
789
        if specific_files == []:
790
            specific_file_ids = []
791
        else:
792
            specific_file_ids = self.target.paths2ids(specific_files,
793
                lookup_trees, require_versioned=require_versioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
794
        if want_unversioned:
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
795
            all_unversioned = sorted([(p.split('/'), p) for p in
796
                                     self.target.extras()
797
                if specific_files is None or
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
798
                    osutils.is_inside_any(specific_files, p)])
799
            all_unversioned = deque(all_unversioned)
800
        else:
801
            all_unversioned = deque()
2012.1.1 by Aaron Bentley
Implement change iterator
802
        to_paths = {}
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
803
        from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
804
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
805
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
806
        to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
807
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
808
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
809
        entry_count = 0
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
810
        # the unversioned path lookup only occurs on real trees - where there 
811
        # can be extras. So the fake_entry is solely used to look up
812
        # executable it values when execute is not supported.
813
        fake_entry = InventoryFile('unused', 'unused', 'unused')
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
814
        for to_path, to_entry in to_entries_by_dir:
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
815
            while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
816
                unversioned_path = all_unversioned.popleft()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
817
                to_kind, to_executable, to_stat = \
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
818
                    self.target._comparison_data(fake_entry, unversioned_path[1])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
819
                yield (None, (None, unversioned_path[1]), True, (False, False),
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
820
                    (None, None),
821
                    (None, unversioned_path[0][-1]),
822
                    (None, to_kind),
823
                    (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
824
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
825
            to_paths[file_id] = to_path
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
826
            entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
827
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
828
            from_path, from_entry = from_data.get(file_id, (None, None))
829
            from_versioned = (from_entry is not None)
830
            if from_entry is not None:
831
                from_versioned = True
832
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
833
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
834
                from_kind, from_executable, from_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
835
                    self.source._comparison_data(from_entry, from_path)
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
836
                entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
837
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
838
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
839
                from_kind = None
840
                from_parent = None
841
                from_name = None
842
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
843
            versioned = (from_versioned, True)
844
            to_kind, to_executable, to_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
845
                self.target._comparison_data(to_entry, to_path)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
846
            kind = (from_kind, to_kind)
847
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
848
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
849
            elif from_kind == 'file':
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
850
                from_size = self.source._file_size(from_entry, from_stat)
851
                to_size = self.target._file_size(to_entry, to_stat)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
852
                if from_size != to_size:
853
                    changed_content = True
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
854
                elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
855
                    self.target.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
856
                    changed_content = True
857
            elif from_kind == 'symlink':
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
858
                if (self.source.get_symlink_target(file_id) !=
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
859
                    self.target.get_symlink_target(file_id)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
860
                    changed_content = True
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
861
                elif from_kind == 'tree-reference':
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
862
                    if (self.source.get_reference_revision(file_id, from_path)
863
                        != self.target.get_reference_revision(file_id, to_path)):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
864
                        changed_content = True 
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
865
            parent = (from_parent, to_entry.parent_id)
866
            name = (from_name, to_entry.name)
867
            executable = (from_executable, to_executable)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
868
            if pb is not None:
869
                pb.update('comparing files', entry_count, num_entries)
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
870
            if (changed_content is not False or versioned[0] != versioned[1]
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
871
                or parent[0] != parent[1] or name[0] != name[1] or 
872
                executable[0] != executable[1] or include_unchanged):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
873
                yield (file_id, (from_path, to_path), changed_content,
874
                    versioned, parent, name, kind, executable)
875
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
876
        while all_unversioned:
877
            # yield any trailing unversioned paths
878
            unversioned_path = all_unversioned.popleft()
879
            to_kind, to_executable, to_stat = \
880
                self.target._comparison_data(fake_entry, unversioned_path[1])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
881
            yield (None, (None, unversioned_path[1]), True, (False, False),
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
882
                (None, None),
883
                (None, unversioned_path[0][-1]),
884
                (None, to_kind),
885
                (None, to_executable))
2012.1.1 by Aaron Bentley
Implement change iterator
886
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
887
        def get_to_path(to_entry):
888
            if to_entry.parent_id is None:
889
                to_path = '' # the root
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
890
            else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
891
                if to_entry.parent_id not in to_paths:
892
                    # recurse up
893
                    return get_to_path(self.target.inventory[to_entry.parent_id])
894
                to_path = osutils.pathjoin(to_paths[to_entry.parent_id],
895
                                           to_entry.name)
896
            to_paths[to_entry.file_id] = to_path
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
897
            return to_path
898
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
899
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
900
            file_id = from_entry.file_id
901
            if file_id in to_paths:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
902
                # already returned
2012.1.1 by Aaron Bentley
Implement change iterator
903
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
904
            if not file_id in self.target.inventory:
905
                # common case - paths we have not emitted are not present in
906
                # target.
907
                to_path = None
908
            else:
909
                to_path = get_to_path(self.target.inventory[file_id])
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
910
            entry_count += 1
911
            if pb is not None:
912
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
913
            versioned = (True, False)
914
            parent = (from_entry.parent_id, None)
915
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
916
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
917
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
918
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
919
            executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
920
            changed_content = True
921
            # the parent's path is necessarily known at this point.
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
922
            yield(file_id, (path, to_path), changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
923
                  name, kind, executable)