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