/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
17
"""Tree classes, representing directory at point in time.
18
"""
19
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
20
from __future__ import absolute_import
21
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
22
import os
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
23
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
24
from .lazy_import import lazy_import
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
25
lazy_import(globals(), """
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
26
import collections
800 by Martin Pool
Merge John's import-speedup branch:
27
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
28
from breezy import (
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
29
    conflicts as _mod_conflicts,
3368.2.30 by Ian Clatworthy
add -Dfilters support
30
    debug,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
31
    delta,
3368.2.16 by Ian Clatworthy
add real implementation of Tree.get_filter_stack
32
    filters,
1551.15.46 by Aaron Bentley
Move plan merge to tree
33
    revision as _mod_revision,
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
34
    rules,
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
35
    trace,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
36
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
37
from breezy.i18n import gettext
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
38
""")
39
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
40
from . import (
41
    errors,
6754.8.3 by Jelmer Vernooij
Use context manager in decorators.
42
    lock,
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
43
    osutils,
44
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
45
from .inter import InterObject
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
46
from .sixish import (
47
    viewvalues,
48
    )
1 by mbp at sourcefrog
import from baz patch-364
49
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
50
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
51
class FileTimestampUnavailable(errors.BzrError):
52
53
    _fmt = "The filestamp for %(path)s is not available."
54
55
    internal_error = True
56
57
    def __init__(self, path):
58
        self.path = path
59
60
6846.6.1 by Jelmer Vernooij
Move Tree{Link,File,Directory,Entry} to breezy.tree.
61
class TreeEntry(object):
62
    """An entry that implements the minimum interface used by commands.
63
    """
64
65
    def __eq__(self, other):
6857 by Jelmer Vernooij
Merge lp:~jelmer/brz/move-ie.
66
        # yes, this is ugly, TODO: best practice __eq__ style.
6846.6.1 by Jelmer Vernooij
Move Tree{Link,File,Directory,Entry} to breezy.tree.
67
        return (isinstance(other, TreeEntry)
68
                and other.__class__ == self.__class__)
69
70
    def kind_character(self):
71
        return "???"
72
73
74
class TreeDirectory(TreeEntry):
75
    """See TreeEntry. This is a directory in a working tree."""
76
77
    def kind_character(self):
78
        return "/"
79
80
81
class TreeFile(TreeEntry):
82
    """See TreeEntry. This is a regular file in a working tree."""
83
84
    def kind_character(self):
85
        return ''
86
87
88
class TreeLink(TreeEntry):
89
    """See TreeEntry. This is a symlink in a working tree."""
90
91
    def kind_character(self):
92
        return ''
93
94
6926.2.1 by Jelmer Vernooij
Some tree reference fixes.
95
class TreeReference(TreeEntry):
96
    """See TreeEntry. This is a reference to a nested tree in a working tree."""
97
98
    def kind_character(self):
99
        return '/'
100
101
558 by Martin Pool
- All top-level classes inherit from object
102
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
103
    """Abstract file tree.
104
105
    There are several subclasses:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
106
1 by mbp at sourcefrog
import from baz patch-364
107
    * `WorkingTree` exists as files on disk editable by the user.
108
109
    * `RevisionTree` is a tree as recorded at some point in the past.
110
111
    Trees can be compared, etc, regardless of whether they are working
112
    trees or versioned trees.
113
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
114
6883.5.17 by Jelmer Vernooij
Add Tree.supports_rename_tracking().
115
    def supports_rename_tracking(self):
116
        """Whether this tree supports rename tracking.
117
118
        This defaults to True, but some implementations may want to override
119
        it.
120
        """
121
        return True
122
6110.6.1 by Jelmer Vernooij
Add Tree.has_versioned_directories.
123
    def has_versioned_directories(self):
124
        """Whether this tree can contain explicitly versioned directories.
125
126
        This defaults to True, but some implementations may want to override
127
        it.
128
        """
129
        return True
130
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
131
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
132
        extra_trees=None, require_versioned=False, include_root=False,
133
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
134
        """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.
135
136
        :param other: A tree to compare with.
137
        :param specific_files: An optional list of file paths to restrict the
138
            comparison to. When mapping filenames to ids, all matches in all
139
            trees (including optional extra_trees) are used, and all children of
140
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
141
        :param want_unchanged: An optional boolean requesting the inclusion of
142
            unchanged entries in the result.
143
        :param extra_trees: An optional list of additional trees to use when
144
            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.
145
        :param require_versioned: An optional boolean (defaults to False). When
146
            supplied and True all the 'specific_files' must be versioned, or
147
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
148
        :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.
149
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
150
        The comparison will be performed by an InterTree object looked up on
1852.8.4 by Robert Collins
Hook InterTree into Tree.
151
        self and other.
152
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
153
        # Martin observes that Tree.changes_from returns a TreeDelta and this
154
        # may confuse people, because the class name of the returned object is
155
        # 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.
156
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
157
            want_unchanged=want_unchanged,
158
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
159
            extra_trees=extra_trees,
160
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
161
            include_root=include_root,
162
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
163
            )
2012.1.1 by Aaron Bentley
Implement change iterator
164
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
165
    def iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
166
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
167
                     require_versioned=True, want_unversioned=False):
4988.10.6 by John Arbash Meinel
Fix bug #304182 by adding a trivial docstring to Tree.iter_changes
168
        """See InterTree.iter_changes"""
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
169
        intertree = InterTree.get(from_tree, self)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
170
        return intertree.iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
171
            extra_trees, require_versioned, want_unversioned=want_unversioned)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
173
    def conflicts(self):
174
        """Get a list of the conflicts in the tree.
175
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
176
        Each conflict is an instance of breezy.conflicts.Conflict.
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
177
        """
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
178
        return _mod_conflicts.ConflictList()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
179
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
180
    def extras(self):
181
        """For trees that can have unversioned files, return all such paths."""
182
        return []
183
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
184
    def get_parent_ids(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
185
        """Get the parent ids for this tree.
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
186
187
        :return: a list of parent ids. [] is returned to indicate
188
        a tree with no parents.
189
        :raises: BzrError if the parents are not known.
190
        """
191
        raise NotImplementedError(self.get_parent_ids)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
192
1 by mbp at sourcefrog
import from baz patch-364
193
    def has_filename(self, filename):
194
        """True if the tree has given filename."""
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
195
        raise NotImplementedError(self.has_filename)
1 by mbp at sourcefrog
import from baz patch-364
196
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
197
    def is_ignored(self, filename):
198
        """Check whether the filename is ignored by this tree.
199
200
        :param filename: The relative filename within the tree.
201
        :return: True if the filename is ignored.
202
        """
203
        return False
204
3146.8.16 by Aaron Bentley
Updates from review
205
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
206
        """Iterate through all file ids, including ids for missing files."""
5837.2.1 by Jelmer Vernooij
Deprecate Tree.__iter__.
207
        raise NotImplementedError(self.all_file_ids)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
208
6825.5.1 by Jelmer Vernooij
Implement Tree.all_versioned_paths.
209
    def all_versioned_paths(self):
210
        """Iterate through all paths, including paths for missing files."""
211
        raise NotImplementedError(self.all_versioned_paths)
212
1 by mbp at sourcefrog
import from baz patch-364
213
    def id2path(self, file_id):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
214
        """Return the path for a file id.
215
216
        :raises NoSuchId:
217
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
218
        raise NotImplementedError(self.id2path)
1 by mbp at sourcefrog
import from baz patch-364
219
6929.6.1 by Jelmer Vernooij
Remove yield_parents argument to Tree.iter_entries_by_dir.
220
    def iter_entries_by_dir(self, specific_files=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
221
        """Walk the tree in 'by_dir' order.
222
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
223
        This will yield each entry in the tree as a (path, entry) tuple.
224
        The order that they are yielded is:
225
226
        Directories are walked in a depth-first lexicographical order,
227
        however, whenever a directory is reached, all of its direct child
228
        nodes are yielded in  lexicographical order before yielding the
229
        grandchildren.
230
231
        For example, in the tree::
232
233
           a/
234
             b/
235
               c
236
             d/
237
               e
238
           f/
239
             g
240
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
241
        The yield order (ignoring root) would be::
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
242
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
243
          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.
244
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
245
        raise NotImplementedError(self.iter_entries_by_dir)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
246
6844.1.1 by Jelmer Vernooij
Many more foreign branch fixes.
247
    def iter_child_entries(self, path, file_id=None):
6471.1.2 by Jelmer Vernooij
Add Tree.iter_child_entries.
248
        """Iterate over the children of a directory or tree reference.
249
6844.1.1 by Jelmer Vernooij
Many more foreign branch fixes.
250
        :param path: Path of the directory
251
        :param file_id: Optional file id of the directory/tree-reference
6471.1.3 by Jelmer Vernooij
Add Tree.iter_child_entries.
252
        :raise NoSuchId: When the file_id does not exist
253
        :return: Iterator over entries in the directory
6471.1.2 by Jelmer Vernooij
Add Tree.iter_child_entries.
254
        """
255
        raise NotImplementedError(self.iter_child_entries)
256
5793.2.1 by Jelmer Vernooij
Add Tree.list_files stub.
257
    def list_files(self, include_root=False, from_dir=None, recursive=True):
258
        """List all files in this tree.
259
260
        :param include_root: Whether to include the entry for the tree root
261
        :param from_dir: Directory under which to list files
262
        :param recursive: Whether to list files recursively
263
        :return: iterator over tuples of (path, versioned, kind, file_id,
264
            inventory entry)
265
        """
266
        raise NotImplementedError(self.list_files)
267
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.
268
    def iter_references(self):
4370.3.2 by Ian Clatworthy
apply jam's review feedback
269
        if self.supports_tree_reference():
270
            for path, entry in self.iter_entries_by_dir():
271
                if entry.kind == 'tree-reference':
272
                    yield path, entry.file_id
2100.3.27 by Aaron Bentley
Enable nested commits
273
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
274
    def kind(self, path, file_id=None):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
275
        raise NotImplementedError("Tree subclass %s must implement kind"
276
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
277
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
278
    def stored_kind(self, path, file_id=None):
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
279
        """File kind stored for this file_id.
280
3146.8.15 by Aaron Bentley
Cleanup and docs
281
        May not match kind on disk for working trees.  Always available
282
        for versioned files, even when the file itself is missing.
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
283
        """
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
284
        return self.kind(path, file_id)
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
285
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
286
    def path_content_summary(self, path):
287
        """Get a summary of the information about path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
288
4595.11.2 by Martin Pool
Clarify contract of path_content_summary
289
        All the attributes returned are for the canonical form, not the
290
        convenient form (if content filters are in use.)
291
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
292
        :param path: A relative path within the tree.
293
        :return: A tuple containing kind, size, exec, sha1-or-link.
294
            Kind is always present (see tree.kind()).
4595.11.13 by Martin Pool
Remove get_kind_and_executable_by_path; go back to using plain path_content_summary
295
            size is present if kind is file and the size of the 
296
                canonical form can be cheaply determined, None otherwise.
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
297
            exec is None unless kind is file and the platform supports the 'x'
298
                bit.
299
            sha1-or-link is the link target if kind is symlink, or the sha1 if
300
                it can be obtained without reading the file.
301
        """
302
        raise NotImplementedError(self.path_content_summary)
303
6809.4.1 by Jelmer Vernooij
Swap file_id and path arguments for get_reference_revision and get_nested_tree.
304
    def get_reference_revision(self, path, file_id=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
305
        raise NotImplementedError("Tree subclass %s must implement "
306
                                  "get_reference_revision"
307
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
308
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
309
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
310
        """Return a tuple of kind, executable, stat_value for a file.
311
312
        entry may be None if there is no inventory entry for the file, but
313
        path must always be supplied.
314
315
        kind is None if there is no file present (even if an inventory id is
316
        present).  executable is False for non-file entries.
317
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
318
        raise NotImplementedError(self._comparison_data)
319
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
320
    def get_file(self, path, file_id=None):
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
321
        """Return a file object for the file file_id in the tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
322
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
323
        If both file_id and path are defined, it is implementation defined as
324
        to which one is used.
325
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
326
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
327
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
328
    def get_file_with_stat(self, path, file_id=None):
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
329
        """Get a file handle and stat object for file_id.
330
331
        The default implementation returns (self.get_file, None) for backwards
332
        compatibility.
333
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
334
        :param path: The path of the file.
335
        :param file_id: The file id to read, if it is known.
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
336
        :return: A tuple (file_handle, stat_value_or_None). If the tree has
337
            no stat facility, or need for a stat cache feedback during commit,
338
            it may return None for the second element of the tuple.
339
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
340
        return (self.get_file(path, file_id), None)
4354.4.5 by Aaron Bentley
Ensure Tree.get_file_with_stat is provided.
341
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
342
    def get_file_text(self, path, file_id=None):
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
343
        """Return the byte content of a file.
344
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
345
        :param path: The path of the file.
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
346
        :param file_id: The file_id of the file.
6006.3.1 by Martin Pool
Start adding ContentFilterTree
347
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
348
        If both file_id and path are supplied, an implementation may use
349
        either one.
6006.3.1 by Martin Pool
Start adding ContentFilterTree
350
351
        :returns: A single byte string for the whole file.
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
352
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
353
        my_file = self.get_file(path, file_id)
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
354
        try:
355
            return my_file.read()
356
        finally:
357
            my_file.close()
358
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
359
    def get_file_lines(self, path, file_id=None):
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
360
        """Return the content of a file, as lines.
361
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
362
        :param path: The path of the file.
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
363
        :param file_id: The file_id of the file.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
364
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
365
        If both file_id and path are supplied, an implementation may use
366
        either one.
367
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
368
        return osutils.split_lines(self.get_file_text(path, file_id))
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
369
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
370
    def get_file_verifier(self, path, file_id=None, stat_value=None):
5906.1.2 by Jelmer Vernooij
Add Tree.get_file_verifier.
371
        """Return a verifier for a file.
372
373
        The default implementation returns a sha1.
374
375
        :param file_id: The handle for this file.
376
        :param path: The path that this file can be found at.
377
            These must point to the same object.
378
        :param stat_value: Optional stat value for the object
379
        :return: Tuple with verifier name and verifier data
380
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
381
        return ("SHA1", self.get_file_sha1(path, file_id,
5906.1.2 by Jelmer Vernooij
Add Tree.get_file_verifier.
382
            stat_value=stat_value))
383
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
384
    def get_file_sha1(self, path, file_id=None, stat_value=None):
5777.1.3 by Jelmer Vernooij
Add stub for Tree.get_file_sha1.
385
        """Return the SHA1 file for a file.
386
5906.1.4 by Jelmer Vernooij
Add InterTree.file_contents_match.
387
        :note: callers should use get_file_verifier instead
388
            where possible, as the underlying repository implementation may
389
            have quicker access to a non-sha1 verifier.
390
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
391
        :param path: The path that this file can be found at.
5777.1.3 by Jelmer Vernooij
Add stub for Tree.get_file_sha1.
392
        :param file_id: The handle for this file.
393
            These must point to the same object.
5883.1.2 by Jelmer Vernooij
Support stat_value argument to get_file_sha1
394
        :param stat_value: Optional stat value for the object
5777.1.3 by Jelmer Vernooij
Add stub for Tree.get_file_sha1.
395
        """
396
        raise NotImplementedError(self.get_file_sha1)
397
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
398
    def get_file_mtime(self, path, file_id=None):
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
399
        """Return the modification time for a file.
400
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
401
        :param path: The path that this file can be found at.
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
402
        :param file_id: The handle for this file.
403
            These must point to the same object.
404
        """
405
        raise NotImplementedError(self.get_file_mtime)
406
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
407
    def get_file_size(self, path, file_id=None):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
408
        """Return the size of a file in bytes.
409
410
        This applies only to regular files.  If invoked on directories or
411
        symlinks, it will return None.
412
        :param file_id: The file-id of the file
413
        """
414
        raise NotImplementedError(self.get_file_size)
415
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
416
    def is_executable(self, path, file_id=None):
5777.1.4 by Jelmer Vernooij
Stub for is_executable.
417
        """Check if a file is executable.
418
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
419
        :param path: The path that this file can be found at.
5777.1.4 by Jelmer Vernooij
Stub for is_executable.
420
        :param file_id: The handle for this file.
421
            These must point to the same object.
422
        """
423
        raise NotImplementedError(self.is_executable)
424
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
425
    def iter_files_bytes(self, desired_files):
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
426
        """Iterate through file contents.
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
427
2708.1.10 by Aaron Bentley
Update docstrings
428
        Files will not necessarily be returned in the order they occur in
429
        desired_files.  No specific order is guaranteed.
430
431
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
432
        value supplied by the caller as part of desired_files.  It should
433
        uniquely identify the file version in the caller's context.  (Examples:
434
        an index number or a TreeTransform trans_id.)
435
436
        bytes_iterator is an iterable of bytestrings for the file.  The
437
        kind of iterable and length of the bytestrings are unspecified, but for
438
        this implementation, it is a tuple containing a single bytestring with
439
        the complete text of the file.
440
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
441
        :param desired_files: a list of (path, identifier) pairs
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
442
        """
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
443
        for path, identifier in desired_files:
2708.1.10 by Aaron Bentley
Update docstrings
444
            # We wrap the string in a tuple so that we can return an iterable
445
            # of bytestrings.  (Technically, a bytestring is also an iterable
446
            # of bytestrings, but iterating through each character is not
447
            # performant.)
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
448
            cur_file = (self.get_file_text(path),)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
449
            yield identifier, cur_file
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
450
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
451
    def get_symlink_target(self, path, file_id=None):
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
452
        """Get the target for a given file_id.
453
454
        It is assumed that the caller already knows that file_id is referencing
455
        a symlink.
456
        :param file_id: Handle for the symlink entry.
5858.1.1 by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target.
457
        :param path: The path of the file.
458
        If both file_id and path are supplied, an implementation may use
459
        either one.
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
460
        :return: The path the symlink points to.
461
        """
462
        raise NotImplementedError(self.get_symlink_target)
463
2946.3.2 by John Arbash Meinel
Add tree implementation tests for Tree.get_root_id()
464
    def get_root_id(self):
465
        """Return the file_id for the root of this tree."""
466
        raise NotImplementedError(self.get_root_id)
467
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
468
    def annotate_iter(self, path, file_id=None,
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
469
                      default_revision=_mod_revision.CURRENT_REVISION):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
470
        """Return an iterator of revision_id, line tuples.
1551.9.18 by Aaron Bentley
Updates from review comments
471
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
472
        For working trees (and mutable trees in general), the special
473
        revision_id 'current:' will be used for lines that are new in this
474
        tree, e.g. uncommitted changes.
475
        :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.
476
        :param default_revision: For lines that don't match a basis, mark them
477
            with this revision id. Not all implementations will make use of
478
            this value.
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
479
        """
480
        raise NotImplementedError(self.annotate_iter)
481
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
482
    def _iter_parent_trees(self):
483
        """Iterate through parent trees, defaulting to Tree.revision_tree."""
484
        for revision_id in self.get_parent_ids():
485
            try:
486
                yield self.revision_tree(revision_id)
487
            except errors.NoSuchRevisionInTree:
488
                yield self.repository.revision_tree(revision_id)
489
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
490
    def path2id(self, path):
491
        """Return the id for path in this tree."""
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
492
        raise NotImplementedError(self.path2id)
1 by mbp at sourcefrog
import from baz patch-364
493
6852.3.1 by Jelmer Vernooij
add Tree.is_versioned.
494
    def is_versioned(self, path):
495
        """Check whether path is versioned.
496
497
        :param path: Path to check
498
        :return: boolean
499
        """
6856 by Jelmer Vernooij
Merge lp:~jelmer/brz/is-versioned.
500
        return self.path2id(path) is not None
6852.3.1 by Jelmer Vernooij
add Tree.is_versioned.
501
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
502
    def find_related_paths_across_trees(self, paths, trees=[],
503
            require_versioned=True):
504
        """Find related paths in tree corresponding to specified filenames in any
505
        of `lookup_trees`.
506
507
        All matches in all trees will be used, and all children of matched
508
        directories will be used.
509
510
        :param paths: The filenames to find related paths for (if None, returns
511
            None)
512
        :param trees: The trees to find file_ids within
513
        :param require_versioned: if true, all specified filenames must occur in
514
            at least one tree.
515
        :return: a set of paths for the specified filenames and their children
516
            in `tree`
517
        """
6885.5.4 by Jelmer Vernooij
Move paths2ids to InventoryTree.
518
        raise NotImplementedError(self.find_related_paths_across_trees)
3363.12.2 by Aaron Bentley
Implement tree.iter_children to instead of adjusting InventoryEntry handling
519
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
520
    def lock_read(self):
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
521
        """Lock this tree for multiple read only operations.
6468.3.1 by Jelmer Vernooij
Use iter_children in a couple more places.
522
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
523
        :return: A breezy.lock.LogicalLockResult.
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
524
        """
6754.8.3 by Jelmer Vernooij
Use context manager in decorators.
525
        return lock.LogicalLockResult(self.unlock)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
526
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
527
    def revision_tree(self, revision_id):
528
        """Obtain a revision tree for the revision revision_id.
529
530
        The intention of this method is to allow access to possibly cached
531
        tree data. Implementors of this method should raise NoSuchRevision if
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
532
        the tree is not locally available, even if they could obtain the
533
        tree via a repository or some other means. Callers are responsible
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
534
        for finding the ultimate source for a revision tree.
535
536
        :param revision_id: The revision_id of the requested tree.
537
        :return: A Tree.
538
        :raises: NoSuchRevision if the tree cannot be obtained.
539
        """
540
        raise errors.NoSuchRevisionInTree(self, revision_id)
541
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
542
    def unknowns(self):
543
        """What files are present in this tree and unknown.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
544
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
545
        :return: an iterator over the unknown files.
546
        """
547
        return iter([])
548
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
549
    def unlock(self):
550
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
551
552
    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.
553
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
554
555
        :return: set of paths.
556
        """
6974.1.1 by Jelmer Vernooij
Provide a sensible default implementaton of Tree.filter_unversioned_files.
557
        # NB: we specifically *don't* call self.has_filename, because for
558
        # WorkingTrees that can indicate files that exist on disk but that
559
        # are not versioned.
6974.1.2 by Jelmer Vernooij
Avoid unnecessary parentheses.
560
        return set(p for p in paths if not self.is_versioned(p))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
561
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
562
    def walkdirs(self, prefix=""):
563
        """Walk the contents of this tree from path down.
564
565
        This yields all the data about the contents of a directory at a time.
566
        After each directory has been yielded, if the caller has mutated the
567
        list to exclude some directories, they are then not descended into.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
568
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
569
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
570
        ((directory-relpath, directory-path-from-root, directory-fileid),
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
571
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id,
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
572
          versioned_kind), ...]),
573
         - directory-relpath is the containing dirs relpath from prefix
574
         - directory-path-from-root is the containing dirs path from /
575
         - 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.
576
         - relpath is the relative path within the subtree being walked.
577
         - basename is the basename
578
         - kind is the kind of the file now. If unknonwn then the file is not
579
           present within the tree - but it may be recorded as versioned. See
580
           versioned_kind.
581
         - lstat is the stat data *if* the file was statted.
582
         - path_from_tree_root is the path from the root of the tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
583
         - file_id is the file_id if the entry is versioned.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
584
         - versioned_kind is the kind of the file as last recorded in the
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
585
           versioning system. If 'unknown' the file is not versioned.
586
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
587
588
        :param prefix: Start walking from prefix within the tree rather than
589
        at the root. This allows one to walk a subtree but get paths that are
590
        relative to a tree rooted higher up.
591
        :return: an iterator over the directory data.
592
        """
593
        raise NotImplementedError(self.walkdirs)
594
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
595
    def supports_content_filtering(self):
596
        return False
597
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
598
    def _content_filter_stack(self, path=None):
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
599
        """The stack of content filters for a path if filtering is supported.
3368.2.47 by Ian Clatworthy
merge bzr.dev r4042
600
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
601
        Readers will be applied in first-to-last order.
602
        Writers will be applied in last-to-first order.
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
603
        Either the path or the file-id needs to be provided.
604
605
        :param path: path relative to the root of the tree
606
            or None if unknown
607
        :return: the list of filters - [] if there are none
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
608
        """
3368.2.16 by Ian Clatworthy
add real implementation of Tree.get_filter_stack
609
        filter_pref_names = filters._get_registered_names()
610
        if len(filter_pref_names) == 0:
611
            return []
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
612
        prefs = next(self.iter_search_rules([path], filter_pref_names))
3368.2.30 by Ian Clatworthy
add -Dfilters support
613
        stk = filters._get_filter_stack_for(prefs)
614
        if 'filters' in debug.debug_flags:
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
615
            trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path, prefs, stk))
3368.2.30 by Ian Clatworthy
add -Dfilters support
616
        return stk
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
617
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
618
    def _content_filter_stack_provider(self):
619
        """A function that returns a stack of ContentFilters.
620
621
        The function takes a path (relative to the top of the tree) and a
622
        file-id as parameters.
623
624
        :return: None if content filtering is not supported by this tree.
625
        """
626
        if self.supports_content_filtering():
627
            return lambda path, file_id: \
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
628
                    self._content_filter_stack(path)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
629
        else:
630
            return None
631
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
632
    def iter_search_rules(self, path_names, pref_names=None,
4324.4.1 by Marius Kruger
Make it possible to blackboxtest rules
633
        _default_searcher=None):
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
634
        """Find the preferences for filenames in a tree.
635
636
        :param path_names: an iterable of paths to find attributes for.
637
          Paths are given relative to the root of the tree.
638
        :param pref_names: the list of preferences to lookup - None for all
639
        :param _default_searcher: private parameter to assist testing - don't use
640
        :return: an iterator of tuple sequences, one per path-name.
641
          See _RulesSearcher.get_items for details on the tuple sequence.
642
        """
4324.4.1 by Marius Kruger
Make it possible to blackboxtest rules
643
        if _default_searcher is None:
644
            _default_searcher = rules._per_user_searcher
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
645
        searcher = self._get_rules_searcher(_default_searcher)
646
        if searcher is not None:
3398.1.34 by Ian Clatworthy
changed API design as requested by jam during review
647
            if pref_names is not None:
648
                for path in path_names:
649
                    yield searcher.get_selected_items(path, pref_names)
650
            else:
651
                for path in path_names:
652
                    yield searcher.get_items(path)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
653
654
    def _get_rules_searcher(self, default_searcher):
655
        """Get the RulesSearcher for this tree given the default one."""
656
        searcher = default_searcher
657
        return searcher
658
6968.2.7 by Jelmer Vernooij
Add breezy.archive.
659
    def archive(self, format, name, root='', subdir=None,
660
                force_mtime=None):
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
661
        """Create an archive of this tree.
662
663
        :param name: target file name
664
        :param format: Format name (e.g. 'tar')
665
        :param root: Root directory name (or None)
666
        :param subdir: Subdirectory to export (or None)
6968.2.7 by Jelmer Vernooij
Add breezy.archive.
667
        :param per_file_timestamps: Whether to set the timestamp
668
            for each file to the last changed time.
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
669
        :return: Iterator over archive chunks
670
        """
6968.2.10 by Jelmer Vernooij
Review comments.
671
        from .archive import create_archive
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
672
        with self.lock_read():
6968.2.7 by Jelmer Vernooij
Add breezy.archive.
673
            return create_archive(format, self, name, root,
674
                    subdir, force_mtime=force_mtime)
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
675
6929.3.3 by Jelmer Vernooij
Add Tree.versionable_kind.
676
    @classmethod
677
    def versionable_kind(cls, kind):
678
        """Check if this tree support versioning a specific file kind."""
679
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
680
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
681
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
682
class InterTree(InterObject):
683
    """This class represents operations taking place between two Trees.
684
685
    Its instances have methods like 'compare' and contain references to the
686
    source and target trees these operations are to be carried out on.
687
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
688
    Clients of breezy should not need to use InterTree directly, rather they
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
689
    should use the convenience methods on Tree such as 'Tree.compare()' which
690
    will pass through to InterTree as appropriate.
691
    """
692
4585.1.18 by Jelmer Vernooij
Add note saying that InterTree will not be tested if the from and to formats are not set.
693
    # Formats that will be used to test this InterTree. If both are
694
    # None, this InterTree will not be tested (e.g. because a complex
695
    # setup is required)
696
    _matching_from_tree_format = None
697
    _matching_to_tree_format = None
698
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
699
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
700
5837.1.2 by Jelmer Vernooij
Register defaults as first optimiser for existing Inter objects.
701
    @classmethod
702
    def is_compatible(kls, source, target):
703
        # The default implementation is naive and uses the public API, so
704
        # it works for all trees.
705
        return True
706
6883.1.1 by Jelmer Vernooij
Avoid file id lookups.
707
    def _changes_from_entries(self, source_entry, target_entry, source_path,
708
                              target_path):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
709
        """Generate a iter_changes tuple between source_entry and target_entry.
710
711
        :param source_entry: An inventory entry from self.source, or None.
712
        :param target_entry: An inventory entry from self.target, or None.
6883.1.1 by Jelmer Vernooij
Avoid file id lookups.
713
        :param source_path: The path of source_entry.
714
        :param target_path: The path of target_entry.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
715
        :return: A tuple, item 0 of which is an iter_changes result tuple, and
716
            item 1 is True if there are any changes in the result tuple.
717
        """
718
        if source_entry is None:
719
            if target_entry is None:
720
                return None
721
            file_id = target_entry.file_id
722
        else:
723
            file_id = source_entry.file_id
724
        if source_entry is not None:
725
            source_versioned = True
726
            source_name = source_entry.name
727
            source_parent = source_entry.parent_id
728
            source_kind, source_executable, source_stat = \
729
                self.source._comparison_data(source_entry, source_path)
730
        else:
731
            source_versioned = False
732
            source_name = None
733
            source_parent = None
734
            source_kind = None
735
            source_executable = None
736
        if target_entry is not None:
737
            target_versioned = True
738
            target_name = target_entry.name
739
            target_parent = target_entry.parent_id
740
            target_kind, target_executable, target_stat = \
741
                self.target._comparison_data(target_entry, target_path)
742
        else:
743
            target_versioned = False
744
            target_name = None
745
            target_parent = None
746
            target_kind = None
747
            target_executable = None
748
        versioned = (source_versioned, target_versioned)
749
        kind = (source_kind, target_kind)
750
        changed_content = False
751
        if source_kind != target_kind:
752
            changed_content = True
753
        elif source_kind == 'file':
6883.7.1 by Jelmer Vernooij
Swap order of arguments to Tree.file_content_matches.
754
            if not self.file_content_matches(
6883.1.2 by Jelmer Vernooij
Fix order.
755
                    source_path, target_path,
756
                    file_id, file_id, source_stat, target_stat):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
757
                changed_content = True
758
        elif source_kind == 'symlink':
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
759
            if (self.source.get_symlink_target(source_path, file_id) !=
760
                self.target.get_symlink_target(target_path, file_id)):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
761
                changed_content = True
6405.2.12 by Jelmer Vernooij
Fix tests.
762
        elif source_kind == 'tree-reference':
6809.4.1 by Jelmer Vernooij
Swap file_id and path arguments for get_reference_revision and get_nested_tree.
763
            if (self.source.get_reference_revision(source_path, file_id)
764
                != self.target.get_reference_revision(target_path, file_id)):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
765
                    changed_content = True
766
        parent = (source_parent, target_parent)
767
        name = (source_name, target_name)
768
        executable = (source_executable, target_executable)
769
        if (changed_content is not False or versioned[0] != versioned[1]
770
            or parent[0] != parent[1] or name[0] != name[1] or
771
            executable[0] != executable[1]):
772
            changes = True
773
        else:
774
            changes = False
775
        return (file_id, (source_path, target_path), changed_content,
776
                versioned, parent, name, kind, executable), changes
777
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
778
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
779
        extra_trees=None, require_versioned=False, include_root=False,
780
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
781
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
782
783
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
784
        :param specific_files: An optional list of file paths to restrict the
785
            comparison to. When mapping filenames to ids, all matches in all
786
            trees (including optional extra_trees) are used, and all children of
787
            matched directories are included.
788
        :param want_unchanged: An optional boolean requesting the inclusion of
789
            unchanged entries in the result.
790
        :param extra_trees: An optional list of additional trees to use when
791
            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.
792
        :param require_versioned: An optional boolean (defaults to False). When
793
            supplied and True all the 'specific_files' must be versioned, or
794
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
795
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
796
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
797
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
798
        if extra_trees is not None:
799
            trees = trees + tuple(extra_trees)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
800
        with self.lock_read():
801
            return delta._compare_trees(self.source, self.target, want_unchanged,
802
                specific_files, include_root, extra_trees=extra_trees,
803
                require_versioned=require_versioned,
804
                want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
805
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
806
    def iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
807
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
808
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
809
        """Generate an iterator of changes between trees.
810
811
        A tuple is returned:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
812
        (file_id, (path_in_source, path_in_target),
813
         changed_content, versioned, parent, name, kind,
2012.1.1 by Aaron Bentley
Implement change iterator
814
         executable)
815
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
816
        Changed_content is True if the file's content has changed.  This
817
        includes changes to its kind, and to a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
818
2012.1.15 by Aaron Bentley
Minor tweaks
819
        versioned, parent, name, kind, executable are tuples of (from, to).
820
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
821
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
822
        Iteration is done in parent-to-child order, relative to the target
823
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
824
825
        There is no guarantee that all paths are in sorted order: the
826
        requirement to expand the search due to renames may result in children
827
        that should be found early being found late in the search, after
828
        lexically later results have been returned.
829
        :param require_versioned: Raise errors.PathsNotVersionedError if a
830
            path in the specific_files list is not versioned in one of
831
            source, target or extra_trees.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
832
        :param specific_files: An optional list of file paths to restrict the
833
            comparison to. When mapping filenames to ids, all matches in all
834
            trees (including optional extra_trees) are used, and all children
835
            of matched directories are included. The parents in the target tree
836
            of the specific files up to and including the root of the tree are
837
            always evaluated for changes too.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
838
        :param want_unversioned: Should unversioned files be returned in the
839
            output. An unversioned file is defined as one with (False, False)
840
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
841
        """
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
842
        if not extra_trees:
843
             extra_trees = []
6885.5.8 by Jelmer Vernooij
Remove interesting_ids support from merge.
844
        else:
845
             extra_trees = list(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
846
        # The ids of items we need to examine to insure delta consistency.
847
        precise_file_ids = set()
848
        changed_file_ids = []
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
849
        if specific_files == []:
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
850
            target_specific_files = []
851
            source_specific_files = []
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
852
        else:
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
853
            target_specific_files = self.target.find_related_paths_across_trees(
854
                    specific_files, [self.source] + extra_trees,
855
                    require_versioned=require_versioned)
856
            source_specific_files = self.source.find_related_paths_across_trees(
857
                    specific_files, [self.target] + extra_trees,
858
                    require_versioned=require_versioned)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
859
        if specific_files is not None:
860
            # reparented or added entries must have their parents included
861
            # so that valid deltas can be created. The seen_parents set
862
            # tracks the parents that we need to have.
863
            # The seen_dirs set tracks directory entries we've yielded.
864
            # After outputting version object in to_entries we set difference
865
            # the two seen sets and start checking parents.
866
            seen_parents = set()
867
            seen_dirs = set()
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
868
        if want_unversioned:
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
869
            all_unversioned = sorted([(p.split('/'), p) for p in
870
                                     self.target.extras()
871
                if specific_files is None or
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
872
                    osutils.is_inside_any(specific_files, p)])
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
873
            all_unversioned = collections.deque(all_unversioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
874
        else:
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
875
            all_unversioned = collections.deque()
2012.1.1 by Aaron Bentley
Implement change iterator
876
        to_paths = {}
3363.14.2 by Aaron Bentley
Get iter_changes running to completion
877
        from_entries_by_dir = list(self.source.iter_entries_by_dir(
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
878
            specific_files=source_specific_files))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
879
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
3363.14.2 by Aaron Bentley
Get iter_changes running to completion
880
        to_entries_by_dir = list(self.target.iter_entries_by_dir(
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
881
            specific_files=target_specific_files))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
882
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
883
        entry_count = 0
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
884
        # the unversioned path lookup only occurs on real trees - where there
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
885
        # can be extras. So the fake_entry is solely used to look up
886
        # executable it values when execute is not supported.
6929.3.2 by Jelmer Vernooij
Remove use of inventory in breezy.tree.
887
        fake_entry = TreeFile()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
888
        for target_path, target_entry in to_entries_by_dir:
889
            while (all_unversioned and
890
                all_unversioned[0][0] < target_path.split('/')):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
891
                unversioned_path = all_unversioned.popleft()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
892
                target_kind, target_executable, target_stat = \
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
893
                    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.
894
                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.
895
                    (None, None),
896
                    (None, unversioned_path[0][-1]),
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
897
                    (None, target_kind),
898
                    (None, target_executable))
899
            source_path, source_entry = from_data.get(target_entry.file_id,
900
                (None, None))
901
            result, changes = self._changes_from_entries(source_entry,
902
                target_entry, source_path=source_path, target_path=target_path)
903
            to_paths[result[0]] = result[1][1]
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
904
            entry_count += 1
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
905
            if result[3][0]:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
906
                entry_count += 1
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
907
            if pb is not None:
908
                pb.update('comparing files', entry_count, num_entries)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
909
            if changes or include_unchanged:
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
910
                if specific_files is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
911
                    new_parent_id = result[4][1]
912
                    precise_file_ids.add(new_parent_id)
913
                    changed_file_ids.append(result[0])
914
                yield result
915
            # Ensure correct behaviour for reparented/added specific files.
916
            if specific_files is not None:
917
                # Record output dirs
918
                if result[6][1] == 'directory':
919
                    seen_dirs.add(result[0])
920
                # Record parents of reparented/added entries.
921
                versioned = result[3]
922
                parents = result[4]
923
                if not versioned[0] or parents[0] != parents[1]:
924
                    seen_parents.add(parents[1])
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
925
        while all_unversioned:
926
            # yield any trailing unversioned paths
927
            unversioned_path = all_unversioned.popleft()
928
            to_kind, to_executable, to_stat = \
929
                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.
930
            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.
931
                (None, None),
932
                (None, unversioned_path[0][-1]),
933
                (None, to_kind),
934
                (None, to_executable))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
935
        # Yield all remaining source paths
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
936
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
937
            file_id = from_entry.file_id
938
            if file_id in to_paths:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
939
                # already returned
2012.1.1 by Aaron Bentley
Implement change iterator
940
                continue
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
941
            to_path = find_previous_path(self.source, self.target, path)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
942
            entry_count += 1
943
            if pb is not None:
944
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
945
            versioned = (True, False)
946
            parent = (from_entry.parent_id, None)
947
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
948
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
949
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
950
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
951
            executable = (from_executable, None)
3619.4.1 by Robert Collins
Improve tests for the behaviour of Tree.iter_changes for missing paths that are only present in one tree, and fix found bugs. (Robert Collins)
952
            changed_content = from_kind is not None
2012.1.1 by Aaron Bentley
Implement change iterator
953
            # the parent's path is necessarily known at this point.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
954
            changed_file_ids.append(file_id)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
955
            yield(file_id, (path, to_path), changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
956
                  name, kind, executable)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
957
        changed_file_ids = set(changed_file_ids)
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
958
        if specific_files is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
959
            for result in self._handle_precise_ids(precise_file_ids,
960
                changed_file_ids):
961
                yield result
962
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
963
    def _get_entry(self, tree, path):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
964
        """Get an inventory entry from a tree, with missing entries as None.
965
966
        If the tree raises NotImplementedError on accessing .inventory, then
967
        this is worked around using iter_entries_by_dir on just the file id
968
        desired.
969
970
        :param tree: The tree to lookup the entry in.
971
        :param file_id: The file_id to lookup.
972
        """
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
973
        # No inventory available.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
974
        try:
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
975
            iterator = tree.iter_entries_by_dir(specific_files=[path])
976
            return iterator.next()[1]
977
        except StopIteration:
978
            return None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
979
980
    def _handle_precise_ids(self, precise_file_ids, changed_file_ids,
981
        discarded_changes=None):
982
        """Fill out a partial iter_changes to be consistent.
983
984
        :param precise_file_ids: The file ids of parents that were seen during
985
            the iter_changes.
986
        :param changed_file_ids: The file ids of already emitted items.
987
        :param discarded_changes: An optional dict of precalculated
988
            iter_changes items which the partial iter_changes had not output
989
            but had calculated.
990
        :return: A generator of iter_changes items to output.
991
        """
992
        # process parents of things that had changed under the users
993
        # requested paths to prevent incorrect paths or parent ids which
994
        # aren't in the tree.
995
        while precise_file_ids:
996
            precise_file_ids.discard(None)
997
            # Don't emit file_ids twice
998
            precise_file_ids.difference_update(changed_file_ids)
999
            if not precise_file_ids:
1000
                break
1001
            # If the there was something at a given output path in source, we
1002
            # have to include the entry from source in the delta, or we would
1003
            # be putting this entry into a used path.
1004
            paths = []
1005
            for parent_id in precise_file_ids:
1006
                try:
1007
                    paths.append(self.target.id2path(parent_id))
1008
                except errors.NoSuchId:
1009
                    # This id has been dragged in from the source by delta
1010
                    # expansion and isn't present in target at all: we don't
1011
                    # need to check for path collisions on it.
1012
                    pass
1013
            for path in paths:
1014
                old_id = self.source.path2id(path)
1015
                precise_file_ids.add(old_id)
1016
            precise_file_ids.discard(None)
1017
            current_ids = precise_file_ids
1018
            precise_file_ids = set()
1019
            # We have to emit all of precise_file_ids that have been altered.
1020
            # We may have to output the children of some of those ids if any
1021
            # directories have stopped being directories.
1022
            for file_id in current_ids:
1023
                # Examine file_id
1024
                if discarded_changes:
1025
                    result = discarded_changes.get(file_id)
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1026
                    source_entry = None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1027
                else:
1028
                    result = None
1029
                if result is None:
6883.1.4 by Jelmer Vernooij
Fix tests.
1030
                    try:
1031
                        source_path = self.source.id2path(file_id)
1032
                    except errors.NoSuchId:
1033
                        source_path = None
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1034
                        source_entry = None
1035
                    else:
1036
                        source_entry = self._get_entry(self.source, source_path)
6883.1.4 by Jelmer Vernooij
Fix tests.
1037
                    try:
1038
                        target_path = self.target.id2path(file_id)
1039
                    except errors.NoSuchId:
1040
                        target_path = None
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1041
                        target_entry = None
1042
                    else:
1043
                        target_entry = self._get_entry(self.target, target_path)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1044
                    result, changes = self._changes_from_entries(
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1045
                        source_entry, target_entry, source_path, target_path)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1046
                else:
1047
                    changes = True
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1048
                # Get this parents parent to examine.
1049
                new_parent_id = result[4][1]
1050
                precise_file_ids.add(new_parent_id)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1051
                if changes:
1052
                    if (result[6][0] == 'directory' and
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1053
                            result[6][1] != 'directory'):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1054
                        # This stopped being a directory, the old children have
1055
                        # to be included.
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1056
                        if source_entry is None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1057
                            # Reusing a discarded change.
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1058
                            source_entry = self._get_entry(self.source, result[1][0])
6471.1.7 by Jelmer Vernooij
merge bzr.dev.
1059
                        precise_file_ids.update(
6883.3.3 by Jelmer Vernooij
Fix replacements.
1060
                                child.file_id
1061
                                for child in self.source.iter_child_entries(result[1][0]))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1062
                    changed_file_ids.add(result[0])
1063
                    yield result
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1064
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1065
    def file_content_matches(
6883.1.3 by Jelmer Vernooij
Add test, make file_id optional.
1066
            self, source_path, target_path,
1067
            source_file_id=None, target_file_id=None,
6883.1.2 by Jelmer Vernooij
Fix order.
1068
            source_stat=None, target_stat=None):
5906.1.8 by Jelmer Vernooij
Tests.
1069
        """Check if two files are the same in the source and target trees.
1070
1071
        This only checks that the contents of the files are the same,
1072
        it does not touch anything else.
1073
6883.7.1 by Jelmer Vernooij
Swap order of arguments to Tree.file_content_matches.
1074
        :param source_path: Path of the file in the source tree
1075
        :param target_path: Path of the file in the target tree
6883.1.3 by Jelmer Vernooij
Add test, make file_id optional.
1076
        :param source_file_id: Optional file id of the file in the source tree
1077
        :param target_file_id: Optional file id of the file in the target tree
5906.1.8 by Jelmer Vernooij
Tests.
1078
        :param source_stat: Optional stat value of the file in the source tree
1079
        :param target_stat: Optional stat value of the file in the target tree
1080
        :return: Boolean indicating whether the files have the same contents
1081
        """
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1082
        with self.lock_read():
1083
            source_verifier_kind, source_verifier_data = (
1084
                    self.source.get_file_verifier(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1085
                        source_path, source_file_id, source_stat))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1086
            target_verifier_kind, target_verifier_data = (
1087
                self.target.get_file_verifier(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1088
                    target_path, target_file_id, target_stat))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1089
            if source_verifier_kind == target_verifier_kind:
1090
                return (source_verifier_data == target_verifier_data)
1091
            # Fall back to SHA1 for now
1092
            if source_verifier_kind != "SHA1":
1093
                source_sha1 = self.source.get_file_sha1(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1094
                        source_path, source_file_id, source_stat)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1095
            else:
1096
                source_sha1 = source_verifier_data
1097
            if target_verifier_kind != "SHA1":
1098
                target_sha1 = self.target.get_file_sha1(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1099
                        target_path, target_file_id, target_stat)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1100
            else:
1101
                target_sha1 = target_verifier_data
1102
            return (source_sha1 == target_sha1)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1103
5837.1.2 by Jelmer Vernooij
Register defaults as first optimiser for existing Inter objects.
1104
InterTree.register_optimiser(InterTree)
1105
1106
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1107
class MultiWalker(object):
1108
    """Walk multiple trees simultaneously, getting combined results."""
1109
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1110
    # Note: This could be written to not assume you can do out-of-order
1111
    #       lookups. Instead any nodes that don't match in all trees could be
1112
    #       marked as 'deferred', and then returned in the final cleanup loop.
1113
    #       For now, I think it is "nicer" to return things as close to the
1114
    #       "master_tree" order as we can.
1115
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1116
    def __init__(self, master_tree, other_trees):
1117
        """Create a new MultiWalker.
1118
1119
        All trees being walked must implement "iter_entries_by_dir()", such
1120
        that they yield (path, object) tuples, where that object will have a
1121
        '.file_id' member, that can be used to check equality.
1122
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1123
        :param master_tree: All trees will be 'slaved' to the master_tree such
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1124
            that nodes in master_tree will be used as 'first-pass' sync points.
1125
            Any nodes that aren't in master_tree will be merged in a second
1126
            pass.
1127
        :param other_trees: A list of other trees to walk simultaneously.
1128
        """
1129
        self._master_tree = master_tree
1130
        self._other_trees = other_trees
1131
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1132
        # Keep track of any nodes that were properly processed just out of
1133
        # order, that way we don't return them at the end, we don't have to
1134
        # track *all* processed file_ids, just the out-of-order ones
1135
        self._out_of_order_processed = set()
1136
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1137
    @staticmethod
1138
    def _step_one(iterator):
1139
        """Step an iter_entries_by_dir iterator.
1140
1141
        :return: (has_more, path, ie)
1142
            If has_more is False, path and ie will be None.
1143
        """
1144
        try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1145
            path, ie = next(iterator)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1146
        except StopIteration:
1147
            return False, None, None
1148
        else:
1149
            return True, path, ie
1150
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1151
    @staticmethod
1152
    def _cmp_path_by_dirblock(path1, path2):
1153
        """Compare two paths based on what directory they are in.
1154
1155
        This generates a sort order, such that all children of a directory are
1156
        sorted together, and grandchildren are in the same order as the
1157
        children appear. But all grandchildren come after all children.
1158
1159
        :param path1: first path
1160
        :param path2: the second path
1161
        :return: negative number if ``path1`` comes first,
1162
            0 if paths are equal
1163
            and a positive number if ``path2`` sorts first
1164
        """
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1165
        # Shortcut this special case
1166
        if path1 == path2:
1167
            return 0
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1168
        # This is stolen from _dirstate_helpers_py.py, only switching it to
1169
        # Unicode objects. Consider using encode_utf8() and then using the
1170
        # optimized versions, or maybe writing optimized unicode versions.
1171
        if not isinstance(path1, unicode):
1172
            raise TypeError("'path1' must be a unicode string, not %s: %r"
1173
                            % (type(path1), path1))
1174
        if not isinstance(path2, unicode):
1175
            raise TypeError("'path2' must be a unicode string, not %s: %r"
1176
                            % (type(path2), path2))
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1177
        return cmp(MultiWalker._path_to_key(path1),
1178
                   MultiWalker._path_to_key(path2))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1179
1180
    @staticmethod
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1181
    def _path_to_key(path):
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1182
        dirname, basename = osutils.split(path)
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1183
        return (dirname.split(u'/'), basename)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1184
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1185
    def _lookup_by_file_id(self, extra_entries, other_tree, file_id):
1186
        """Lookup an inventory entry by file_id.
1187
1188
        This is called when an entry is missing in the normal order.
1189
        Generally this is because a file was either renamed, or it was
1190
        deleted/added. If the entry was found in the inventory and not in
1191
        extra_entries, it will be added to self._out_of_order_processed
1192
1193
        :param extra_entries: A dictionary of {file_id: (path, ie)}.  This
1194
            should be filled with entries that were found before they were
1195
            used. If file_id is present, it will be removed from the
1196
            dictionary.
1197
        :param other_tree: The Tree to search, in case we didn't find the entry
1198
            yet.
1199
        :param file_id: The file_id to look for
1200
        :return: (path, ie) if found or (None, None) if not present.
1201
        """
1202
        if file_id in extra_entries:
1203
            return extra_entries.pop(file_id)
1204
        # TODO: Is id2path better as the first call, or is
1205
        #       inventory[file_id] better as a first check?
1206
        try:
1207
            cur_path = other_tree.id2path(file_id)
1208
        except errors.NoSuchId:
1209
            cur_path = None
1210
        if cur_path is None:
1211
            return (None, None)
1212
        else:
1213
            self._out_of_order_processed.add(file_id)
6915.4.2 by Jelmer Vernooij
Remove __getitem__ and __iter__ from Inventory.
1214
            cur_ie = other_tree.root_inventory.get_entry(file_id)
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1215
            return (cur_path, cur_ie)
1216
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1217
    def iter_all(self):
1218
        """Match up the values in the different trees."""
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1219
        for result in self._walk_master_tree():
1220
            yield result
1221
        self._finish_others()
1222
        for result in self._walk_others():
1223
            yield result
1224
1225
    def _walk_master_tree(self):
1226
        """First pass, walk all trees in lock-step.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1227
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1228
        When we are done, all nodes in the master_tree will have been
1229
        processed. _other_walkers, _other_entries, and _others_extra will be
1230
        set on 'self' for future processing.
1231
        """
1232
        # This iterator has the most "inlining" done, because it tends to touch
1233
        # every file in the tree, while the others only hit nodes that don't
1234
        # match.
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1235
        master_iterator = self._master_tree.iter_entries_by_dir()
1236
1237
        other_walkers = [other.iter_entries_by_dir()
1238
                         for other in self._other_trees]
1239
        other_entries = [self._step_one(walker) for walker in other_walkers]
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1240
        # Track extra nodes in the other trees
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1241
        others_extra = [{} for _ in range(len(self._other_trees))]
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1242
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1243
        master_has_more = True
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1244
        step_one = self._step_one
1245
        lookup_by_file_id = self._lookup_by_file_id
1246
        out_of_order_processed = self._out_of_order_processed
1247
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1248
        while master_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1249
            (master_has_more, path, master_ie) = step_one(master_iterator)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1250
            if not master_has_more:
1251
                break
1252
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1253
            file_id = master_ie.file_id
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1254
            other_values = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1255
            other_values_append = other_values.append
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1256
            next_other_entries = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1257
            next_other_entries_append = next_other_entries.append
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1258
            for idx, (other_has_more, other_path, other_ie) in enumerate(other_entries):
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1259
                if not other_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1260
                    other_values_append(lookup_by_file_id(
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1261
                        others_extra[idx], self._other_trees[idx], file_id))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1262
                    next_other_entries_append((False, None, None))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1263
                elif file_id == other_ie.file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1264
                    # This is the critical code path, as most of the entries
1265
                    # should match between most trees.
1266
                    other_values_append((other_path, other_ie))
1267
                    next_other_entries_append(step_one(other_walkers[idx]))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1268
                else:
1269
                    # This walker did not match, step it until it either
1270
                    # matches, or we know we are past the current walker.
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1271
                    other_walker = other_walkers[idx]
1272
                    other_extra = others_extra[idx]
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1273
                    while (other_has_more and
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1274
                           self._cmp_path_by_dirblock(other_path, path) < 0):
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1275
                        other_file_id = other_ie.file_id
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1276
                        if other_file_id not in out_of_order_processed:
1277
                            other_extra[other_file_id] = (other_path, other_ie)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1278
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1279
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1280
                    if other_has_more and other_ie.file_id == file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1281
                        # We ended up walking to this point, match and step
1282
                        # again
1283
                        other_values_append((other_path, other_ie))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1284
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1285
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1286
                    else:
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1287
                        # This record isn't in the normal order, see if it
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1288
                        # exists at all.
1289
                        other_values_append(lookup_by_file_id(
1290
                            other_extra, self._other_trees[idx], file_id))
1291
                    next_other_entries_append((other_has_more, other_path,
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1292
                                               other_ie))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1293
            other_entries = next_other_entries
1294
1295
            # We've matched all the walkers, yield this datapoint
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1296
            yield path, file_id, master_ie, other_values
1297
        self._other_walkers = other_walkers
1298
        self._other_entries = other_entries
1299
        self._others_extra = others_extra
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1300
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1301
    def _finish_others(self):
1302
        """Finish walking the other iterators, so we get all entries."""
1303
        for idx, info in enumerate(self._other_entries):
1304
            other_extra = self._others_extra[idx]
1305
            (other_has_more, other_path, other_ie) = info
3514.3.4 by John Arbash Meinel
Handle more cases when the other tree has extra nodes.
1306
            while other_has_more:
1307
                other_file_id = other_ie.file_id
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1308
                if other_file_id not in self._out_of_order_processed:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1309
                    other_extra[other_file_id] = (other_path, other_ie)
3514.3.4 by John Arbash Meinel
Handle more cases when the other tree has extra nodes.
1310
                other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1311
                    self._step_one(self._other_walkers[idx])
1312
        del self._other_entries
1313
1314
    def _walk_others(self):
1315
        """Finish up by walking all the 'deferred' nodes."""
1316
        # TODO: One alternative would be to grab all possible unprocessed
1317
        #       file_ids, and then sort by path, and then yield them. That
1318
        #       might ensure better ordering, in case a caller strictly
1319
        #       requires parents before children.
1320
        for idx, other_extra in enumerate(self._others_extra):
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1321
            others = sorted(viewvalues(other_extra),
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1322
                            key=lambda x: self._path_to_key(x[0]))
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1323
            for other_path, other_ie in others:
1324
                file_id = other_ie.file_id
3514.3.7 by John Arbash Meinel
comment
1325
                # We don't need to check out_of_order_processed here, because
1326
                # the lookup_by_file_id will be removing anything processed
1327
                # from the extras cache
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1328
                other_extra.pop(file_id)
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1329
                other_values = [(None, None)] * idx
3514.3.5 by John Arbash Meinel
Handle some edge cases when we have multiple other trees.
1330
                other_values.append((other_path, other_ie))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1331
                for alt_idx, alt_extra in enumerate(self._others_extra[idx+1:]):
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1332
                    alt_idx = alt_idx + idx + 1
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1333
                    alt_extra = self._others_extra[alt_idx]
1334
                    alt_tree = self._other_trees[alt_idx]
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1335
                    other_values.append(self._lookup_by_file_id(
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1336
                                            alt_extra, alt_tree, file_id))
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1337
                yield other_path, file_id, None, other_values
6883.5.2 by Jelmer Vernooij
Add find_previous_paths call.
1338
1339
1340
def find_previous_paths(from_tree, to_tree, paths):
1341
    """Find previous tree paths.
1342
1343
    :param from_tree: From tree
1344
    :param to_tree: To tree
1345
    :param paths: Iterable over paths to search for
1346
    :return: Dictionary mapping from from_tree paths to paths in to_tree, or
1347
        None if there is no equivalent path.
1348
    """
1349
    ret = {}
1350
    for path in paths:
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1351
        ret[path] = find_previous_path(from_tree, to_tree, path)
6883.5.2 by Jelmer Vernooij
Add find_previous_paths call.
1352
    return ret
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1353
1354
6883.5.11 by Jelmer Vernooij
Fix tests.
1355
def find_previous_path(from_tree, to_tree, path, file_id=None):
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1356
    """Find previous tree path.
1357
1358
    :param from_tree: From tree
1359
    :param to_tree: To tree
1360
    :param path: Path to search for
1361
    :return: path in to_tree, or None if there is no equivalent path.
1362
    """
6883.5.11 by Jelmer Vernooij
Fix tests.
1363
    if file_id is None:
1364
        file_id = from_tree.path2id(path)
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1365
    if file_id is None:
1366
        raise errors.NoSuchFile(path)
1367
    try:
1368
        return to_tree.id2path(file_id)
1369
    except errors.NoSuchId:
1370
        return None